diff options
Diffstat (limited to 'sys-apps')
25 files changed, 273 insertions, 153 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex da7c024261ce..9fbaafc38f78 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest index ffe717445a7f..0fcbd1bdecad 100644 --- a/sys-apps/accountsservice/Manifest +++ b/sys-apps/accountsservice/Manifest @@ -1,5 +1,3 @@ -AUX accountsservice-0.6.35-gentoo-system-users.patch 1122 BLAKE2B f6196cc7136581ede5437aad909a5c2baa6cda36a27d7e4ceebd0aee2b40a66ef83324b3dde92a77ca0dfca96a47ac342f4a580f38ad6e3a042384dd9e742282 SHA512 e8ac404aed1da3ab4bb092b476cbb18f2ae7d209bcbe6a30cb9058f50dce0f70d64a3de593108ef5588132389d522d19975384eb1b8414119cb622bc7d738931 -AUX accountsservice-0.6.55-meson-0.61-build.patch 659 BLAKE2B 08e271eb7228ed9b1a23633b35d9b1d8d9bf5499f734af9fce12fd642baa6d0aafd4d34a639a281467677f1e4948c82b33eb08af81b425d7bf0fb8e353c2ab94 SHA512 8a0ec9ebfe543afa3cdc4c68da67f9b22a5b08191eb664bb68404d868e31dbf584114f91b638ad1e0dd63635b45f58ccffb66defe4b9452ecdf6e591a77e2f6a AUX accountsservice-22.04.62-gentoo-system-users.patch 1318 BLAKE2B 69c74ad620cebd6864efff7ad87401a72ea5f644a773a682653b45584e34755aaf12a0e79ba816c990b0af2784d01fec5e8b657699ecfc7c38343330a36fda57 SHA512 a85a6ca785a3863d96eae39bc3eee5fe89bedd0bdae40cd6bc2e077bb88f72d73d0be63dcf0e0a788f0f5d69ed39801c9ede623afe8ed08c94372314b1fddd09 DIST accountsservice-22.07.5.tar.xz 101688 BLAKE2B db8e5001f0b81b89c105d15557d5c62251ca58e4fad08f3cbfd52881b05980ccbb693766347c5cde640dcf3823a59f667fe15ec0c8e04cdd226915f91cea90a6 SHA512 9099abc9d8db58672db01e6ba9b23ba7bc8ed910ac001499d2a241089f55eafac47a482811cba80b1d6ee11df03a384e8ef2fd87df3b1125a8cf97c580177534 DIST accountsservice-22.08.8.tar.xz 102672 BLAKE2B 7c9436d3845fc1883772b434c4f9e2fba934d17e6d4452a6be65e1d790a23b331eaaa64b0e6eff6fefe79587a40cf1749a0f3de09f323b10740046bd9d145c9d SHA512 2ca3ceb1b44338d9924b86788256d4eef7ec10e0c2197bfb8cc6c31ae224fab3051f03cb406a526f90057684965bef4ba0f2cc01b26198ec1fc6baec36ad3ff8 diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.35-gentoo-system-users.patch b/sys-apps/accountsservice/files/accountsservice-0.6.35-gentoo-system-users.patch deleted file mode 100644 index 39ebf42ea6ac..000000000000 --- a/sys-apps/accountsservice/files/accountsservice-0.6.35-gentoo-system-users.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/src/user-classify.c.old 2013-12-04 20:29:48.944454769 +0100 -+++ b/src/user-classify.c 2013-12-04 20:32:59.728283477 +0100 -@@ -55,6 +55,48 @@ - "at", - "gdm", - "gnome-initial-setup" -+ /* Additional Gentoo system users with non-trivial login shell */ -+ "amanda", -+ "backuppc", -+ "drqueue", -+ "firebird", -+ "flexlm", -+ "foldingathome", -+ "geneweb", -+ "git", -+ "gnump3d", -+ "hacluster", -+ "hg", -+ "hsqldb", -+ "infinote", -+ "foldingathome", -+ "geneweb", -+ "git", -+ "gnump3d", -+ "hacluster", -+ "hg", -+ "hsqldb", -+ "infinote", -+ "jffnms", -+ "klive", -+ "mailman", -+ "mpd", -+ "mythtv", -+ "nagios", -+ "nx", -+ "oneadmin", -+ "openvpn", -+ "p2p", -+ "phxd", -+ "resin", -+ "rplayd", -+ "scponly", -+ "secoff", -+ "tinyproxy", -+ "ttrssd", -+ "vboxguest", -+ "vdr", -+ "vdradmin", - }; - - #define PATH_NOLOGIN "/sbin/nologin" diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch b/sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch deleted file mode 100644 index d56f4b7e63b8..000000000000 --- a/sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch -https://bugs.gentoo.org/831465 - -From: Luca Boccassi <bluca@debian.org> -Date: Sun, 31 Oct 2021 12:29:14 +0000 -Subject: [PATCH] Fix build with meson 0.60 - -Positional parameters to merge_file() were never allowed and always -ignored, so just drop it. -See: https://github.com/mesonbuild/meson/issues/9441 - -Fixes #97 ---- a/data/meson.build -+++ b/data/meson.build -@@ -33,7 +33,6 @@ configure_file( - policy = act_namespace.to_lower() + '.policy' - - i18n.merge_file( -- policy, - input: policy + '.in', - output: policy, - po_dir: po_dir, -GitLab diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest index c967f58fef32..16b896fe8904 100644 --- a/sys-apps/attr/Manifest +++ b/sys-apps/attr/Manifest @@ -1,5 +1,5 @@ AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8 DIST attr-2.5.1.tar.gz 465714 BLAKE2B 05928f8274b0b4beee31b329c8459436c5b9019ebd2f937667b7beb8df7a455c48742a90d9c4faca5c0b38c9c3812043d3d66f9587108d3424c6184fef494b56 SHA512 8b4c043d61f8f3e0cd098e701181069f51117b85fd6ba18bfe9af77d894ea671232377d4793ffc822e9259ceee6ac71d75732eb93b2830c6cb5d0d918ba2d21b -EBUILD attr-2.5.1.ebuild 2465 BLAKE2B 27d47d5398fec70e74c119678080d8b5c9e94cf1dadc4838441bda1ab5b0026df97514718fa487926c9a030ecfe2d2b9566c21cbfb6c68e522024ccb39a934c3 SHA512 70a39e833f3454c130d8a687e90b89bb0826cb1121d361aaf6fd4b4f7e9ef3182af69d8393eb1e4f4351c77ba5b68ba1271ac1ab84f3a3d2514e462c1887c452 -EBUILD attr-9999.ebuild 2473 BLAKE2B d17b6f61f4f04ca41574c84a13880f6ecab28eda8d1134a81058031b2c00a3459ac72b6446341c5aa3dd240787de64707a80689707fd48805453b135fb581365 SHA512 85a5ed5575c0cd46c47c37aaac94af0c3b4a6fa37d7306a53ad688d67b0a7b6b0ab26b5b25607ce82d457d7cfe6467c4cfd151532f722a8dbba2954d7dbfa49f +EBUILD attr-2.5.1.ebuild 2488 BLAKE2B 937097787557daf163827410ffa5744d59e1988c6a02eabce1b6fcb6df7e6e42b8dd6a189707372af7e11216234a6d136bb068e54c5f9b322b369b2f1144c63a SHA512 8b62fe97d9169b5ca235140e76dced003867b0f226f932ac6b026470e484bfe08037ed832c36371dae45fc2b84c2d7273b1eac355b529f50ee60b537266c36e5 +EBUILD attr-9999.ebuild 2496 BLAKE2B 86f50f1cfb70b9984adea2ab6072d999d0c37d2d9f7b79d016145c0ee8d8d5517a6cce748e45b27e8008392e0d0eaf9670f6645b332985232f89a45542552c6f SHA512 093175c072ca47791f740cedc8ee0ec06607d31b2ba91bd54bf5e715ca422c48ba08e58ab718814f6717bc9a4dcd05dd932cbc96f8386de93dc95980886d7709 MISC metadata.xml 337 BLAKE2B c04cc7c99b3d9d39870605354acd4f0a4b03d47e79228f444e915ce17abd2eb075418919dc3272903fdd524f56588ef194d7cdbd43f2b040c4f6a9d5fa2eebee SHA512 e9ba5573c84dd1b2cdce5b74e53b731c1ba4b3e72bca569f3febc77e431b96982cd83a71720e021ba23e8d6fd23f9dbea43a6c8d94b2b6ce1b3d26fda038d6de diff --git a/sys-apps/attr/attr-2.5.1.ebuild b/sys-apps/attr/attr-2.5.1.ebuild index 03afe6d30c16..54825bea2267 100644 --- a/sys-apps/attr/attr-2.5.1.ebuild +++ b/sys-apps/attr/attr-2.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -21,7 +21,10 @@ SLOT="0" IUSE="debug nls static-libs" -BDEPEND="nls? ( sys-devel/gettext )" +BDEPEND=" + sys-devel/binutils + nls? ( sys-devel/gettext ) +" src_prepare() { default diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild index 6b4cccd9af31..50b844e8a1e7 100644 --- a/sys-apps/attr/attr-9999.ebuild +++ b/sys-apps/attr/attr-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -21,7 +21,10 @@ SLOT="0" IUSE="debug nls static-libs" -BDEPEND="nls? ( sys-devel/gettext )" +BDEPEND=" + sys-devel/binutils + nls? ( sys-devel/gettext ) +" src_prepare() { default diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest index c36641c61367..79f797e1f593 100644 --- a/sys-apps/gnome-disk-utility/Manifest +++ b/sys-apps/gnome-disk-utility/Manifest @@ -1,4 +1,6 @@ AUX gnome-disk-utility-41.0-meson-0.61-build.patch 763 BLAKE2B e4e2732bd634635c43db1e8fb17cb7b74a9540c90b686f5d0573be452a80a4ee1fa8c7bd6adee3a1f5709c4914fc418072b74ad00f3aaccdafc02460317b3fc8 SHA512 188aa575f186e46b17f5614737f51de6a5ecce1484610b64001cc12f3dbabef041222055844f8017a9baf1b58a0931c37b1bf2f2ecabc352b6355928edee1dd3 DIST gnome-disk-utility-41.0.tar.xz 1401088 BLAKE2B 78769a714a8e5ee5596da3502562a7a136f54c7b832f44b8b70bae60de42af9dda433c4acd3b74ca31f71e53a633f2888c4e21d6ce9d9ccf2a03485903b3985f SHA512 a78dd281c078046abef5c0986777c6a87bc27d9b1bd6e798b5be058a3352b33dead8f5fea6e8f30e8c61bdd21996ee7d784838d953a33973243faabd7b713895 +DIST gnome-disk-utility-42.0.tar.xz 1740332 BLAKE2B 4d05876364a475d1e16651569862fe3e9bb97549463146e69722c55922c0609069334e198eff91208448dc0baf7fcefe6bab56612e89fd7412fea42ba20549d2 SHA512 c47c37262295ba455b483a7ebe7799e92f94b97d177327817bb088cddcc3ff1f5840c3e270651287ff6a88257ec7cfcd1abe4167bf7454bbf55e145c8f1dc7c9 EBUILD gnome-disk-utility-41.0.ebuild 1477 BLAKE2B 4b6f5ea10814add8853d45cc956d7e2e383eaa9b69132b0ff395d449916412707f4ecc7f2c60ee379d4ae46ab786d8a0f0a9d21969b87525e74e335a444eac4f SHA512 072fb731ccf0ae6378e655649feac807b69bef10dfc74aac417629d0ac37672910b2d32ebca3680305ce275973a2e90c1c313d95152d9368bd3abd5cc19b0060 +EBUILD gnome-disk-utility-42.0.ebuild 1423 BLAKE2B d54e6d71bf98ab4fac38d1dcd127ef75cc46ed4084fef036fbfd51f41505e48f7d26322326c066c55c71d1bea67a481dceddfd32938afd8424ec16665877b55b SHA512 0ad5522f194530223695358dc03926035df7cffe81bd60fa122a291c316da16dfd87689bec62bdaa67427b01150bfa60e7c7c11175d7f425506e26d8d8c19881 MISC metadata.xml 598 BLAKE2B e9bd803739e63d5667cf9d84b27af2efeeac8e31591d022cfce00fa147f4ee267ea2c03624f43c2d822c00b853b1606f6663814a731182aaf557be259ab2fe45 SHA512 fa5f53e258f9db1447b28979f655b6794491af9eafd0d6f113d43fd2073d36fcedc126fef7fde4a21b99e2ad11e4442c7c333d9dfaeee92064b0de23c071c23e diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild new file mode 100644 index 000000000000..fb3a0a790e86 --- /dev/null +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="Disk Utility for GNOME using udisks" +HOMEPAGE="https://wiki.gnome.org/Apps/Disks" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="fat elogind gnome systemd" +REQUIRED_USE="?? ( elogind systemd )" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + +DEPEND=" + >=media-libs/libdvdread-4.2.0:0= + >=dev-libs/glib-2.31:2 + >=x11-libs/gtk+-3.16.0:3 + >=media-libs/libcanberra-0.1[gtk3] + >=gui-libs/libhandy-1.5.0:1= + >=app-arch/xz-utils-5.0.5 + >=x11-libs/libnotify-0.7:= + >=app-crypt/libsecret-0.7 + >=dev-libs/libpwquality-1.0.0 + >=sys-fs/udisks-2.7.6:2 + elogind? ( >=sys-auth/elogind-209 ) + systemd? ( >=sys-apps/systemd-209:0= ) +" +RDEPEND="${DEPEND} + x11-themes/adwaita-icon-theme + fat? ( sys-fs/dosfstools ) + gnome? ( >=gnome-base/gnome-settings-daemon-3.8 ) +" +# libxml2 for xml-stripblanks in gresource +BDEPEND=" + dev-libs/libxml2:2 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + -Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none)) + $(meson_use gnome gsd_plugin) + -Dman=true + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest index 14c99b430f4c..e8a2ef9bcc9c 100644 --- a/sys-apps/hwdata/Manifest +++ b/sys-apps/hwdata/Manifest @@ -1,9 +1,5 @@ -DIST hwdata-0.353.tar.gz 2206215 BLAKE2B e1c30d7d486a2f03eb8b59dfc12544a5e5a988295d5dc220e2d6a344991c62d8ded0e8e71a8b0907fb9fb7fe0bac8528386cc4665c903362db6ed6f0a6985b94 SHA512 f4bdea533a1cdf406d065da6a684b131b30f6a0b8fb791418d54b756c9297da981a8e25e128ef97af50ae88553e1473dba17a29c11a15490065faf9bf2dcd0d4 DIST hwdata-0.354.tar.gz 2212834 BLAKE2B 5df04fd6069e131be7195b515f4f7273e28030d46823fa3054371f9afde4eb9976df2663bc7d31d056cb718a479630676f05459064decd59914f3a69bcfb03f1 SHA512 07bbe5137f35c0402029e066e90a29da1ca95faa6996a192b1f9ac00568e5020cc540b642ad2b22b25c2cfa0d7e4c2d7b80c9978ca0cd091691d8f1cf2933915 -DIST hwdata-0.355.tar.gz 2220329 BLAKE2B 2374aa2c87b39181c251ad39d87d10ffa1ac3987de6bd4e8e0d2318ec13ecf0127998c9ca4dafd76076bedefd7f4c263df5a1bf1acad3e926887503d2acf34ca SHA512 d2141b1ae9dc582a2c1c820d5bd0a1532323ba8b5b09cff06863419a70500593b8e4636224e129848e605feafa267f11c5040af7bb2f5f101d812025324f0b0d -DIST hwdata-0.356.tar.gz 2228946 BLAKE2B 3b58365e8e2c10f9e41f70470068bafce435156c6bb6889aa7c1db92b8178dd4c672ae7ee9ac628ef9223ea20203306e1f35c9dd010d5912b42227ed49c2e1fa SHA512 16a9d5e878e11bd5a83b49ff52a291ff732e179db2550a220d3be6785afc0d4ced7dc6df1afdd33f424352a3d8380138a5c726b39cb90a0e07ff87258e152571 -EBUILD hwdata-0.353.ebuild 693 BLAKE2B fe89d5cd31ca413ebcd1e39060b6913dde0b3637b888ea5798d942e826932e3ed08aec0f9034a6a87a1222a0f0b6e6c12159b5044c7f14c6eb0cf5636fa498da SHA512 94a81baa7dd3974fba28c6c5ceba29498dcf1e8575c144316de88b566a68819fd726ee008adf014ba36fbddb335944a7c398b8e585b5f8eba0943a57b2c711d5 +DIST hwdata-0.357.tar.gz 2234392 BLAKE2B 54f26384664cc78d99db52cffa99bf74f57bf355908bd0a87bd01436596b8ed618567caa6f4486e32cbf11bd9313946db2f4d52ce7f2eae1d25b643e68714473 SHA512 7674e77887629e57cf1d6cb73ce7f4734f9dd5e5f8cee0016aa74f0ff6b962f9f0e501069f4cbaa0a5281fed179d2912a653071999b9f7d0eb4d81fff719cad1 EBUILD hwdata-0.354.ebuild 698 BLAKE2B 136ac0f6d57825812547ca50d3abe718286ad2446205f0a155b5579761d1de1505075082bd2bceb8a7ab537ea36d1e8ea5f00fd4e02d9c4bd26d20353cba6b7b SHA512 31fe8fb5e5ac591a9df1c6817677b9a7acf604e20a1ab20dccd7bb884093456f024d6765bef3fececc8bc160ec9bd5828063ac0435c923da759fd9443a99996d -EBUILD hwdata-0.355.ebuild 701 BLAKE2B 2dfc5adafff54a5860818f63314931b5f2344ace66f45fb8b0d57d4272128b121964ed5ccc37d6a90d95720fb492c2309db19518c8fc6d9edeac17ebb2610112 SHA512 30344157fb62cf2ccba7a17e1713b51cd840548339e2c9400b20eecd3926c322c2d8e62516daa35a6961c202e6a7cf5ad316e414a9112d73b674f80d841179d6 -EBUILD hwdata-0.356.ebuild 701 BLAKE2B 2dfc5adafff54a5860818f63314931b5f2344ace66f45fb8b0d57d4272128b121964ed5ccc37d6a90d95720fb492c2309db19518c8fc6d9edeac17ebb2610112 SHA512 30344157fb62cf2ccba7a17e1713b51cd840548339e2c9400b20eecd3926c322c2d8e62516daa35a6961c202e6a7cf5ad316e414a9112d73b674f80d841179d6 +EBUILD hwdata-0.357.ebuild 701 BLAKE2B 2dfc5adafff54a5860818f63314931b5f2344ace66f45fb8b0d57d4272128b121964ed5ccc37d6a90d95720fb492c2309db19518c8fc6d9edeac17ebb2610112 SHA512 30344157fb62cf2ccba7a17e1713b51cd840548339e2c9400b20eecd3926c322c2d8e62516daa35a6961c202e6a7cf5ad316e414a9112d73b674f80d841179d6 MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184 diff --git a/sys-apps/hwdata/hwdata-0.353.ebuild b/sys-apps/hwdata/hwdata-0.353.ebuild deleted file mode 100644 index 881972920216..000000000000 --- a/sys-apps/hwdata/hwdata-0.353.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Hardware identification and configuration data" -HOMEPAGE="https://github.com/vcrhonek/hwdata" -SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -RESTRICT="test" - -src_configure() { - # configure is not compatible with econf - local conf=( - ./configure - --prefix="${EPREFIX}/usr" - --libdir="${EPREFIX}/lib" - --datadir="${EPREFIX}/usr/share" - ) - echo "${conf[@]}" >&2 - "${conf[@]}" || die -} diff --git a/sys-apps/hwdata/hwdata-0.356.ebuild b/sys-apps/hwdata/hwdata-0.356.ebuild deleted file mode 100644 index 6ad75332f251..000000000000 --- a/sys-apps/hwdata/hwdata-0.356.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Hardware identification and configuration data" -HOMEPAGE="https://github.com/vcrhonek/hwdata" -SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -RESTRICT="test" - -src_configure() { - # configure is not compatible with econf - local conf=( - ./configure - --prefix="${EPREFIX}/usr" - --libdir="${EPREFIX}/lib" - --datadir="${EPREFIX}/usr/share" - ) - echo "${conf[@]}" >&2 - "${conf[@]}" || die -} diff --git a/sys-apps/hwdata/hwdata-0.355.ebuild b/sys-apps/hwdata/hwdata-0.357.ebuild index 6ad75332f251..6ad75332f251 100644 --- a/sys-apps/hwdata/hwdata-0.355.ebuild +++ b/sys-apps/hwdata/hwdata-0.357.ebuild diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 33252ee0d24d..5f581b5ef775 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -7,9 +7,11 @@ DIST iproute2-5.13.0.tar.xz 845236 BLAKE2B e1c148e2a720236163e7f4d46aa38d244a02a DIST iproute2-5.14.0.tar.xz 853572 BLAKE2B 52544021798f2cb716a57998d98dadc2441142b02d38c7e274bc17a6e5f994bdb5bd3ebf0b896bfd7e327a44f00f92c2af8e67367cdc0aac70769d563082f543 SHA512 e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22 DIST iproute2-5.16.0.tar.xz 862504 BLAKE2B 370068ccb02b0f3cb77b662509279872af676f2bdd03b92a01a227ed08d70d8fd0545667a04250c76dbae92ccec094d8b8749e272eb9a0acaccbe421cea6b1d5 SHA512 11ebe1951c97a072d3374d14149e94e44d2f309ff6b00a3f163dae3e174c156ca802ebeeddead069c01ccc6275a65b4396fda78d67144f80cea69297f655de93 +DIST iproute2-5.17.0.tar.xz 870908 BLAKE2B 4310829ebbde7fd21ecc28856deddabfa93f26bf7937b3ef3c0e05e4e0bf925a9b167334efaefe3e275d196e7370a290679739ae8d8397dc6511f4da25dfd459 SHA512 fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6bd776c2716144f574b4fc17963fc231a83ad253cce6a563814556eeb60b211ba9b0b87330186259b34d EBUILD iproute2-5.13.0-r1.ebuild 4864 BLAKE2B e62ccfe102bad1106e0345e5a986090408c8737ec3b96815250c07d54ef96fc14531d21a2389de46f68d64102a97568096038dadf4c899c0f1ad7f5257381d8e SHA512 681689226fda0bdc8947e2c26420cdad6e971eecb9816a562002fa6e2ce673859ee2b648bb83c9be6bfa3f86033314063b214dc36980ffedf9627ff4f5dfe889 EBUILD iproute2-5.14.0.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01 EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e EBUILD iproute2-5.16.0.ebuild 4988 BLAKE2B 6d39aebec3b18e3521a4f7dd430f71133ce51c9d2667f57bd9f48792e4a5dffb3d943d2d3501a545c1c86068e3b79f1e4ebebbd6d69f48d398a039eda643fe6b SHA512 2c69c4795d6a953c7ff177d7cb6f118d366d19a902b34023c26e82d8ebeb12eae906a39d75dfcbc46e04f383aa97591a5a80f72adaa8a9b60cc457e8cdc098ee +EBUILD iproute2-5.17.0.ebuild 4926 BLAKE2B b10bd40a6acb0ca3345a5ca66349e70fb170e53471249021655ca073efb72bf335ad12a9b4ba44c339657e69212083fed886b92f0bc998ffa0f34ffffa68b5e9 SHA512 1a7faee630ec6735e49ddf30bf902f7e781114fbf0ea0f14c61aa7d074a4ef871f9b3f51648f766f27a49d087c2efc314eb054147eb5bc4346c5266851b5853b EBUILD iproute2-9999.ebuild 4926 BLAKE2B b10bd40a6acb0ca3345a5ca66349e70fb170e53471249021655ca073efb72bf335ad12a9b4ba44c339657e69212083fed886b92f0bc998ffa0f34ffffa68b5e9 SHA512 1a7faee630ec6735e49ddf30bf902f7e781114fbf0ea0f14c61aa7d074a4ef871f9b3f51648f766f27a49d087c2efc314eb054147eb5bc4346c5266851b5853b MISC metadata.xml 814 BLAKE2B a74c3bee84fc81acfeee405c22b84ca9a10f2daf4be9d496202cbc5a2595f7222b864f4105f5dd46ec45e7de57b6ffff991f907da6378293267209b9eafe91d5 SHA512 74936295cae7e84f39ea6dd8e6bee613bed9e9716c6a96aa8f497be96b14367a2d8829db3ed108b760afdd196c5dbc9f32b14f29f5a0939e47b15d7a68aeca4a diff --git a/sys-apps/iproute2/iproute2-5.17.0.ebuild b/sys-apps/iproute2/iproute2-5.17.0.ebuild new file mode 100644 index 000000000000..11dfd239d1a7 --- /dev/null +++ b/sys-apps/iproute2/iproute2-5.17.0.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + inherit git-r3 +else + SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="kernel routing and traffic control utilities" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" + +LICENSE="GPL-2" +SLOT="0" +IUSE="atm berkdb bpf caps elf +iptables libbsd minimal selinux" + +# We could make libmnl optional, but it's tiny, so eh +RDEPEND=" + !net-misc/arpd + !minimal? ( net-libs/libmnl:= ) + atm? ( net-dialup/linux-atm ) + berkdb? ( sys-libs/db:= ) + bpf? ( dev-libs/libbpf:= ) + caps? ( sys-libs/libcap ) + elf? ( virtual/libelf:= ) + iptables? ( >=net-firewall/iptables-1.4.20:= ) + libbsd? ( dev-libs/libbsd ) + selinux? ( sys-libs/libselinux ) +" +# We require newer linux-headers for ipset support #549948 and some defines #553876 +DEPEND=" + ${RDEPEND} + >=sys-kernel/linux-headers-3.16 +" +BDEPEND=" + app-arch/xz-utils + >=sys-devel/bison-2.4 + sys-devel/flex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907 + "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722 + #"${FILESDIR}"/${PN}-5.1.0-portability.patch + "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch +) + +doecho() { + echo "${@}" + "${@}" || die +} + +src_prepare() { + default + + # Fix version if necessary + local versionfile="include/version.h" + if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then + einfo "Fixing version string" + sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ + -i ${versionfile} || die + fi + + # echo -n is not POSIX compliant + sed 's@echo -n@printf@' -i configure || die + + sed -i \ + -e '/^CC :\?=/d' \ + -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ + -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ + Makefile || die + + # Build against system headers + rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc + sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die + + if use minimal ; then + sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die + fi +} + +src_configure() { + tc-export AR CC PKG_CONFIG + + # This sure is ugly. Should probably move into toolchain-funcs at some point. + local setns + pushd "${T}" >/dev/null || die + printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c + ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n + echo 'int main(){return 0;}' > test.c + ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile + popd >/dev/null || die + + # run "configure" script first which will create "config.mk"... + # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242) + doecho ./configure --libbpf_force $(usex bpf on off) + + # ...now switch on/off requested features via USE flags + # this is only useful if the test did not set other things, per bug #643722 + cat <<-EOF >> config.mk + TC_CONFIG_ATM := $(usex atm y n) + TC_CONFIG_XT := $(usex iptables y n) + TC_CONFIG_NO_XT := $(usex iptables n y) + # We've locked in recent enough kernel headers, bug #549948 + TC_CONFIG_IPSET := y + HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_CAP := $(usex caps y n) + HAVE_MNL := $(usex minimal n y) + HAVE_ELF := $(usex elf y n) + HAVE_SELINUX := $(usex selinux y n) + IP_CONFIG_SETNS := ${setns} + # Use correct iptables dir, bug #144265, bug #293709 + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + HAVE_LIBBSD := $(usex libbsd y n) + EOF +} + +src_compile() { + emake V=1 NETNS_RUN_DIR=/run/netns +} + +src_install() { + if use minimal ; then + into / + dosbin tc/tc + dobin ip/ip + return 0 + fi + + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}"/$(get_libdir) \ + SBINDIR="${EPREFIX}"/sbin \ + CONFDIR="${EPREFIX}"/etc/iproute2 \ + DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ + MANDIR="${EPREFIX}"/usr/share/man \ + ARPDDIR="${EPREFIX}"/var/lib/arpd \ + install + + dodir /bin + mv "${ED}"/{s,}bin/ip || die # bug #330115 + + dolib.a lib/libnetlink.a + insinto /usr/include + doins include/libnetlink.h + # This local header pulls in a lot of linux headers it + # doesn't directly need. Delete this header that requires + # linux-headers-3.8 until that goes stable. # bug #467716 + sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die + + if use berkdb ; then + keepdir /var/lib/arpd + # bug #47482, arpd doesn't need to be in /sbin + dodir /usr/bin + mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die + elif [[ -d "${ED}"/var/lib/arpd ]]; then + rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die + fi +} diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest index df56c181d7d3..8444d7eebbec 100644 --- a/sys-apps/pkgcore/Manifest +++ b/sys-apps/pkgcore/Manifest @@ -1,6 +1,6 @@ DIST pkgcore-0.12.10.tar.gz 625285 BLAKE2B e6d8aeec37e9f5379cc12ca9ff502bbfd8ab355087be63160b9a03feddb5c792cc0ef01d338926e3217ee01859fca5a84aa710db8e224dde8e2befc59e3fafad SHA512 8b5159a06e8291be1663de077ac089b0cfc0da1334111ee66cb6c3b627bb29ecbc7fa6b4727fef1d4c9ac93889a7de787114d07071157a1fc1ed0b5143ebe12f DIST pkgcore-0.12.9.tar.gz 624918 BLAKE2B 190ccae01862b7e498dabcab5e8716ab0f3ed732eeb0469a0ca39f5e201c75ea19575f49be29a6d36b3acad8d5252528dc5e76444cd21fec25681a9350b93875 SHA512 2e391f9ae2baacaaec025c4b6cd7fd7c7757d7815d8bc62aec0f09e4fdbf7fc99ce832bc2c3ce15013fda860465ca19f27377935dc535a286446e548e08be6cd -EBUILD pkgcore-0.12.10.ebuild 1128 BLAKE2B 8a1e4b3be381366d63c74e02d3f4daa2a4c9613b07b7837579da10763aff9029e41e390c4b8e2f9754b0d6e621feb559328128e681da9ea00f6a49e5638cb698 SHA512 44ceade535f78821029b3a4d26e0b3b1c1510530499daf2989c66b9e5f99d72eeb873c09351bc3e8648d7a6521638a80bb48c1f6e7ee742a8a88ba56591bc819 +EBUILD pkgcore-0.12.10.ebuild 1123 BLAKE2B ee9387c1773b2fc590cef6a7773a3f4d3c7e7842e146fb8536db2c168f10726690dfbcd15fb664131f00461ac353e71c89d19df2f2463363db40d12ed8749163 SHA512 e0c56d9af4891c33ada9db8b279273fcd79d503d0db8856de9ff3e456f48ab233253d06c18a965f245eecb6b5618088c2cab3ac589379c06a70a5806c415ec4c EBUILD pkgcore-0.12.9.ebuild 1119 BLAKE2B a5b776d54396ecd6491bf3db798c1131caa37402331c3968096673d0efabc172469734a04312fc0f8ead1b2a37018d8b03bc69ec05fd9ec792c73dba0db5c9ee SHA512 97aa6863c986cfdbf0a04af429ca774c6e4230c1010aebbc487156d92db4e23e082f5939e05dec83de2eefe83fab4192a7c5293779bcad260e878ba4f038a36d EBUILD pkgcore-9999.ebuild 1128 BLAKE2B 8a1e4b3be381366d63c74e02d3f4daa2a4c9613b07b7837579da10763aff9029e41e390c4b8e2f9754b0d6e621feb559328128e681da9ea00f6a49e5638cb698 SHA512 44ceade535f78821029b3a4d26e0b3b1c1510530499daf2989c66b9e5f99d72eeb873c09351bc3e8648d7a6521638a80bb48c1f6e7ee742a8a88ba56591bc819 MISC metadata.xml 338 BLAKE2B 8e1efa689e0129b002ca035af4d3da753e9ef4d80029e01d2baceaca5a45a4c1c325ed25d58f38094a73564a033611e92a3b60d836967e9c664021d643bd0813 SHA512 019b2e934eb8f3a04148d4426466fc397983487122e10e9a2dc2f42e747bc7675947edf549e5ab5efb284d753de0af994a0a7a4f014ee22183a156afa4a462da diff --git a/sys-apps/pkgcore/pkgcore-0.12.10.ebuild b/sys-apps/pkgcore/pkgcore-0.12.10.ebuild index f6d5f97f6274..baa75c6b7014 100644 --- a/sys-apps/pkgcore/pkgcore-0.12.10.ebuild +++ b/sys-apps/pkgcore/pkgcore-0.12.10.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git" inherit git-r3 else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" fi diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index bc1136c1cf87..2415f17b48bf 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -16,6 +16,6 @@ EBUILD portage-3.0.18.ebuild 8718 BLAKE2B 31ae0f52479b5c4704eaea954e09fd2e105bbb EBUILD portage-3.0.20-r6.ebuild 9837 BLAKE2B a4176c20b1e43ef301bbf595a335406130be6d157180a3cb867a71813280dccdbb5f03ec0068c0f4803b123d56da951898e49f30a60e6e5a3ed8bee56092d3d1 SHA512 e3cbfc10e9891e51c382ef1d854f3eafe3c147a8e1248316a6f78b6dd25715bab84bfa32241bc54624e5db610359d27c9162bc3753531b753fc0b9a7aba97c68 EBUILD portage-3.0.28-r1.ebuild 8727 BLAKE2B e174e7fb7f51f1ec04d4076f6b04e9d7facc33319c3c743c0e87b503d8f00ca459fec5546f322c6b84291e5e0178b0d76b20806908bfd542983f547e900e0a0a SHA512 86c2b9b9dcdcaa6be5247db802ec230327981d4f3c4e31980e19064621a9287dc9ac9c8e81a94dbc1611857fe847c8989a7f3b7a09db3227092a9297d7f440a7 EBUILD portage-3.0.29.ebuild 8548 BLAKE2B 32eba52517af7bde9fbafddb15203a7c9c6b72cd549b6a81f79b35b0ba96cedc7a121f3dd9496a3d4c66377ef591fe63a6eb0b57da3a1b72d0e2656aa4b11da9 SHA512 11f9394cfd8ed261d0b83a724366d9e43b2fb76fd71d1f6e1424ebf07d55a4dde78ea25157266f5eb6bd85d414f07d4499888907697d41248ceabf74ced03282 -EBUILD portage-3.0.30-r1.ebuild 8653 BLAKE2B e54f227d33b9fff047a30fca6c33083aff750b4dc5150a32c9242afd9f5e26821d55ececa169f8bd9a578bf77e84828c8a4cb99f3f9d34449ab485375a2e0d1a SHA512 8bb2dd10d4fb2a918efff386b2c55704d4f3729d44f15cfb0a938b909e96b7d875e806c418bcd332055b99006bd3b77a8e80b09cb126b8e3328f8893c406cff5 -EBUILD portage-9999.ebuild 7837 BLAKE2B e2b62b5356d8ad26a5538b26b7222a99a08f50e7a6ea3e01873a30bffb9b46681d27ccecef801dbc95c5c1c52d579f917309e5e69116dc173a68f61dc7b3fa9f SHA512 ec2ff4c107b3a48ec1c5746a99f52c9175bc26a9b48e0210faf40deff42b9ce462befd4bb2f677a482e1285858d5c857e7c691a55793e8aacc3ff1a641249c2e +EBUILD portage-3.0.30-r1.ebuild 8834 BLAKE2B 8346cef2c47e8d29484674b2df37f4f38b15f9615f5578321adc6aaf98cae4649f475989e3c30cc479364903fc7bb2ca65ab1fe1fb897c828db4430dc12706b5 SHA512 0cf01ec82ca48f225309ff118ea9741e8bb9cc7f127bd753b0d6da5b12297ce71ebf7f2cb022dc0d08f957a111723fa750152bf55e406c57a74819432a036e43 +EBUILD portage-9999.ebuild 8018 BLAKE2B 9df65587b54a652aa2c404bbb6cc97a96740c5467753858d3a498ddf5990db62ca8ae590a67e21d793297bc02ff61c0eef86ccef0f7a7e135866914acad8e780 SHA512 51307bb4ec176494f4fd4c9d24bf876bc0dc69077ae0fd814e69844a6ef640974ca8b4897358a3f3082baaa8d66287e1910890d381d0b8da5fe888c1ceb4627e MISC metadata.xml 1483 BLAKE2B 5f164044c11b8fc7a103c459be58268403dab87fbbfeedd0f5fa4d1a4edf9ec7d4983cc7d5a3e6d298b268859fc1eb91723f0c98313e9b3b5dfb0368aedb1a20 SHA512 284a46b4708fc88734ca87f041fb6a88bc4a7e6a50ce03533a1eef9602694adcb09679b665a3793e4609ea85fd41b84438b27479ffa00ac53cbf9d4bb89a3402 diff --git a/sys-apps/portage/portage-3.0.30-r1.ebuild b/sys-apps/portage/portage-3.0.30-r1.ebuild index 590e0036a88a..142f3b42ff89 100644 --- a/sys-apps/portage/portage-3.0.30-r1.ebuild +++ b/sys-apps/portage/portage-3.0.30-r1.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( pypy3 python3_{8..10} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 -inherit distutils-r1 linux-info tmpfiles prefix +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" @@ -76,6 +76,10 @@ PDEPEND=" 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 } @@ -99,7 +103,7 @@ python_prepare_all() { >> cnf/make.globals || die fi - if use native-extensions; then + if use native-extensions && ! tc-is-cross-compiler; then printf "[build_ext]\nportage_ext_modules=true\n" >> \ setup.cfg || die fi diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index c741638d18e9..03fbe40d7065 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( pypy3 python3_{8..10} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 -inherit distutils-r1 git-r3 linux-info tmpfiles prefix +inherit distutils-r1 git-r3 linux-info toolchain-funcs tmpfiles prefix DESCRIPTION="The package management and distribution system for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" @@ -76,6 +76,10 @@ PDEPEND=" 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 } @@ -93,7 +97,7 @@ python_prepare_all() { >> cnf/make.globals || die fi - if use native-extensions; then + if use native-extensions && ! tc-is-cross-compiler; then printf "[build_ext]\nportage_ext_modules=true\n" >> \ setup.cfg || die fi diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest index 0050d778a256..45e816b08ecb 100644 --- a/sys-apps/sandbox/Manifest +++ b/sys-apps/sandbox/Manifest @@ -13,7 +13,7 @@ EBUILD sandbox-2.25.ebuild 1615 BLAKE2B b42f819adc73df7f3c7b0f2654eeaa41f2384076 EBUILD sandbox-2.26.ebuild 1455 BLAKE2B d1d05a952f34ec697b26176ba6183006d636d546af197277d30a1811b7200a45d1327db669ac411174e74989024f4c87d69ffbd68834e7a76fdf5a8ce8bd0446 SHA512 8fb95b39aad62153208436bb73c84fd6d891333cb251958ac2ee71913cdc59b98002f53dbb471fbbb2e76ae954b34c3cedc8c94b4f5d6e4fb65ffd40e4c8b3d7 EBUILD sandbox-2.27.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca EBUILD sandbox-2.28.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca -EBUILD sandbox-2.29.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca +EBUILD sandbox-2.29.ebuild 1557 BLAKE2B 3ed52c1ef3a9ed537582c1f4b714d11607fc79c01694bf746620a44afaaa17f36e1d7a6cd906302781db0602d6b6e72d48bc94ebf8be6a96013ce2cd61121675 SHA512 ff6c9179e992e828e93396da4ca17bc3fad99e70634c524ec05a9af59fd6c94480d56616f1e25a4095400355179991cd0dbba9d678ab3e1fed2980f901c26ff7 EBUILD sandbox-3.0.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca EBUILD sandbox-3.1.ebuild 1618 BLAKE2B 10cfbee355236fc67f56acec39539a708984aeddff9781ecdf72a00c05c4b38b31079324f41615a8cacd78f94c72da8fee1ca73e7d020b5b853812917a6f42cc SHA512 837fdd8538a28f67b1cde4795c57ef115a4637c94ae3723fca9be6936d354d156bf1b10492fc88f0ac7620cbc7edb952dc10ff92b19b6145b34f0a626f3ce3a2 MISC metadata.xml 377 BLAKE2B fcbc91501a4a61bfa3c3cc01b0746f5f638093933cf8a9ba1e6206071cb0482c9ba18c5c10541d934327cf805ee0e40c010b3f25a221ab63fefa2fd9f39da0d7 SHA512 92aa26a3200dd1508fb86da0e0bc70be66ccbcf66593ee6833102c9961ac17c8a99c5b070a2cd2e79dba8e5daa0316cdb6744baa3fbd9342953fcc00b1277d35 diff --git a/sys-apps/sandbox/sandbox-2.29.ebuild b/sys-apps/sandbox/sandbox-2.29.ebuild index 83e908988817..902f38f6d5d4 100644 --- a/sys-apps/sandbox/sandbox-2.29.ebuild +++ b/sys-apps/sandbox/sandbox-2.29.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" IUSE="+nnp" DEPEND="app-arch/xz-utils diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest index 2b91a9778d83..c458c65ef2b8 100644 --- a/sys-apps/usbguard/Manifest +++ b/sys-apps/usbguard/Manifest @@ -2,6 +2,6 @@ AUX usbguard-0.7.6-usbguard-dbus.openrc 278 BLAKE2B 58f11c693e25436605af6ad41a1f AUX usbguard-0.7.6-usbguard.openrc 309 BLAKE2B d5297058d0ee8ce0f9fc91f2158f4aef5f077e1087800449a0319038d677a2a70274305058cd104ba30529b3c9daf82ffbe16ca5cdf20a3b4817e66d499d08c5 SHA512 512a08f59caf9de22b0776473a1ea9a4322b05c6286c99dac3055e0c6d52c78542448c33e19708338080cfdcdfcfb0f9868e8c523155e978c0161c262081da09 DIST usbguard-1.1.0.tar.gz 1648078 BLAKE2B 99dd7fef6cf93f72b87a00874757c1a2447530aa48405f2d260c3f3295881e3e6521c77195467af84c5b4554510250149eba5181eb44e9a997a120217e32bbea SHA512 f882e8ba38743c044984520d5514035e0e76e185328c2f16226ce8fb14b5dbde0c021327b3dabfdea36e18428be5fb23b559f6837ef7f81dabb5e9b4ed4e1e91 DIST usbguard-1.1.1.tar.gz 1651887 BLAKE2B ef736740592fb9a9589d53eaccd17fd8f0ebb4ca6f39794674aaad2edb3e259048452a63e6966a527a040cea83576d79a37b870d85cc4fff7603a6502dab4973 SHA512 7810471a3778b4bca644565cefa2666f98d53c2747bff7262b9bbb0327e7dba7a1e8c067c96d89e6742ccec5f65410f4e273bf84ee2bb1fbc7ff5738df3af780 -EBUILD usbguard-1.1.0.ebuild 2383 BLAKE2B 93eb01dead9b410fb401504569fdc0c705fdf913382bbdd9e589342ea3015be48517c4b994c1528ed8a99ff2fe7b8e618f30582b0f514d44f5b5635b0b3622e3 SHA512 3d9a3489189148b8526c84b335a822c97c69c9a7022f87930869a7875c48cf450d0b79135ed173dc8047c14d69705ad5b88ff45b69c32f9182e67e7f69201f7e -EBUILD usbguard-1.1.1.ebuild 2383 BLAKE2B 93eb01dead9b410fb401504569fdc0c705fdf913382bbdd9e589342ea3015be48517c4b994c1528ed8a99ff2fe7b8e618f30582b0f514d44f5b5635b0b3622e3 SHA512 3d9a3489189148b8526c84b335a822c97c69c9a7022f87930869a7875c48cf450d0b79135ed173dc8047c14d69705ad5b88ff45b69c32f9182e67e7f69201f7e +EBUILD usbguard-1.1.0-r1.ebuild 2385 BLAKE2B c553a785308a63f839386d426e878400bfd40bdbc7d0d032428f0d7864d83d2ed91ea8717473f4e8f3ad054280b0a77eafd2cb53239851848706cd5d86d58a28 SHA512 3bf634d0ef87f82bee8f7a5d90858947055eff9c63bf3b53dd701b0ba5cc178f837dae3b273438bdca640cc95326086d2d3d50428b68259ff6ddcc80596bd194 +EBUILD usbguard-1.1.1-r1.ebuild 2385 BLAKE2B c553a785308a63f839386d426e878400bfd40bdbc7d0d032428f0d7864d83d2ed91ea8717473f4e8f3ad054280b0a77eafd2cb53239851848706cd5d86d58a28 SHA512 3bf634d0ef87f82bee8f7a5d90858947055eff9c63bf3b53dd701b0ba5cc178f837dae3b273438bdca640cc95326086d2d3d50428b68259ff6ddcc80596bd194 MISC metadata.xml 345 BLAKE2B ee71f0699ba99d30148f602e0af3b921c5c243e23e8587428df56ea8fa841f929103687b38d35fb7eb6812c0ccc2d811df0670db7a0beb915a61a8cf3914a7b2 SHA512 97c84d9a097784f95b0f33bef9855a3d81732eb29371de1c4ec2d9313c5346ad46832bec29bd6135fcf48540cbc683b2b13cf217f0f29df9995c0bd6b1b035b9 diff --git a/sys-apps/usbguard/usbguard-1.1.0.ebuild b/sys-apps/usbguard/usbguard-1.1.0-r1.ebuild index cb6d70408cdb..78027c44d831 100644 --- a/sys-apps/usbguard/usbguard-1.1.0.ebuild +++ b/sys-apps/usbguard/usbguard-1.1.0-r1.ebuild @@ -32,7 +32,7 @@ CDEPEND=" sys-apps/dbus sys-auth/polkit[introspection] ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) systemd? ( sys-apps/systemd ) umockdev? ( dev-util/umockdev ) " diff --git a/sys-apps/usbguard/usbguard-1.1.1.ebuild b/sys-apps/usbguard/usbguard-1.1.1-r1.ebuild index cb6d70408cdb..78027c44d831 100644 --- a/sys-apps/usbguard/usbguard-1.1.1.ebuild +++ b/sys-apps/usbguard/usbguard-1.1.1-r1.ebuild @@ -32,7 +32,7 @@ CDEPEND=" sys-apps/dbus sys-auth/polkit[introspection] ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) systemd? ( sys-apps/systemd ) umockdev? ( dev-util/umockdev ) " |