diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index daa69766d6..0b07b72afb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,6 +24,12 @@ In GURU we use ['thin manifests'](https://wiki.gentoo.org/wiki/Repository_format String variables should be quoted (e.g. not `$P` or `${P}` but `"${P}"`). `repoman -dx full` will warn you about any unquoted variables you might have forgotten about. +- #### Run tests if you enable them + +You can enable `FEATURES="test"` for GURU in your [package.env](https://wiki.gentoo.org/wiki//etc/portage/package.env) or on the command line: + +`sudo env FEATURES=test USE=test ebuild foo-1.0.ebuild test` + - #### No Symlinks in the repository Please don't use symlinks in the repository (e.g. foobar-x.y.z.ebuild -> foobar-9999.ebuild), see [this forum posts](https://forums.gentoo.org/viewtopic-t-1079126-start-0.html) on why this is not a good idea. @@ -32,7 +38,7 @@ Please don't use symlinks in the repository (e.g. foobar-x.y.z.ebuild -> foobar- Sometimes a upstream lists dependencies which are considered deprecated. If possible, packages should **not** depend on these deprecated dependencies. Reasons a dependency might be deprecated is that it is too old, unmaintained, or the features it adds are not useful to Gentoo. You can find an overview of the currently deprecated dependencies and the reason they are deprecated in `$(portageq get_repo_path / gentoo)/profiles/package.deprecated`. `repoman -dx full` will warn you if your package depends on a deprecated dependency. -For Python packages there are some additional (test) dependencies that are considered undesirable or not useful, but are not considered deprecated. You can find an overview of those [here](https://dev.gentoo.org/~mgorny/python-guide/distutils.html#enabling-tests) and in the list below: +For Python packages there are some additional (test) dependencies that are considered undesirable or not useful, but are not considered deprecated. You can find an overview of those [here](https://projects.gentoo.org/python/guide/distutils.html#enabling-tests) and in the list below: ``` dev-python/black dev-python/check-manifest @@ -78,11 +84,21 @@ Running `repoman -dx full` in the directory your ebuild is in will preform some Pkgcheck does even more checks than repoman. While it is good practice to make repoman as happy as possible, it is not necessary to fix *every* issue that pkgcheck reports. Because pkgcheck is *very* strict. That being said, pkgcheck is a very useful tool to perfect your ebuilds. -- #### Tests and documentation for Python packages. +- #### Establish your package testing workflow + +There are [make.conf flags](https://wiki.gentoo.org/wiki/Package_testing#make.conf_.26_test.conf) you might want to set to enable more QA checks. + +The [app-portage/iwdevtools](https://github.com/ionenwks/iwdevtools) package contains scripts that help with ebuild development: finding incorrect dependencies, detectng [ABI changes](https://devmanual.gentoo.org/general-concepts/slotting/index.html#abi-breakage) etc. + +- #### Tests and documentation for Python packages Many Python packages have tests and documentation. Unlike some other eclasses the [distutils-r1 eclass](https://devmanual.gentoo.org/eclass-reference/distutils-r1.eclass/index.html) does not enable support for these tests automatically. This is because there are multiple test runners available for Python. To enable tests for your Python ebuilds, use the `distutils_enable_tests ` function. Similarly, support for documentation building with Sphinx can be added with the `distutils_enable_sphinx [--no-autodoc | ...]` function. Please note that these functions already append to IUSE and RESTRICT, so there is no need to specify this manually. -See the [dev manual](https://devmanual.gentoo.org/eclass-reference/distutils-r1.eclass/index.html) and the [Gentoo Python Guide](https://dev.gentoo.org/~mgorny/python-guide/distutils.html) for more information. +See the [dev manual](https://devmanual.gentoo.org/eclass-reference/distutils-r1.eclass/index.html) and the [Gentoo Python Guide](https://projects.gentoo.org/python/guide/distutils.html) for more information. + +- #### Prefer the PEP 517 mode for `distutils-r1` packages + +If you are writing a new ebuild or doing a version bump for a project that has `pyproject.toml` file, consider switching to [the PEP 517 mode](https://projects.gentoo.org/python/guide/distutils.html#the-pep-517-and-legacy-modes). - #### Avoid introducing USE flags for small files and optional runtime dependencies. diff --git a/app-admin/customrescuecd-x86_64/Manifest b/app-admin/customrescuecd-x86_64/Manifest index e6ffc7dcca..69fcb1f6d6 100644 --- a/app-admin/customrescuecd-x86_64/Manifest +++ b/app-admin/customrescuecd-x86_64/Manifest @@ -1,2 +1 @@ -DIST CUSTOMRESCUECD-x86_64-0.12.2.iso 1516290048 BLAKE2B c9d2b857948c09a16b86bb9ccb7373f1908f52f97ed21c64ef422e6d7c3501278fd7871b34c035a70554b494926325d1be2978df729ffd93cb7f3bee6b0c5adc SHA512 f215116878557ada9d321ba018970723a1e3905cbebf12aac5e1e65e97c9180f852fcfff5c2133c28e97bb3d1eb8fb80ca26bbf307de8b202fa39eb02a474abd -DIST CUSTOMRESCUECD-x86_64-0.12.3.iso 1531445248 BLAKE2B a4873c26660cebb9f12b70df9aba0fef8dc64d2e15184f8054d252c3f893c967dcbc00b6b5cc154e726379c6a8cf6d024e432eba41de35a5488715f9a1ddb877 SHA512 fa2d535918f1bc321f65ae111b806c91aa34e09d32907fc1c12ee186b2ed4e96494d0c555101fe3d969f3364b95bae5496ff8a2ed6b350f6321b8f084cac6192 +DIST CUSTOMRESCUECD-x86_64-0.12.4.iso 1581383680 BLAKE2B cdf282a5d95a3aad7b178234eafd82d6b76969716b9b9f6b6c5c52b4c53e993db684b8f258502640fcb7b1fe6347c6de395d21dab954507cbe361c5bc953b705 SHA512 b12698432bc99ef1ddea8129512b45fe48debf0e3b47f15327f0a38e80dd54e5b7fa88489858ab7cd8fc4b3b14db3dd1f383a876950fcc6f6a3bee19293b8265 diff --git a/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.3.ebuild b/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.3.ebuild deleted file mode 100644 index d57a8059dc..0000000000 --- a/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="CUSTOMRESCUECD-x86_64" -DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gentoo" -HOMEPAGE="https://sourceforge.net/projects/customrescuecd" -SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso" - -LICENSE="GPL-3" -SLOT="${PV}" -KEYWORDS="~amd64" -RESTRICT="bindist mirror" - -S=${WORKDIR} - -src_unpack() { :; } - -src_install() { - insinto "/usr/share/${PN%-*}" - doins "${DISTDIR}/${MY_P}-${PV}.iso" -} - -pkg_postinst() { - local f=${EROOT}/usr/share/${PN%-*}/${PN}-newest.iso - - # no version newer than ours? we're the newest! - if ! has_version ">${CATEGORY}/${PF}"; then - ln -f -s -v "${MY_P}-${PV}.iso" "${f}" || die - fi -} - -pkg_postrm() { - local f=${EROOT}/usr/share/${PN%-*}/${PN}-newest.iso - - # if there is no version newer than ours installed - if ! has_version ">${CATEGORY}/${PF}"; then - # and we are truly and completely uninstalled... - if [[ ! ${REPLACED_BY_VERSION} ]]; then - # then find an older version to set the symlink to - local newest_version=$(best_version "<${CATEGORY}/${PF}") - - if [[ ${newest_version} ]]; then - # update the symlink - ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die - else - # last version removed? clean up the symlink - rm -v "${f}" || die - # and the parent directory - rmdir "${f%/*}" || die - fi - fi - fi -} diff --git a/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.2.ebuild b/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.4.ebuild similarity index 100% rename from app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.2.ebuild rename to app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.4.ebuild diff --git a/app-editors/mined/mined-2015.25.ebuild b/app-editors/mined/mined-2015.25.ebuild index 79ac97d1c6..006d7fe6d1 100644 --- a/app-editors/mined/mined-2015.25.ebuild +++ b/app-editors/mined/mined-2015.25.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,13 +14,18 @@ IUSE="" RDEPEND="" DEPEND="${RDEPEND}" BDEPEND="" -#src_configure() { -# econf -#} +S=${S}/src +src_configure() { + sed -in 's/OBJDIR=..\/bin\/sh/OBJDIR=bin\/sh/' mkmined + sed -in 's/\"\${COPT--DTERMIO \$W}\"/\"${CFLAGS} \${COPT--DTERMIO}\"/' mkmined +} + src_compile() { - emake -j1 + mkdir bin/ + ./mkmined } + src_install() { - dobin bin/Linux.x86_64/mined - doman man/mined.1 + dobin bin/sh/mined + doman ../man/mined.1 } diff --git a/app-misc/ssmtool/ssmtool-0.6.2.ebuild b/app-misc/ssmtool/ssmtool-0.6.2.ebuild index c20470c0a1..25a34ce7fe 100644 --- a/app-misc/ssmtool/ssmtool-0.6.2.ebuild +++ b/app-misc/ssmtool/ssmtool-0.6.2.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_USE_SETUPTOOLS=pyproject.toml +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 DESCRIPTION="A simple sentence mining tool written in PyQt5" @@ -30,7 +30,7 @@ RDEPEND=" dev-python/playsound[${PYTHON_USEDEP}] dev-python/charset_normalizer[${PYTHON_USEDEP}] dev-python/EbookLib[${PYTHON_USEDEP}] - dev-python/sentence_splitter[${PYTHON_USEDEP}] + dev-python/sentence-splitter[${PYTHON_USEDEP}] dev-python/mobi[${PYTHON_USEDEP}] dev-python/SLPP[${PYTHON_USEDEP}] " diff --git a/dev-python/EbookLib/EbookLib-0.17.1.ebuild b/dev-python/EbookLib/EbookLib-0.17.1.ebuild index 861957e95b..ab0e953340 100644 --- a/dev-python/EbookLib/EbookLib-0.17.1.ebuild +++ b/dev-python/EbookLib/EbookLib-0.17.1.ebuild @@ -13,5 +13,3 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -distutils_enable_tests pytest diff --git a/dev-python/SLPP/SLPP-1.2.3.ebuild b/dev-python/SLPP/SLPP-1.2.3.ebuild index ffd5f394f9..c3edebe587 100644 --- a/dev-python/SLPP/SLPP-1.2.3.ebuild +++ b/dev-python/SLPP/SLPP-1.2.3.ebuild @@ -13,5 +13,3 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -distutils_enable_tests pytest diff --git a/dev-python/mobi/Manifest b/dev-python/mobi/Manifest index 44c252b751..b2e87dc06c 100644 --- a/dev-python/mobi/Manifest +++ b/dev-python/mobi/Manifest @@ -1 +1 @@ -DIST mobi-0.3.2.tar.gz 91513 BLAKE2B 0a5b5da80e4cfaae4794dd20eb8a91b0f2b436d95bcd36ccc141a95900d8d3b339b4fb8991895b8de5d7787526d63beb14bfd44d34f1c3ae5d8cef6655251ac2 SHA512 702693dfbe54e1df4b45201411edb92aaea84241843ebc1e436a78e927873f9df2d28d94a6ab4559d7ef1f93d890207844e00453a0f289585977a00cf57135ee +DIST mobi-0.3.2-r1.tar.gz 649831 BLAKE2B d738b53b5be68cb03acfbedf1a5c1b9f207c743e6ee4fd83a88b2dad01e9a1f0d332d1d1a27c29b7e98edc0d3c10ae632f3de6c27249aa297a0923ce62c87966 SHA512 eca946811091927011fbf2ba3f3ad92f9c914861a4549e70571e74fc8974de75924c41482945540bb38381129a02965d3f2c04b11e728923129b89dea6c957c4 diff --git a/dev-python/mobi/mobi-0.3.2.ebuild b/dev-python/mobi/mobi-0.3.2-r1.ebuild similarity index 64% rename from dev-python/mobi/mobi-0.3.2.ebuild rename to dev-python/mobi/mobi-0.3.2-r1.ebuild index 8eb9f18f8e..aec377bd8f 100644 --- a/dev-python/mobi/mobi-0.3.2.ebuild +++ b/dev-python/mobi/mobi-0.3.2-r1.ebuild @@ -4,14 +4,17 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_PEP517=poetry inherit distutils-r1 DESCRIPTION="unpack unencrypted mobi files" HOMEPAGE="https://github.com/iscc/mobi https://pypi.org/project/mobi/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/iscc/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}-r1.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-python/loguru[${PYTHON_USEDEP}]" distutils_enable_tests pytest diff --git a/dev-python/sentence-splitter/Manifest b/dev-python/sentence-splitter/Manifest new file mode 100644 index 0000000000..e43d104387 --- /dev/null +++ b/dev-python/sentence-splitter/Manifest @@ -0,0 +1 @@ +DIST sentence-splitter-1.4.tar.gz 33888 BLAKE2B 490da5f1dde77a164306a0ac5cd9b073eda5e25e8016f7dbd4e5add1341c276ea7dd646442e88697e9fb1f3ebe58ad04da7d0fda36793e66c34f83a728f6a121 SHA512 d1c8cc2c830f5b005265c5a0633bde9237f0d4f52526fc16197fa1b6bb413c25394e41eea03bdcedc824066c4d16d4c77b293ecb3ba37f8ec8eee2037842869f diff --git a/dev-python/sentence_splitter/metadata.xml b/dev-python/sentence-splitter/metadata.xml similarity index 100% rename from dev-python/sentence_splitter/metadata.xml rename to dev-python/sentence-splitter/metadata.xml diff --git a/dev-python/sentence_splitter/sentence_splitter-1.4.ebuild b/dev-python/sentence-splitter/sentence-splitter-1.4-r1.ebuild similarity index 70% rename from dev-python/sentence_splitter/sentence_splitter-1.4.ebuild rename to dev-python/sentence-splitter/sentence-splitter-1.4-r1.ebuild index 753104bdb6..5a451aa521 100644 --- a/dev-python/sentence_splitter/sentence_splitter-1.4.ebuild +++ b/dev-python/sentence-splitter/sentence-splitter-1.4-r1.ebuild @@ -3,15 +3,17 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..10} pypy3 ) inherit distutils-r1 DESCRIPTION="Sentence splitter using heuristic algorithm by Philipp Koehn and Josh Schroeder" HOMEPAGE="https://github.com/mediacloud/sentence-splitter https://pypi.org/project/sentence-splitter/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/mediacloud/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" +RDEPEND="dev-python/regex[${PYTHON_USEDEP}]" + distutils_enable_tests pytest diff --git a/dev-python/sentence_splitter/Manifest b/dev-python/sentence_splitter/Manifest deleted file mode 100644 index 42e8226fe6..0000000000 --- a/dev-python/sentence_splitter/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sentence_splitter-1.4.tar.gz 30607 BLAKE2B 6f1ebf416e9cb0ae837d54dbae0ae275a091086bbaf266b8e991014a7aab8e9c63af16ba3904d34691df10f4d237817a9049383b70ba4de14c8d32748e759320 SHA512 b173f1dd0b94191f03eab4ac4679608ec2cb2f2964c644144020df4ea740915ad7f96737e2384eb6fb2d4cd8a1cf353e472b8e059714e914a8973f99f3ad8e94 diff --git a/dev-util/cdecl/Manifest b/dev-util/cdecl/Manifest index 2c5aff4520..4be916cd12 100644 --- a/dev-util/cdecl/Manifest +++ b/dev-util/cdecl/Manifest @@ -1 +1 @@ -DIST cdecl-9.10.tar.gz 651328 BLAKE2B 1889fbd7cd387e7e7905f7fb9fb45b82053db18621d84ab4e10de8c4ed0863ea9087746eb85e8dc58d4319a48b3d7a1ead7310fed16b6361741e545aecbc2e71 SHA512 91af182ac736d7955121a6661f7a606b576a976d901256a2d7112b1a8f59f6978f86de019d1b7399fcf1aebffe8a8f93dee163955695c629cc961cd9fdf7a52c +DIST cdecl-11.11.tar.gz 765023 BLAKE2B c8847740339f0d9c977c43d9cbf4ea05061a428cef47bfa0cbf908548162eb328483a477e86b60525e39c3e59dc32a21fb093c3afecafb17da1943945c875d98 SHA512 32b95c51af4b1eaa2833777c3a63a807d63f754a766a5dbb215508c11bca99be0b3d3ef260b6bc52a9cbae7f99d82c27fe034f4c9acfcb0447ba1d1c9dba14f4 diff --git a/dev-util/cdecl/cdecl-9.10.ebuild b/dev-util/cdecl/cdecl-11.11.ebuild similarity index 87% rename from dev-util/cdecl/cdecl-9.10.ebuild rename to dev-util/cdecl/cdecl-11.11.ebuild index 46923f4d9b..7e715e9185 100644 --- a/dev-util/cdecl/cdecl-9.10.ebuild +++ b/dev-util/cdecl/cdecl-11.11.ebuild @@ -1,7 +1,7 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -24,10 +24,6 @@ BDEPEND=" sys-devel/flex " -PATCHES=( - "${FILESDIR}/${P}-tinfo.patch" -) - S="${WORKDIR}/${PN}-${P}" src_prepare() { diff --git a/dev-util/cdecl/files/cdecl-9.10-tinfo.patch b/dev-util/cdecl/files/cdecl-9.10-tinfo.patch deleted file mode 100644 index ddc8b628e3..0000000000 --- a/dev-util/cdecl/files/cdecl-9.10-tinfo.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 948525fd0ca553d4fce84fc5b080278494c4f224 Mon Sep 17 00:00:00 2001 -From: Marco Sirabella -Date: Tue, 18 May 2021 17:43:35 -0400 -Subject: [PATCH] Search for the library containing: tigetnum (tinfo) - -For me, `tigetnum` is found in tinfo.so, ncurses has been split off into -tinfo due to being compiled with the --with-termlib flag. - -pkg-config --libs automatically reports this, but this check is good -enough to catch this specific problem. ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index b617f9b1..b892ffea 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -113,6 +113,7 @@ AC_CHECK_FUNCS([geteuid getpwuid fmemopen strsep]) - AC_SEARCH_LIBS([endwin],[curses ncurses]) - AC_SEARCH_LIBS([readline],[readline]) - AC_SEARCH_LIBS([add_history],[readline history]) -+AC_SEARCH_LIBS([tigetnum],[curses ncurses tinfo]) - - # If readline wasn't disabled by the user, does it actually exist and is it a - # proper readline? diff --git a/net-client/lagrange/Manifest b/net-client/lagrange/Manifest index 656245ac42..84675aef07 100644 --- a/net-client/lagrange/Manifest +++ b/net-client/lagrange/Manifest @@ -1,4 +1,4 @@ -DIST lagrange-1.10.1.tar.gz 8652043 BLAKE2B 2cc88adf60c527b4590ad1173b2c85189c6cf9f8c826b5957d8aba363e31b7bf858b720d6706622597d3fee2865b8e0f45e60774adbb818b5a1f83d20000aee6 SHA512 ebc7ce67ca66770feffc311a09c0d1d6c14765ba5678095c801d62e29a8dea7bfbfc2475f4904e4683bb380ae9a6e8000d27a040545bc4480a56527a7d676b2c -DIST lagrange-1.10.1.tar.gz.sig 488 BLAKE2B e2a84bb6060aecec26f3813a2bf30585cb175bbdb4a2e40569c5e019bdc8bfb0ae7ae64b0ac8198c1ac9f879b14f023846634df0809ab4a958c2f4000b163cf6 SHA512 7ac1973fc8bf978c409046fe12466dd49b1bb701eb9b36711359c19963d426d56d2793f771929c498640051395f51670d3553125bcd4dbdcc41e77523930f1a6 DIST lagrange-1.10.2.tar.gz 8659158 BLAKE2B 4f5270a0d42378281b537ea54bbe47f07e83ae7928f6d0a2471a8041ccd1de6becc1d2da81fe854118e0aee1f918662c96e6042d5b411da64920ad8b90168c89 SHA512 d8953da32a49edf4c693431652c49aebe9ad02605912e5b37b6e60d7c273f03a236de85498fab9f1a95b228dfc5088e60272c7b52dfb66ddfbb646116dbda4b3 DIST lagrange-1.10.2.tar.gz.sig 488 BLAKE2B cbff684be98f87f449f72f45619fb7d604f9c2a4599377273d73dc54b75f4f7c356a71560caeafdbc925e88d77fad6301f143c82d3d4e17ec07b20fea2257734 SHA512 7b6b2a2b33c9365a2aff6082ac303a8102ee6b50388365d7a21b8aa721fa917e466e6b47dd45fb31ca9eb9609978f7b2b5dfb1c483a4bf853cadd5e616c57163 +DIST lagrange-1.10.3.tar.gz 8665044 BLAKE2B e8016b4df38bd27db05ffc41e9560bc3d835503d561fe1ca9356a30c2187db216d560d7a2a895fbcb227e83e8344afce076a0920d08d33227271feb692a77c90 SHA512 1172c9d2b37cbdd9b8fd718bb41994f495b46341f5ed8ba0d2a71753d31c7b6f66f0fbf862d036de7269a2fedc53619d8ab4dec536e06fb1df0b1e71623964de +DIST lagrange-1.10.3.tar.gz.sig 488 BLAKE2B b01e01a66fa7d23bd3a068a83eaf7f27efbea2f05d354439c6d7edf04107a13218f71115c12f89905c51b808c09c92167bc8be5bb81b00e021b4e889cdf05311 SHA512 b107a4714a58daf46e97184af095a15d805bc8a29bfc56c152728a9b6ee938154b783519fc9b0acf5811390fd4777c068571e2f434d8c5b94c1c20f6a845968c diff --git a/net-client/lagrange/lagrange-1.10.1.ebuild b/net-client/lagrange/lagrange-1.10.3.ebuild similarity index 100% rename from net-client/lagrange/lagrange-1.10.1.ebuild rename to net-client/lagrange/lagrange-1.10.3.ebuild diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest index 4f673292d4..52d03e95c3 100644 --- a/net-misc/gmid/Manifest +++ b/net-misc/gmid/Manifest @@ -1,3 +1,4 @@ -DIST gmid-1.7.4.tar.gz 81988 BLAKE2B 4dc2ec0e89aeb0b2c627927f35a9996f3d91c91b0266f351c6b64f1ba52e0f425cc48add1bdee6f5434f2a486ddd76db8c9e574ac9cbaea3e2a34b16bf0ee9ad SHA512 3dd2cae5597d1b88eec8f2f3b8e60ccc3e2034cbaa30382d982cf0435f1a243643d40c5d00aa7d1c7abae9c9f6751b38f7d6741ec08f7ee280bc2db99263d19e DIST gmid-1.7.5.sha.sig 708 BLAKE2B ae5c1ee80e7994c9d8b1b630c01b9dea121f08d2d8efd2a6ccfa129badaa680da037c2a0b955497ba81224e0faf2ca95a9ce11076aadf4012321648bdd5cde81 SHA512 b2ca1974188199eae71aab4d7cc740b7101adc7b3ebe36aa5690aa638e03e028f6f8cd6798fda2586543e2ca71981d95d0921fa58775dd8d66898650d9299578 DIST gmid-1.7.5.tar.gz 82100 BLAKE2B 15d5ff725019193dd0394ad7d0f641d036064355118c37980c899b8c84b226eff2ebd5c8f0b17d5575e44f26d93b9492ef48efac6d7d93c4f1972dfb965e4e3d SHA512 eb7951f93746fe133291ac4136837b07d768997241fe913650ecd75d98153479e417c34a4e687ca30dc08f904dcc738d16834910ca21b100e3a220d7ed715507 +DIST gmid-1.8.sha.sig 888 BLAKE2B 283d9996dc279591bc6537fd3be5666b55ab8e81ae0284d7de867e7d34560cf51502fcd26126f294600785d57f94ac316b545c3bb3788d0db57397ccfebb0524 SHA512 dbb08dbd890c869e09dc9bd528efd6912fb40e8f18bf07601d64c935155b51e7ec8d7722c68b816262f5df78babd0e18e1f98b9df4835960a519595aed744e1d +DIST gmid-1.8.tar.gz 141057 BLAKE2B 299514df69c35ea0b5ac8e83261025a3a34a419998e4c3833c4f0f8abff6e526222b3c5b0ae69dffd5b2605efe9c0c27ef870fc8eee34f6059095ca7f18706a6 SHA512 ba1c755909004b8399a2323be6a5325fe5a712c0c845630cadabd83d1fb9dd636b4ac077df5b644c04b4701f1b8a92ca02126dcb5c82019ce5a46beefdc42dd5 diff --git a/net-misc/gmid/files/gmid.service b/net-misc/gmid/files/gmid.service new file mode 100644 index 0000000000..9c5d14cc84 --- /dev/null +++ b/net-misc/gmid/files/gmid.service @@ -0,0 +1,21 @@ +[Unit] +Description=The gmid Gemini server +Documentation=https://gmid.omarpolo.com/ +After=network-online.target syslog.target +Wants=network-online.target + +[Service] +Type=simple +User=gemini +Group=gemini +ExecStart=/usr/bin/gmid -f -c /etc/gmid.conf +ExecStop=/bin/kill -TERM $MAINPID +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-failure +RestartSec=30 +StandardOutput=journal +StandardError=inherit +SyslogIdentifier=gmid + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/gmid/gmid-1.7.4.ebuild b/net-misc/gmid/gmid-1.8.ebuild similarity index 66% rename from net-misc/gmid/gmid-1.7.4.ebuild rename to net-misc/gmid/gmid-1.8.ebuild index 10cb49b3a1..7b929d7cc5 100644 --- a/net-misc/gmid/gmid-1.7.4.ebuild +++ b/net-misc/gmid/gmid-1.8.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 SSL_DAYS=36500 SSL_CERT_MANDATORY=1 -inherit ssl-cert systemd toolchain-funcs +VERIFY_SIG_METHOD="signify" +inherit ssl-cert systemd toolchain-funcs verify-sig DESCRIPTION="Simple and secure Gemini server" HOMEPAGE="https://gmid.omarpolo.com" @@ -14,8 +15,9 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git" inherit git-r3 else - SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz + verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/SHA256.sig -> ${P}.sha.sig )" + KEYWORDS="~amd64 ~x86" fi LICENSE="BSD ISC MIT" @@ -28,24 +30,35 @@ DEPEND=" acct-user/gemini dev-libs/imsg-compat dev-libs/libevent:= - dev-libs/libretls + dev-libs/libretls:= dev-libs/openssl:= " +RDEPEND="${DEPEND}" BDEPEND=" virtual/pkgconfig virtual/yacc " -RDEPEND="${DEPEND}" +if [[ ${PV} != 9999 ]]; then + BDEPEND+="verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) )" +fi + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub" DOCS=( README.md ChangeLog contrib/README ) -src_prepare() { - default - - sed \ - -e "s:/usr/local/bin/gmid:/usr/bin/gmid:" \ - -e "s:/etc/gmid.conf:/etc/gmid/gmid.conf:" \ - -i contrib/gmid.service || die +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + if use verify-sig; then + # Too many levels of symbolic links + cp "${DISTDIR}"/${P}.{sha.sig,tar.gz} "${WORKDIR}" || die + cd "${WORKDIR}" || die + verify-sig_verify_signed_checksums \ + ${P}.sha.sig sha256 ${P}.tar.gz + fi + default + fi } src_configure() { @@ -66,13 +79,6 @@ src_configure() { fi } -src_compile() { - emake gmid - if use test ; then - emake -C regress gg data puny-test fcgi-test - fi -} - src_test() { emake regress } @@ -86,7 +92,7 @@ src_install() { insinto /usr/share/vim/vimfiles doins -r contrib/vim/* - systemd_dounit contrib/gmid.service + systemd_dounit "${FILESDIR}"/gmid.service newinitd "${FILESDIR}"/gmid.initd gmid newconfd "${FILESDIR}"/gmid.confd gmid diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild new file mode 100644 index 0000000000..7b929d7cc5 --- /dev/null +++ b/net-misc/gmid/gmid-9999.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +SSL_DAYS=36500 +SSL_CERT_MANDATORY=1 +VERIFY_SIG_METHOD="signify" +inherit ssl-cert systemd toolchain-funcs verify-sig + +DESCRIPTION="Simple and secure Gemini server" +HOMEPAGE="https://gmid.omarpolo.com" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz + verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/SHA256.sig -> ${P}.sha.sig )" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="BSD ISC MIT" +SLOT="0" +IUSE="seccomp test" +RESTRICT="!test? ( test )" + +DEPEND=" + !elibc_Darwin? ( dev-libs/libbsd ) + acct-user/gemini + dev-libs/imsg-compat + dev-libs/libevent:= + dev-libs/libretls:= + dev-libs/openssl:= +" +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + virtual/yacc +" +if [[ ${PV} != 9999 ]]; then + BDEPEND+="verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) )" +fi + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub" + +DOCS=( README.md ChangeLog contrib/README ) + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + if use verify-sig; then + # Too many levels of symbolic links + cp "${DISTDIR}"/${P}.{sha.sig,tar.gz} "${WORKDIR}" || die + cd "${WORKDIR}" || die + verify-sig_verify_signed_checksums \ + ${P}.sha.sig sha256 ${P}.tar.gz + fi + default + fi +} + +src_configure() { + local conf_args + tc-export CC + + # note: not an autoconf configure script + conf_args=( + PREFIX="${EPREFIX}"/usr/share + BINDIR="${EPREFIX}"/usr/bin + $(use_enable seccomp sandbox) + ) + + ./configure "${conf_args[@]}" || die + + if use seccomp && has usersandbox ${FEATURES} ; then + export SKIP_RUNTIME_TESTS=1 + fi +} + +src_test() { + emake regress +} + +src_install() { + default + + insinto /etc/gmid + doins "${FILESDIR}"/gmid.conf + + insinto /usr/share/vim/vimfiles + doins -r contrib/vim/* + + systemd_dounit "${FILESDIR}"/gmid.service + newinitd "${FILESDIR}"/gmid.initd gmid + newconfd "${FILESDIR}"/gmid.confd gmid + + keepdir /var/gemini/localhost +} + +pkg_postinst() { + if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then + install_cert /etc/ssl/${PN}/${PN} + chown gemini:gemini "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem} + fi + + einfo "This gemini server can be run as a user with zero configuration.\n" + einfo "In order to use it with the init service you will need to generate a" + einfo "self-signed TLS certificate and a key and set up the configuration" + einfo "file (see man 1 gmid for details)." +} diff --git a/profiles/updates/1Q-2022 b/profiles/updates/1Q-2022 index 61430447e6..76a0a2c56a 100644 --- a/profiles/updates/1Q-2022 +++ b/profiles/updates/1Q-2022 @@ -1 +1,2 @@ move app-emulation/nvidia-container-toolkit app-containers/nvidia-container-toolkit +move dev-python/sentence_splitter dev-python/sentence-splitter diff --git a/sec-keys/signify-keys-gmid/Manifest b/sec-keys/signify-keys-gmid/Manifest index dd09710009..ddb9b227f1 100644 --- a/sec-keys/signify-keys-gmid/Manifest +++ b/sec-keys/signify-keys-gmid/Manifest @@ -1 +1,2 @@ DIST gmid-1.7.pub 95 BLAKE2B 4975dca61d35e80829b42217863caf394fb3cb4e161b59f2700d089f6e230cb0b9cb278fc0e4cd690c931cd4986a0491f7cbc8434ac51876e15b08d865f8f0ee SHA512 4d337576549d9202afbe357cc85a34a2ea6098c035b19d449446810ca0c89b641886ec5290a03122e238640a29c994581829f0631ee8ce82c3011a37a03d7da7 +DIST gmid-1.8.pub 95 BLAKE2B fefbcfb96e782f768dced47c590147c490bc4fa1425b0c34aff02a1be5b5f26d34c8b6218e221b98f0a9af0a82bb0d5a942d5fc38f19b7365ca092700a3af284 SHA512 9bb264dcf6f91a2c638184c0563a067908928302b1ec943558aef9a4b6325d068cf63db433d51bc87ac80a1e96d5ca52c10f07b01bd23d7b52840a9ada845129 diff --git a/sec-keys/signify-keys-gmid/signify-keys-gmid-1.8.ebuild b/sec-keys/signify-keys-gmid/signify-keys-gmid-1.8.ebuild new file mode 100644 index 0000000000..d07f8b4d6d --- /dev/null +++ b/sec-keys/signify-keys-gmid/signify-keys-gmid-1.8.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="${PN#signify-keys-}" +MY_PV="$(ver_cut 1-2)" +MY_P="${MY_PN}-${MY_PV}" +DESCRIPTION="Signify keys used to sign gmid releases" +HOMEPAGE="https://github.com/omar-polo/gmid" +SRC_URI="https://github.com/omar-polo/${MY_PN}/releases/download/${PV}/${MY_P}.pub" +S="${WORKDIR}" + +LICENSE="public-domain" +SLOT="${MY_PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + +src_install() { + local files=( ${A} ) + + insinto /usr/share/signify-keys + newins - ${MY_P}.pub < <(cat "${files[@]/#/${DISTDIR}/}" || die) +} diff --git a/x11-misc/gromit-mpx/Manifest b/x11-misc/gromit-mpx/Manifest index 0fc8169508..ccd2d989c4 100644 --- a/x11-misc/gromit-mpx/Manifest +++ b/x11-misc/gromit-mpx/Manifest @@ -1 +1,2 @@ +DIST gromit-mpx-1.4.1.tar.gz 1860019 BLAKE2B e13668e0e96aaa41c0a7a32f58ba136a406d0c675ee9b494171ee0ae834891f7c3251b58cd0c7987c5241ae172f16f7d27ff9bf22c5ab737507738bf21353712 SHA512 762cb068331121c27de8ebd6e226a18fe2f67d80f574a9d9241ae1484038cd82165b3098be29fc2e00831cf40f52c0e8bd0ef78e493a9eb642405a18a48680d3 DIST gromit-mpx-1.4.tar.gz 1858578 BLAKE2B e7f8cd9f424422f7169b14f9780c64c317fecc9de421e6960f1926629423ddf1e9ac796b806d36cae884dd074e352cfca6084b9821cc74cdcabfbecf3d611c9c SHA512 5a2b81dcaef9b04e9d514c966b0b96dcb1b6b4a4cba1f26056ac3b758922d82e551397cf9c06a32a395e6a5b99a3d8c08fdd5ac875fdf7455efc2abe7eeb82f5 diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.4.1.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.4.1.ebuild new file mode 100644 index 0000000000..95600ede05 --- /dev/null +++ b/x11-misc/gromit-mpx/gromit-mpx-1.4.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool" +HOMEPAGE="https://github.com/bk138/gromit-mpx" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bk138/${PN}.git" +else + SRC_URI="https://github.com/bk138/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +SLOT="0" +LICENSE="GPL-2" + +RDEPEND=" + x11-libs/gtk+:3 + dev-libs/libappindicator:3 + x11-libs/libX11 + >=x11-apps/xinput-1.3 +" +DEPEND="${RDEPEND}" + +src_prepare () { + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc + ) + + cmake_src_configure +} diff --git a/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild b/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild index 60db7a22ee..95600ede05 100644 --- a/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild +++ b/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg diff --git a/x11-misc/squeekboard/squeekboard-1.15.0.ebuild b/x11-misc/squeekboard/squeekboard-1.15.0.ebuild index be6e567f4d..3262a1a42e 100644 --- a/x11-misc/squeekboard/squeekboard-1.15.0.ebuild +++ b/x11-misc/squeekboard/squeekboard-1.15.0.ebuild @@ -61,7 +61,7 @@ SRC_URI+=" $(cargo_crate_uris ${CRATES})" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="~arm64" IUSE="+wayland" RDEPEND=" diff --git a/x11-misc/squeekboard/squeekboard-1.16.0.ebuild b/x11-misc/squeekboard/squeekboard-1.16.0.ebuild index d80afc2328..bc71875fc9 100644 --- a/x11-misc/squeekboard/squeekboard-1.16.0.ebuild +++ b/x11-misc/squeekboard/squeekboard-1.16.0.ebuild @@ -55,13 +55,13 @@ inherit cargo gnome2-utils meson toolchain-funcs xdg MY_COMMIT="19630334b07d6d2949932cf05018925cb3ab9613" DESCRIPTION="Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone" -HOMEPAGE="https://source.puri.sm/Librem5/squeekboard" -SRC_URI="https://source.puri.sm/Librem5/squeekboard/-/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://gitlab.gnome.org/Phosh/squeekboard" +SRC_URI="https://gitlab.gnome.org/Phosh/squeekboard/-/archive/v${PV}/squeekboard-v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" $(cargo_crate_uris ${CRATES})" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="~arm64" RDEPEND=" ${PYTHON_DEPS}