diff options
Diffstat (limited to 'sys-apps')
43 files changed, 260 insertions, 1257 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex 964e9ce6c0ee..e14eb9d097d9 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest index 4200d807437d..c4d4d5679ed9 100644 --- a/sys-apps/ethtool/Manifest +++ b/sys-apps/ethtool/Manifest @@ -3,5 +3,5 @@ DIST ethtool-5.14.tar.xz 318536 BLAKE2B 09b5c9c8103635e33b22e55caff3b0f3751bf14d DIST ethtool-5.15.tar.xz 318864 BLAKE2B 855c07e388bfabf37637f20e2714c6ca27717f38d7f658be96e0e9ec9d4514e61f4ee29361fc0279510869606ad18126ccd2a47160f1097ab52b1e35216e9721 SHA512 28147468a92c179217b459907a3257ee4f2d2ed028cb87b074f1c7ca6eb91aca81c8a9f5c7fe74e81d16a516e6e7eb20137bf7a15b5479fd82a327c64954da12 EBUILD ethtool-5.10.ebuild 583 BLAKE2B bbce36771a7b34b2b62b533a36df3d4039b913ac36e34cbd63fc5a28e7d717cb8449d65c1cc0cd80353f55ad3380eea3fa9d9f2cfacbc574b172bcff7f7e8910 SHA512 79631f2df71aa0c831e92578dac932d49f1fa9b946b9450d7f61d8fdf14dda1a218e79bb51ffc1ebe9534505c68ddaa9d547c7c8b6c2d271c1ddc34130e5fddc EBUILD ethtool-5.14.ebuild 598 BLAKE2B 31042341fe0493ba59c2feb21148535e5274acb673e039ceba4d119d28417af0964147c522174086c55da7d3aa9885118ed685de5014e26a6f3636758c3ce12d SHA512 d219a369422e72561a14985674b6faa17f77be2669ff8690858fd05d9aab2c380a6d851fff50ef0bd813057b2e7824a79ce151f8aafc46f04f58c4139e3527e9 -EBUILD ethtool-5.15.ebuild 598 BLAKE2B 31042341fe0493ba59c2feb21148535e5274acb673e039ceba4d119d28417af0964147c522174086c55da7d3aa9885118ed685de5014e26a6f3636758c3ce12d SHA512 d219a369422e72561a14985674b6faa17f77be2669ff8690858fd05d9aab2c380a6d851fff50ef0bd813057b2e7824a79ce151f8aafc46f04f58c4139e3527e9 +EBUILD ethtool-5.15.ebuild 592 BLAKE2B e248f09a9dbe27e49b5e955d5f6cb98f214bac27589dfcb8af1d74d63d9edb5e2c27959cf45cfd9cd519800df9d3cf6ff5b8645613f2eeb22ea3cc0490af4867 SHA512 73891906dcdcc42dd62d780b571e766136bd10d3db1a4901fe649ce98d68ea2e0f3f9951fc2f6b1f4a229d2c46db1dec8b9ccbd415ff27cb0ceeaab6fa4d3dc7 MISC metadata.xml 993 BLAKE2B 92777546a5d0d904b319409448ce71991ddd4b89941888b19d2cb093b9f3227361fac1ef39535524a5bcb7b1cfd91c90fb4557d5501b46d44df64e647fb7d3aa SHA512 696f633f299189a01bc9ff309faac585a849323e0d471e1ddb7631bc917c83220844bae7ba1568a181b08029f4109bb2cf0c3063cee5f0d91705a04abe353793 diff --git a/sys-apps/ethtool/ethtool-5.15.ebuild b/sys-apps/ethtool/ethtool-5.15.ebuild index 4ddb6be7e3ff..d5e44fb2b182 100644 --- a/sys-apps/ethtool/ethtool-5.15.ebuild +++ b/sys-apps/ethtool/ethtool-5.15.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" IUSE="+netlink" BDEPEND="app-arch/xz-utils" diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest index 781c8a2c7fdd..15b2159753ec 100644 --- a/sys-apps/haveged/Manifest +++ b/sys-apps/haveged/Manifest @@ -6,7 +6,7 @@ AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415a DIST haveged-1.9.14.tar.gz 496346 BLAKE2B 9df0b51dc5856b4b943a0c1c1c8f9b947dd3d22bdf45639920911e2619264fc771cba68ad70559b34523a6361cc5da588392bf0b24de1dbf824f1dfc7898a2bb SHA512 bdb6d9de667298d32b474bcbdd5f90c12b870b154b86f8817948de787d378b428bf823234f20129666bd1abced2f154643b5999e43975969f6bba87124650924 DIST haveged-1.9.15.tar.gz 493789 BLAKE2B 08d956651e3e717bdaf42f957bca93d0f74049b38219b2d283c3b0e2dc49be0061c8a58b742c63cb1f8b03f8060ed9816735879d023c5dc606a0362e81b56f75 SHA512 405fe15e3711de503d4d28f5f67fc9f393da03eb80d2a5f6167c3539fda4f11f7e7b8e795a6770d6dfa3273ee887133898c1ca4b41d80c62e1997d8796f4325e DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa -EBUILD haveged-1.9.14-r1.ebuild 1011 BLAKE2B f9dc5af910f01581714ee93ef04a2d316f243395332df2ae942b5cdf464fb721965c8bc0fe19df93ce519f63b4afb457e85c58ebd69f2febac341d611911ba1d SHA512 caf13dc9634e4b9e1035429cb60fc56678ab53642540c3c188096dadc4957e411173a12dc8cf74a8f2e32f10bb01f65610b83d2ec5502e35d44f7393b0e4681a -EBUILD haveged-1.9.15.ebuild 1015 BLAKE2B c599b1b8dc619e2906fa058aaa6a2cc41a3a2c59d0f005b0cc69cee264255a8aa49d779f040f805e81c023399626414be49a276ce1692d31848b8992e4f075d2 SHA512 03dcb3675ec38fdb5f98794ebfed197415a7b9735e89e404b9c08a096bda84cde0a1ba1befee09fb00c1534d8eb03869bd6bc023cc9fa35f082129a69403917b -EBUILD haveged-1.9.8c-r1.ebuild 1064 BLAKE2B 60289aa161de1a57286387bb5ad64e67287120e659763f3874bd10282cb32f42619d9e9c749b7a7cd2ac237208bf0ddb1ffa73550e46687d3f62f946c58a5e75 SHA512 7098595525b1d88bbf6d182332b843cb4e5c26baf450c9231a88c59d5da5b8ce9d0c045483a00213225b3b9d5fbd3bb17896183123a6e0c4321045e7f846637d -MISC metadata.xml 372 BLAKE2B 826f81d7bbd38bc37d0ef9adc0a8c5b5470d1fe9a56376ad45e109d6c107309eb2033105d979bec20557558c42268d022ce8a1894215d235d216215960efcdb7 SHA512 e4f6cb90179ba44f2f36c9ab45de0d5fb8fea0460f61cf068562f09e1cc24eabff2e880ceee42d1ff11f8f63034f6bf105c885f024b1f1726648020114901d47 +EBUILD haveged-1.9.14-r1.ebuild 1012 BLAKE2B a13a79a0348ef09079fd0bee5e2a5c90a065253f8c28ec586e2b15bc3e1fe8b594abb84336e92c3ab71d5de5a0617c98bfa7d6084e17e52608cf178efdf7025b SHA512 e6c083a00a025291cb4eada1ec5690ec76a8659c629d654d1179b7ef1e6818b1c0954def8858f1ea582a6b6b3f751c091c8896fdc6248a78e37e84a36a775ff5 +EBUILD haveged-1.9.15.ebuild 1012 BLAKE2B 4984b1d33da747d0ac7cf62dd9bc11c420daaa2f9296069e44ad018c0c6e1ab9d7f5a7ee3fee3213a39316eeda3a2eec02f46f9cee743c38020e9323d752436f SHA512 8b47e4fbe680c208027eacb76365b216a74364dee285d1da024763138f80cdbdc0f1062f258b6254dcf0d3e0a9bb0a0f81d088b5ccccbd09a6112ae5d3f4015c +EBUILD haveged-1.9.8c-r1.ebuild 1065 BLAKE2B c3d29001c9f5256876f0e5ddd4590a19bce73ee9ab68c09459bd499bd88476a000e1731569e8e86ffbcbf3e96fa274e800b3911f3a4f313936f8d642ae49ecea SHA512 b2e11b2c7b4012717eaefd24ae30885c983964d28fa7c61931e5a7b6dab442989b383e6da6df897fcbdb3452331eacb709829552894b697d07f7b085c144dff8 +MISC metadata.xml 453 BLAKE2B 8e0b710e55e214dd0dfeed4222fbfd8eeb4fd363a2d0e8f3c1d3ac401d7bb68a7d608f5629f06fe46b2d368e221772a63a03641c6aa8c6e62b21aa0ed2ca2960 SHA512 46efe891a245b81f9d872fe8be2cf62beb8a7e39659ab6929f52a4936deb8e9b66c52d7575b741a1ddf3d158ce5ca1b1df8b3c6ffee97b15effc5b4ba8c4c23f diff --git a/sys-apps/haveged/haveged-1.9.14-r1.ebuild b/sys-apps/haveged/haveged-1.9.14-r1.ebuild index 3dafc5c5629d..6d3133dc452a 100644 --- a/sys-apps/haveged/haveged-1.9.14-r1.ebuild +++ b/sys-apps/haveged/haveged-1.9.14-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit systemd DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm" -HOMEPAGE="http://www.issihosts.com/haveged/" +HOMEPAGE="https://www.issihosts.com/haveged/" SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" diff --git a/sys-apps/haveged/haveged-1.9.15.ebuild b/sys-apps/haveged/haveged-1.9.15.ebuild index b4ccd7925181..de9a69ac22d6 100644 --- a/sys-apps/haveged/haveged-1.9.15.ebuild +++ b/sys-apps/haveged/haveged-1.9.15.ebuild @@ -5,12 +5,12 @@ EAPI=8 inherit systemd DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm" -HOMEPAGE="http://www.issihosts.com/haveged/" +HOMEPAGE="https://www.issihosts.com/haveged/" SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv x86" IUSE="selinux static-libs threads" RDEPEND=" diff --git a/sys-apps/haveged/haveged-1.9.8c-r1.ebuild b/sys-apps/haveged/haveged-1.9.8c-r1.ebuild index 8861599ce688..e43224c9bc51 100644 --- a/sys-apps/haveged/haveged-1.9.8c-r1.ebuild +++ b/sys-apps/haveged/haveged-1.9.8c-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit systemd DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm" -HOMEPAGE="http://www.issihosts.com/haveged/" +HOMEPAGE="https://www.issihosts.com/haveged/" SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" diff --git a/sys-apps/haveged/metadata.xml b/sys-apps/haveged/metadata.xml index 8bb7c3aecca0..8ab99b65a4f8 100644 --- a/sys-apps/haveged/metadata.xml +++ b/sys-apps/haveged/metadata.xml @@ -5,8 +5,11 @@ <email>blueness@gentoo.org</email> <name>Anthony G. Basile</name> </maintainer> -<maintainer type="project"> + <maintainer type="project"> <email>sysadmin@gentoo.org</email> <name>Gentoo Sysadmin Project</name> </maintainer> + <upstream> + <remote-id type="github">jirka-h/haveged</remote-id> + </upstream> </pkgmetadata> diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 827eeea13e65..7f0e3bb19cd2 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -7,6 +7,6 @@ DIST iproute2-5.14.0.tar.xz 853572 BLAKE2B 52544021798f2cb716a57998d98dadc244114 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22 EBUILD iproute2-5.13.0-r1.ebuild 4864 BLAKE2B e62ccfe102bad1106e0345e5a986090408c8737ec3b96815250c07d54ef96fc14531d21a2389de46f68d64102a97568096038dadf4c899c0f1ad7f5257381d8e SHA512 681689226fda0bdc8947e2c26420cdad6e971eecb9816a562002fa6e2ce673859ee2b648bb83c9be6bfa3f86033314063b214dc36980ffedf9627ff4f5dfe889 EBUILD iproute2-5.14.0.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01 -EBUILD iproute2-5.15.0.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01 +EBUILD iproute2-5.15.0.ebuild 4996 BLAKE2B ab55fdf0ff2d208c72d8be4b41bcf656d91ff6c64e0b76f4bc8b1729c551d07426349fe4c8b3940a1f2e374c2eca7b79f7caa533a7a89fdf321accc5dda62e58 SHA512 101b23e2bb54d6534c1863d0c761ca69d38e10b34fa380244e98c4d9b94a744ed0cfd0819d2cc1d49c166c53502455ba2c662526dddd68319652ac5a6d90af59 EBUILD iproute2-9999.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01 MISC metadata.xml 814 BLAKE2B a74c3bee84fc81acfeee405c22b84ca9a10f2daf4be9d496202cbc5a2595f7222b864f4105f5dd46ec45e7de57b6ffff991f907da6378293267209b9eafe91d5 SHA512 74936295cae7e84f39ea6dd8e6bee613bed9e9716c6a96aa8f497be96b14367a2d8829db3ed108b760afdd196c5dbc9f32b14f29f5a0939e47b15d7a68aeca4a diff --git a/sys-apps/iproute2/iproute2-5.15.0.ebuild b/sys-apps/iproute2/iproute2-5.15.0.ebuild index 367b3541cbfe..7688ba0d4564 100644 --- a/sys-apps/iproute2/iproute2-5.15.0.ebuild +++ b/sys-apps/iproute2/iproute2-5.15.0.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" fi DESCRIPTION="kernel routing and traffic control utilities" diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest index ce61d1d3836f..0d9d8b3eda6a 100644 --- a/sys-apps/lshw/Manifest +++ b/sys-apps/lshw/Manifest @@ -2,5 +2,4 @@ AUX lshw-02.19.2b-respect-LDFLAGS.patch 815 BLAKE2B 44cd1820a6ba3c854d04d9affeea DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0 EBUILD lshw-02.19.2b_p20210121-r1.ebuild 2267 BLAKE2B b4dee0d296ab18f6ab8eb050d11d911856aaf254c5df4c6ebc3e35fec5af8ed552d6fbca147b586da873320746eb9abbc4f2910240726c6dd69a72e0e5aa7cea SHA512 d6148eaf68bf55043274d39cc77cc6f627c1a160d2bb2689549530d35a4ec0d0f6a2af25428d1152b3d94facabfb5457cc4d206525d536016c1e1e336ae97873 EBUILD lshw-02.19.2b_p20210121-r2.ebuild 2337 BLAKE2B b10667741c441265be37d6d6be87fae0f5f61fd0703b7505d8fbade3a64d276bcee9ec50458a94c2971be63aad86cbcb490ec7c5e5b863dcfeea7d1ec84087cc SHA512 6542c88a86299725facd8a366955035ded5014d76a88431609725afa8128dcb71a82cb0d57840af9d830db5fdb0e5e419c0228eb608f003d5fdb7b8bcb682af5 -EBUILD lshw-02.19.2b_p20210121.ebuild 2262 BLAKE2B 76c1c74029c8115c2894a8bc13683cff4afe075442c2e09a81434dd799e329c5780e4c83420d70dad22f6644e9313a8f64b35d18e6c49859878090769e6e22c1 SHA512 ec6a140e7f30ab39965beef848362e8a20672f8da50fd670aac236f5d9caa97f4e555849468231fbd38631600f910f13b6c342b68a30c7f0ce93c45835ce3280 MISC metadata.xml 462 BLAKE2B 0eca79307d6db1495a4799c970f6de55239b0b3b3636fb6ab833eccf824ed6569206a33272a2dbbc420d8f3d746ee8db7312fbc56f119f068634043699705e0a SHA512 948063d79d644ddfd3b559a7f113c73fa45a43d9282aad12400444d7e9431db44e0a5ef75fc0d866cfae9e0b67859df2b5996512e9eb296622546cb2bfdea9e7 diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild deleted file mode 100644 index 1d03cec797f2..000000000000 --- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES='fr' - -inherit desktop flag-o-matic plocale toolchain-funcs xdg - -MY_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1" -MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6) - -DESCRIPTION="Hardware Lister" -HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter" -SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="gtk sqlite static" - -REQUIRED_USE="static? ( !gtk !sqlite )" - -DEPEND="${RDEPEND}" -RDEPEND="sys-apps/hwids - gtk? ( x11-libs/gtk+:3 ) - sqlite? ( dev-db/sqlite:3 )" -BDEPEND="gtk? ( virtual/pkgconfig ) - sqlite? ( virtual/pkgconfig )" - -S=${WORKDIR}/${PN} - -DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} ) - -src_prepare() { - default - - plocale_find_changes "src/po" "" ".po" || die - sed -i \ - -e "/^LANGUAGES =/ s/=.*/= $(plocale_get_locales)/" \ - src/po/Makefile || die - sed -i \ - -e 's:\<pkg-config\>:${PKG_CONFIG}:' \ - -e 's:+\?make -C:${MAKE} -C:' \ - -e '/^CXXFLAGS/s:=-g: +=:' \ - -e '/^CXXFLAGS/s:-g ::' \ - -e '/^LDFLAGS/s: -g::' \ - -e '/^all:/s: $(DATAFILES)::' \ - -e '/^install:/s: all::' \ - src/Makefile src/gui/Makefile || die - sed -i \ - -e '/^CXXFLAGS/s:\?=-g: +=:' \ - -e '/^LDFLAGS=/d' \ - src/core/Makefile || die - sed -i \ - -e '/^#define PCIID_PATH/s:DATADIR"\/pci.ids.*:"/usr/share/misc/pci.ids":' \ - src/core/pci.cc || die - sed -i \ - -e '/^#define USBID_PATH/s:DATADIR"\/usb.ids.*:"/usr/share/misc/usb.ids":' \ - src/core/usb.cc || die -} - -src_compile() { - tc-export CC CXX AR PKG_CONFIG - use static && append-ldflags -static - - # Need two sep make statements to avoid parallel build issues. #588174 - local sqlite=$(usex sqlite 1 0) - emake VERSION=${MY_PV} SQLITE=${sqlite} all - use gtk && emake SQLITE=${sqlite} gui -} - -src_install() { - emake VERSION=${MY_PV} DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') - if use gtk ; then - newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg - make_desktop_entry \ - "${EPREFIX}"/usr/sbin/gtk-lshw \ - "${DESCRIPTION}" - fi -} diff --git a/sys-apps/lsvpd/Manifest b/sys-apps/lsvpd/Manifest index 9c9de509a107..3b7e1620aec4 100644 --- a/sys-apps/lsvpd/Manifest +++ b/sys-apps/lsvpd/Manifest @@ -1,5 +1,3 @@ -DIST lsvpd-1.7.12.tar.gz 90806 BLAKE2B 1b55c463602105c36654f7baaf5d7c8f27ec045f35a648e87327f5b0b1c19ec62f5701a48d51114435dc5edfc503b78c35eb109a7982d6e6c10df4dd0d20e4a1 SHA512 0a37a580432004c359080edd2b07ea44a68dcf81621e0ec3a89cf7c4ca0f64a29143cee154a8d39c1411f64bf229a8a19f10d9f2c95971374b97a4c05b1c1523 DIST lsvpd-1.7.13.tar.gz 93269 BLAKE2B 9b92de69b810314dd8c84e300fabcce2117b16373b68c7e414cd6035f1b64f90fec2e2c4f0b623263d0f7de1e499464139e7b8ffa30e2e13b76fce50ea67ff4c SHA512 99039b622051a24d1d17a014a81c6909a403c4b3746c2e4e62b0822f1d14319b3fcd5c82c13ec240ef2110c8a08de5b74a39ed0dea8a482977a475566cd83d3b -EBUILD lsvpd-1.7.12.ebuild 598 BLAKE2B 7693e27284afd64ec727f8ea620ac64164cda00c7df76ef390529b6838815e06b0faa985df66675a73c459464634c6e69a48d6c499fbfa5bbba3969d2c3fce4c SHA512 cf883c99713be270444d57c679a79fb88f1037a2b26d5434ad9aebc4055159776156ec7e0b415eabe4acb07f6f2431f0e61a96b78f8ba342439dbd8b2ac50bf4 EBUILD lsvpd-1.7.13-r1.ebuild 599 BLAKE2B cd957f7eec4975eb3bb501b96996c592aebe6d0ae665274ad5e2738d0ed94b6b6a95150bd2c442877743dd89de5c6a78ac19700f7765b1682fc1762a688f65e1 SHA512 aa6b35fbcc109bb504dd4f755c2ee233122c5dd5b57395112fc68873a87722939fcd78b4ad81fb2b8af994bfffdce2aedaa5ddf1bd5d53497378b605e54a9ce0 MISC metadata.xml 989 BLAKE2B 7ebdc7122186b4592922dada5663240f97304867ffc6388bfacd4f27dc22928c46417afa71f7a7a0d4ac6e99f89c6e56afdace589b6a6eb0a8ca7eb5a75ff92f SHA512 a321b9e6e79a39866f36f18ceae469701737145a09bd6e721d2f23d04815344fc875d236c8a2c4a885770298259438fabf93faa21924c51ca9f180ad3e8e586f diff --git a/sys-apps/lsvpd/lsvpd-1.7.12.ebuild b/sys-apps/lsvpd/lsvpd-1.7.12.ebuild deleted file mode 100644 index cc68314bdd30..000000000000 --- a/sys-apps/lsvpd/lsvpd-1.7.12.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Utility to List Device Vital Product Data (VPD)" -HOMEPAGE="https://github.com/power-ras/lsvpd" -SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="ppc64" -IUSE="" - -RDEPEND=" - dev-db/sqlite:3 - sys-apps/hwids - sys-apps/sg3_utils:0= - sys-libs/librtas - sys-libs/libvpd - sys-libs/zlib -" - -DEPEND="${RDEPEND} - virtual/os-headers -" - -BDEPEND="" - -src_prepare() { - default - eautoreconf -} diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest index 8d362055639b..8ea5c56f41e6 100644 --- a/sys-apps/moreutils/Manifest +++ b/sys-apps/moreutils/Manifest @@ -1,6 +1,8 @@ AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee92def3df7cc5bb74b476ae8172924421676bec09f6c74a59d7b07b82382e57b502088d75e5c365a5747ee7d38e8ba3c227 SHA512 db1ff22fb8a6284bea95488b71c456353379d4f9b4142f62ad7371e2546ff82fae6e7e2fb4be2e5b018d475ef5d19c677059cdb171d882e9c7a3641ed0ce4647 DIST moreutils-0.65.tar.gz 93180 BLAKE2B 2105cc281b9f4c9598bb0cdd5a4b9b8042e77eb14de323ba889c182c956b00d7b8a899c4112542e0a3d513fd961ee0ed6c82dd2dbefffe50e1d4fd326919ef4f SHA512 dcad2a3b6d9621da6d2f860f39acb04c80d42cc2123e12a6ec84524f6a1fc7f5ae4bd5d00e698fe14d4c5e7d491d790970ce4370c9abd1f63318d1c512f596b9 DIST moreutils-0.66.tar.gz 93387 BLAKE2B 783ed558f0f77c2b384a1aa8852243242ce24e44e40b58f92e2179308df9cc3a27142820a7743c25ba4529a4b7ea7ae20c1fc02b86324638a7d13ad7536c6b21 SHA512 6c5f8b677d9912cf4e7aabf442361c89d23767f2a5df0a2c29ab72314e1ed3767a0a7a7abaa5044cf73ef877184d16e1d58e340780971e9e1299857756aca6a3 +DIST moreutils-0.67.tar.gz 93627 BLAKE2B 4b8788411f1300ccffa10a52a327ee676b2a241531dafc2106495977ffd29a5b32c91c0afb6425b5797bfea04fa98a3cfd69e034cffc2fb255f5e8505d3b3474 SHA512 3a395fa80c1c1d769ec078cbf9455952201a364d8264796c6443a397ed7fa4f08250ecd140f047cf2e9533d6fc5310b3a579a7c083a5bc4cb4672d39c35dab75 EBUILD moreutils-0.65.ebuild 1695 BLAKE2B e7804204f2162acf5a551abbad7a622def057c100cb04cddb4abdcd8169ce1dbf658f4e578af097a7d3e22cc10cb7b62b5a35eec647be273d9c57e5b318e3905 SHA512 4bc2cfba306082fe2dac9c3e43f25eaf66e3eea69b5ec4ac88c6237d4bd624fa1aa2a162e3be91766c38cfa12cae50f8cbfc4382aef96b47f8ce9b28168d8ea6 EBUILD moreutils-0.66.ebuild 1695 BLAKE2B e7804204f2162acf5a551abbad7a622def057c100cb04cddb4abdcd8169ce1dbf658f4e578af097a7d3e22cc10cb7b62b5a35eec647be273d9c57e5b318e3905 SHA512 4bc2cfba306082fe2dac9c3e43f25eaf66e3eea69b5ec4ac88c6237d4bd624fa1aa2a162e3be91766c38cfa12cae50f8cbfc4382aef96b47f8ce9b28168d8ea6 +EBUILD moreutils-0.67.ebuild 1715 BLAKE2B e856f1587b8df3a9242febd1a60a777acefbdbfcf027951d8fb88997ac30ab10f7ec5670c5a0b44f84a9210fe75184ee0144ba52f4507d7f4a033ff0b6ec94bd SHA512 f04c034efd4e306d34f5d89f76114276120982395dcfab6d2a9170356df05a83debb4f76876b7710d86449e79ec8afb9aa1a888bb357f43ca101e2ee59f67b91 MISC metadata.xml 314 BLAKE2B 41e19552cdd8289a03ab33f6fd514028d689236160501e2c84644e1075e957f6faeba6eacf163fcd624e995bd6ff7016e663e65cc753e7de3621aa46922a0766 SHA512 36a70c222b6de13c1245d0a95d097389e84ee7b7f55a08c62ca5c7c44bb51808f63faa10e81fdec7eff7bb680be32ed31bb2fd5362c5f35ba8fb92bb60a7ffe3 diff --git a/sys-apps/moreutils/moreutils-0.67.ebuild b/sys-apps/moreutils/moreutils-0.67.ebuild new file mode 100644 index 000000000000..3ba226c6231c --- /dev/null +++ b/sys-apps/moreutils/moreutils-0.67.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit toolchain-funcs + +DESCRIPTION="A collection of tools that nobody thought to write when Unix was young" +HOMEPAGE="https://joeyh.name/code/moreutils/ https://git.joeyh.name/index.cgi/moreutils.git/" +# Not available at time of release +#SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz" +SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux ~x64-macos" +IUSE="+doc +perl" + +RDEPEND="perl? ( + dev-lang/perl + dev-perl/IPC-Run + dev-perl/Time-Duration + dev-perl/TimeDate + )" +BDEPEND="doc? ( + >=app-text/docbook2X-0.8.8-r2 + app-text/docbook-xml-dtd:4.4 + dev-lang/perl + )" +IDEPEND="app-admin/eselect" + +PATCHES=( + "${FILESDIR}"/${PN}-0.64-respect-env.patch +) + +src_prepare() { + # don't build manpages + if ! use doc ; then + sed -i -e '/^all:/s/$(MANS)//' -e '/man1/d' Makefile || die + fi + + # don't install perl scripts + if ! use perl ; then + sed -i -e '/PERLSCRIPTS/d' Makefile || die + fi + + default +} + +src_compile() { + tc-export CC + + emake \ + CFLAGS="${CFLAGS}" \ + DOCBOOKXSL="${BROOT}"/usr/share/sgml/docbook/xsl-stylesheets \ + PREFIX="${EPREFIX}/usr" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install + + # sys-process is more advanced than parallel from moreutils, rename it + if use doc; then + mv "${ED}"/usr/share/man/man1/{,${PN}_}parallel.1 || die + fi + + mv "${ED}"/usr/bin/{,${PN}_}parallel || die +} + +pkg_postinst() { + # Try to make sure ${EDITOR} is valid for vipe (bug #604630) + eselect editor update +} diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index 70c5650bdb17..ba085b23e70e 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -8,9 +8,9 @@ DIST openrc-0.44.7.tar.gz 255444 BLAKE2B 8058e1fd8fcce46f53e73b56ec8da5eec9ba080 DIST openrc-0.44.8.tar.gz 255668 BLAKE2B 13d023ea3346313ded9f9bff729c296a3317577ddc58cadbe57429833075776a3a3dc52dfd1c9e9721407b747df0f6471a81d12dc79216dc4b75222104208965 SHA512 ee8520b42df2f20cc770b9cc1a82eee4c7cb2e0d2e8b0788f5201e7c5ca864f414e97f679f3c25b808cb3641bc99cd74580dcd9777f4738f43adba65754ae679 DIST openrc-0.44.9.tar.gz 254859 BLAKE2B 467f47e6bb09e0cea4c093f7516979112c2b70fb898a8030ef28ad78a20b89751256d545f21d295e948e791027c5b4b9e8b1cac244d3698161a449cc4bc1b38f SHA512 41488b2e699b1f66f334c4f90021b57a175ae1c9c77464bb747d38907a3a54cc1e48284484577d2f72cde8e4007b03e6529c549f462e8acdba8ffc796ac58239 EBUILD openrc-0.43.5-r1.ebuild 5066 BLAKE2B b3e56275bd07558fa1b3a67e76c343d4368803ff8c806872e1fe7351667848640b722de86c5cac410d76e02d69a5adb764a942aafa180e22c4d79d7c90533e6e SHA512 8214a366eeb208c3f05302ec0f35a0bc9fb500951d102faa3010c0b8dc005d2d4a04609efd89351c76984ed18b0013e16367a0d257d809b667f69f981164dd46 -EBUILD openrc-0.44.10.ebuild 4359 BLAKE2B f53a464c885015589d13e32ebfb698f68cf3e89ed00b8fa2f0fcad61c40f64b208f89b2e01ca5e7802b2c2b9a528c5df8025aa738ed96b2ae867574f8679fc78 SHA512 0382a8624f6adcc5506c1d3a391b7e996c51e06888199a99d5666909981279a0991c01222f52fdae7e5c1dd8c217b9cc9ebf7e51f68886e2719d41158b32562b -EBUILD openrc-0.44.7.ebuild 4526 BLAKE2B b8764b74d29d517878dc2152940840ca70f7486ad9e7c5eaaad69bc6e567b213f345dbf80160f2f8437d8ee4f22b9d51941e057678b3ab28a1790c6ec5ad2b6f SHA512 24727522c449166a6bdb32648fbab754a880536f6edb463523499efac000ebb2de2087bb4875ad7fb743c2cdbe6087cb4bb111ada9ce278166562958ceb776fe -EBUILD openrc-0.44.8.ebuild 4439 BLAKE2B f40488139a43e7dcff4e9a75d6cf7ef38f0031e55d766e7ec8f11a184c7554e58598acfc86cabae7c2d88429cc65c3506b3c2ed783629896d722bf7d0b1e327a SHA512 0c81ccc39e2e1496ea9e1cda71230aad631da478b1f3017a057aed7b0779b3eec9830253a306f40efbbfd7adda6ab4e8e841b0187cb4299c3d1cfa66422f1223 -EBUILD openrc-0.44.9.ebuild 4359 BLAKE2B f53a464c885015589d13e32ebfb698f68cf3e89ed00b8fa2f0fcad61c40f64b208f89b2e01ca5e7802b2c2b9a528c5df8025aa738ed96b2ae867574f8679fc78 SHA512 0382a8624f6adcc5506c1d3a391b7e996c51e06888199a99d5666909981279a0991c01222f52fdae7e5c1dd8c217b9cc9ebf7e51f68886e2719d41158b32562b -EBUILD openrc-9999.ebuild 4368 BLAKE2B a0e9a673ba22f1d0c6db4d959f3b786044c06bce370f6e5df8bc9d0d722f9bd4132a3549fcd66448a4a1a136584feaaae8ca391f074636f18f69878eec3b786e SHA512 2cba40f232e34a4a6afc5f270143e1daed775ca58802be11159afb57b9e19708a342ca3dfd5fb3b1b54d535f80b4d9bdeacecdb5a5c55ec7ec1ffd2c9ded6a68 +EBUILD openrc-0.44.10.ebuild 4387 BLAKE2B bc963720189c83f651237c52a55d907b2039c7447f9835b50e5f8decf4f3003aedfb5ac0bac5040bbafbe2ab739e41e267503b3d674031d7a32d8f5cd2dbba32 SHA512 1240620cbc33f7d6313278abe7aa6fda7ae99f8a74c882fccf1f7c4ca07311442952867c9f2e30e89830413daa54f606f4508fe0c494ccaf617ef4e17e20d81e +EBUILD openrc-0.44.7.ebuild 4554 BLAKE2B 8617df340ef9cd5af23d2eae62dbdc1a91f91ffdb2428c9046d4f3b60062ee5f7873cc8c4665083241969eb8d13361c3ccda1bb0553b5c7b980a13cd564cb385 SHA512 420564d421fb8fd6cdc344a952226af1418d11da91eff05be7d175fdb8435b24b22dd8b179a137ae5851f71b300a805d591c784556e5a60ab3bb1773cb9cb6c9 +EBUILD openrc-0.44.8.ebuild 4467 BLAKE2B d02d3b2738cfbce373e272bd1ca0df976d16042bde5b24b932937fbebf7bd1263ff346ad473b6196cadde4605f8c743d87a4a819e4ecde86552c7855a36e60f6 SHA512 6098755fc5b1202c6785cd43c38763af40d75f211b1de3e640207cf84802682a34582bdbd31b9ee52c9ee9b66cb6fcfdc2dbad1dd41419f537627d7b9970637a +EBUILD openrc-0.44.9.ebuild 4387 BLAKE2B bc963720189c83f651237c52a55d907b2039c7447f9835b50e5f8decf4f3003aedfb5ac0bac5040bbafbe2ab739e41e267503b3d674031d7a32d8f5cd2dbba32 SHA512 1240620cbc33f7d6313278abe7aa6fda7ae99f8a74c882fccf1f7c4ca07311442952867c9f2e30e89830413daa54f606f4508fe0c494ccaf617ef4e17e20d81e +EBUILD openrc-9999.ebuild 4396 BLAKE2B 78a8697930e9ec5b4792cb8ad738a0b69426fd0979d15da3378fd0a1008a21b0df67d0ed43603fa4ad4a6fed03e8fd6aa04a629f41025582cb14f89b85e011f5 SHA512 2773b661bca4a7279cbffed1606c622c8d73561dbae40c1fe6ad67bebc71c75f0fc90e0ecdcc4136c313d12269319d825118a81f6dee2393e83dbd2d2c3c14a1 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37 diff --git a/sys-apps/openrc/openrc-0.44.10.ebuild b/sys-apps/openrc/openrc-0.44.10.ebuild index 4e57ae57a034..8ced74993f6f 100644 --- a/sys-apps/openrc/openrc-0.44.10.ebuild +++ b/sys-apps/openrc/openrc-0.44.10.ebuild @@ -63,6 +63,7 @@ src_configure() { -Dos=Linux $(meson_use pam) $(meson_feature selinux) + -Drootprefix="${EPREFIX}" -Dshell=$(usex bash /bin/bash /bin/sh) $(meson_use sysv-utils sysvinit) -Dtermcap=$(usev ncurses) diff --git a/sys-apps/openrc/openrc-0.44.7.ebuild b/sys-apps/openrc/openrc-0.44.7.ebuild index 7f782f68a788..1fd2f3b212cc 100644 --- a/sys-apps/openrc/openrc-0.44.7.ebuild +++ b/sys-apps/openrc/openrc-0.44.7.ebuild @@ -63,6 +63,7 @@ src_configure() { -Dos=Linux $(meson_use pam) $(meson_feature selinux) + -Drootprefix="${EPREFIX}" -Dshell=$(usex bash /bin/bash /bin/sh) $(meson_use sysv-utils sysvinit) -Dtermcap=$(usev ncurses) diff --git a/sys-apps/openrc/openrc-0.44.8.ebuild b/sys-apps/openrc/openrc-0.44.8.ebuild index 182e1761f233..619e1585c366 100644 --- a/sys-apps/openrc/openrc-0.44.8.ebuild +++ b/sys-apps/openrc/openrc-0.44.8.ebuild @@ -68,6 +68,7 @@ src_configure() { -Dos=Linux $(meson_use pam) $(meson_feature selinux) + -Drootprefix="${EPREFIX}" -Dshell=$(usex bash /bin/bash /bin/sh) $(meson_use sysv-utils sysvinit) -Dtermcap=$(usev ncurses) diff --git a/sys-apps/openrc/openrc-0.44.9.ebuild b/sys-apps/openrc/openrc-0.44.9.ebuild index 4e57ae57a034..8ced74993f6f 100644 --- a/sys-apps/openrc/openrc-0.44.9.ebuild +++ b/sys-apps/openrc/openrc-0.44.9.ebuild @@ -63,6 +63,7 @@ src_configure() { -Dos=Linux $(meson_use pam) $(meson_feature selinux) + -Drootprefix="${EPREFIX}" -Dshell=$(usex bash /bin/bash /bin/sh) $(meson_use sysv-utils sysvinit) -Dtermcap=$(usev ncurses) diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index c1adfbae4a59..4c8638a6543e 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -63,6 +63,7 @@ src_configure() { -Dos=Linux $(meson_use pam) $(meson_feature selinux) + -Drootprefix="${EPREFIX}" -Dshell=$(usex bash /bin/bash /bin/sh) $(meson_use sysv-utils sysvinit) -Dtermcap=$(usev ncurses) diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest index 563b91fa985d..a4fa0ef042fd 100644 --- a/sys-apps/pciutils/Manifest +++ b/sys-apps/pciutils/Manifest @@ -2,6 +2,5 @@ AUX conf.d-pciparm 988 BLAKE2B c51b826806c58411939d8987e103cba5775806abcbf12a932 AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334cca8f9eb02b83dad456e36ae1bf77ed8fcc0eac52e0dc638f19a41682fa3e1d3623011d09301945b SHA512 c5a527236039edf29f6876d3b07909045dd04e40d863d68014dd96cc021b7b61356470e67541b5b68487d996a299b60b3da46272259f9d0724ea1392e6243646 AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638d01cd49ebb5be638b2bd10627fe77279c4be79684e13c588b5d3b252eba66dc1a95275d60d40bcf12df46cf8bbdc807 SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49 DIST pciutils-3.7.0.tar.gz 516418 BLAKE2B fca6720cff73ec20559c666c76fdcd3b59cdf0e33e2c3894a82590d77c5d51cf22e667fe65d9f66a248a624c2b9c868f6e9b69f45f4b6d704b637afe55041e6a SHA512 8a8fb9dc44a8dd31f80e45a48f6693452c11d343b9dfed87dd5cea6846f38d001f294e4010cd7c0545e238fde45b0e9a8e88c67a43d80676a585336e3665a631 -EBUILD pciutils-3.7.0-r1.ebuild 2871 BLAKE2B 45bac6fb278e1ce05810ca8bb89a024cbe2e067750d7f7a333bc6ac6d53c65849c21e90c30e5996c357abbf58137f9475a5fd85c2ccd6ab3b9f3a126cc1019be SHA512 8327a20ddba2eec98128f7b58b3085ff0ba259bf7ceaf6a8c8497007bae07d96739ec0145f45d12d9249cc27b57ee642dcad18c7de7c1b3e34da57734a323d27 EBUILD pciutils-3.7.0-r2.ebuild 2625 BLAKE2B 79828b3bb68b1aea998c716677815a2a459df5813c26056d69ce336ff3b2c63b51a9299f4f75c7e9eb7d99d75644c8a68ef21016ce15c929294566d894ee0b5f SHA512 6b35ea095aac16030aa2033e8429dcb80bbd6300e8de1750342e3b70af354417dfde559936f962b8c883d0b173ae0ccd164da4eded1065fc47924ce879ccc028 MISC metadata.xml 525 BLAKE2B 5a7a502d28b6e74db1f1f008adfc5d9c398fb7832c8c82e066c9d4834726a0cd1e97b9738ca21906468f3c2444f20bfcf715339a1314e34b2b43d4f5c631a659 SHA512 5e53a4261ea0aa0d58f7a16b5c8ddbc2e6bda130e49642a9dc220f39cd6a77b8fdf22c22fd7def106d4728b880b75371feea3d552981d03294b86b8cb7fd08c0 diff --git a/sys-apps/pciutils/pciutils-3.7.0-r1.ebuild b/sys-apps/pciutils/pciutils-3.7.0-r1.ebuild deleted file mode 100644 index 56a6825079f8..000000000000 --- a/sys-apps/pciutils/pciutils-3.7.0-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib toolchain-funcs multilib-minimal flag-o-matic - -DESCRIPTION="Various utilities dealing with the PCI bus" -HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git" -SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="dns +kmod static-libs +udev zlib" -REQUIRED_USE="static-libs? ( !udev )" - -# Have the sub-libs in RDEPEND with [static-libs] since, logically, -# our libpci.a depends on libz.a/etc... at runtime. -LIB_DEPEND=" - zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] ) -" -DEPEND=" - kmod? ( sys-apps/kmod ) - udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] ) - static-libs? ( ${LIB_DEPEND} ) - !static-libs? ( ${LIB_DEPEND//static-libs([+-]),} ) -" -RDEPEND=" - ${DEPEND} - sys-apps/hwids -" -BDEPEND="kmod? ( virtual/pkgconfig )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.9-static-pc.patch -) - -MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h ) - -switch_config() { - [[ $# -ne 2 ]] && return 1 - local opt=$1 val=$2 - - sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die - return 0 -} - -src_prepare() { - default - - if use static-libs ; then - cp -pPR "${S}" "${S}.static" || die - mv "${S}.static" "${S}/static" || die - fi - - multilib_copy_sources -} - -multilib_src_configure() { - append-lfs-flags #471102 -} - -pemake() { - emake \ - HOST="${CHOST}" \ - CROSS_COMPILE="${CHOST}-" \ - CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - RANLIB="$(tc-getRANLIB)" \ - DNS=$(usex dns) \ - IDSDIR='$(SHAREDIR)/misc' \ - MANDIR='$(SHAREDIR)/man' \ - PREFIX="${EPREFIX}/usr" \ - SHARED="yes" \ - STRIP="" \ - ZLIB=$(usex zlib) \ - PCI_COMPRESSED_IDS=0 \ - PCI_IDS=pci.ids \ - LIBDIR="\${PREFIX}/$(get_libdir)" \ - LIBKMOD=$(multilib_native_usex kmod) \ - HWDB=$(usex udev) \ - "$@" -} - -multilib_src_compile() { - pemake OPT="${CFLAGS}" all - if use static-libs ; then - pemake \ - -C "${BUILD_DIR}/static" \ - OPT="${CFLAGS}" \ - SHARED="no" \ - lib/libpci.a - fi -} - -multilib_src_install() { - pemake DESTDIR="${D}" install install-lib - use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a" -} - -multilib_src_install_all() { - dodoc ChangeLog README TODO - - rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \ - "${ED}"/usr/share/man/man8/update-pciids.8* - - newinitd "${FILESDIR}"/init.d-pciparm pciparm - newconfd "${FILESDIR}"/conf.d-pciparm pciparm -} - -pkg_postinst() { - if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then - elog "The 'network-cron' USE flag is gone; if you want a more up-to-date" - elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)." - fi -} diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest index fff5a2551ce3..f8e907072b65 100644 --- a/sys-apps/systemd-tmpfiles/Manifest +++ b/sys-apps/systemd-tmpfiles/Manifest @@ -1,12 +1,7 @@ -AUX 249-sys-include-posix.patch 1831 BLAKE2B eaea99f57a189d77789c9b61ed7962f108f1ed733e3ab8d76fb8dd4849faf8f05338f3addaaad97ba2f8796200de0f5079d3838d995ba2519b7d4ea2a568d0d5 SHA512 3d98055f2beb22fe5607125585929fc531b790f489779dcd162541b5461a9da15d76e7a713f6476a3278073e6fd2488bc0af19eca952f6534d90aadb81ef644f AUX stmpfiles-dev.initd 421 BLAKE2B af962a76a2f3985aff460193a9bdcb7d340a3cf0a5c7cb65150dade564dc780d91634028b5f8a87750be66e6c47bbe519088fbc0c46047f180e93c3eabffc16d SHA512 1eac910984bda9ba5d8e9c5b17718c356f90b41ccf22bb68393b4f00901c8999501e1b482decbf22e6a16157f430eee159b3332f6e82a9442423adc884057475 AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f547755f0631f5f37f2d6e1382e361878aed80545bbb5ba198b564337e4083c073f73552d8bed4a8732ff6b819f SHA512 12201b6a3d7f4a178ca9504638cbbc7e518c5075ce9a3b2653650960b54225f3516381dd4e0366d13f16aecaa1dec40ad1a41ef1f849b6c45be81c49108bdccd AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40 -AUX systemd-tmpfiles-249.2-meson-0.60.patch 867 BLAKE2B 9bc6279989dabcef766da3b46113d29547c4146a38e52c440093229462bf781e431cb8770ab1808c13fd81a196df913da6eaf1abb6bf127439237228b5af6d1d SHA512 9b690693e003f30d30d4341a395bb7c28d0c0cf0117ae1bb0844f52aef3937723eb8a42120d4f4777dbad2243e49b2e771892e6157d0e930831982ff96ccffa3 -DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046addb6971ea1997fc7dd8626de90d162a4beb6383b5724df78a14c73be1283df58632fb4a0fcb32f90f50f1886f31a1aded15e9567c SHA512 4655f2a06e1b3310cb27b839360353dfbfdbdaa86f4392aeebf63f63efd441d1953f7ac108be7fed7ea721596d191988ed999e34443e47922afca92db779175a DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b -DIST systemd-stable-249.2.tar.gz 10591728 BLAKE2B fb24c681cf2328aa26fa49a8ba20cccd1ee0fae82ec9f9931a69eaa377fc01b2ece12fdf407444514d494b8ac1418f155b0fceeff4925bebaba691f0b8a2acc8 SHA512 4f42a0b93156529a464545361436fa98193e12a7e0809315b9fdedbcf33b81dd2037acac27fb0dfefcb2679bc49ebb6da4d152ecb4b15db797c81f7ca4588a11 DIST systemd-stable-249.5.tar.gz 10597897 BLAKE2B 5c573322ef9bcd9d019776d6e2d8625a741c1535c0d06661b5666c2438a70cfc4dc182919bb419829de27a4d93c16717ce24e668faf9bd6b09e57f8bd88be725 SHA512 d6f1a5a6f03f0ed05b111aee75da509c5868c523af6209f33e630724dd0c7e0d0abf16920795d587e6c31a5915d247ebc613cf26d4aecf39f82ebb0690fab75f -EBUILD systemd-tmpfiles-249.2.ebuild 6112 BLAKE2B fbb96ea7d801712fdfccdbb5dff9c9a834b62b4cfa89b768f62552786b3bb4ce6f4cb41aa222959f4ac19c08728c1af25908e7de48ea781140a7eaefff0ac826 SHA512 dba3880866c5eb033a38fbff1728f4a327cf5e0e737ad20d9cbb4d3305ad39122dcfca243b9024bc16c6f06a47c1fb13072505d34d8bfe02288a3b29b65b97be EBUILD systemd-tmpfiles-249.5.ebuild 5968 BLAKE2B 72a4b96753da7d54754c79d2dd90c669987adfc1fae84a9bb4985cb953702db10d74e2cb4f6e7bb34d11afa43506c16f5a63b8e6b4f15e041c95d817f64931aa SHA512 2acbac61323d3d744e9e0ee9362cee06b8460ab8673cf07181e4a76a44a0b287516f634abe8fdea1ca2ee143364ee56e6e8f85ec8a1651a5d056c136bfe148b2 MISC metadata.xml 361 BLAKE2B 51c4e3dcb18cea86f9508c51e534a670e92e81aefe8e04af436f279d3158999d6dd8836dd53abcd4b35cacfeffff829a4157d2a63ce08d4eea62791b6761feb4 SHA512 6645f474e642a386927ae353561fadda273327321705500ddb8de14ed53f94788d782680b4b765c5da0151395a9f3f3c9bea2726c05cb79e52ee26a6e033c63f diff --git a/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch b/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch deleted file mode 100644 index 6d9e0039b9c9..000000000000 --- a/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch +++ /dev/null @@ -1,67 +0,0 @@ -Silence annoying #warning's on musl - -https://github.com/systemd/systemd/pull/20362 -https://github.com/systemd/systemd/pull/20364 - -From f8d54f7810aeea5ff27a5db03e1aab7ea54c8268 Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Mon, 2 Aug 2021 12:41:38 +0200 -Subject: [PATCH] Use correct `<fcntl.h>` include - -* `<sys/fcntl.h>` is not specified in POSIX ---- - src/basic/fileio.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/fileio.h b/src/basic/fileio.h -index af797cfafdbf..4295b84a85c5 100644 ---- a/src/basic/fileio.h -+++ b/src/basic/fileio.h -@@ -2,11 +2,11 @@ - #pragma once - - #include <dirent.h> -+#include <fcntl.h> - #include <stdbool.h> - #include <stddef.h> - #include <stdio.h> - #include <sys/stat.h> --#include <sys/fcntl.h> - #include <sys/types.h> - - #include "macro.h" -From 2b6c0bb2a341c95223ce672249e43c743b03d78c Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Mon, 2 Aug 2021 16:09:10 +0200 -Subject: [PATCH] Use correct `<poll.h>` include - -* `<sys/poll.h>` is not specified in POSIX ---- - src/shared/nscd-flush.c | 2 +- - src/shared/varlink.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/shared/nscd-flush.c b/src/shared/nscd-flush.c -index dfc47c423441..19e16d93455c 100644 ---- a/src/shared/nscd-flush.c -+++ b/src/shared/nscd-flush.c -@@ -1,5 +1,5 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ --#include <sys/poll.h> -+#include <poll.h> - - #include "fd-util.h" - #include "io-util.h" -diff --git a/src/shared/varlink.c b/src/shared/varlink.c -index 3a53c16a7242..4033947d3b8c 100644 ---- a/src/shared/varlink.c -+++ b/src/shared/varlink.c -@@ -1,7 +1,7 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - - #include <malloc.h> --#include <sys/poll.h> -+#include <poll.h> - - #include "alloc-util.h" - #include "errno-util.h" diff --git a/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch b/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch deleted file mode 100644 index b931912be23e..000000000000 --- a/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/systemd/systemd/commit/c29537f39e4f413a6cbfe9669fa121bdd6d8b36f -https://bugs.gentoo.org/821547 - -From: Dan Streetman <ddstreet@canonical.com> -Date: Fri, 3 Sep 2021 12:43:33 -0400 -Subject: [PATCH] meson.build: change operator combining bools from + to and - -upstream meson stopped allowing combining boolean with the plus -operator, and now requires using the logical and operator - -reference: -https://github.com/mesonbuild/meson/commit/43302d3296baff6aeaf8e03f5d701b0402e37a6c - -Fixes: #20632 ---- a/meson.build -+++ b/meson.build -@@ -35,7 +35,7 @@ conf.set10('BUILD_MODE_DEVELOPER', get_option('mode') == 'developer', - - want_ossfuzz = get_option('oss-fuzz') - want_libfuzzer = get_option('llvm-fuzz') --if want_ossfuzz + want_libfuzzer > 1 -+if want_ossfuzz and want_libfuzzer - error('only one of oss-fuzz or llvm-fuzz can be specified') - endif - - diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild deleted file mode 100644 index ad80dc82cf86..000000000000 --- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild +++ /dev/null @@ -1,263 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == *.* ]]; then - MY_PN=systemd-stable -else - MY_PN=systemd -fi - -MINKV="3.11" -MUSL_PATCHSET="${PV%.*}.1-r1" -PYTHON_COMPAT=( python3_{8..10} ) -inherit flag-o-matic meson python-any-r1 - -DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" -SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz - elibc_musl? ( - https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz - https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz - )" - -LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="selinux test" -RESTRICT="!test? ( test )" - -RDEPEND=" - sys-apps/acl:0= - >=sys-apps/util-linux-2.30:0= - sys-libs/libcap:0= - selinux? ( sys-libs/libselinux:0= ) - virtual/libcrypt:= - !sys-apps/opentmpfiles - !sys-apps/systemd -" - -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-${MINKV} -" - -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/gperf - >=dev-util/meson-0.46 - >=sys-apps/coreutils-8.16 - sys-devel/gettext - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( - # backport from 250 to silence musl warnings - "${FILESDIR}/249-sys-include-posix.patch" - "${FILESDIR}/${P}-meson-0.60.patch" -) - -python_check_deps() { - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" -} - -pkg_pretend() { - if [[ -n ${EPREFIX} ]]; then - ewarn "systemd-tmpfiles uses un-prefixed paths at runtime.". - fi -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - # musl patchset from: - # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd - # check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches - # we share patch tarball with sys-fs/udev - if use elibc_musl; then - einfo "applying musl patches and workarounds" - eapply "${WORKDIR}/musl-patches" - - # avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch - append-cppflags '-D__UAPI_DEF_ETHHDR=0' - - # src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’, - # but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’} - # not a nice workaround, but it comes from debug messages and we don't really use this component. - append-cflags '-Wno-error=format' - fi - - default - - # https://bugs.gentoo.org/767403 - python_fix_shebang src/test/*.py - python_fix_shebang test/*.py - python_fix_shebang tools/*.py -} - -src_configure() { - # disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries, static-libsystemd(true)" - # and optionally selinux feature can be enabled to make tmpfiles secontext-aware - local systemd_disable_options=( - adm-group - analyze - apparmor - audit - backlight - binfmt - blkid - bzip2 - coredump - dbus - efi - elfutils - environment-d - fdisk - gcrypt - glib - gshadow - gnutls - hibernate - hostnamed - hwdb - idn - ima - initrd - firstboot - kernel-install - kmod - ldconfig - libcryptsetup - libcurl - libfido2 - libidn - libidn2 - libiptc - link-networkd-shared - link-systemctl-shared - link-timesyncd-shared - link-udev-shared - localed - logind - lz4 - machined - microhttpd - networkd - nscd - nss-myhostname - nss-resolve - nss-systemd - oomd - openssl - p11kit - pam - pcre2 - polkit - portabled - pstore - pwquality - randomseed - resolve - rfkill - seccomp - smack - sysext - sysusers - timedated - timesyncd - tpm - qrencode - quotacheck - userdb - utmp - vconsole - wheel-group - xdg-autostart - xkbcommon - xz - zlib - zstd - ) - - # prepend -D and append =false, e.g. zstd becomes -Dzstd=false - systemd_disable_options=( ${systemd_disable_options[@]/#/-D} ) - systemd_disable_options=( ${systemd_disable_options[@]/%/=false} ) - - local emesonargs=( - -Drootprefix="${EPREFIX:-/}" - -Dacl=true - -Dtmpfiles=true - -Dstandalone-binaries=true # this and below option does the magic - -Dstatic-libsystemd=true - -Dsysvinit-path='' - ${systemd_disable_options[@]} - $(meson_use selinux) - ) - meson_src_configure -} - -src_compile() { - # tmpfiles and sysusers can be built as standalone and link systemd-shared in statically. - # https://github.com/systemd/systemd/pull/16061 original implementation - # we just need to pass -Dstandalone-binaries=true and - # use <name>.standalone target below. - # check meson.build for if have_standalone_binaries condition per target. - local mytargets=( - systemd-tmpfiles.standalone - man/tmpfiles.d.5 - man/systemd-tmpfiles.8 - ) - meson_src_compile "${mytargets[@]}" -} - -src_install() { - # lean and mean installation, single binary and man-pages - pushd "${BUILD_DIR}" > /dev/null || die - into / - newbin systemd-tmpfiles.standalone systemd-tmpfiles - - doman man/{systemd-tmpfiles.8,tmpfiles.d.5} - - popd > /dev/null || die - - # service files adapter from opentmpfiles - newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev - newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup - - # same content, but install as different file - newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev - newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup -} - -src_test() { - # 'meson test' will compile full systemd, but we can still outsmart it - "${EPYTHON}" test/test-systemd-tmpfiles.py \ - "${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed" -} - -# stolen from opentmpfiles ebuild -add_service() { - local initd=$1 - local runlevel=$2 - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - mkdir -p "${EROOT}/etc/runlevels/${runlevel}" - ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}" -} - -pkg_postinst() { - if [[ -z $REPLACING_VERSIONS ]]; then - add_service stmpfiles-dev sysinit - add_service stmpfiles-setup boot - fi -} diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index c67e2eafc710..b0f1d4fc53c6 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,16 +1,16 @@ AUX 00-hostnamed-network-user.conf 227 BLAKE2B 0cc780a2ea9f31f08be01184704e4fa8b4b95e4c82b7e2dd4127f82c594a5cd7c8f865a83ae5f1284e58a7fd120ee9a9f4f586b7e479d21f1e8adf26e8e61238 SHA512 97e8decd802de8581fb546e3a714376fbd065108f3edfed54a1036d93df02f9947c358aec9aa4841a766c9120fa20c69eb7867bb4d2bd7339d8bd89c43235b2b +AUX 250-fix-openssl.patch 3558 BLAKE2B 719581b5e54202e7de45e8f23d7e2453a53184556598077fdc45bf5d6fdf208d00e5cb122cc33f5cb493e833d21e6e9335d553e964c1cb3ef1b2efcd027ff5d7 SHA512 a5673aa00ac018d3685f882a2843c397842024cff873467ecc6f6f4977a641c3c8f0350c60301fc3cb59ce75d5781ab15d6c79974a847ce0e0f1d03731a01430 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60 AUX org.freedesktop.hostname1_no_polkit.conf 471 BLAKE2B 50d9f86b2c4813a90eac8a31f0f762eb1b9e0272024419bfffd1d8c4dbe9955541df5c1e5a14e1663db3c0194e95a8984e5ec0c8a65eb74d279f021c3ef3d348 SHA512 af38bfed2230a75e03de6831a5202e21af6c01e13670df1a5b1b454203bd9db47428a61aa9cf0a21841a11e7caa889e3f6147342ba5411649e00f334a8e03639 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781 -DIST systemd-250-rc3.tar.gz 11110576 BLAKE2B 282c9701a23eb64ad8d12374228291d58a2d11316444992218ac4c8fdf2babc8a01f8d5e86c43206b476c0edef0ca3adb29221560e297a05f94f0a34e6fafe24 SHA512 7ddba91eea3357c493a6ec4dc427b4ec9ecd5d6322ab4827aaeb26ccc152354e85d1e81f0aa1bffae5b4d4cbd80626acda764915187d54c1773192bdbb50999f +DIST systemd-250.tar.gz 11112823 BLAKE2B c75ac7f1fcf1a65c9c88b25dce78dd44a039025b52767c3a1de78fae7a89705ed8ba8986d18d674faa9bfac3380a1c847bde35292d16f90bf22d992a459ddc73 SHA512 7894ea63793dd0c6ae12f6acab04ba02e247e537c404693f69174bf4a10d85f01f51c4938912c9a43c35e526b3ae945a1774d45249b58b31a393332b6c01f4f8 DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf SHA512 7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f DIST systemd-stable-249.7.tar.gz 10608252 BLAKE2B a5597c4973b24c962779622cae47dbf8351af49f8cd898d9c16a967c6f3600c6feb293e9b03eab0423b860eef5b04b287185fb9827cb323429d0ab9fc6d809b2 SHA512 4daf8570621fdcda5c94d982908c64eddfeef989005f4fd79a10f199dbc6f366354177bb59dff34bcb14764fb4423a870ffabac1163849ec53592e29760105fc EBUILD systemd-249.6-r1.ebuild 14730 BLAKE2B c40a2c8ba95cfb613f3260fc0ad4b21408c35a5e4d804d3f80df0934fa4a86276cfe19de8354189f5e1554deb75b6e73caa701d64995f97ff0d4f57a1b418ca4 SHA512 45196efcb82b33fe295e29aa37066a0b175ca603d62cbadd0ee655b22ec4b8a91c0edd1107d38320e292b885b2f83b9ae625fed21db3a24392c253b9d90685d0 -EBUILD systemd-249.6.ebuild 14912 BLAKE2B 5f2b604251b83115870e2116361f4daf868a75782801a35c7856fe106917b7b81cd28855a1b3d831869b18e16d6bfbe5cc1183ffb02dcc011cce41beceafd7d5 SHA512 9287649652457983b45829ed2c64684490bcaa73e60e4f4678fbbd8b1a0309fb1a049149478cce74a66c429096df9bcf7287e0b710b285012f5a57d239ec1fde -EBUILD systemd-249.7.ebuild 14737 BLAKE2B 50016925e397ab5fc909dad7e27ea890fbf8208513bfa57c66f51e9ddf763567e13145cefeaffe4ee989209aa21ba8f837d086ddfa082ae723fdb2893253d88d SHA512 0f7a9424d254bd2fc9c686cf2543fdf23a29a04e872505a24ed4d38c7efb4e7edc807fed02b4e1762be5673943bec3c0ebeaf990540a2ac7d6b6dd810b5fe37a -EBUILD systemd-250_rc3.ebuild 15215 BLAKE2B d93b18659bd652562a76f0d53ab5daedabbd87ecafc29aec85c3a9a28962d7c95abe74e810dafbde1f30deb742f8ea8b3e769a4d63a8c10f8ae053ec18fafbfd SHA512 f9cd6b7189ab6077f37af7b58960517479c8aaa56f9d7d4e81af6c4bdd5756652d2b215d33b8047bb12d7761f81e2041fc8203ee381ca2ef0d46b61dda92a8d1 +EBUILD systemd-249.7.ebuild 14731 BLAKE2B 3aedadd028899d1a74cb841660f8fe1a59d78330cb7bd951388d87aa7197f94d2fbcec600a95a0a6d76c55d085178f7c5fdcd3374f49ee58d040e7ce66f1e73b SHA512 5b75ee51471cc21e3fbb4c77c4fd4f2580f4932964f90f787b51d72ec60785193a06ea72f0281fabc73aa514eca73b8ecefe6e7192decdcb091b449e47f302bb +EBUILD systemd-250.ebuild 15252 BLAKE2B 54c0cf56290b28ab6822eb68aaca0f6002320dd405c32f47805e6bbd6265734b38607d273c286f27928fddb8583656bbdfbeb0f895d9a80ae734b96d3bf81e34 SHA512 0e191eed71e5adff0a90002f5e674ffe9d5ad71533b03042ecef9853ac8b9f36c57f778e120c51c7c286077fc74941be5cb2a768eeb04b535bdfa91731999cb5 EBUILD systemd-9999.ebuild 15214 BLAKE2B 8ea4a8af044301a2478bccfbe7fd539d8d08df42d8f034d1bc7311b5de548096bafeb051c4f336e15a3c6d070280441edaa9a99065dbbc37fd2eeaa0794111de SHA512 572da12e857e2938e10948e6e30b4a030566f5667e1300354c409f65219f9631db5a23a00d082ace98a696f7281d1499c8b457d894aaec2cf3144ecb1be2d13e -MISC metadata.xml 2623 BLAKE2B f07eb8074cfbd61dfb5580b1ec83d6f26dc3aff248d3dcb6932c164921b96681d829516fc9106d3e95f152412f5da4665506402d3c07db58ebd6120f32c9c1a5 SHA512 d2579bdef5d5715fc0d2a699c547ed3dcd938a91ab586fa6b8ee6f9c251af3ea8d04bfd0fd1db60fc943064a12e2ead4efed11894846fcf31d304cb18ee8c43a +MISC metadata.xml 2555 BLAKE2B 3581e1550610c6595e763220767a3b803b38083f366fdc13c25f429973b347c1279b54f7db63367f40c1df375e4afa31c5d6dc70b09e8769c8bcb40e6a757762 SHA512 20d7902ea3af217b49de64d42680ad464b4aaedfc7a4225a464d607e95229f2f9e86586d090a698c53538972d03de41e2ebdf712b656a2560d257864e11d51d8 diff --git a/sys-apps/systemd/files/250-fix-openssl.patch b/sys-apps/systemd/files/250-fix-openssl.patch new file mode 100644 index 000000000000..520ba0b66427 --- /dev/null +++ b/sys-apps/systemd/files/250-fix-openssl.patch @@ -0,0 +1,102 @@ +From 9bcf483b117b23ae25bf4a5d39ddc3eade8659a6 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe <watanabe.yu+github@gmail.com> +Date: Fri, 24 Dec 2021 10:06:13 +0900 +Subject: [PATCH] meson: fix build with -Dcryptolib=openssl + -Ddns-over-tls=false + +Previously, when -Ddns-over-tls=false, libopenssl was missing in the +dependency of resolved. +Also, this drops libgpg_error when it is not necessary. + +Replaces #21878. +--- + meson.build | 3 +-- + src/resolve/meson.build | 9 +-------- + 2 files changed, 2 insertions(+), 10 deletions(-) + +diff --git a/meson.build b/meson.build +index c0cbadecb123..0b7c1918ad4c 100644 +--- a/meson.build ++++ b/meson.build +@@ -1474,7 +1474,7 @@ conf.set10('PREFER_OPENSSL', + opt == 'openssl' or (opt == 'auto' and conf.get('HAVE_OPENSSL') == 1 and conf.get('HAVE_GCRYPT') == 0)) + conf.set10('HAVE_OPENSSL_OR_GCRYPT', + conf.get('HAVE_OPENSSL') == 1 or conf.get('HAVE_GCRYPT') == 1) +-lib_openssl_or_gcrypt = conf.get('PREFER_OPENSSL') == 1 ? libopenssl : libgcrypt ++lib_openssl_or_gcrypt = conf.get('PREFER_OPENSSL') == 1 ? [libopenssl] : [libgcrypt, libgpg_error] + + dns_over_tls = get_option('dns-over-tls') + if dns_over_tls != 'false' +@@ -2200,7 +2200,6 @@ if conf.get('ENABLE_RESOLVE') == 1 + libsystemd_resolve_core], + dependencies : [threads, + lib_openssl_or_gcrypt, +- libgpg_error, + libm, + libidn], + install_rpath : rootlibexecdir, +diff --git a/src/resolve/meson.build b/src/resolve/meson.build +index 0580fbeec625..2cdf24b1cbef 100644 +--- a/src/resolve/meson.build ++++ b/src/resolve/meson.build +@@ -135,7 +135,7 @@ systemd_resolved_sources += custom_target( + output : 'resolved-dnssd-gperf.c', + command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) + +-systemd_resolved_dependencies = [threads, libgpg_error, libm] ++systemd_resolved_dependencies = [threads, libm] + [lib_openssl_or_gcrypt] + if conf.get('ENABLE_DNS_OVER_TLS') == 1 + if conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1 + systemd_resolved_sources += files( +@@ -178,14 +178,12 @@ tests += [ + [libsystemd_resolve_core, + libshared], + [lib_openssl_or_gcrypt, +- libgpg_error, + libm]], + + [['src/resolve/test-dns-packet.c'], + [libsystemd_resolve_core, + libshared], + [lib_openssl_or_gcrypt, +- libgpg_error, + libm]], + + [['src/resolve/test-resolved-etc-hosts.c', +@@ -194,21 +192,18 @@ tests += [ + [libsystemd_resolve_core, + libshared], + [lib_openssl_or_gcrypt, +- libgpg_error, + libm]], + + [['src/resolve/test-resolved-packet.c'], + [libsystemd_resolve_core, + libshared], + [lib_openssl_or_gcrypt, +- libgpg_error, + libm]], + + [['src/resolve/test-dnssec.c'], + [libsystemd_resolve_core, + libshared], + [lib_openssl_or_gcrypt, +- libgpg_error, + libm], + [], 'HAVE_OPENSSL_OR_GCRYPT'], + +@@ -216,7 +211,6 @@ tests += [ + [libsystemd_resolve_core, + libshared], + [lib_openssl_or_gcrypt, +- libgpg_error, + libm], + [], '', 'manual'], + ] +@@ -226,6 +220,5 @@ fuzzers += [ + [libsystemd_resolve_core, + libshared], + [lib_openssl_or_gcrypt, +- libgpg_error, + libm]], + ] diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml index cd0754d004d6..1197a68cfdd0 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -22,7 +22,6 @@ <flag name="homed">Enable portable home directories</flag> <flag name="hostnamed-fallback">Enable setting hostname with networkd/hostnamed without polkit (requires running <pkg>sys-apps/dbus-broker</pkg>)</flag> <flag name="http">Enable embedded HTTP server in journald</flag> - <flag name="hwdb">Enable support for the hardware database</flag> <flag name="importd">Enable import daemon</flag> <flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag> <flag name="lz4">Enable lz4 compression for the journal</flag> diff --git a/sys-apps/systemd/systemd-249.6.ebuild b/sys-apps/systemd/systemd-249.6.ebuild deleted file mode 100644 index 3604e181f993..000000000000 --- a/sys-apps/systemd/systemd-249.6.ebuild +++ /dev/null @@ -1,514 +0,0 @@ -# Copyright 2011-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) - -# Avoid QA warnings -TMPFILES_OPTIONAL=1 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - inherit git-r3 -else - if [[ ${PV} == *.* ]]; then - MY_PN=systemd-stable - else - MY_PN=systemd - fi - MY_PV=${PV/_/-} - MY_P=${MY_PN}-${MY_PV} - S=${WORKDIR}/${MY_P} - SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" -fi - -inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0/2" -IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd" - -REQUIRED_USE=" - homed? ( cryptsetup pam ) - importd? ( curl gcrypt lzma ) - pwquality? ( homed ) -" -RESTRICT="!test? ( test )" - -MINKV="3.11" - -OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0=" - -COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - virtual/libcrypt:=[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl:0= ) - apparmor? ( sys-libs/libapparmor:0= ) - audit? ( >=sys-process/audit-2:0= ) - cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) - curl? ( net-misc/curl:0= ) - dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - fido2? ( dev-libs/libfido2:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - homed? ( ${OPENSSL_DEP} ) - http? ( - >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] - >=net-libs/gnutls-3.1.4:0= - ) - idn? ( net-dns/libidn2:= ) - importd? ( - app-arch/bzip2:0= - sys-libs/zlib:0= - ) - kmod? ( >=sys-apps/kmod-15:0= ) - lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) - nat? ( net-firewall/iptables:0= ) - pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] ) - pkcs11? ( app-crypt/p11-kit:0= ) - pcre? ( dev-libs/libpcre2 ) - pwquality? ( dev-libs/libpwquality:0= ) - qrcode? ( media-gfx/qrencode:0= ) - repart? ( ${OPENSSL_DEP} ) - seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) - selinux? ( sys-libs/libselinux:0= ) - tpm? ( app-crypt/tpm2-tss:0= ) - xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) - zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] ) -" - -# Newer linux-headers needed by ia64, bug #480218 -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-${MINKV} - gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) -" - -# baselayout-2.2 has /run -RDEPEND="${COMMON_DEPEND} - >=acct-group/adm-0-r1 - >=acct-group/wheel-0-r1 - >=acct-group/kmem-0-r1 - >=acct-group/tty-0-r1 - >=acct-group/utmp-0-r1 - >=acct-group/audio-0-r1 - >=acct-group/cdrom-0-r1 - >=acct-group/dialout-0-r1 - >=acct-group/disk-0-r1 - >=acct-group/input-0-r1 - >=acct-group/kvm-0-r1 - >=acct-group/lp-0-r1 - >=acct-group/render-0-r1 - acct-group/sgx - >=acct-group/tape-0-r1 - acct-group/users - >=acct-group/video-0-r1 - >=acct-group/systemd-journal-0-r1 - >=acct-user/root-0-r1 - acct-user/nobody - >=acct-user/systemd-journal-remote-0-r1 - >=acct-user/systemd-coredump-0-r1 - >=acct-user/systemd-network-0-r1 - acct-user/systemd-oom - >=acct-user/systemd-resolve-0-r1 - >=acct-user/systemd-timesync-0-r1 - >=sys-apps/baselayout-2.2 - selinux? ( sec-policy/selinux-base-policy[systemd] ) - sysv-utils? ( - !sys-apps/openrc[sysv-utils(-)] - !sys-apps/sysvinit - ) - !sysv-utils? ( sys-apps/sysvinit ) - resolvconf? ( !net-dns/openresolv ) - !build? ( || ( - sys-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) ) - !sys-auth/nss-myhostname - !sys-fs/eudev - !sys-fs/udev -" - -# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) -PDEPEND=">=sys-apps/dbus-1.9.8[systemd] - hwdb? ( sys-apps/hwids[systemd(+),udev] ) - >=sys-fs/udev-init-scripts-34 - policykit? ( sys-auth/polkit ) - !vanilla? ( sys-apps/gentoo-systemd-integration )" - -BDEPEND=" - app-arch/xz-utils:0 - dev-util/gperf - >=dev-util/meson-0.46 - >=sys-apps/coreutils-8.16 - sys-devel/gettext - virtual/pkgconfig - test? ( - app-text/tree - dev-lang/perl - sys-apps/dbus - ) - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') - $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') -" - -python_check_deps() { - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" && - has_version -b "dev-python/lxml[${PYTHON_USEDEP}]" -} - -QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" -QA_EXECSTACK="usr/lib/systemd/boot/efi/*" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - if use test && has pid-sandbox ${FEATURES}; then - ewarn "Tests are known to fail with PID sandboxing enabled." - ewarn "See https://bugs.gentoo.org/674458." - fi - - local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS - ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE - ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS - ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS - ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH - ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED - ~!SYSFS_DEPRECATED_V2" - - use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" - kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" - kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" - kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF" - - if kernel_is -lt 5 10 20; then - CONFIG_CHECK+=" ~CHECKPOINT_RESTORE" - else - CONFIG_CHECK+=" ~KCMP" - fi - - if linux_config_exists; then - local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) - if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then - ewarn "It's recommended to set an empty value to the following kernel config option:" - ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" - fi - if linux_chkconfig_present X86; then - CONFIG_CHECK+=" ~DMIID" - fi - fi - - if kernel_is -lt ${MINKV//./ }; then - ewarn "Kernel version at least ${MINKV} required" - fi - - check_extra_config - fi -} - -pkg_setup() { - : -} - -src_unpack() { - default - [[ ${PV} != 9999 ]] || git-r3_src_unpack -} - -src_prepare() { - # Do NOT add patches here - local PATCHES=() - - [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) - - # Add local patches here - PATCHES+=( - ) - - if ! use vanilla; then - PATCHES+=( - "${FILESDIR}/gentoo-generator-path-r2.patch" - "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch" - "${FILESDIR}/gentoo-journald-audit.patch" - ) - fi - - default -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - - python_setup - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --localstatedir="${EPREFIX}/var" - -Dsupport-url="https://gentoo.org/support/" - -Dpamlibdir="$(getpam_mod_dir)" - # avoid bash-completion dep - -Dbashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in PATH - $(meson_use split-usr) - -Dsplit-bin=true - -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" - -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - # Avoid infinite exec recursion, bug 642724 - -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" - # no deps - -Dima=true - -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified) - # Optional components/dependencies - $(meson_native_use_bool acl) - $(meson_native_use_bool apparmor) - $(meson_native_use_bool audit) - $(meson_native_use_bool cryptsetup libcryptsetup) - $(meson_native_use_bool curl libcurl) - $(meson_native_use_bool dns-over-tls dns-over-tls) - $(meson_native_use_bool elfutils) - $(meson_native_use_bool fido2 libfido2) - $(meson_use gcrypt) - $(meson_native_use_bool gnuefi gnu-efi) - -Defi-includedir="${ESYSROOT}/usr/include/efi" - -Defi-ld="$(tc-getLD)" - -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" - $(meson_native_use_bool homed) - $(meson_native_use_bool hwdb) - $(meson_native_use_bool http microhttpd) - $(meson_native_use_bool idn) - $(meson_native_use_bool importd) - $(meson_native_use_bool importd bzip2) - $(meson_native_use_bool importd zlib) - $(meson_native_use_bool kmod) - $(meson_use lz4) - $(meson_use lzma xz) - $(meson_use zstd) - $(meson_native_use_bool nat libiptc) - $(meson_use pam) - $(meson_native_use_bool pkcs11 p11kit) - $(meson_native_use_bool pcre pcre2) - $(meson_native_use_bool policykit polkit) - $(meson_native_use_bool pwquality) - $(meson_native_use_bool qrcode qrencode) - $(meson_native_use_bool repart) - $(meson_native_use_bool seccomp) - $(meson_native_use_bool selinux) - $(meson_native_use_bool tpm tpm2) - $(meson_native_use_bool test dbus) - $(meson_native_use_bool xkb xkbcommon) - -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" - # Breaks screen, tmux, etc. - -Ddefault-kill-user-processes=false - -Dcreate-log-dirs=false - - # multilib options - $(meson_native_true backlight) - $(meson_native_true binfmt) - $(meson_native_true coredump) - $(meson_native_true environment-d) - $(meson_native_true firstboot) - $(meson_native_true hibernate) - $(meson_native_true hostnamed) - $(meson_native_true ldconfig) - $(meson_native_true localed) - $(meson_native_true man) - $(meson_native_true networkd) - $(meson_native_true quotacheck) - $(meson_native_true randomseed) - $(meson_native_true rfkill) - $(meson_native_true sysusers) - $(meson_native_true timedated) - $(meson_native_true timesyncd) - $(meson_native_true tmpfiles) - $(meson_native_true vconsole) - ) - - meson_src_configure "${myconf[@]}" -} - -multilib_src_test() { - unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR - meson_src_test -} - -multilib_src_install_all() { - local rootprefix=$(usex split-usr '' /usr) - - # meson doesn't know about docdir - mv "${ED}"/usr/share/doc/{systemd,${PF}} || die - - einstalldocs - dodoc "${FILESDIR}"/nsswitch.conf - - if ! use resolvconf; then - rm -f "${ED}${rootprefix}"/sbin/resolvconf || die - fi - - rm "${ED}"/etc/init.d/README || die - rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die - - if ! use sysv-utils; then - rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die - rm "${ED}"/usr/share/man/man1/init.1 || die - rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die - fi - - if ! use resolvconf && ! use sysv-utils; then - rmdir "${ED}${rootprefix}"/sbin || die - fi - - # https://bugs.gentoo.org/761763 - rm -r "${ED}"/usr/lib/sysusers.d || die - - # Preserve empty dirs in /etc & /var, bug #437008 - keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} - keepdir /etc/kernel/install.d - keepdir /etc/systemd/{network,system,user} - keepdir /etc/udev/rules.d - - if use hwdb; then - keepdir /etc/udev/hwdb.d - fi - - keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} - keepdir /usr/lib/{binfmt.d,modules-load.d} - keepdir /usr/lib/systemd/user-generators - keepdir /var/lib/systemd - keepdir /var/log/journal - - # Symlink /etc/sysctl.conf for easy migration. - dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf - - if use pam; then - newpamd "${FILESDIR}"/systemd-user.pam systemd-user - fi - - if use hwdb; then - rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die - fi - - if use split-usr; then - # Avoid breaking boot/reboot - dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd - dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown - fi - - gen_usr_ldscript -a systemd udev -} - -migrate_locale() { - local envd_locale_def="${EROOT}/etc/env.d/02locale" - local envd_locale=( "${EROOT}"/etc/env.d/??locale ) - local locale_conf="${EROOT}/etc/locale.conf" - - if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then - # If locale.conf does not exist... - if [[ -e ${envd_locale} ]]; then - # ...either copy env.d/??locale if there's one - ebegin "Moving ${envd_locale} to ${locale_conf}" - mv "${envd_locale}" "${locale_conf}" - eend ${?} || FAIL=1 - else - # ...or create a dummy default - ebegin "Creating ${locale_conf}" - cat > "${locale_conf}" <<-EOF - # This file has been created by the sys-apps/systemd ebuild. - # See locale.conf(5) and localectl(1). - - # LANG=${LANG} - EOF - eend ${?} || FAIL=1 - fi - fi - - if [[ ! -L ${envd_locale} ]]; then - # now, if env.d/??locale is not a symlink (to locale.conf)... - if [[ -e ${envd_locale} ]]; then - # ...warn the user that he has duplicate locale settings - ewarn - ewarn "To ensure consistent behavior, you should replace ${envd_locale}" - ewarn "with a symlink to ${locale_conf}. Please migrate your settings" - ewarn "and create the symlink with the following command:" - ewarn "ln -s -n -f ../locale.conf ${envd_locale}" - ewarn - else - # ...or just create the symlink if there's nothing here - ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" - ln -n -s ../locale.conf "${envd_locale_def}" - eend ${?} || FAIL=1 - fi - fi -} - -pkg_preinst() { - if ! use split-usr; then - local dir - for dir in bin sbin lib; do - if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then - eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged." - eerror "One of them should be a symbolic link to the other one." - FAIL=1 - fi - done - if [[ ${FAIL} ]]; then - eerror "Migration to system layout with merged directories must be performed before" - eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage." - die "System layout with split directories still used" - fi - fi -} - -pkg_postinst() { - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. - if use hwdb; then - systemd-hwdb --root="${ROOT}" update - fi - - udev_reload || FAIL=1 - - # Bug 465468, make sure locales are respected, and ensure consistency - # between OpenRC & systemd - migrate_locale - - if [[ -z ${REPLACING_VERSIONS} ]]; then - if type systemctl &>/dev/null; then - systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1 - fi - elog "To enable a useful set of services, run the following:" - elog " systemctl preset-all --preset-mode=enable-only" - fi - - if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then - rm "${EROOT}/var/lib/systemd/timesync" - fi - - if [[ ${FAIL} ]]; then - eerror "One of the postinst commands failed. Please check the postinst output" - eerror "for errors. You may need to clean up your system and/or try installing" - eerror "systemd again." - eerror - fi -} - -pkg_prerm() { - # If removing systemd completely, remove the catalog database. - if [[ ! ${REPLACED_BY_VERSION} ]]; then - rm -f -v "${EROOT}"/var/lib/systemd/catalog/database - fi -} diff --git a/sys-apps/systemd/systemd-249.7.ebuild b/sys-apps/systemd/systemd-249.7.ebuild index 5f4dc1168d11..0d9a1792bad8 100644 --- a/sys-apps/systemd/systemd-249.7.ebuild +++ b/sys-apps/systemd/systemd-249.7.ebuild @@ -20,7 +20,7 @@ else MY_P=${MY_PN}-${MY_PV} S=${WORKDIR}/${MY_P} SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" fi inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript diff --git a/sys-apps/systemd/systemd-250_rc3.ebuild b/sys-apps/systemd/systemd-250.ebuild index 8a8e65f58636..26dc346527a3 100644 --- a/sys-apps/systemd/systemd-250_rc3.ebuild +++ b/sys-apps/systemd/systemd-250.ebuild @@ -20,7 +20,7 @@ else MY_P=${MY_PN}-${MY_PV} S=${WORKDIR}/${MY_P} SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript @@ -237,6 +237,7 @@ src_prepare() { # Add local patches here PATCHES+=( + "${FILESDIR}"/250-fix-openssl.patch ) if ! use vanilla; then diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest index bc68c41c0d99..55a3fc661d82 100644 --- a/sys-apps/usbutils/Manifest +++ b/sys-apps/usbutils/Manifest @@ -1,6 +1,3 @@ -DIST usbutils-013.tar.xz 98056 BLAKE2B d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873 SHA512 eb1751e5b82f7a1bdffc667662cebee6fd42f466e59d4eb4c98f0d3723d740305377da1df1ba5831402fddbbd1697bbfa2abd22d9ed175e2dee55d6d007e9e54 DIST usbutils-014.tar.xz 165884 BLAKE2B aea4f8edd3c7d7bc400fd63a8702b6d0bb50b8ed07196c4a0ed20a615eacf6373794afb9e7d5d81408dc3382848e965ecf8bc1bbec20837e4d1f96ba47cc40b5 SHA512 43c9f6ed14f8d01e014ef39a5d50b3b09031c6bda8261e0945b4cb4287c9107104175b386c2adc61dc7f9f476afb30f9a647a6ece6dee26b4133a4f10af72792 -EBUILD usbutils-013-r1.ebuild 1265 BLAKE2B a035c8d3aeaee690d4b618c98d75de6eafc39deda40ba306d5d628a508ea2c35cd1e522da0c0acfba2fea94b5956b00a5ea32bf56812a196d2ebf1980e494600 SHA512 35a854187104fd4a5768af7dd6ce57b75170b685a389a12f45ea5a75f916e46f32446b5af2c222923af206b64d19711cf6b6019071781619b0a6d8d60bc6fb2e -EBUILD usbutils-014-r1.ebuild 1328 BLAKE2B 950493cf36450787a49b171353ebf7bb56fd75d88fcee025a694d76d78b21d6458850a3f3ab41797e39c0d6af64201c7df9085b630ec3bdfd5d254e613fa3777 SHA512 360593108c2aab34c6dee0e62524c868c849c7a122a6ad9614cb5a3993ca1c3f5ca3a7cab74effcdad2cb8d6c24ef51584bbc4f4965260abbbd24c11dd8946e1 -EBUILD usbutils-014.ebuild 1321 BLAKE2B d1ee5b521795e6e698f9138629f809de31c5e65c0943cfe565553f2ec770ca7ee3a7f1e1327c8fd2bee207747c510605c955a6fe0be3a278803bfe96e668b88b SHA512 325d1c06286f15d7d6af397a6727bb29a4578ee1f5979655dd718f6dffb7967f756dbe91d5d3b02c12860012abc2557c4e76b34943ba9793c5c0d03f02889adb +EBUILD usbutils-014-r1.ebuild 1331 BLAKE2B 784f8460e23b0bd885ec86d6c0e4daa2b40a72193d7c82d83e20d3d9b219369c8835ebd283485afae927b7451859ab79c2546a85409363392e12a457b19b490c SHA512 3c7fac95d86331cf4320d8e4ab1bf39907677ea68463c59393be2fc2813b5023cd01a87333cd1c7f603adec60d4eb3f9cba26ea082d45ca0028ec0387bb84a2e MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-apps/usbutils/usbutils-013-r1.ebuild b/sys-apps/usbutils/usbutils-013-r1.ebuild deleted file mode 100644 index 18fefda1788a..000000000000 --- a/sys-apps/usbutils/usbutils-013-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit autotools python-single-r1 - -DESCRIPTION="USB enumeration utilities" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/ - https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/" -SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="virtual/libusb:1= - virtual/libudev:=" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig" -RDEPEND="${DEPEND} - sys-apps/hwids - python? ( ${PYTHON_DEPS} )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - eautoreconf - use python && python_fix_shebang lsusb.py.in -} - -src_configure() { - local myeconfargs=( - --datarootdir="${EPREFIX}/usr/share" - --datadir="${EPREFIX}/usr/share/misc" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - newdoc usbhid-dump/NEWS NEWS.usbhid-dump - dobin usbreset # noinst_PROGRAMS, but installed by other distros - - use python || rm -f "${ED}"/usr/bin/lsusb.py -} diff --git a/sys-apps/usbutils/usbutils-014-r1.ebuild b/sys-apps/usbutils/usbutils-014-r1.ebuild index 135aaef523d1..547e7cc8092a 100644 --- a/sys-apps/usbutils/usbutils-014-r1.ebuild +++ b/sys-apps/usbutils/usbutils-014-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) inherit autotools python-single-r1 diff --git a/sys-apps/usbutils/usbutils-014.ebuild b/sys-apps/usbutils/usbutils-014.ebuild deleted file mode 100644 index adc0efbb6dea..000000000000 --- a/sys-apps/usbutils/usbutils-014.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) - -inherit autotools python-single-r1 - -DESCRIPTION="USB enumeration utilities" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/ - https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/" -SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="virtual/libusb:1= - virtual/libudev:=" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig - python? ( ${PYTHON_DEPS} )" -RDEPEND="${DEPEND} - sys-apps/hwids - python? ( ${PYTHON_DEPS} )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - eautoreconf - use python && python_fix_shebang lsusb.py.in -} - -src_configure() { - local myeconfargs=( - --datarootdir="${EPREFIX}/usr/share" - --datadir="${EPREFIX}/usr/share/misc" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - newdoc usbhid-dump/NEWS NEWS.usbhid-dump - dobin usbreset # noinst_PROGRAMS, but installed by other distros - - if ! use python ; then - rm -f "${ED}"/usr/bin/lsusb.py || die - fi -} diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 6f1d293ec014..198ce27bacbd 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -5,6 +5,6 @@ AUX util-linux-2.37.1-agetty_ctrl-c_erase.patch 1900 BLAKE2B 570c03cc5059198efde AUX util-linux-2.37.2-ioctl_ns-test-hang.patch 1308 BLAKE2B 87f9d63b91342c7560987438dad5e6ed43046233ae3400f91ff09767825b20ae2ff3886d8a7a3d7790dda11cffbf351c4047ac5397d1dbb98a548303d1caa8af SHA512 f0f0616a8729e302ef30b72437e34d7ac308e32206c0fdea2d3117da6a01d18b809016e2f46affed3b8fcaf156c64cd895a7460895aadcf39352fe724a3bfd78 DIST util-linux-2.37.2.tar.xz 5621624 BLAKE2B 40ab80485781dfc58e6d0e98dae115b96f11ee0cc370524e1e13d3c4a4dfed3a5a4a248311f8ca645f6f84bbaf4785412ca8282b840af4e37a01312764885abe SHA512 38f0fe820445e3bfa79550e6581c230f98c7661566ccc4daa51c7208a5f972c61b4e57dfc86bed074fdbc7c40bc79f856be8f6a05a8860c1c0cecc4208e8b81d EBUILD util-linux-2.37.2-r1.ebuild 9412 BLAKE2B f94d8887209e0a2e547c1846483bffc3f6f371fb03904317b6a7e50bffded3d8eda64d6119af2c72dba64bb75844deb717b9daad96a023033bf3c2711f880b43 SHA512 d7a74218f362e0ff1807899001006824801f7da22b580cf43c8e621b03240d8bd33a3a78c6718ac1604897744c9552315d1b24330c3e94553294de6564fd5f1f -EBUILD util-linux-2.37.2-r3.ebuild 9570 BLAKE2B 71c8b345b0abff4d432c97dbc1c575e4295ebf248ca06cf85dfe5d2be9080dc90c4f1c3620df93baf9ae2b0b52f0db49bef92bf6c2a8099539b45f9f0366f11c SHA512 2d595b9d8a661d0e0298d75750df7887c15972a9469b052ed667809bda24ddbe400bff1667aa5fa38a2aac1b755f7c601e09d8c2a82db0b0c3152ea0697975b9 -EBUILD util-linux-9999.ebuild 9423 BLAKE2B fd4b0b00d237a19fe73e3f220758371aa162fc8e11cda4574c27bcab0188ad6e6bf299ebe305a6e7ad955d80e8dbab88e0c4ce31214222b64115805baf16d02f SHA512 c9b7a642e4d21a0332d320fd1ea28014e53ae6c019252073ebbebdfd3603bd1c91940387be4b06c547fd7e415a8cff014af9980e998bcf056704c8360a7ca350 +EBUILD util-linux-2.37.2-r3.ebuild 9573 BLAKE2B 2738dff580cab8a5b5a508a66e7adf32fa5505ff4d9b68fef57b91f61dcf9c3d6d54818d21e90104722d66f3cbe98200c72dbd25f17d72819fee9b9ca74c22fc SHA512 c7c4ecb87d10041b2121037fe8f4c7b25158cce15820778a421b5f61ac24fde73117617545b32971cdea391fe784b4e4e1dba79d29cf8b572dc665597f754247 +EBUILD util-linux-9999.ebuild 9426 BLAKE2B 9b316a2a5504239f7efbaabbe02091c306ed692bc2c50c78a7ce0c60281595e03bc710c97ba8079ef407c771859038f7311d6435da5c35ef4c0d3f275f63d862 SHA512 f4a9ccd964c4108410fda35a37c8219c1a034892460fe19e99fcd1d28507bf63b1f55591e79cf1e556d1ba3b2e5246e81d8aed02af314a3c845d22905d524f48 MISC metadata.xml 1448 BLAKE2B 5fb494f00e91500e600340c00734b34c953a9bec939bdbcf8c9946412290bfce34219057f8a7eeadca56ffc050ac4b043039efbeb9d1db2396bfd35917ccca10 SHA512 729b1e16d89447baaa37085bd8aa7a887984ac2c64810d4f81127aaac873f7d28f0299e10a1cb8ca151ff59553cbe8b734390ca26f6998044f0a889a452b907b diff --git a/sys-apps/util-linux/util-linux-2.37.2-r3.ebuild b/sys-apps/util-linux/util-linux-2.37.2-r3.ebuild index 6fe8be147bb4..9532360938eb 100644 --- a/sys-apps/util-linux/util-linux-2.37.2-r3.ebuild +++ b/sys-apps/util-linux/util-linux-2.37.2-r3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ pam python-r1 multilib-minimal multiprocessing systemd diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 66a76758c397..8ba7230d848f 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ pam python-r1 multilib-minimal multiprocessing systemd diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest index aed79789ddc1..b9395f41803c 100644 --- a/sys-apps/xdg-desktop-portal/Manifest +++ b/sys-apps/xdg-desktop-portal/Manifest @@ -1,3 +1,5 @@ DIST xdg-desktop-portal-1.10.1.tar.xz 479660 BLAKE2B 88a2b8ea890036bf0d4192fae4ae143e350d903a528e09a0bd7ffc7bda2a58b5c04ae80f1cec4357bb05cba8db417b6193fc6ef7f7dd65bf414f80a8ac2800c5 SHA512 5db0bd866674ff016d864646ea7f91f09a1b8fbc5ec735e4c97165af71770d2c7d3333e771062644dd522b32f67ead72bc7ef99186e3b069671c174d4d601fdc +DIST xdg-desktop-portal-1.12.1.tar.xz 484352 BLAKE2B afa14ab78f35cb1c0e66514f313f5dc297ceef88af1ca7b3028305faa8398bdae1b9e897289b18a93b1cda1a8290c0e51bf73e66c9dce231f57a58652fb9e120 SHA512 62df427e2d8d54acd9a34a02a77c26ae3911fbb4c5844eff4a253dc839775c929c6945401b93549ba200ba637d315146767e41f18a831d7627b35de880de0da1 EBUILD xdg-desktop-portal-1.10.1.ebuild 987 BLAKE2B ad57dd3a283dc008a022b61bdb0a23c8aa3476ca466a528387aa7ebffce602a75e9f1349f53e0f806d50e94a61eeb74774452bf0955cdf8b05ca3e40e438fd10 SHA512 6e9b80266a96c9b9f7752849395e0543bf083ccaa1490a94f73891530c9bfa03d25338a00b53f234c21ffecde74714690f9208d326d83e9aadf69f4458f972a7 +EBUILD xdg-desktop-portal-1.12.1.ebuild 990 BLAKE2B 69077d25af98362d53549b448b3eb3d0b29bf6e4732ae99c835636e147ac91d432aa0cd98799da15f2e7d78becdebd88f3fe67b6049e11c91c9b2091006d1cb9 SHA512 95db5a9f0a322f602b9520c67be1a6eb76a56c42be893649dd434ee1ad0d8fd89266a03e84a35248f38350b45c1621518a342e1af9ff30e3ae0d6f1b6a559167 MISC metadata.xml 361 BLAKE2B 29f050b1cf9380b76d4a779066ae0db5704da11ba9d97e1b2ed7c8d15003d534ecb83c4cd186e7f47e0e89b10e51299ee7bdd9acff9a02f9dc721647bca283da SHA512 872fc2c477635667b5593856f3fef346b96add82b754f9978c36c3c4e56a00516196faab14bac0adff40636c481ba436889b13549b2fc29412f3a21d1166fa25 diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.12.1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.12.1.ebuild new file mode 100644 index 000000000000..1b6590b6ba9b --- /dev/null +++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.12.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd + +DESCRIPTION="Desktop integration portal" +HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal" +SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="geolocation screencast" + +DEPEND=" + dev-libs/glib:2 + dev-libs/json-glib + sys-fs/fuse:0 + geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) + screencast? ( >=media-video/pipewire-0.3:= ) +" +RDEPEND="${DEPEND} + sys-apps/dbus +" +BDEPEND=" + dev-util/gdbus-codegen + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + local myeconfargs=( + --disable-docbook-docs # requires flatpak + --disable-libportal # not packaged + --with-systemduserunitdir="$(systemd_get_userunitdir)" + $(use_enable geolocation geoclue) + $(use_enable screencast pipewire) + ) + econf "${myeconfargs[@]}" +} |