diff options
Diffstat (limited to 'sys-apps')
31 files changed, 600 insertions, 1860 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex 44296f072080..40e6e22f27f3 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest index 6b4bb0c15192..521c18ecda26 100644 --- a/sys-apps/dbus-broker/Manifest +++ b/sys-apps/dbus-broker/Manifest @@ -1,7 +1,9 @@ AUX dbus-broker-32-apparmor-libaudit.patch 766 BLAKE2B 4cbca2ae01f7e63048f303953a131ea2a927cc372abadd5bf2a23ef5f5618e4045ce587eb9983b3d6040a70c6f4fba10acfd775fdda62ef976b3899f141d9d36 SHA512 750f68436845765db7a7ff12b42045fb2e25f15c177e4f08ed17bd4919e60d856837a54145920c276a7dff772e32e6ce48e4f1eac803cb4cdf05fc9e49ed6c22 +AUX dbus-broker-33-strict-aliasing.patch 10322 BLAKE2B b89244315d09621876fcdc4b6d4fce34a351669ff5dcb136dd14e7b23156912a2aa32cadcb56491781cbeacc1f0e2aae3821fe5dc982639eebd5bcbc4936036a SHA512 2534520b8c54c74abc80c7834cbf89b7f36552097dff8be128747de197966d432fb33620090b60f98ad6e026d6ec8f5676a2f43ecf4a477154de582b4b683bc7 DIST dbus-broker-32.tar.xz 248196 BLAKE2B 511159673f0e3a2260e611b85b80719506e9eafe9d93d743891be664e4a79e3ade48f6ec047fa085c414087673290d6b958eec30d3b0d27048e2c1a1521d6c10 SHA512 aa23d058771f56e6378df0a17ac413813b6350b77e61128c0887f35a546f10534b1a6d598868e9f5c642244c3632a8ce5e315e6794305a56f5abbebd36bf822c DIST dbus-broker-33.tar.xz 253172 BLAKE2B 2b1773999af5caa435acb9dca848c96863b8d738dee6c3542e492d031555c0251a07d371465cd5dc071c0198b33251bf8233f18ddaa7ae34dc9b5df938ca9298 SHA512 776684a5d19a6c25fc46dff19821014a32d967f8132385b86c5281f2d69192dce64b3ad92ae6a158d1d64753e89d918385a1a31f32811f54060504113f065baa EBUILD dbus-broker-32.ebuild 1232 BLAKE2B 239580fb9a9e2b550051277c65ce6a5d7d936d81fe85a90310e318df57c4710fbe33083330c7cd581714055814399477caa4a4d187cac620850b3e09428a415d SHA512 38099a8a113cadfe8b3c24086dec2b58c015fd78ffe2cf4cc8121bcb9157d721593d7ae3c82a57fa2eaff7821b24c22d144a9758e5add144bbe0f8faa959c447 -EBUILD dbus-broker-33.ebuild 1245 BLAKE2B ddaf204835e5b0d6d1445c5d0a294153a4d9fa734fb2f233deca4e467b2cf5dc563b4c14da7a3f7f6f769ec62867a8dca4d1d671dfbebc9c398302b53fe59316 SHA512 f1360e8bd160320e57137684740983bcb3394b9b6bcfb39cf42f4db6ea39ffdf57688f1e8e20ead29e77789d9278af67983db982a9a5fb18e1650e8d2b41f627 -EBUILD dbus-broker-9999.ebuild 1248 BLAKE2B fcba83dd9ed174b6b76613651ff58806effc6711c41957d177cb0331a0c877ba8462665eb0d6deaf5f561a8ed5a7cc406d3515eb2773e549bcba898779267ab1 SHA512 eb161e460427ac6b8385b80c6fc9325400dc368f1d1e8ceb1407a12596d5a5469df8c2ee680461118b7d98958163b2183d491032749421fd9adb10c78a199a03 +EBUILD dbus-broker-33-r1.ebuild 1297 BLAKE2B bb3cd910bca3b692203185d5d142dad91ee441768f498608d5ba729024f21e081dfbb776ad4f26d84c04f8e5824791b6ec4e5c3a55de12e0d221838abfd4ef65 SHA512 294b7867ebfd4e74cef21eea865d9622c6125abe154f7d2656499261b3715faf4729c050ea0c287b17adddb7de7ada9279f89e6808a9f3ca8300cb78a8c8796a +EBUILD dbus-broker-33-r2.ebuild 1227 BLAKE2B 6c82b46ba49e0011b7466503fc8e199dd3e72c56c7276cdbfc2fadc3258cc4a58af6050c8b3ce2b9190745441a1e2be9dd954e7d526e5331b81b4c624053f05f SHA512 4250788c76eaaa0bec0eeee709fd37b5908c9ee511e1b6bb1b4a43243dd48381fad72ad02f46028ab2b5420825790242aa052f419cb19716688f592806dee4f1 +EBUILD dbus-broker-9999.ebuild 1227 BLAKE2B 6c82b46ba49e0011b7466503fc8e199dd3e72c56c7276cdbfc2fadc3258cc4a58af6050c8b3ce2b9190745441a1e2be9dd954e7d526e5331b81b4c624053f05f SHA512 4250788c76eaaa0bec0eeee709fd37b5908c9ee511e1b6bb1b4a43243dd48381fad72ad02f46028ab2b5420825790242aa052f419cb19716688f592806dee4f1 MISC metadata.xml 409 BLAKE2B 47bd4b617aaf73c385f1c321592abf3cb4fe06dbc35a574a9cd8f65417a6554314e7034a47d36c04a7f90264c6087103ac3cbcd051d5177b38f22550553b07c0 SHA512 048e0790b2c9e8dbbf446d4ce2651124245976194260b1813b3e1807366ba09cdb204a9787dc77bca0f9bc4400fe94422cfdbe63d729c3333b67c98a6a20a1c3 diff --git a/sys-apps/dbus-broker/dbus-broker-33.ebuild b/sys-apps/dbus-broker/dbus-broker-33-r1.ebuild index 645121c3f9b2..aae6b444ce7e 100644 --- a/sys-apps/dbus-broker/dbus-broker-33.ebuild +++ b/sys-apps/dbus-broker/dbus-broker-33-r1.ebuild @@ -50,8 +50,9 @@ src_unpack() { fi src_configure() { - # Causes test failures - filter-flags -fno-semantic-interposition + # Causes test failures with -fno-semantic-interposition (bug #919100) + append-flags -fno-strict-aliasing + filter-lto local emesonargs=( $(meson_use apparmor) diff --git a/sys-apps/dbus-broker/dbus-broker-33-r2.ebuild b/sys-apps/dbus-broker/dbus-broker-33-r2.ebuild new file mode 100644 index 000000000000..e1bb5c68ca07 --- /dev/null +++ b/sys-apps/dbus-broker/dbus-broker-33-r2.ebuild @@ -0,0 +1,65 @@ +# Copyright 2017-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git" +else + SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +fi + +DESCRIPTION="Linux D-Bus Message Broker" +HOMEPAGE="https://github.com/bus1/dbus-broker/wiki" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="apparmor audit doc +launcher selinux" + +DEPEND=" + apparmor? ( + >=sys-libs/libapparmor-3.0 + ) + audit? ( + >=sys-process/audit-3.0 + >=sys-libs/libcap-ng-0.6 + ) + launcher? ( + >=dev-libs/expat-2.2 + >=sys-apps/systemd-230:0= + ) + selinux? ( >=sys-libs/libselinux-3.2 ) +" +RDEPEND="${DEPEND} + launcher? ( sys-apps/dbus )" +BDEPEND=" + doc? ( dev-python/docutils ) + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-33-strict-aliasing.patch +) + +if [[ ${PV} == 9999 ]]; then +src_unpack() { + git-r3_src_unpack + cd "${P}" || die + meson subprojects download || die +} +fi + +src_configure() { + local emesonargs=( + $(meson_use apparmor) + $(meson_use audit) + $(meson_use doc docs) + $(meson_use launcher) + $(meson_use selinux) + ) + meson_src_configure +} diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild index 206bac4cf1bb..e1bb5c68ca07 100644 --- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild +++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic meson +inherit meson if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -41,6 +41,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-33-strict-aliasing.patch +) + if [[ ${PV} == 9999 ]]; then src_unpack() { git-r3_src_unpack @@ -50,9 +54,6 @@ src_unpack() { fi src_configure() { - # Causes test failures - filter-flags -fno-semantic-interposition - local emesonargs=( $(meson_use apparmor) $(meson_use audit) diff --git a/sys-apps/dbus-broker/files/dbus-broker-33-strict-aliasing.patch b/sys-apps/dbus-broker/files/dbus-broker-33-strict-aliasing.patch new file mode 100644 index 000000000000..cb21fb08ae5e --- /dev/null +++ b/sys-apps/dbus-broker/files/dbus-broker-33-strict-aliasing.patch @@ -0,0 +1,207 @@ +https://bugs.gentoo.org/919100 +https://github.com/c-util/c-utf8/issues/4 +https://github.com/c-util/c-utf8/commit/4b7cb9f940e45d3c68bf427cdeeaf5da47b03b41 + +From 4b7cb9f940e45d3c68bf427cdeeaf5da47b03b41 Mon Sep 17 00:00:00 2001 +From: David Rheinsberg <david.rheinsberg@gmail.com> +Date: Wed, 4 Jan 2023 14:14:56 +0100 +Subject: [PATCH] c-utf8: avoid violating strict-aliasing rules + +Use the c_load*() helpers of c-stdaux to avoid the strict aliasing rules +of the C language. + +Signed-off-by: David Rheinsberg <david.rheinsberg@gmail.com> +--- a/subprojects/libcutf8-1/src/c-utf8.c ++++ b/subprojects/libcutf8-1/src/c-utf8.c +@@ -17,9 +17,9 @@ + #define C_UTF8_ASCII_MASK ((size_t)UINT64_C(0x8080808080808080)) + #define C_UTF8_ASCII_SUB ((size_t)UINT64_C(0x0101010101010101)) + +-static inline int c_utf8_word_is_ascii(const size_t *word) { ++static inline int c_utf8_word_is_ascii(size_t word) { + /* True unless any byte is NULL or has the MSB set. */ +- return ((((*word - C_UTF8_ASCII_SUB) | *word) & C_UTF8_ASCII_MASK) == 0); ++ return ((((word - C_UTF8_ASCII_SUB) | word) & C_UTF8_ASCII_MASK) == 0); + } + + /** +@@ -37,10 +37,10 @@ static inline int c_utf8_word_is_ascii(const size_t *word) { + * byte, without any upper bound on its length. + */ + _c_public_ void c_utf8_verify_ascii(const char **strp, size_t *lenp) { +- unsigned char *str = (unsigned char *)*strp; ++ const char *str = *strp; + size_t len = lenp ? *lenp : (size_t)-1; + +- while (len > 0 && *str < 128) { ++ while (len > 0 && c_load_8(str, 0) < 128) { + if ((void*)c_align_to((unsigned long)str, sizeof(size_t)) == str) { + /* + * If the string is aligned to a word boundary, scan two +@@ -51,8 +51,8 @@ _c_public_ void c_utf8_verify_ascii(const char **strp, size_t *lenp) { + * available. + */ + while (len >= 2 * sizeof(size_t)) { +- if (!c_utf8_word_is_ascii((size_t*)str) || +- !c_utf8_word_is_ascii(((size_t*)str) + 1)) ++ if (!c_utf8_word_is_ascii(c_load(size_t, le, aligned, str, 0)) || ++ !c_utf8_word_is_ascii(c_load(size_t, le, aligned, str, sizeof(size_t)))) + break; + + str += 2 * sizeof(size_t); +@@ -63,8 +63,8 @@ _c_public_ void c_utf8_verify_ascii(const char **strp, size_t *lenp) { + /* + * Find the actual end of the ASCII-portion of the string. + */ +- while (len > 0 && *str < 128) { +- if (_c_unlikely_(*str == 0x00)) ++ while (len > 0 && c_load_8(str, 0) < 128) { ++ if (_c_unlikely_(c_load_8(str, 0) == 0x00)) + goto out; + ++str; + --len; +@@ -74,7 +74,7 @@ _c_public_ void c_utf8_verify_ascii(const char **strp, size_t *lenp) { + * The string was not aligned, scan one character at a time until + * it is. + */ +- if (_c_unlikely_(*str == 0x00)) ++ if (_c_unlikely_(c_load_8(str, 0) == 0x00)) + goto out; + ++str; + --len; +@@ -82,7 +82,7 @@ _c_public_ void c_utf8_verify_ascii(const char **strp, size_t *lenp) { + } + + out: +- *strp = (char *)str; ++ *strp = str; + if (lenp) + *lenp = len; + } +@@ -104,13 +104,13 @@ _c_public_ void c_utf8_verify_ascii(const char **strp, size_t *lenp) { + * byte, without any upper bound on its length. + */ + _c_public_ void c_utf8_verify(const char **strp, size_t *lenp) { +- unsigned char *str = (unsigned char *)*strp; ++ const char *str = *strp; + size_t len = lenp ? *lenp : (size_t)-1; + + /* See Unicode 10.0.0, Chapter 3, Section D92 */ + + while (len > 0) { +- switch (*str) { ++ switch (c_load_8(str, 0)) { + case 0x00: + goto out; + case 0x01 ... 0x7F: +@@ -123,7 +123,7 @@ _c_public_ void c_utf8_verify(const char **strp, size_t *lenp) { + case 0xC2 ... 0xDF: + if (_c_unlikely_(len < 2)) + goto out; +- if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(*(str + 1)))) ++ if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(c_load_8(str, 1)))) + goto out; + + str += 2; +@@ -133,9 +133,9 @@ _c_public_ void c_utf8_verify(const char **strp, size_t *lenp) { + case 0xE0: + if (_c_unlikely_(len < 3)) + goto out; +- if (_c_unlikely_(*(str + 1) < 0xA0 || *(str + 1) > 0xBF)) ++ if (_c_unlikely_(c_load_8(str, 1) < 0xA0 || c_load_8(str, 1) > 0xBF)) + goto out; +- if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(*(str + 2)))) ++ if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(c_load_8(str, 2)))) + goto out; + + str += 3; +@@ -145,9 +145,9 @@ _c_public_ void c_utf8_verify(const char **strp, size_t *lenp) { + case 0xE1 ... 0xEC: + if (_c_unlikely_(len < 3)) + goto out; +- if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(*(str + 1)))) ++ if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(c_load_8(str, 1)))) + goto out; +- if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(*(str + 2)))) ++ if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(c_load_8(str, 2)))) + goto out; + + str += 3; +@@ -157,9 +157,9 @@ _c_public_ void c_utf8_verify(const char **strp, size_t *lenp) { + case 0xED: + if (_c_unlikely_(len < 3)) + goto out; +- if (_c_unlikely_(*(str + 1) < 0x80 || *(str + 1) > 0x9F)) ++ if (_c_unlikely_(c_load_8(str, 1) < 0x80 || c_load_8(str, 1) > 0x9F)) + goto out; +- if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(*(str + 2)))) ++ if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(c_load_8(str, 2)))) + goto out; + + str += 3; +@@ -169,9 +169,9 @@ _c_public_ void c_utf8_verify(const char **strp, size_t *lenp) { + case 0xEE ... 0xEF: + if (_c_unlikely_(len < 3)) + goto out; +- if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(*(str + 1)))) ++ if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(c_load_8(str, 1)))) + goto out; +- if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(*(str + 2)))) ++ if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(c_load_8(str, 2)))) + goto out; + + str += 3; +@@ -181,11 +181,11 @@ _c_public_ void c_utf8_verify(const char **strp, size_t *lenp) { + case 0xF0: + if (_c_unlikely_(len < 4)) + goto out; +- if (_c_unlikely_(*(str + 1) < 0x90 || *(str + 1) > 0xBF)) ++ if (_c_unlikely_(c_load_8(str, 1) < 0x90 || c_load_8(str, 1) > 0xBF)) + goto out; +- if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(*(str + 2)))) ++ if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(c_load_8(str, 2)))) + goto out; +- if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(*(str + 3)))) ++ if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(c_load_8(str, 3)))) + goto out; + + str += 4; +@@ -195,11 +195,11 @@ _c_public_ void c_utf8_verify(const char **strp, size_t *lenp) { + case 0xF1 ... 0xF3: + if (_c_unlikely_(len < 4)) + goto out; +- if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(*(str + 1)))) ++ if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(c_load_8(str, 1)))) + goto out; +- if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(*(str + 2)))) ++ if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(c_load_8(str, 2)))) + goto out; +- if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(*(str + 3)))) ++ if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(c_load_8(str, 3)))) + goto out; + + str += 4; +@@ -209,11 +209,11 @@ _c_public_ void c_utf8_verify(const char **strp, size_t *lenp) { + case 0xF4: + if (_c_unlikely_(len < 4)) + goto out; +- if (_c_unlikely_(*(str + 1) < 0x80 || *(str + 1) > 0x8F)) ++ if (_c_unlikely_(c_load_8(str, 1) < 0x80 || c_load_8(str, 1) > 0x8F)) + goto out; +- if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(*(str + 2)))) ++ if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(c_load_8(str, 2)))) + goto out; +- if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(*(str + 3)))) ++ if (_c_unlikely_(!C_UTF8_CHAR_IS_TAIL(c_load_8(str, 3)))) + goto out; + + str += 4; +@@ -226,7 +226,7 @@ _c_public_ void c_utf8_verify(const char **strp, size_t *lenp) { + } + + out: +- *strp = (char *)str; ++ *strp = str; + if (lenp) + *lenp = len; + } diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest index e7808ebf4bfe..6c4e945a5075 100644 --- a/sys-apps/moar/Manifest +++ b/sys-apps/moar/Manifest @@ -2,6 +2,9 @@ DIST moar-1.18.3-deps.tar.xz 4893264 BLAKE2B 48ac9d4992c2f6d1aa0f9160bde87bd19d6 DIST moar-1.18.3.tar.gz 2784912 BLAKE2B 8ad06cfb0c21225e5b949d39adbadadef98e4e4292432cd3e6533240afa416118fb9a9d21b06d6bdf85a6f2a19b90f09c3e298db24fec755a168423e85dc9c64 SHA512 81e54889fa0a12d127abc5596fd820d5adc5f5162adedd7125cf9e8cbd0cb0dc75c5570a1504b2c68e063880e77df4299d7830a44479c6690f6ba48ec97ea4ac DIST moar-1.18.4-deps.tar.xz 4893264 BLAKE2B 48ac9d4992c2f6d1aa0f9160bde87bd19d66acfe912753645c9dbb6e5bc007eb68caf1fff53bae84b03e4a6607858717666b1527bf8d0080b0aca6dbb37a894e SHA512 bf141777d4fee5c14e76130671862f255675da3c628c21cb892d53a469a0872d4c7f47699c16c50728df76ba4d9e467e9b8744a322c1acc8d0151f9eb5987b66 DIST moar-1.18.4.tar.gz 2785962 BLAKE2B 9fdce78371e99a2e8b6be79ee6b16e880a670ace989013898ea23a84b9a8701a7832519108c03503e6a021fb34b518cc57642b08f2ae404a182cfe58157fe3ee SHA512 4ce60f3a57241058fce83a1663e6aea6f3eb485a80a433243d76e522ee2cdd8bbec94913820d50949610f923d975cfa2588cf11e7824c3cf0f3beb38988a2a00 +DIST moar-1.18.5-deps.tar.xz 4893264 BLAKE2B 48ac9d4992c2f6d1aa0f9160bde87bd19d66acfe912753645c9dbb6e5bc007eb68caf1fff53bae84b03e4a6607858717666b1527bf8d0080b0aca6dbb37a894e SHA512 bf141777d4fee5c14e76130671862f255675da3c628c21cb892d53a469a0872d4c7f47699c16c50728df76ba4d9e467e9b8744a322c1acc8d0151f9eb5987b66 +DIST moar-1.18.5.tar.gz 2786493 BLAKE2B dc8e47fd59cb485d7b105428053015221b280753838d5a21c140df49b51aebea7befa14ba4549f89019956c1df2cf9bf5ffeab458fa99f483f353dcb63100bd6 SHA512 c7efc790d6a8b0867a0e8c5734b95e03b6deed3627f9278b7a7e8086cf4313322d87ac98e34ec1777f9a01b0dddac894737d09c1c20aaed1fa2b2b47a370d59d EBUILD moar-1.18.3.ebuild 969 BLAKE2B 48cde082c556a547a62739d52c13b54d82048b4e09fc0fed118866c994c07518f79ba06bb6b68affac58de05e00d8e0bc3fb23c84ee7126dd311f654a9f66d5c SHA512 7367fef7d786418e8954eccdc20a2af84e16e109837fbbeab433ab42a867589d85dbce2fca7be648faf8321f0ddfec2e96fba0328ee5b452abee34ff5f4bf2b7 EBUILD moar-1.18.4.ebuild 969 BLAKE2B 48cde082c556a547a62739d52c13b54d82048b4e09fc0fed118866c994c07518f79ba06bb6b68affac58de05e00d8e0bc3fb23c84ee7126dd311f654a9f66d5c SHA512 7367fef7d786418e8954eccdc20a2af84e16e109837fbbeab433ab42a867589d85dbce2fca7be648faf8321f0ddfec2e96fba0328ee5b452abee34ff5f4bf2b7 +EBUILD moar-1.18.5.ebuild 969 BLAKE2B 48cde082c556a547a62739d52c13b54d82048b4e09fc0fed118866c994c07518f79ba06bb6b68affac58de05e00d8e0bc3fb23c84ee7126dd311f654a9f66d5c SHA512 7367fef7d786418e8954eccdc20a2af84e16e109837fbbeab433ab42a867589d85dbce2fca7be648faf8321f0ddfec2e96fba0328ee5b452abee34ff5f4bf2b7 MISC metadata.xml 316 BLAKE2B 19b5d071afbcad1f05744cca494156dc634f3fc35afaf4828dcf1e691e75a0f47f162b6cf548e5a333441f25327970f6a71d6acb436b60a68deeb7fb44659d45 SHA512 44155ffd972d79d47e41fe2ed38583e41eaaeb9f6b0de7e52b666930906f561e73d1f604acf602750ae1bed50e516dbbe36327b47ba2005813438e0d2db070e1 diff --git a/sys-apps/moar/moar-1.18.5.ebuild b/sys-apps/moar/moar-1.18.5.ebuild new file mode 100644 index 000000000000..25abd2aac1ff --- /dev/null +++ b/sys-apps/moar/moar-1.18.5.ebuild @@ -0,0 +1,42 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Pager designed to do the right thing without any configuration" +HOMEPAGE="https://github.com/walles/moar" +SRC_URI="https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="BSD-2 BSD MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="test" +RESTRICT="!test? ( test )" + +# moarvm: https://github.com/walles/moar/issues/143 +RDEPEND="!dev-lang/moarvm" +BDEPEND=" + test? ( + app-arch/bzip2 + app-arch/xz-utils + ) +" + +src_compile() { + # https://github.com/walles/moar/blob/master/build.sh#L28 + ego build -ldflags="-w -X main.versionString=${PV}" -o moar +} + +src_test() { + # From test.sh (we don't run that because it has some linting etc) + ego test -timeout 20s ./... +} + +src_install() { + dobin moar + doman moar.1 + einstalldocs +} diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest index 9ce57c0c37e5..59e7eb53e5c1 100644 --- a/sys-apps/moreutils/Manifest +++ b/sys-apps/moreutils/Manifest @@ -1,4 +1,6 @@ AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee92def3df7cc5bb74b476ae8172924421676bec09f6c74a59d7b07b82382e57b502088d75e5c365a5747ee7d38e8ba3c227 SHA512 db1ff22fb8a6284bea95488b71c456353379d4f9b4142f62ad7371e2546ff82fae6e7e2fb4be2e5b018d475ef5d19c677059cdb171d882e9c7a3641ed0ce4647 DIST moreutils-0.67.tar.gz 93627 BLAKE2B 4b8788411f1300ccffa10a52a327ee676b2a241531dafc2106495977ffd29a5b32c91c0afb6425b5797bfea04fa98a3cfd69e034cffc2fb255f5e8505d3b3474 SHA512 3a395fa80c1c1d769ec078cbf9455952201a364d8264796c6443a397ed7fa4f08250ecd140f047cf2e9533d6fc5310b3a579a7c083a5bc4cb4672d39c35dab75 +DIST moreutils-0.68.tar.gz 93732 BLAKE2B f6bac790a294f6a05624ca33906a41e60a0dcc5c25ef31f62dc501ecf39913299f6ecd64130ed4da1896342ae4bfc286b02217f68c76d0e915cd2d8f684237b1 SHA512 8d2ee4ab1e2409a4adde018c558884ff6c642c7426b1d07d5d15bf89ba42ea5aec279c01d7d80815a825adc527ceddf0de8db9c05b0392fccc8e76bcae032558 EBUILD moreutils-0.67-r1.ebuild 1755 BLAKE2B f3a7a184194b4f0c6a85511bd8995dfc2bd4a7f7a2ed3a412d6802425af0edf92c06ecf272549a94fb1f927e0db72e29ab0d0425b93a02405e2f8a25e8f1e3eb SHA512 b02efd0423a8544c020d977ebde73bfc1b149c94d08d432616fb4ce74a9c66662c2debbc0dcfee2c0085124ef69fcf429c37463d3dece9e1c94c391ccc3e3b79 +EBUILD moreutils-0.68.ebuild 1758 BLAKE2B 05660a9aa43ec5f798ace9db57860e3afbeb9487a3043031e5f51d72c4ff939fd76278984ed1b964278d79a1be0b49ea0d46a26742c752d06e4418b22be60212 SHA512 2e17348454f287734cf75cbed30619997e56ad779acfaa6321689383bdae030545f4ad58bd431883317cf74e48f4c8916487af90bc97cd2f67c69b4dde6a4337 MISC metadata.xml 314 BLAKE2B 41e19552cdd8289a03ab33f6fd514028d689236160501e2c84644e1075e957f6faeba6eacf163fcd624e995bd6ff7016e663e65cc753e7de3621aa46922a0766 SHA512 36a70c222b6de13c1245d0a95d097389e84ee7b7f55a08c62ca5c7c44bb51808f63faa10e81fdec7eff7bb680be32ed31bb2fd5362c5f35ba8fb92bb60a7ffe3 diff --git a/sys-apps/moreutils/moreutils-0.68.ebuild b/sys-apps/moreutils/moreutils-0.68.ebuild new file mode 100644 index 000000000000..54715703df91 --- /dev/null +++ b/sys-apps/moreutils/moreutils-0.68.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="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=" + !<dev-util/pwntools-4.10.0_beta0-r2 + 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/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest index 7c4a61de2189..f7af0585a63b 100644 --- a/sys-apps/osinfo-db-tools/Manifest +++ b/sys-apps/osinfo-db-tools/Manifest @@ -1,5 +1,9 @@ AUX osinfo-db-tools-1.10.0-no-clobber-fortify-source.patch 357 BLAKE2B 6f03e39bdce770d98188fc792ec0f47b14c0662aee992ab034a97554261fd977c2e7cfa21b95eb6934eff3909f0af6857570642ef66088d4d6809142863a47cc SHA512 ab561d3c3134a870f6d50c08358114d9052c354eb9d91fdc3f5605d61404ff6aa03b281e21a7e7ea47ec006cc54220de4e45eca2e6ac05f31097829c1b6f9943 +AUX osinfo-db-tools-1.11.0-Make-xmlError-structs-constant.patch 2087 BLAKE2B 91486144c791ee881efc73db1a6ccc05fc8da97c2c84e5513c56bf22569a365e05371b440e963f751ff0908169d4b3ce13f1450cd566040e71a4e67425ae2b0b SHA512 70862e35522c59e0b7acdf7e7f665ac30446e2f14e8bf7ad5e66119700306540505fac45811ef58c8c59034ce0abfedd5a88f3dfdc752e59c6b4d5f3e4bf07a0 +AUX osinfo-db-tools-1.11.0-osinfo-db-validate-Add-more-libxml-includes.patch 1229 BLAKE2B b15f56f2ec7ba9e49ba62e6d80ea26f11f838cbac48533bfb5a9b3a620ef6177c8f2d68c0d46b7506e5dbcc534edebd42be72d0ebf705ac9ed4c36c4e563ed60 SHA512 233a5d37735213b838eb6d3f3e923d617be01158601bd0a66cf2d832a783596f1cf6fc23674f788ddf0c7688ca7bd7d1906401f52284909831d09401cb3a8dcf DIST osinfo-db-tools-1.10.0.tar.xz 60508 BLAKE2B 2b9abbdba25add96440e2a937ae994c0305f995b924ffc7c88c2c31c122d3e5cf0c710fbf55724bea56f63be7250321ee27d2179e3f247461d6843f7e03dfc58 SHA512 27271b15404a6cb0065854ba8556c272cf3427ff4fd18fc9a22dbca2b01686c32661b24e18f5eff9a1b240a3a459d8fe66cbde530873d60b8c850bdd0b42c475 +DIST osinfo-db-tools-1.11.0.tar.xz 64792 BLAKE2B fc085da5bad46c5c178bdd09cc294c8f0f208cbd3ee4dda9e22bd681cac70913bc4dc9a11d44d252b5d7cb33b8a5625aca7c285ae098f72839e5fe4d2238c157 SHA512 adab5b16d8fcbae89619eb12f669fa4c7765a65af54a864995e3a9131bb18ee62568c8f7ed166f0400e5e622f56844ba53ed9ef5c2322e33acb9ef1cf0c94701 EBUILD osinfo-db-tools-1.10.0-r1.ebuild 1060 BLAKE2B 2870ce831be5a755d00d37781f28dd299f764032afd98583cb25a9167575f7132b330c5c49fcab3cf6835e8caaac2bf2b8a5c07f276c28829bc0b84b94e961ba SHA512 4e0ad4203bb3378d73a43597f474261ac3faaa6ee2a55f8a1e0c93155c708f2b059a8679f09db0ff45a41bc4e0808359de4e41d03b9d2098c8691d0590738a1b -EBUILD osinfo-db-tools-1.10.0-r2.ebuild 1136 BLAKE2B 9dff6db6be528aa9080908366d223c6499149f3de783dc1840d3d8723bb7727c054227255991ad0101cfed45d4ea80b50c2ef31489a68500ba59263e529dfbba SHA512 b748818fa3bf010811da3f3ba6ee7ed54da556d2bbff7be41f6ea7ffdd062dfc5ea06edddd245987bacdfb43489cb553911c572759071b57c709dde5b21be068 +EBUILD osinfo-db-tools-1.10.0-r2.ebuild 1279 BLAKE2B 3105a5b331d8c01dcb457733394eefc1464e86eb689be43088fe2e289791da60d7e6a7bddd5c7eae6b3e110b3506eed7353acc07f567359965e52f939c2813ce SHA512 3033d08426eb3e9462f806c6d308162ada8565c4c5d1c5b1d1a5c4357fae00b0e04b789b250537ce881a153c1621ad55e753bd885bbc2da2a9c849340f72cbe3 +EBUILD osinfo-db-tools-1.11.0.ebuild 1279 BLAKE2B 3105a5b331d8c01dcb457733394eefc1464e86eb689be43088fe2e289791da60d7e6a7bddd5c7eae6b3e110b3506eed7353acc07f567359965e52f939c2813ce SHA512 3033d08426eb3e9462f806c6d308162ada8565c4c5d1c5b1d1a5c4357fae00b0e04b789b250537ce881a153c1621ad55e753bd885bbc2da2a9c849340f72cbe3 MISC metadata.xml 354 BLAKE2B d60564aa9028df9e48d1213b20c33f1057fd21becf7ecf5f3004138fd5eac922b36d5c609d2bbdb03a8208d9a6f5a2969982c68b9ea9bee5c4e212e0caabd4fa SHA512 e6377db8098215eafb31f39fcbbf7982702419d3be0a7ad4a8299e0073d59e79f44d45e2c232fda0276e1f1ebf476ad19028bde0d780b662b1ffe3fa1817ba39 diff --git a/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.11.0-Make-xmlError-structs-constant.patch b/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.11.0-Make-xmlError-structs-constant.patch new file mode 100644 index 000000000000..964b2c10b6ec --- /dev/null +++ b/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.11.0-Make-xmlError-structs-constant.patch @@ -0,0 +1,53 @@ +From 34378a4ac257f2f5fcf364786d1634a8c36b304f Mon Sep 17 00:00:00 2001 +Message-ID: <34378a4ac257f2f5fcf364786d1634a8c36b304f.1701158114.git.mprivozn@redhat.com> +From: Michal Privoznik <mprivozn@redhat.com> +Date: Mon, 27 Nov 2023 15:04:43 +0100 +Subject: [PATCH 1/2] Make xmlError structs constant + +In libxml2 commits v2.12.0~14 and v2.12.0~77 the API changed so +that: + +1) xmlGetLastError() returns pointer to a constant xmlError + struct, and + +2) xmlSetStructuredErrorFunc() changed the signature of callback + (validate_structured_error_nop()), it too is passed pointer to + a constant xmlError struct. + +But of course, older libxml2 expects different callback +signature. Therefore, we need to typecast it anyway. + +Also, drop obviously incorrect @error annotation in +validate_structured_error_nop; the variable is used. + +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + tools/osinfo-db-validate.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c +index a721b4d..b1434a6 100644 +--- a/tools/osinfo-db-validate.c ++++ b/tools/osinfo-db-validate.c +@@ -35,7 +35,7 @@ static void validate_generic_error_nop(void *userData G_GNUC_UNUSED, + } + + static void validate_structured_error_nop(void *userData G_GNUC_UNUSED, +- xmlErrorPtr error G_GNUC_UNUSED) ++ const xmlError *error) + { + if (error->file) + g_printerr("%s:%d %s", error->file, error->line, error->message); +@@ -173,7 +173,8 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro + g_autofree gchar *schemapath = NULL; + + xmlSetGenericErrorFunc(NULL, validate_generic_error_nop); +- xmlSetStructuredErrorFunc(NULL, validate_structured_error_nop); ++ /* Drop this typecast when >=libxml2-2.12.0 is required */ ++ xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc) validate_structured_error_nop); + + schemapath = g_file_get_path(schema); + rngParser = xmlRelaxNGNewParserCtxt(schemapath); +-- +2.41.0 + diff --git a/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.11.0-osinfo-db-validate-Add-more-libxml-includes.patch b/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.11.0-osinfo-db-validate-Add-more-libxml-includes.patch new file mode 100644 index 000000000000..c823465fe227 --- /dev/null +++ b/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.11.0-osinfo-db-validate-Add-more-libxml-includes.patch @@ -0,0 +1,35 @@ +From 019487cbc79925e49988789bf533c78dab7e1842 Mon Sep 17 00:00:00 2001 +Message-ID: <019487cbc79925e49988789bf533c78dab7e1842.1701158114.git.mprivozn@redhat.com> +In-Reply-To: <34378a4ac257f2f5fcf364786d1634a8c36b304f.1701158114.git.mprivozn@redhat.com> +References: <34378a4ac257f2f5fcf364786d1634a8c36b304f.1701158114.git.mprivozn@redhat.com> +From: Michal Privoznik <mprivozn@redhat.com> +Date: Mon, 27 Nov 2023 15:06:04 +0100 +Subject: [PATCH 2/2] osinfo-db-validate: Add more libxml/ includes + +In its 2.12.0 release, libxml reworked their header files (some +might even call it cleaning up, I call it API incompatible +change) and now we don't get all declarations we need by just +including one file. Add missing includes. + +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + tools/osinfo-db-validate.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c +index b1434a6..f3275db 100644 +--- a/tools/osinfo-db-validate.c ++++ b/tools/osinfo-db-validate.c +@@ -20,7 +20,9 @@ + * Daniel P. Berrange <berrange@redhat.com> + */ + ++#include <libxml/parser.h> + #include <libxml/relaxng.h> ++#include <libxml/tree.h> + #include <locale.h> + #include <glib/gi18n.h> + +-- +2.41.0 + diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r2.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r2.ebuild index 220ff049a956..49f4ca477a35 100644 --- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r2.ebuild +++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r2.ebuild @@ -40,6 +40,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.10.0-no-clobber-fortify-source.patch + "${FILESDIR}"/${PN}-1.11.0-Make-xmlError-structs-constant.patch + "${FILESDIR}"/${PN}-1.11.0-osinfo-db-validate-Add-more-libxml-includes.patch ) python_check_deps() { diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.11.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.11.0.ebuild new file mode 100644 index 000000000000..49f4ca477a35 --- /dev/null +++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.11.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) + +inherit meson python-any-r1 + +DESCRIPTION="Tools for managing the osinfo database" +HOMEPAGE="https://libosinfo.org/" +SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.44:2 + dev-libs/json-glib + >=app-arch/libarchive-3.0.0:= + net-libs/libsoup:3.0 + >=dev-libs/libxml2-2.6.0 +" +# perl dep is for pod2man (manpages) +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + >=sys-devel/gettext-0.19.8 + dev-lang/perl + test? ( + $(python_gen_any_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.10.0-no-clobber-fortify-source.patch + "${FILESDIR}"/${PN}-1.11.0-Make-xmlError-structs-constant.patch + "${FILESDIR}"/${PN}-1.11.0-osinfo-db-validate-Add-more-libxml-includes.patch +) + +python_check_deps() { + python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/requests[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest index 5dbdf36cd020..56a7d4396046 100644 --- a/sys-apps/osinfo-db/Manifest +++ b/sys-apps/osinfo-db/Manifest @@ -1,3 +1,5 @@ DIST osinfo-db-20230719.tar.xz 144088 BLAKE2B 2b4297be735da6a9c37f3ccb9164071afd8983740eb6d400d0262f76e27a5bdfde74d35d104ec9487ed4b1ba48306bffe7a3704017cde9429aca9a0f22b881f1 SHA512 42751d3c8defea0aec49389354a4b682e1881f6387296e7d1b8d32afe3a1d8b9d7a3093bac33d0dbba359d28f1375f35dee7b0ca89fc7f1ce39276c231deda7b +DIST osinfo-db-20231027.tar.xz 143660 BLAKE2B 212abe98a09165fdae9b7069ab00c120f90ccf944242cdb355b6c2cf8085086c29d08779123a2fd6c72abd6b7dad88a6d473368cf659f2682b342692bc04d6f0 SHA512 2a0729f99ff840ab29d90b3174da6fa6ebf0665786f17079a592ee4988a95fbf2b1453834139c6f62c491d777eefb1d094dc39b80ac13398e2db32e1033e9900 EBUILD osinfo-db-20230719.ebuild 699 BLAKE2B d039878d19b83c2c72c4e791de677279aa69a0015bffba18adc7f57444ee5c9b942b09bf36e350d19ffcbe8d3ba62640cf2591452da7af3c680ddde139434016 SHA512 52cb2fadb90628750b39e822da6afd0e7acdbbc414241bc87bf75d66fb276227e35f470d788f40c77aa51bab23ea614c521689d2e330d0aadaeb756589e53dcd +EBUILD osinfo-db-20231027.ebuild 702 BLAKE2B 51a14f3f014f2aeab578adb2092bea20500f7144666056c74870d1963d227c8fbd52121dd5ad5afd8b85520d788e05e2d7ab74fd5797276f2ce2ce38661b0bdc SHA512 2c1e9ca52148b6246bb494846989657d232a348e7b5526cb83cb108ca9f8b7496776743a63e386803faa70570da9f6b4f217e5ea463db64d19fbcc7dcf02b081 MISC metadata.xml 373 BLAKE2B 76c02900ad2c6c313bcc5f3806b1e9911ec01f23c057847bbbdb70ff7de957541d131fe6f57ab74473d20389c1562b1938fd2248ab70747fae68fa664fce2a28 SHA512 6759db491e7ce75a4a0b9805b8ff7e2bd1800fc626560e47af4e14de6ca4632e7dfc9fe7fe7ae1da8ca5b56b94854a92c5057bda98601e134012e63ff9c756a5 diff --git a/sys-apps/osinfo-db/osinfo-db-20231027.ebuild b/sys-apps/osinfo-db/osinfo-db-20231027.ebuild new file mode 100644 index 000000000000..82e86e48b879 --- /dev/null +++ b/sys-apps/osinfo-db/osinfo-db-20231027.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="osinfo database files" +HOMEPAGE="https://libosinfo.org/ https://gitlab.com/libosinfo/osinfo-db" +SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz" +S="${WORKDIR}" + +LICENSE="GPL-2+" +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + +BDEPEND="sys-apps/osinfo-db-tools" + +# we don't depend on intltool here, contrary to README, as the tarball already +# contains the processed results with translations in XML files + +src_unpack() { :; } + +src_install() { + osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}" +} diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index eb0a21c9d14f..9293ae3b7e24 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,28 +1,13 @@ AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4 AUX depgraph.py-fix-no-ebuilds-binpkgs-message.patch 1690 BLAKE2B 225d42fd148c50d244503ba2039daa02a2fd05aa9bb339d21d4b204786d10379e44d491aa8016eacc079103943ee32c0cef74a7f72de7a84520347f80ca03a4b SHA512 0587687db2be3fa70fcf05ec3171d979492c3c986b0e1050ff3dd4dca6e92ef372c70cfe2d088e854e85cddc285129e38e082c92daac358f94971b8d61ec0d26 AUX portage-3.0.49-prefixify-init-script-shebangs.patch 1202 BLAKE2B 729ad1f61268637d3155bed7626de6cd1764697781e625770bd3930ab4e3075192b304e8c2c0f5ff4a0de7c607f703cb57de3608970231db406560107144313d SHA512 6bed5f71b71093093e1146091fe7bc010df8fa5dd45d91e97b0c67223a22491d57a993c17c2a4c70068c9e85d0d7c7452714c71f7c30958696b5e2f61d55d857 -AUX portage-3.0.54-Convert-portageq-helper-to-a-function.patch 2100 BLAKE2B 0b117f415cde2e756a1dfb2f87684cff1b5496835cea0bcfd074f27bbc9920720afeae4d24f8a271fe4841cc38075a160b19ee41d467ceebbb443d7c4bfb2372 SHA512 c3a00f4575e6f52b6d703c951c3c34b59d6f6893bf9e831ebb532bf779ae7849c7d345c7da79202fc3daf38b5ae29c9a9d7ae1f6c08b9cadea01c10ae68ea03e AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd -DIST portage-3.0.45.3.tar.bz2 1146552 BLAKE2B 0506124bf47d71df699c2ecb2846b19f68b39813409e141fe292e237093eeb4f3d6fb771f6328624e0182322f71f42e629c2c58a2c590efb8697fa61b03d73a4 SHA512 89757efb71127249356c7d4ea1a05de7409285abaf045b2c6b5ddd463bef997db497df6ea3a05085656eced49bee625732bfb2d0771b7592f883f8712e547415 -DIST portage-3.0.46.tar.bz2 1148375 BLAKE2B d97698eb3341a8d04980e021e5be8650193baf60c1ba34c11ccc79c147a256f152cb5c3a455798f38ee93164666dba31d3f510837c2924c1190f657fe1019b77 SHA512 0aa43d58cb23ff5931d31b2ebf724b0f9cb163d7e452c120f2917b9a1fac1cad7930c28dd40e6482a3f4e66ff05e1340e7135aa9d0eca60182c04f573c094afb DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B a47f951a35828ba9c8fc88c2eab5222c98ed20240c736c366d8f2e4f4aef773a140bf0e150448cc3796a7adb7471ce006aae4de1816bbbaae6dd83dcf28f52b0 SHA512 f07950d10c01bda0915aa30c5c0b6ce2864754fe7dea38b5341336cd7665dcabfdc219969f1a3d2803db59bc23fc4284bc96b4087a596cb27a5d9eb075735469 -DIST portage-3.0.50.tar.bz2 1153508 BLAKE2B b90d93f8922acdb5486a52c1354c6c9829fac608971078a641b604b57240065eec4e82cc9cb2fb8b4ba485a7f2d52473c0a90295b29eb578638ad11cd3cf2943 SHA512 355841af862077f9203d6f8cbe904f4966516597444f38ef535fc06d0fe5c21d9c1da139a44407fdd69b56eb9c49c286187d856ef4e9b9bc6b21bab5b772a88f DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 1095ab616993951da8f4d43cef4cf815672c67cb48ea2fe5aeb6b7c629058bfab1557d2b9508f2e3e9f38676733b5d60ec6a3686bc57840065c428508769cb1c SHA512 bf237819173bed9df3b63ada067a2a99700618d88fd4b528146c56bdd592f2452003db6cc6da4a445b647eb4d8bb591260ea0d2a5627ad540526a2e802025836 -DIST portage-3.0.52.tar.bz2 1157447 BLAKE2B 61e4d32f9713b9b0a2df6ca636b2d756dacdb93f862eeab8a8b46d436b9c90d3d5d04989023dc5580ce0c4a6827fa623e5b32ce3d5094ff56ccde7a53c1af81c SHA512 1a249b140cc24b6d83314ad0b3f4ca73fcff3df01f1207c2fe661b16e78ab1155bb6dca4fb89100910fce13bf0fc21636232f9560360cf12f2c43b803d2a0429 -DIST portage-3.0.53.tar.bz2 1162321 BLAKE2B 1c38bc97d9aca2ce4062ed0fc2ef9297911379a32f1ed32b4d5ced760970edbfb9579471efd69c0fc16e3227ef6444d60c2bb19be6d809eabe832250d340b4b5 SHA512 d747acc922da2d6f2dc10a8b5a6c7cf4b325ab903b3c5634d5aa1927bbfffa306076ad780a4634d7bcf6092b763b753b02c14f1a21197706559d370c6eee00a1 -DIST portage-3.0.54.tar.bz2 1164619 BLAKE2B b70ed74a557470068f873b544bc7efc497f4121b2189601c44f9ddc1571e80cdc1387148cdd705604a24a2357289385345df5d60e03e7ebff1e8797bed350fe4 SHA512 2e9e16dae4a30e2bfed2d5eab7eb4e4c8260cc1b5a826d247e98908fb8669e4e5176d7f59a01d4d7a302f874fe1d80c17da87bb87d31f98af7a79e1823fa4009 -DIST portage-3.0.55.tar.bz2 1167100 BLAKE2B 8dd4ffa3f816e34a9afa5ba70d0ae252797a782cf8b3dd4df9c4fe52f1fb218d757b3679a5d43229accdbed52ae70bb6a706768839bf735b342bdfc598e252a1 SHA512 de891a7a91012546ded5ac6f3427324d1d959beeb7442339f350728bee3337ff49e48a113b191dc0d515f3545b8662ff26ad434bb9cbfbc23bd47938a8932fce DIST portage-3.0.56.tar.bz2 1166588 BLAKE2B f6e8d8dbfb3b157f1e5577419ef78c8e63b6f754ffa94da22e6466f11b77738e11fc9ad4803341b6640a6c7f48bd73bb02a12643b8176d60147e88aa1fb48314 SHA512 6eac4edb286f3ef0074cbaaf3b216c8dd40fe474e1a9bd6f86d7185cceabe19edb76b324af76d9fa1005ba8809d624354c21ab84284aba0d92e467612bd9fe47 -EBUILD portage-3.0.45.3-r2.ebuild 9026 BLAKE2B 48786771a530eb0dd7c8e93536dceefa1a0433cd1467a8bef84ff52b8f8932abbda3f742ead1b05c1d75db8d97b3ef2124dddf12164ccc74d6e8558fac065504 SHA512 7d361598083421293c74cacbc24929825beddf132f4e2dfa110a97ec262e5841f7885bec6dafa31076afa6b48dd0e72f53703d2e0ffe2a4aa92b5f6cd6d658e6 -EBUILD portage-3.0.46.ebuild 9028 BLAKE2B 2be98cc99c708e434c9e451a1257f6c891ad529cba3363431d85030475f3c293b12bf6e2a81a6de35b64692405199f3583d43d207031dfb45fd361c51aaaf394 SHA512 af75ee0c836bd570f9ff43f9f236d418b825f7def2e798a1d10157a98b48239185c3654806ebe5f13db1b240f428f3c7f2a492d410d1bae2a8bcbd797dcde493 EBUILD portage-3.0.49-r2.ebuild 9527 BLAKE2B 6cad70f759ec4440c228193e2535d57d679eddee0c73d444c78880d38e9529588835f8de721e900495261c53ea9461e2bce1c1b63ed8d32f657f6e458119d18a SHA512 0a49e29242fb469a2d389b06a8e1fdf0187cb7d35c56e4ce3661722dc0668f1383ca52321417fa2110f2d02670b2e4cf43c319efa511e373ca4f2520e2ac2ba7 -EBUILD portage-3.0.50.ebuild 6691 BLAKE2B dded37b41de71abaa3c44dc371274e75aedb76172502d11bfa44a1edefe3333697debe6cfcaf1640b62a930d72dc66bb35680b1bbce05d378492089db512b46e SHA512 6f0477031c35cb1d64eeba798bbd177613a382b315ab798018807ff4ca747e6c22d013e79a4169d8c79077940f7ff989c319e68f835508e6a10ca461f7418df2 EBUILD portage-3.0.51.ebuild 6685 BLAKE2B fe61ecc1e16ec93521d7972c8a957431333d72e95afb61cf550ce475619f7919bdc52386f2836132052619ed6bbfe0118ec4ff95405846fc59e35188b27d579b SHA512 951f99a38dc20b21852adeed0a4ee1a4ed7f51ca00cfb28041954d1c04a226300aa1a10f9e59476d43d38b4da4b9258784ef342299548dff1bd7bf7aa794bf97 -EBUILD portage-3.0.52.ebuild 6712 BLAKE2B 30cd93ffdd565f7d3f7380c1d86c8f1eb29e0b9be15c52482612b9badabe5f1f3335c1b994341a2a643b8901dc2049a300db38aa54dc19cc6c2e62970c3f9ae4 SHA512 15023ec0a54e2cfc62f5f934b54829d8a342f20ea86d5d98aadf14d26db19fc269983b0635264eb23f784ecb15bbcda8734be87940f14c1abcd48aefa5d18596 -EBUILD portage-3.0.53.ebuild 6712 BLAKE2B 30cd93ffdd565f7d3f7380c1d86c8f1eb29e0b9be15c52482612b9badabe5f1f3335c1b994341a2a643b8901dc2049a300db38aa54dc19cc6c2e62970c3f9ae4 SHA512 15023ec0a54e2cfc62f5f934b54829d8a342f20ea86d5d98aadf14d26db19fc269983b0635264eb23f784ecb15bbcda8734be87940f14c1abcd48aefa5d18596 -EBUILD portage-3.0.54-r1.ebuild 6807 BLAKE2B e982e9b70f2dfcd42c9e86f61bc8981c7bb3da9b9fb7b1c8873ad2a15217d7feb559ef555f00e5af621c435ef36965236d5dfa26abf01bdaa1d8148d59cc3fd7 SHA512 ef6f0b57d4ddc0dd963f341c944f2f7260b8ef00e1185a26bcd5534573f5bd7af40b098bd8171233cca05de7c1396713dfaaaeebac0ce80098f9ef7c664f18af -EBUILD portage-3.0.55.ebuild 6712 BLAKE2B 30cd93ffdd565f7d3f7380c1d86c8f1eb29e0b9be15c52482612b9badabe5f1f3335c1b994341a2a643b8901dc2049a300db38aa54dc19cc6c2e62970c3f9ae4 SHA512 15023ec0a54e2cfc62f5f934b54829d8a342f20ea86d5d98aadf14d26db19fc269983b0635264eb23f784ecb15bbcda8734be87940f14c1abcd48aefa5d18596 -EBUILD portage-3.0.56.ebuild 6712 BLAKE2B 30cd93ffdd565f7d3f7380c1d86c8f1eb29e0b9be15c52482612b9badabe5f1f3335c1b994341a2a643b8901dc2049a300db38aa54dc19cc6c2e62970c3f9ae4 SHA512 15023ec0a54e2cfc62f5f934b54829d8a342f20ea86d5d98aadf14d26db19fc269983b0635264eb23f784ecb15bbcda8734be87940f14c1abcd48aefa5d18596 -EBUILD portage-9999.ebuild 6712 BLAKE2B 30cd93ffdd565f7d3f7380c1d86c8f1eb29e0b9be15c52482612b9badabe5f1f3335c1b994341a2a643b8901dc2049a300db38aa54dc19cc6c2e62970c3f9ae4 SHA512 15023ec0a54e2cfc62f5f934b54829d8a342f20ea86d5d98aadf14d26db19fc269983b0635264eb23f784ecb15bbcda8734be87940f14c1abcd48aefa5d18596 +EBUILD portage-3.0.56-r1.ebuild 6768 BLAKE2B 726ebc2654736b27bdffc75e47abf80abe1a1e506fc3d132ce0b969459c1eadd25b8a1a48ba51d309267c1c6e89c27fd51db5b9491ade4ebc1f9a0a7f810b771 SHA512 b60d4d8841996cc3f0edd8f419c07f496d62f28779c9740c7dca9a4eac528478729ba5be58d815e733c2d44e5c6b2d7f1b88b525ffbf48c482084529f9435be2 +EBUILD portage-9999.ebuild 6773 BLAKE2B 09ee4a06e701b17e3e4e94a4d61fe8cbbfc9801c1f216ea533031aac6218b72632841b8b17a88ca826015accf959ae596381dd7819ef27496da768d3b62213fe SHA512 11169cb777a5a72c10b090ac805653d436f13f8ec553ceb2c8da40a6190d4a132297d3ab7379f8aefb9ada0f642dff46e28dde857fd70d43824fd90238c04a71 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d diff --git a/sys-apps/portage/files/portage-3.0.54-Convert-portageq-helper-to-a-function.patch b/sys-apps/portage/files/portage-3.0.54-Convert-portageq-helper-to-a-function.patch deleted file mode 100644 index 970f49d6a001..000000000000 --- a/sys-apps/portage/files/portage-3.0.54-Convert-portageq-helper-to-a-function.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 27952b1d753ef4ea9bbd2307f8a9a315ad94557d Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Thu, 26 Oct 2023 10:42:00 -0400 -Subject: [PATCH] Convert portageq helper to a function -To: gentoo-portage-dev@lists.gentoo.org - -This keeps it out of PATH in ebuilds to avoid breaking external -utilities that call portageq. - -Bug: https://bugs.gentoo.org/906129 -Bug: https://bugs.gentoo.org/916287 -Bug: https://bugs.gentoo.org/916296 -Signed-off-by: Mike Gilbert <floppym@gentoo.org> ---- - NEWS | 4 +++- - bin/ebuild-helpers/portageq | 8 -------- - bin/phase-helpers.sh | 4 ++++ - bin/portageq-wrapper | 1 - - 4 files changed, 7 insertions(+), 10 deletions(-) - delete mode 100755 bin/ebuild-helpers/portageq - -diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq -deleted file mode 100755 -index bd9d6b044..000000000 ---- a/bin/ebuild-helpers/portageq -+++ /dev/null -@@ -1,8 +0,0 @@ --#!/usr/bin/env bash --# Copyright 2009-2023 Gentoo Authors --# Distributed under the terms of the GNU General Public License v2 -- --source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 -- --die "'${0##*/}' is not allowed in ebuild scope" --exit 1 -diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh -index 3f12b3707..6c2ecf0bc 100644 ---- a/bin/phase-helpers.sh -+++ b/bin/phase-helpers.sh -@@ -1006,6 +1006,10 @@ best_version() { - ___best_version_and_has_version_common "$@" - } - -+portageq() { -+ die "portageq is not allowed in ebuild scope" -+} -+ - if ___eapi_has_get_libdir; then - get_libdir() { - local libdir_var="LIBDIR_${ABI}" -diff --git a/bin/portageq-wrapper b/bin/portageq-wrapper -index afa2defe1..047d1d826 100755 ---- a/bin/portageq-wrapper -+++ b/bin/portageq-wrapper -@@ -9,7 +9,6 @@ IFS=":" - set -f # in case ${PATH} contains any shell glob characters - - for path in "${PORTAGE_BIN_PATH}" ${PATH}; do -- [[ ${path} == */portage/*/ebuild-helpers* ]] && continue - [[ -x ${path}/portageq ]] || continue - PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \ - exec "${PORTAGE_PYTHON:-/usr/bin/python}" "${path}/portageq" "$@" --- -2.42.0 - diff --git a/sys-apps/portage/portage-3.0.45.3-r2.ebuild b/sys-apps/portage/portage-3.0.45.3-r2.ebuild deleted file mode 100644 index 3d6fdf246820..000000000000 --- a/sys-apps/portage/portage-3.0.45.3-r2.ebuild +++ /dev/null @@ -1,286 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_EXT=1 -PYTHON_COMPAT=( pypy3 python3_{10..11} ) -PYTHON_REQ_USE='bzip2(+),threads(+)' -TMPFILES_OPTIONAL=1 - -inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix - -DESCRIPTION="The package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" -SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -SLOT="0" -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-arch/xz-utils - test? ( dev-vcs/git ) -" -DEPEND=" - !build? ( $(python_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - apidoc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-epytext[${PYTHON_USEDEP}] - ) -" -# Require sandbox-2.2 for bug #288863. -# For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). -# app-portage/gemato goes without PYTHON_USEDEP since we're calling -# the executable. -RDEPEND=" - acct-user/portage - app-arch/zstd - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/baselayout-2.9 - >=sys-apps/findutils-4.9 - !build? ( - >=sys-apps/sed-4.0.5 - >=app-shells/bash-5.0:0[readline] - >=app-admin/eselect-1.2 - rsync-verify? ( - >=app-portage/gemato-14.5[${PYTHON_USEDEP}] - >=sec-keys/openpgp-keys-gentoo-release-20220101 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - ) - ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - kernel_linux? ( sys-apps/util-linux ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - ) ) - !<app-admin/logrotate-3.8.0 - !<app-portage/gentoolkit-0.4.6 - !<app-portage/repoman-2.3.10 - !~app-portage/repoman-3.0.0 -" -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - >=sys-apps/coreutils-6.4 - >=sys-apps/file-5.44-r3 - ) -" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# NOTE: FEATURES=installsources requires debugedit and rsync - -pkg_pretend() { - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" - - if use native-extensions && tc-is-cross-compiler; then - einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)" - fi - - check_extra_config -} - -python_prepare_all() { - local PATCHES=( - ) - - distutils-r1_python_prepare_all - - sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die - - if use gentoo-dev; then - einfo "Disabling --dynamic-deps by default for gentoo-dev..." - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ - -i lib/_emerge/create_depgraph_params.py || \ - die "failed to patch create_depgraph_params.py" - - einfo "Enabling additional FEATURES for gentoo-dev..." - echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir warn-on-large-env"' \ - >> cnf/make.globals || die - fi - - if use native-extensions && ! tc-is-cross-compiler; then - printf "[build_ext]\nportage_ext_modules=true\n" >> \ - setup.cfg || die - fi - - if ! use ipc ; then - einfo "Disabling ipc..." - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i lib/_emerge/AbstractEbuildProcess.py || \ - die "failed to patch AbstractEbuildProcess.py" - fi - - if use xattr && use kernel_linux ; then - einfo "Adding FEATURES=xattr to make.globals ..." - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - if use build || ! use rsync-verify; then - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ - -e '/^sync-webrsync-verify-signature/s|yes|no|' \ - -i cnf/repos.conf || die "sed failed" - fi - - if [[ -n ${EPREFIX} ]] ; then - einfo "Setting portage.const.EPREFIX ..." - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ - -w "/_BINARY/" lib/portage/const.py - - einfo "Prefixing shebangs ..." - > "${T}/shebangs" || die - while read -r -d $'\0' ; do - local shebang=$(head -n1 "$REPLY") - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then - echo "${REPLY}" >> "${T}/shebangs" || die - fi - done < <(find . -type f -executable ! -name etc-update -print0) - - if [[ -s ${T}/shebangs ]]; then - xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" - fi - - einfo "Adjusting make.globals, repos.conf and etc-update ..." - hprefixify cnf/{make.globals,repos.conf} bin/etc-update - - if use prefix-guest ; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi - fi - - cd "${S}/cnf" || die - if [[ -f "make.conf.example.${ARCH}".diff ]] ; then - patch make.conf.example "make.conf.example.${ARCH}".diff || \ - die "Failed to patch make.conf.example" - else - eerror "" - eerror "Portage does not have an arch-specific configuration for this arch." - eerror "Please notify the arch maintainer about this issue. Using generic." - eerror "" - fi -} - -python_compile_all() { - local targets=() - use doc && targets+=( docbook ) - use apidoc && targets+=( apidoc ) - - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi -} - -python_test() { - esetup.py test -} - -python_install() { - # Install sbin scripts to bindir for python-exec linking - # they will be relocated in pkg_preinst() - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -python_install_all() { - distutils-r1_python_install_all - - local targets=() - use doc && targets+=( - install_docbook - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - use apidoc && targets+=( - install_apidoc - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf - - # Due to distutils/python-exec limitations - # these must be installed to /usr/bin. - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' - einfo "Moving admin scripts to the correct directory" - dodir /usr/sbin - for target in ${sbin_relocations}; do - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" - mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" - done -} - -pkg_preinst() { - if ! use build; then - python_setup - local sitedir=$(python_get_sitedir) - [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" - env -u DISTDIR \ - -u PORTAGE_OVERRIDE_EPREFIX \ - -u PORTAGE_REPOSITORIES \ - -u PORTDIR \ - -u PORTDIR_OVERLAY \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.default_locations || die - - env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die - - env -u FEATURES -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die - fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} - fi - - if has_version "<${CATEGORY}/${PN}-2.3.77"; then - elog "The emerge --autounmask option is now disabled by default, except for" - elog "portions of behavior which are controlled by the --autounmask-use and" - elog "--autounmask-license options. For backward compatibility, previous" - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." - elog "Users can get the old behavior simply by adding --autounmask to the" - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" - elog "change, see https://bugs.gentoo.org/658648." - fi -} - -pkg_postinst() { - # Warn about obsolete "enotice" script, bug #867010 - local bashrc=${EROOT}/etc/portage/profile/profile.bashrc - if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then - eerror "Obsolete 'enotice' script detected!" - eerror "Please remove this from ${bashrc} to avoid problems." - eerror "See bug 867010 for more details." - fi -} diff --git a/sys-apps/portage/portage-3.0.46.ebuild b/sys-apps/portage/portage-3.0.46.ebuild deleted file mode 100644 index 6c88d92bd623..000000000000 --- a/sys-apps/portage/portage-3.0.46.ebuild +++ /dev/null @@ -1,286 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_EXT=1 -PYTHON_COMPAT=( pypy3 python3_{10..11} ) -PYTHON_REQ_USE='bzip2(+),threads(+)' -TMPFILES_OPTIONAL=1 - -inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix - -DESCRIPTION="The package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" -SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86" -SLOT="0" -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-arch/xz-utils - test? ( dev-vcs/git ) -" -DEPEND=" - !build? ( $(python_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - apidoc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-epytext[${PYTHON_USEDEP}] - ) -" -# Require sandbox-2.2 for bug #288863. -# For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). -# app-portage/gemato goes without PYTHON_USEDEP since we're calling -# the executable. -RDEPEND=" - acct-user/portage - app-arch/zstd - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/baselayout-2.9 - >=sys-apps/findutils-4.9 - !build? ( - >=sys-apps/sed-4.0.5 - >=app-shells/bash-5.0:0[readline] - >=app-admin/eselect-1.2 - rsync-verify? ( - >=app-portage/gemato-14.5[${PYTHON_USEDEP}] - >=sec-keys/openpgp-keys-gentoo-release-20220101 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - ) - ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - kernel_linux? ( sys-apps/util-linux ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - ) ) - !<app-admin/logrotate-3.8.0 - !<app-portage/gentoolkit-0.4.6 - !<app-portage/repoman-2.3.10 - !~app-portage/repoman-3.0.0 -" -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - >=sys-apps/coreutils-6.4 - >=sys-apps/file-5.44-r3 - ) -" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# NOTE: FEATURES=installsources requires debugedit and rsync - -pkg_pretend() { - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" - - if use native-extensions && tc-is-cross-compiler; then - einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)" - fi - - check_extra_config -} - -python_prepare_all() { - local PATCHES=( - ) - - distutils-r1_python_prepare_all - - sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die - - if use gentoo-dev; then - einfo "Disabling --dynamic-deps by default for gentoo-dev..." - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ - -i lib/_emerge/create_depgraph_params.py || \ - die "failed to patch create_depgraph_params.py" - - einfo "Enabling additional FEATURES for gentoo-dev..." - echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir warn-on-large-env"' \ - >> cnf/make.globals || die - fi - - if use native-extensions && ! tc-is-cross-compiler; then - printf "[build_ext]\nportage_ext_modules=true\n" >> \ - setup.cfg || die - fi - - if ! use ipc ; then - einfo "Disabling ipc..." - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i lib/_emerge/AbstractEbuildProcess.py || \ - die "failed to patch AbstractEbuildProcess.py" - fi - - if use xattr && use kernel_linux ; then - einfo "Adding FEATURES=xattr to make.globals ..." - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - if use build || ! use rsync-verify; then - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ - -e '/^sync-webrsync-verify-signature/s|yes|no|' \ - -i cnf/repos.conf || die "sed failed" - fi - - if [[ -n ${EPREFIX} ]] ; then - einfo "Setting portage.const.EPREFIX ..." - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ - -w "/_BINARY/" lib/portage/const.py - - einfo "Prefixing shebangs ..." - > "${T}/shebangs" || die - while read -r -d $'\0' ; do - local shebang=$(head -n1 "$REPLY") - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then - echo "${REPLY}" >> "${T}/shebangs" || die - fi - done < <(find . -type f -executable ! -name etc-update -print0) - - if [[ -s ${T}/shebangs ]]; then - xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" - fi - - einfo "Adjusting make.globals, repos.conf and etc-update ..." - hprefixify cnf/{make.globals,repos.conf} bin/etc-update - - if use prefix-guest ; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi - fi - - cd "${S}/cnf" || die - if [[ -f "make.conf.example.${ARCH}".diff ]] ; then - patch make.conf.example "make.conf.example.${ARCH}".diff || \ - die "Failed to patch make.conf.example" - else - eerror "" - eerror "Portage does not have an arch-specific configuration for this arch." - eerror "Please notify the arch maintainer about this issue. Using generic." - eerror "" - fi -} - -python_compile_all() { - local targets=() - use doc && targets+=( docbook ) - use apidoc && targets+=( apidoc ) - - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi -} - -python_test() { - esetup.py test -} - -python_install() { - # Install sbin scripts to bindir for python-exec linking - # they will be relocated in pkg_preinst() - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -python_install_all() { - distutils-r1_python_install_all - - local targets=() - use doc && targets+=( - install_docbook - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - use apidoc && targets+=( - install_apidoc - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf - - # Due to distutils/python-exec limitations - # these must be installed to /usr/bin. - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' - einfo "Moving admin scripts to the correct directory" - dodir /usr/sbin - for target in ${sbin_relocations}; do - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" - mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" - done -} - -pkg_preinst() { - if ! use build; then - python_setup - local sitedir=$(python_get_sitedir) - [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" - env -u DISTDIR \ - -u PORTAGE_OVERRIDE_EPREFIX \ - -u PORTAGE_REPOSITORIES \ - -u PORTDIR \ - -u PORTDIR_OVERLAY \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.default_locations || die - - env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die - - env -u FEATURES -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die - fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} - fi - - if has_version "<${CATEGORY}/${PN}-2.3.77"; then - elog "The emerge --autounmask option is now disabled by default, except for" - elog "portions of behavior which are controlled by the --autounmask-use and" - elog "--autounmask-license options. For backward compatibility, previous" - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." - elog "Users can get the old behavior simply by adding --autounmask to the" - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" - elog "change, see https://bugs.gentoo.org/658648." - fi -} - -pkg_postinst() { - # Warn about obsolete "enotice" script, bug #867010 - local bashrc=${EROOT}/etc/portage/profile/profile.bashrc - if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then - eerror "Obsolete 'enotice' script detected!" - eerror "Please remove this from ${bashrc} to avoid problems." - eerror "See bug 867010 for more details." - fi -} diff --git a/sys-apps/portage/portage-3.0.50.ebuild b/sys-apps/portage/portage-3.0.50.ebuild deleted file mode 100644 index dd57d21ea7c6..000000000000 --- a/sys-apps/portage/portage-3.0.50.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -PYTHON_REQ_USE='bzip2(+),threads(+)' -TMPFILES_OPTIONAL=1 - -inherit meson linux-info multiprocessing python-r1 tmpfiles - -DESCRIPTION="The package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI=" - https://anongit.gentoo.org/git/proj/portage.git - https://github.com/gentoo/portage.git - " - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -# setuptools is still needed as a workaround for Python 3.12+ for now. -# https://github.com/mesonbuild/meson/issues/7702 -# -# >=meson-1.2.1-r1 for bug #912051 -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ' python3_12) - test? ( - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-vcs/git - ) -" -DEPEND=" - ${PYTHON_DEPS} - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 - sys-devel/patch - !build? ( $(python_gen_impl_dep 'ssl(+)') ) - apidoc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-epytext[${PYTHON_USEDEP}] - ) - doc? ( - ~app-text/docbook-xml-dtd-4.4 - app-text/xmlto - ) -" -# Require sandbox-2.2 for bug #288863. -# For whirlpool hash, require python[ssl] (bug #425046). -RDEPEND=" - ${PYTHON_DEPS} - acct-user/portage - >=app-arch/tar-1.27 - app-arch/zstd - >=app-misc/pax-utils-0.1.17 - dev-lang/python-exec:2 - >=sys-apps/baselayout-2.9 - >=sys-apps/findutils-4.9 - !build? ( - >=app-admin/eselect-1.2 - >=app-shells/bash-5.0:0 - >=sec-keys/openpgp-keys-gentoo-release-20230329 - >=sys-apps/sed-4.0.5 - rsync-verify? ( - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - >=app-portage/gemato-14.5[${PYTHON_USEDEP}] - ) - ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - kernel_linux? ( sys-apps/util-linux ) - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - ) ) - !<app-admin/logrotate-3.8.0 - !<app-portage/gentoolkit-0.4.6 - !<app-portage/repoman-2.3.10 - !~app-portage/repoman-3.0.0 -" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# NOTE: FEATURES=installsources requires debugedit and rsync -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - >=sys-apps/coreutils-6.4 - >=sys-apps/file-5.44-r3 - ) -" - -pkg_pretend() { - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" - - check_extra_config -} - -src_prepare() { - default - - if use prefix-guest; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi -} - -src_configure() { - local code_only=false - python_foreach_impl my_src_configure -} - -my_src_configure() { - local emesonargs=( - -Dcode-only=${code_only} - -Deprefix="${EPREFIX}" - -Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - $(meson_use doc) - $(meson_use apidoc) - $(meson_use gentoo-dev) - $(meson_use ipc) - $(meson_use xattr) - ) - - if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then - emesonargs+=( -Dnative-extensions=true ) - else - emesonargs+=( -Dnative-extensions=false ) - fi - - if use build; then - emesonargs+=( -Drsync-verify=false ) - else - emesonargs+=( $(meson_use rsync-verify) ) - fi - - meson_src_configure - code_only=true -} - -src_compile() { - python_foreach_impl meson_src_compile -} - -src_test() { - local -x PYTEST_ADDOPTS="-vv -ra -l -o console_output_style=count -n $(makeopts_jobs) --dist=worksteal" - - python_foreach_impl meson_src_test --no-rebuild --verbose -} - -src_install() { - python_foreach_impl my_src_install - dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf - - local scripts - mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die) - python_replicate_script "${scripts[@]}" -} - -my_src_install() { - local pydirs=( - "${D}$(python_get_sitedir)" - "${ED}/usr/lib/portage/${EPYTHON}" - ) - - meson_src_install - python_optimize "${pydirs[@]}" - python_fix_shebang "${pydirs[@]}" -} - -pkg_preinst() { - if ! use build && [[ -z ${ROOT} ]]; then - python_setup - local sitedir=$(python_get_sitedir) - [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" - env -u DISTDIR \ - -u PORTAGE_OVERRIDE_EPREFIX \ - -u PORTAGE_REPOSITORIES \ - -u PORTDIR \ - -u PORTDIR_OVERLAY \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.default_locations || die - - env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die - - env -u FEATURES -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die - fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} - fi - - if has_version "<${CATEGORY}/${PN}-2.3.77"; then - elog "The emerge --autounmask option is now disabled by default, except for" - elog "portions of behavior which are controlled by the --autounmask-use and" - elog "--autounmask-license options. For backward compatibility, previous" - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." - elog "Users can get the old behavior simply by adding --autounmask to the" - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" - elog "change, see https://bugs.gentoo.org/658648." - fi -} - -pkg_postinst() { - # Warn about obsolete "enotice" script, bug #867010 - local bashrc=${EROOT}/etc/portage/profile/profile.bashrc - if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then - eerror "Obsolete 'enotice' script detected!" - eerror "Please remove this from ${bashrc} to avoid problems." - eerror "See bug 867010 for more details." - fi -} diff --git a/sys-apps/portage/portage-3.0.52.ebuild b/sys-apps/portage/portage-3.0.52.ebuild deleted file mode 100644 index f261a5eae11a..000000000000 --- a/sys-apps/portage/portage-3.0.52.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -PYTHON_REQ_USE='bzip2(+),threads(+)' -TMPFILES_OPTIONAL=1 - -inherit meson linux-info multiprocessing python-r1 tmpfiles - -DESCRIPTION="The package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI=" - https://anongit.gentoo.org/git/proj/portage.git - https://github.com/gentoo/portage.git - " - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -# setuptools is still needed as a workaround for Python 3.12+ for now. -# https://github.com/mesonbuild/meson/issues/7702 -# -# >=meson-1.2.1-r1 for bug #912051 -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ' python3_12) - test? ( - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-vcs/git - ) -" -DEPEND=" - ${PYTHON_DEPS} - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 - sys-devel/patch - !build? ( $(python_gen_impl_dep 'ssl(+)') ) - apidoc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-epytext[${PYTHON_USEDEP}] - ) - doc? ( - ~app-text/docbook-xml-dtd-4.4 - app-text/xmlto - ) -" -# Require sandbox-2.2 for bug #288863. -# For whirlpool hash, require python[ssl] (bug #425046). -RDEPEND=" - ${PYTHON_DEPS} - acct-user/portage - >=app-arch/tar-1.27 - app-arch/zstd - >=app-misc/pax-utils-0.1.17 - dev-lang/python-exec:2 - >=sys-apps/baselayout-2.9 - >=sys-apps/findutils-4.9 - !build? ( - >=app-admin/eselect-1.2 - app-portage/getuto - >=app-shells/bash-5.0:0 - >=sec-keys/openpgp-keys-gentoo-release-20230329 - >=sys-apps/sed-4.0.5 - rsync-verify? ( - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - >=app-portage/gemato-14.5[${PYTHON_USEDEP}] - ) - ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - kernel_linux? ( sys-apps/util-linux ) - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - ) ) - !<app-admin/logrotate-3.8.0 - !<app-portage/gentoolkit-0.4.6 - !<app-portage/repoman-2.3.10 - !~app-portage/repoman-3.0.0 -" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# NOTE: FEATURES=installsources requires debugedit and rsync -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - >=sys-apps/coreutils-6.4 - >=sys-apps/file-5.44-r3 - ) -" - -pkg_pretend() { - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" - - check_extra_config -} - -src_prepare() { - default - - if use prefix-guest; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi -} - -src_configure() { - local code_only=false - python_foreach_impl my_src_configure -} - -my_src_configure() { - local emesonargs=( - -Dcode-only=${code_only} - -Deprefix="${EPREFIX}" - -Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - $(meson_use doc) - $(meson_use apidoc) - $(meson_use gentoo-dev) - $(meson_use ipc) - $(meson_use xattr) - ) - - if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then - emesonargs+=( -Dnative-extensions=true ) - else - emesonargs+=( -Dnative-extensions=false ) - fi - - if use build; then - emesonargs+=( -Drsync-verify=false ) - else - emesonargs+=( $(meson_use rsync-verify) ) - fi - - meson_src_configure - code_only=true -} - -src_compile() { - python_foreach_impl meson_src_compile -} - -src_test() { - local -x PYTEST_ADDOPTS="-vv -ra -l -o console_output_style=count -n $(makeopts_jobs) --dist=worksteal" - - python_foreach_impl meson_src_test --no-rebuild --verbose -} - -src_install() { - python_foreach_impl my_src_install - dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf - - local scripts - mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die) - python_replicate_script "${scripts[@]}" -} - -my_src_install() { - local pydirs=( - "${D}$(python_get_sitedir)" - "${ED}/usr/lib/portage/${EPYTHON}" - ) - - meson_src_install - python_optimize "${pydirs[@]}" - python_fix_shebang "${pydirs[@]}" -} - -pkg_preinst() { - if ! use build && [[ -z ${ROOT} ]]; then - python_setup - local sitedir=$(python_get_sitedir) - [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" - env -u DISTDIR \ - -u PORTAGE_OVERRIDE_EPREFIX \ - -u PORTAGE_REPOSITORIES \ - -u PORTDIR \ - -u PORTDIR_OVERLAY \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.default_locations || die - - env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die - - env -u FEATURES -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die - fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} - fi - - if has_version "<${CATEGORY}/${PN}-2.3.77"; then - elog "The emerge --autounmask option is now disabled by default, except for" - elog "portions of behavior which are controlled by the --autounmask-use and" - elog "--autounmask-license options. For backward compatibility, previous" - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." - elog "Users can get the old behavior simply by adding --autounmask to the" - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" - elog "change, see https://bugs.gentoo.org/658648." - fi -} - -pkg_postinst() { - # Warn about obsolete "enotice" script, bug #867010 - local bashrc=${EROOT}/etc/portage/profile/profile.bashrc - if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then - eerror "Obsolete 'enotice' script detected!" - eerror "Please remove this from ${bashrc} to avoid problems." - eerror "See bug 867010 for more details." - fi -} diff --git a/sys-apps/portage/portage-3.0.53.ebuild b/sys-apps/portage/portage-3.0.53.ebuild deleted file mode 100644 index f261a5eae11a..000000000000 --- a/sys-apps/portage/portage-3.0.53.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -PYTHON_REQ_USE='bzip2(+),threads(+)' -TMPFILES_OPTIONAL=1 - -inherit meson linux-info multiprocessing python-r1 tmpfiles - -DESCRIPTION="The package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI=" - https://anongit.gentoo.org/git/proj/portage.git - https://github.com/gentoo/portage.git - " - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -# setuptools is still needed as a workaround for Python 3.12+ for now. -# https://github.com/mesonbuild/meson/issues/7702 -# -# >=meson-1.2.1-r1 for bug #912051 -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ' python3_12) - test? ( - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-vcs/git - ) -" -DEPEND=" - ${PYTHON_DEPS} - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 - sys-devel/patch - !build? ( $(python_gen_impl_dep 'ssl(+)') ) - apidoc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-epytext[${PYTHON_USEDEP}] - ) - doc? ( - ~app-text/docbook-xml-dtd-4.4 - app-text/xmlto - ) -" -# Require sandbox-2.2 for bug #288863. -# For whirlpool hash, require python[ssl] (bug #425046). -RDEPEND=" - ${PYTHON_DEPS} - acct-user/portage - >=app-arch/tar-1.27 - app-arch/zstd - >=app-misc/pax-utils-0.1.17 - dev-lang/python-exec:2 - >=sys-apps/baselayout-2.9 - >=sys-apps/findutils-4.9 - !build? ( - >=app-admin/eselect-1.2 - app-portage/getuto - >=app-shells/bash-5.0:0 - >=sec-keys/openpgp-keys-gentoo-release-20230329 - >=sys-apps/sed-4.0.5 - rsync-verify? ( - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - >=app-portage/gemato-14.5[${PYTHON_USEDEP}] - ) - ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - kernel_linux? ( sys-apps/util-linux ) - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - ) ) - !<app-admin/logrotate-3.8.0 - !<app-portage/gentoolkit-0.4.6 - !<app-portage/repoman-2.3.10 - !~app-portage/repoman-3.0.0 -" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# NOTE: FEATURES=installsources requires debugedit and rsync -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - >=sys-apps/coreutils-6.4 - >=sys-apps/file-5.44-r3 - ) -" - -pkg_pretend() { - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" - - check_extra_config -} - -src_prepare() { - default - - if use prefix-guest; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi -} - -src_configure() { - local code_only=false - python_foreach_impl my_src_configure -} - -my_src_configure() { - local emesonargs=( - -Dcode-only=${code_only} - -Deprefix="${EPREFIX}" - -Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - $(meson_use doc) - $(meson_use apidoc) - $(meson_use gentoo-dev) - $(meson_use ipc) - $(meson_use xattr) - ) - - if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then - emesonargs+=( -Dnative-extensions=true ) - else - emesonargs+=( -Dnative-extensions=false ) - fi - - if use build; then - emesonargs+=( -Drsync-verify=false ) - else - emesonargs+=( $(meson_use rsync-verify) ) - fi - - meson_src_configure - code_only=true -} - -src_compile() { - python_foreach_impl meson_src_compile -} - -src_test() { - local -x PYTEST_ADDOPTS="-vv -ra -l -o console_output_style=count -n $(makeopts_jobs) --dist=worksteal" - - python_foreach_impl meson_src_test --no-rebuild --verbose -} - -src_install() { - python_foreach_impl my_src_install - dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf - - local scripts - mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die) - python_replicate_script "${scripts[@]}" -} - -my_src_install() { - local pydirs=( - "${D}$(python_get_sitedir)" - "${ED}/usr/lib/portage/${EPYTHON}" - ) - - meson_src_install - python_optimize "${pydirs[@]}" - python_fix_shebang "${pydirs[@]}" -} - -pkg_preinst() { - if ! use build && [[ -z ${ROOT} ]]; then - python_setup - local sitedir=$(python_get_sitedir) - [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" - env -u DISTDIR \ - -u PORTAGE_OVERRIDE_EPREFIX \ - -u PORTAGE_REPOSITORIES \ - -u PORTDIR \ - -u PORTDIR_OVERLAY \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.default_locations || die - - env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die - - env -u FEATURES -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die - fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} - fi - - if has_version "<${CATEGORY}/${PN}-2.3.77"; then - elog "The emerge --autounmask option is now disabled by default, except for" - elog "portions of behavior which are controlled by the --autounmask-use and" - elog "--autounmask-license options. For backward compatibility, previous" - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." - elog "Users can get the old behavior simply by adding --autounmask to the" - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" - elog "change, see https://bugs.gentoo.org/658648." - fi -} - -pkg_postinst() { - # Warn about obsolete "enotice" script, bug #867010 - local bashrc=${EROOT}/etc/portage/profile/profile.bashrc - if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then - eerror "Obsolete 'enotice' script detected!" - eerror "Please remove this from ${bashrc} to avoid problems." - eerror "See bug 867010 for more details." - fi -} diff --git a/sys-apps/portage/portage-3.0.54-r1.ebuild b/sys-apps/portage/portage-3.0.54-r1.ebuild deleted file mode 100644 index 695d1d6a5bb9..000000000000 --- a/sys-apps/portage/portage-3.0.54-r1.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -PYTHON_REQ_USE='bzip2(+),threads(+)' -TMPFILES_OPTIONAL=1 - -inherit meson linux-info multiprocessing python-r1 tmpfiles - -DESCRIPTION="The package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI=" - https://anongit.gentoo.org/git/proj/portage.git - https://github.com/gentoo/portage.git - " - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -# setuptools is still needed as a workaround for Python 3.12+ for now. -# https://github.com/mesonbuild/meson/issues/7702 -# -# >=meson-1.2.1-r1 for bug #912051 -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ' python3_12) - test? ( - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-vcs/git - ) -" -DEPEND=" - ${PYTHON_DEPS} - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 - sys-devel/patch - !build? ( $(python_gen_impl_dep 'ssl(+)') ) - apidoc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-epytext[${PYTHON_USEDEP}] - ) - doc? ( - ~app-text/docbook-xml-dtd-4.4 - app-text/xmlto - ) -" -# Require sandbox-2.2 for bug #288863. -# For whirlpool hash, require python[ssl] (bug #425046). -RDEPEND=" - ${PYTHON_DEPS} - acct-user/portage - >=app-arch/tar-1.27 - app-arch/zstd - >=app-misc/pax-utils-0.1.17 - dev-lang/python-exec:2 - >=sys-apps/baselayout-2.9 - >=sys-apps/findutils-4.9 - !build? ( - >=app-admin/eselect-1.2 - app-portage/getuto - >=app-shells/bash-5.0:0 - >=sec-keys/openpgp-keys-gentoo-release-20230329 - >=sys-apps/sed-4.0.5 - rsync-verify? ( - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - >=app-portage/gemato-14.5[${PYTHON_USEDEP}] - ) - ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - kernel_linux? ( sys-apps/util-linux ) - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - ) ) - !<app-admin/logrotate-3.8.0 - !<app-portage/gentoolkit-0.4.6 - !<app-portage/repoman-2.3.10 - !~app-portage/repoman-3.0.0 -" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# NOTE: FEATURES=installsources requires debugedit and rsync -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - >=sys-apps/coreutils-6.4 - >=sys-apps/file-5.44-r3 - ) -" - -pkg_pretend() { - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" - - check_extra_config -} - -src_prepare() { - local PATCHES=( - "${FILESDIR}/portage-3.0.54-Convert-portageq-helper-to-a-function.patch" - ) - default - - if use prefix-guest; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi -} - -src_configure() { - local code_only=false - python_foreach_impl my_src_configure -} - -my_src_configure() { - local emesonargs=( - -Dcode-only=${code_only} - -Deprefix="${EPREFIX}" - -Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - $(meson_use doc) - $(meson_use apidoc) - $(meson_use gentoo-dev) - $(meson_use ipc) - $(meson_use xattr) - ) - - if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then - emesonargs+=( -Dnative-extensions=true ) - else - emesonargs+=( -Dnative-extensions=false ) - fi - - if use build; then - emesonargs+=( -Drsync-verify=false ) - else - emesonargs+=( $(meson_use rsync-verify) ) - fi - - meson_src_configure - code_only=true -} - -src_compile() { - python_foreach_impl meson_src_compile -} - -src_test() { - local -x PYTEST_ADDOPTS="-vv -ra -l -o console_output_style=count -n $(makeopts_jobs) --dist=worksteal" - - python_foreach_impl meson_src_test --no-rebuild --verbose -} - -src_install() { - python_foreach_impl my_src_install - dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf - - local scripts - mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die) - python_replicate_script "${scripts[@]}" -} - -my_src_install() { - local pydirs=( - "${D}$(python_get_sitedir)" - "${ED}/usr/lib/portage/${EPYTHON}" - ) - - meson_src_install - python_optimize "${pydirs[@]}" - python_fix_shebang "${pydirs[@]}" -} - -pkg_preinst() { - if ! use build && [[ -z ${ROOT} ]]; then - python_setup - local sitedir=$(python_get_sitedir) - [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" - env -u DISTDIR \ - -u PORTAGE_OVERRIDE_EPREFIX \ - -u PORTAGE_REPOSITORIES \ - -u PORTDIR \ - -u PORTDIR_OVERLAY \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.default_locations || die - - env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die - - env -u FEATURES -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die - fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} - fi - - if has_version "<${CATEGORY}/${PN}-2.3.77"; then - elog "The emerge --autounmask option is now disabled by default, except for" - elog "portions of behavior which are controlled by the --autounmask-use and" - elog "--autounmask-license options. For backward compatibility, previous" - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." - elog "Users can get the old behavior simply by adding --autounmask to the" - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" - elog "change, see https://bugs.gentoo.org/658648." - fi -} - -pkg_postinst() { - # Warn about obsolete "enotice" script, bug #867010 - local bashrc=${EROOT}/etc/portage/profile/profile.bashrc - if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then - eerror "Obsolete 'enotice' script detected!" - eerror "Please remove this from ${bashrc} to avoid problems." - eerror "See bug 867010 for more details." - fi -} diff --git a/sys-apps/portage/portage-3.0.55.ebuild b/sys-apps/portage/portage-3.0.55.ebuild deleted file mode 100644 index f261a5eae11a..000000000000 --- a/sys-apps/portage/portage-3.0.55.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -PYTHON_REQ_USE='bzip2(+),threads(+)' -TMPFILES_OPTIONAL=1 - -inherit meson linux-info multiprocessing python-r1 tmpfiles - -DESCRIPTION="The package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI=" - https://anongit.gentoo.org/git/proj/portage.git - https://github.com/gentoo/portage.git - " - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -# setuptools is still needed as a workaround for Python 3.12+ for now. -# https://github.com/mesonbuild/meson/issues/7702 -# -# >=meson-1.2.1-r1 for bug #912051 -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ' python3_12) - test? ( - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-vcs/git - ) -" -DEPEND=" - ${PYTHON_DEPS} - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 - sys-devel/patch - !build? ( $(python_gen_impl_dep 'ssl(+)') ) - apidoc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-epytext[${PYTHON_USEDEP}] - ) - doc? ( - ~app-text/docbook-xml-dtd-4.4 - app-text/xmlto - ) -" -# Require sandbox-2.2 for bug #288863. -# For whirlpool hash, require python[ssl] (bug #425046). -RDEPEND=" - ${PYTHON_DEPS} - acct-user/portage - >=app-arch/tar-1.27 - app-arch/zstd - >=app-misc/pax-utils-0.1.17 - dev-lang/python-exec:2 - >=sys-apps/baselayout-2.9 - >=sys-apps/findutils-4.9 - !build? ( - >=app-admin/eselect-1.2 - app-portage/getuto - >=app-shells/bash-5.0:0 - >=sec-keys/openpgp-keys-gentoo-release-20230329 - >=sys-apps/sed-4.0.5 - rsync-verify? ( - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - >=app-portage/gemato-14.5[${PYTHON_USEDEP}] - ) - ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - kernel_linux? ( sys-apps/util-linux ) - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - ) ) - !<app-admin/logrotate-3.8.0 - !<app-portage/gentoolkit-0.4.6 - !<app-portage/repoman-2.3.10 - !~app-portage/repoman-3.0.0 -" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# NOTE: FEATURES=installsources requires debugedit and rsync -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - >=sys-apps/coreutils-6.4 - >=sys-apps/file-5.44-r3 - ) -" - -pkg_pretend() { - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" - - check_extra_config -} - -src_prepare() { - default - - if use prefix-guest; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi -} - -src_configure() { - local code_only=false - python_foreach_impl my_src_configure -} - -my_src_configure() { - local emesonargs=( - -Dcode-only=${code_only} - -Deprefix="${EPREFIX}" - -Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - $(meson_use doc) - $(meson_use apidoc) - $(meson_use gentoo-dev) - $(meson_use ipc) - $(meson_use xattr) - ) - - if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then - emesonargs+=( -Dnative-extensions=true ) - else - emesonargs+=( -Dnative-extensions=false ) - fi - - if use build; then - emesonargs+=( -Drsync-verify=false ) - else - emesonargs+=( $(meson_use rsync-verify) ) - fi - - meson_src_configure - code_only=true -} - -src_compile() { - python_foreach_impl meson_src_compile -} - -src_test() { - local -x PYTEST_ADDOPTS="-vv -ra -l -o console_output_style=count -n $(makeopts_jobs) --dist=worksteal" - - python_foreach_impl meson_src_test --no-rebuild --verbose -} - -src_install() { - python_foreach_impl my_src_install - dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf - - local scripts - mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die) - python_replicate_script "${scripts[@]}" -} - -my_src_install() { - local pydirs=( - "${D}$(python_get_sitedir)" - "${ED}/usr/lib/portage/${EPYTHON}" - ) - - meson_src_install - python_optimize "${pydirs[@]}" - python_fix_shebang "${pydirs[@]}" -} - -pkg_preinst() { - if ! use build && [[ -z ${ROOT} ]]; then - python_setup - local sitedir=$(python_get_sitedir) - [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" - env -u DISTDIR \ - -u PORTAGE_OVERRIDE_EPREFIX \ - -u PORTAGE_REPOSITORIES \ - -u PORTDIR \ - -u PORTDIR_OVERLAY \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.default_locations || die - - env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die - - env -u FEATURES -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die - fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} - fi - - if has_version "<${CATEGORY}/${PN}-2.3.77"; then - elog "The emerge --autounmask option is now disabled by default, except for" - elog "portions of behavior which are controlled by the --autounmask-use and" - elog "--autounmask-license options. For backward compatibility, previous" - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." - elog "Users can get the old behavior simply by adding --autounmask to the" - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" - elog "change, see https://bugs.gentoo.org/658648." - fi -} - -pkg_postinst() { - # Warn about obsolete "enotice" script, bug #867010 - local bashrc=${EROOT}/etc/portage/profile/profile.bashrc - if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then - eerror "Obsolete 'enotice' script detected!" - eerror "Please remove this from ${bashrc} to avoid problems." - eerror "See bug 867010 for more details." - fi -} diff --git a/sys-apps/portage/portage-3.0.56.ebuild b/sys-apps/portage/portage-3.0.56-r1.ebuild index f261a5eae11a..7c8174eb7fef 100644 --- a/sys-apps/portage/portage-3.0.56.ebuild +++ b/sys-apps/portage/portage-3.0.56-r1.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86" fi LICENSE="GPL-2" @@ -36,6 +36,10 @@ RESTRICT="!test? ( test )" BDEPEND=" ${PYTHON_DEPS} >=dev-util/meson-1.2.1-r1 + || ( + >=dev-util/meson-1.3.0-r1 + <dev-util/meson-1.3.0 + ) $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] ' python3_12) diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index f261a5eae11a..dafc3d985c50 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -36,6 +36,10 @@ RESTRICT="!test? ( test )" BDEPEND=" ${PYTHON_DEPS} >=dev-util/meson-1.2.1-r1 + || ( + >=dev-util/meson-1.3.0-r1 + <dev-util/meson-1.3.0 + ) $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] ' python3_12) diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 7e7223bb292b..78fa7a114ec1 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -16,14 +16,14 @@ DIST systemd-stable-254.4.tar.gz 14332995 BLAKE2B 2b51ea867e142beeaf332cead5e2da DIST systemd-stable-254.5.tar.gz 14334696 BLAKE2B 2f63d79ae93add69ac0b56dda9f67019340f84692de4da200557b9f5f1f16bebbad42a9a7e2d6ef7420aa37746d2ede0481fd8e39f03a31576c7e4e48e259ce3 SHA512 cac713670216add9e5473e2c86f04da441015e7cc0ac1500b9e1489a435f9b80c4c6ee24e9b22e4c4213a495bc1a0a908925df2045e344a2170d5aea6aafa16c DIST systemd-stable-254.6.tar.gz 14400611 BLAKE2B 5b23131b8aaabcd386ceb9cfb4ba8e7e1c92c454dbcc2dd907fb459f3022cd324cef86d531fe296ad56349602e487544d60900f71e189aadac6ec0a361a382e3 SHA512 3ebb8c2b931d13cf6efa59842d6d7fb84410fee02f5161061900321497d33750e0b88e2366a4234ba1ab0b89b797da0b1f8b577e0924e560cd9914fde83a1e45 DIST systemd-stable-254.7.tar.gz 14411955 BLAKE2B 1213237a001fb0aef8912637f31d7d77888bc2505e1e8d8d295642a547bdebbc3a786eed095694e6a6fe2665d6e8e45e98cd883186eedeb1b4fd73daf2520dcf SHA512 2e859813f1f52fa693631ce43466875ac2ac42e09872011ee52fe4e44727663c3de9f128a47776899423188c1e99ce73a69059426a9356c930e275037d001685 -EBUILD systemd-253.11.ebuild 14663 BLAKE2B 66ba48a7c362fad0c42b5de9d6929b2e3587104bbd0991dd68938d6f4f5c3ace504a4ca57193efd84ee6cceb576c3ecf11717a2f2ccf3697e00847bf9f3de48d SHA512 ad0c880ee70d34e8486e7ad0083013c42d5f1b0dacaf65cd16da9830a9f983a1ea93921df7c19d272915950fc606a4e0a69116583ab3c8204897633351cbf365 +EBUILD systemd-253.11.ebuild 14661 BLAKE2B 4d08e0b78f8748ae78b9eaded181c740bc5c5f78f83fe7dc61cc9738658bedd6811e0d214c32e719e96898ad70008d15e527e12b7df17b122f3d9ce45505e94a SHA512 1d5ee451cf3a0494399c2f30c9cf5e93be11bcfce4c5a834521b4a2de1da7c80ba60b1195d142fb92ffbaf1a69e524849c15bb729ba2dbcab9f2956c08a559de EBUILD systemd-253.12.ebuild 14669 BLAKE2B 106db6ca3073de27cd0f7c72b30397da77cbd98dfe1d1357f67d39f61e722c47d7fd5b3b7378e329883e9894cfe90159f3db50400ca5d791b438907b00b797b3 SHA512 56e632a1f7d396607df97f3bfbde8e85ed4534b69b341e196356adf26f932f54db0bde0365ea5e4ef8c84e36662b61b7465ba4b3336c0eebbaa3932554c13eaa EBUILD systemd-253.13.ebuild 14669 BLAKE2B 106db6ca3073de27cd0f7c72b30397da77cbd98dfe1d1357f67d39f61e722c47d7fd5b3b7378e329883e9894cfe90159f3db50400ca5d791b438907b00b797b3 SHA512 56e632a1f7d396607df97f3bfbde8e85ed4534b69b341e196356adf26f932f54db0bde0365ea5e4ef8c84e36662b61b7465ba4b3336c0eebbaa3932554c13eaa EBUILD systemd-253.3-r1.ebuild 14579 BLAKE2B ec9e31176bad8f142e224369a868b275facb3d3f48e26a9753efd89f40af5c107e70febbbf79fffbefcfe174e258ffae6175e23dde6c3105cec40ec60e5aee7b SHA512 f25ca4b5fbeee20f1137ea9cdf7305a8eb41814ab10946bb3fbacb4bbd9aa5f03fe804119c76e5b4c05abc8b7abb2b5ed9d40dea300b009ca8dab774239b7069 EBUILD systemd-253.6.ebuild 14661 BLAKE2B 4d08e0b78f8748ae78b9eaded181c740bc5c5f78f83fe7dc61cc9738658bedd6811e0d214c32e719e96898ad70008d15e527e12b7df17b122f3d9ce45505e94a SHA512 1d5ee451cf3a0494399c2f30c9cf5e93be11bcfce4c5a834521b4a2de1da7c80ba60b1195d142fb92ffbaf1a69e524849c15bb729ba2dbcab9f2956c08a559de EBUILD systemd-254.3.ebuild 14824 BLAKE2B 30302795c1190012a9ea1540fc4f6b04d35d27afdac5aa170a2ea0082183f51448631b653a4cfbb98befaa6f0df1d07c0c59d4e467ba74d5bba01b53cdc7fd18 SHA512 b1d9acd433a6b5606361c59ff5afb51179ca98213629bbe7b26d55f8f4b7fd80a7beee57e5e9588360a0e62d79a6a2de9fad75d72499b5ae19968a831a422608 EBUILD systemd-254.4.ebuild 14824 BLAKE2B 30302795c1190012a9ea1540fc4f6b04d35d27afdac5aa170a2ea0082183f51448631b653a4cfbb98befaa6f0df1d07c0c59d4e467ba74d5bba01b53cdc7fd18 SHA512 b1d9acd433a6b5606361c59ff5afb51179ca98213629bbe7b26d55f8f4b7fd80a7beee57e5e9588360a0e62d79a6a2de9fad75d72499b5ae19968a831a422608 -EBUILD systemd-254.5-r1.ebuild 14964 BLAKE2B 5bde714048b0ba5ad7bd18c718a657f448f0fec150bf1ba40882500414b37dd4bbb6a88fc61aa3aebb1eb6d47b71b0b78bad2868959ce8df74d2b9531f99d28a SHA512 853e414190f6f1f4bc6c27eac86738a09788434f74095ca1781f007aa83c891feef99b359ccc4f12130bcec508e1424fd4283f2642a7d613b09758692e4c1814 +EBUILD systemd-254.5-r1.ebuild 14962 BLAKE2B fe76fdf8c0bbd48a3c1f16e52680783cc19823d2979f45bd466882631c041b3d722156d264b3ff6e7b06cff6f605abc7762bc33cf3af23fb5016fd318cf2fa4c SHA512 86f770447a401de29dfc517dd1e958145396141c63f0b01485f7175b0bd5ab2ffb00f71c327e746891503526b284243c39bd5adb2053f87163bed79bb1f1509e EBUILD systemd-254.6.ebuild 14969 BLAKE2B c520398d1ca9398cc5021b6abfb43521d588e0777ae711239e6a0ccaedcbf2f5ac4565a40f94ca06a6c951e9a95505c627def769c8f336f245b78fa9ce29e0be SHA512 0795cea8e391d38e6fd1df8a814d9b6922e90e59ec646b9f5764e7e09cd221fffa4e377ec3cf182231a87ac2835b4b6c2cae607acc5870964a37055d84455966 EBUILD systemd-254.7.ebuild 14969 BLAKE2B c520398d1ca9398cc5021b6abfb43521d588e0777ae711239e6a0ccaedcbf2f5ac4565a40f94ca06a6c951e9a95505c627def769c8f336f245b78fa9ce29e0be SHA512 0795cea8e391d38e6fd1df8a814d9b6922e90e59ec646b9f5764e7e09cd221fffa4e377ec3cf182231a87ac2835b4b6c2cae607acc5870964a37055d84455966 EBUILD systemd-255_rc3.ebuild 14105 BLAKE2B 4060447391c50cf789f9828585091789f8373e8dedf3d3faa63c270a74a6465e57b31141ad6d17f7877e2d864701f0b70a58e358e53ba8ee8298ea51737cecf3 SHA512 f839acbbc1f4ccd8ced53bbc1a6313a3f38f6d357ee577693ac25813b94cb3e465de588cf19becb5ddf2b6adab0f491bffa2b56fb50210619497c64e29cbc7d6 diff --git a/sys-apps/systemd/systemd-253.11.ebuild b/sys-apps/systemd/systemd-253.11.ebuild index 0d7891e86082..443fe8bbfd7a 100644 --- a/sys-apps/systemd/systemd-253.11.ebuild +++ b/sys-apps/systemd/systemd-253.11.ebuild @@ -23,7 +23,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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 diff --git a/sys-apps/systemd/systemd-254.5-r1.ebuild b/sys-apps/systemd/systemd-254.5-r1.ebuild index 663677dee912..f011c25978c4 100644 --- a/sys-apps/systemd/systemd-254.5-r1.ebuild +++ b/sys-apps/systemd/systemd-254.5-r1.ebuild @@ -23,7 +23,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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi inherit bash-completion-r1 linux-info meson-multilib pam python-single-r1 |