gentoo resync 04.02.2018

13 files changed, 54 insertions, 95 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 76837d975bb7..ac867a4eafbc 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index ffc5cf20be86..dbdc60d9ecbe 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,4 +1,6 @@
 AUX ack-2.14-gentoo.patch 431 BLAKE2B 61a7313811afc88f3289609998902d03de0b11b0b01c95e5be5a656995909584f46fd844d4e3befdad22ac83f16d66a04b1f8e53abb92a75ab3e185c8013bcd4 SHA512 5eeceda1a764358b4d7f8836cce41d21cdb895f2763325ddfd7ad7456af3d55807113a3702834f097fd513fef20db8de4003344d9ea73a58dac64d4c68e0e99b
 DIST ack-2.18.tar.gz 232279 BLAKE2B dc7c347eee2be367a2b1bd4839719661f1c0de68bd3fcb3512c68cb5c42e09e8208712e7e3c57b418a00c961a933574a0c09c7f107fe43a4f96efeae21fbc8d8 SHA512 4147161baa8d82fb84b29980d5eac7cf3197733192ca827d3fa4e8f55fa9df29d92b2ac21beb69df00186eea03c7ae6fcb85d6e4334a0a21c232ddeb4933bcf5
+DIST ack-2.22.tar.gz 250275 BLAKE2B 52cafe63b6f4aa50feb3a8d68141662fbbec7a73d31b2f06d3d63c7efb9ba681214ac20fbfd299f680d4e3758eaed8b4b9b3cd697f38977f2e0657a90dc0478a SHA512 d0073c424d861f2cfdc2ce8c0dfa149620803b4c30adb6c6f4f8896277ac89bb6d97d3e8e9bdfd1202f95808bd387b2e3a8353a3e7d204cdd61eb9cafde48303
 EBUILD ack-2.18-r1.ebuild 776 BLAKE2B ccd1290eedd9cd29692386364406ebac8202c2584cd35579dfecf4e1c21fb60c201ea6bfa9aefe19ad0fa0b57c1f483dccda6c66a5a72d1f2e57f3570ac6de6c SHA512 25979e6b277a49c9b087b987ccc14192d53f9f55ed7efbd55a491f14c2219f7fdeb0ed805e835ea58c893277ea35cc5f43f0974f65454e6fed352c570b468ffe
+EBUILD ack-2.22.ebuild 778 BLAKE2B 56b352c5f7d0ad66432f7bdd241b90bd9ce262d7501639793e267576e5e3747deb73ef8af5aae0cd522769040fc52ca310efeb8b6d9a603c7092335ee50035c9 SHA512 ff81502cb1783bb173909ac3b729fd252b7c6fba7f8218ad951feaa2a9c97e47aca615394c82d40f338dcc9fc5de4ebb591042572862618ad1e2d2990f8fed1a
 MISC metadata.xml 1725 BLAKE2B 7787caf338ec9ba64acce9d2fcb542279db07d0c19001073e65a3904ac313b62d0f1fcf5df1445a86f4aeacb8563b7f179d077fda31514db4454c50a81599341 SHA512 9ceab2bd4b599aa83b1b780b322b753a5bdfb51b4883aa804907f5d5d8420276c75a04ae717f8520778cb3fc25ba4c4a710a64ddd49193f050992436c0faeb8f
diff --git a/sys-apps/ack/ack-2.22.ebuild b/sys-apps/ack/ack-2.22.ebuild
new file mode 100644
index 000000000000..3e28da27b33c
--- /dev/null
+++ b/sys-apps/ack/ack-2.22.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DIST_AUTHOR=PETDANCE
+inherit perl-module
+
+DESCRIPTION="ack is a tool like grep, optimized for programmers"
+HOMEPAGE="https://beyondgrep.com/ ${HOMEPAGE}"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="test"
+
+RDEPEND=">=dev-perl/File-Next-1.160.0"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/IO-Tty )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.14-gentoo.patch )
+
+src_test() {
+	# Tests fail when run in parallel and if dev-perl/IO-Tty is installed
+	# which enables interactive tests that need to read from stdin. If IO-Tty
+	# is not installed the related tests are skipped.
+	MAKEOPTS+=" -j1" perl-module_src_test
+}
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 46a63ee9f838..e8d711b32c9c 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,5 +1,3 @@
-DIST baobab-3.22.1.tar.xz 947932 BLAKE2B 820c483964ef44d9ce557253128030044f456986e4c71bc0c2e64436290fd2b9e4aeadb1cb717179de68064faf80df5deaeced91d535eb5ae084abeb897b62fd SHA512 6fae974ef79dc9b61269cc07fcdb4f6d8f043cf3eb8239c2408a7ccb1445800c1beda85da8ae9e0da1a39604e4896a6aab0ab04391286df20c20783d208c6c36
 DIST baobab-3.24.0.tar.xz 970636 BLAKE2B bac7397a0b157723f8341b09b7e00fdaef2a50803ff901be6c307aa733b72478f7b3f62850e3e8445b79d1ad17668c617655aa7268402a487ee6e10267d0a7a2 SHA512 7a16cdc7b4e77e8bad23bccc171b4e552b2eb33a43822579cdf4b1d5ac76526955c0efeadf355fcda3a72b1fd6f8dbf2a6088406b5a21b8ecc4d06ff525baa17
-EBUILD baobab-3.22.1.ebuild 826 BLAKE2B f6eb457e87e64cda16727b3a3f1a54e404f4c0e44102205a0456d0112dfe5346bcacf21fb7738a77ccd862673146250c7ae4bce29e296d5150ee04244ddfca56 SHA512 9f7237475393c82e795a34f2e52bc7104b0200d435643ab54eeca2bde42c059282fbb224c4aa655bda6ffa66dd2c910ce9e5e3519a5c11cea0037443b5424690
 EBUILD baobab-3.24.0.ebuild 826 BLAKE2B 2710c2b9102a30500cdf8e27dbc22be0145c293f615be673ff41a634f82f61bc76e9ae17fba1aab1c8a4acb918e2d03471563ffc5fb4468683d312d3a6cd2e23 SHA512 c617bd4aa3327aebd0c9576b6921b38dc309bed6cd7dfa339a8293c261109bbafb5092f9db6da6c1ba575eb1dbceb32be0f2a982c0b4f47a0abf1e67d062f7b9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/baobab/baobab-3.22.1.ebuild b/sys-apps/baobab/baobab-3.22.1.ebuild
deleted file mode 100644
index 25b752e2597a..000000000000
--- a/sys-apps/baobab/baobab-3.22.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Disk usage browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2[dbus]
-	>=x11-libs/gtk+-3.19.1:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	x11-themes/adwaita-icon-theme
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure   \
-		VALAC=$(type -P true)  \
-		VAPIGEN=$(type -P true)
-}
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index b9979205d768..cb0cd1e2f27f 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-disk-utility-3.22.1.tar.xz 1455508 BLAKE2B 49075e3b6e413a6c69e483004aba7fe4212c2494992f7177ae8ea139bab9f4f657e9ce756ba558b073a09c7c8fe24f58e470bb52811a7bc98fb9c6048ed9b98c SHA512 f8ea64eb5adc3d6d55669bfa85c80a23f91ecb86f8632ae4ef035ad5062375e4fd73581f6ad12f6d83b1d6d98508a046b64a5a6544dea59765da2ff4b42b2d37
 DIST gnome-disk-utility-3.24.1.tar.xz 1947976 BLAKE2B a3b9d02417bed415bf6b9b8d86abcfa857abe316133ce7abfa11db835831e916d879b09d1e1129d12621b0234ffa27c1e246837cb614c51c54ce387a9c73bea4 SHA512 ae6bf83e005733ae985987411a9fe25b0059f64484fc0d613ad54af478130782974607bec53713ee36c2a28de653ceba82b0fb091aee57101773c0eeeaaed2d5
-EBUILD gnome-disk-utility-3.22.1.ebuild 1058 BLAKE2B 93b66145017932d9f09b7b660e4a17486d45311911e67cfbc8a9685078e18725f7a080a0333b8adb57b7650155e2cd3fe015f91a7ab20e3086387ed917f819d4 SHA512 5d521e064f7af967328969c485fe93247560bc9d05396e4096faf470b3b9c09fdcce389a7e50e5340de289e264b4b89d7dfcf5c0ba216e67ac3c5b61a4088671
 EBUILD gnome-disk-utility-3.24.1.ebuild 1065 BLAKE2B a94d3c210fe8038a595a61e0eb50b6ab7444c39222d4c2e6643698ccad2a3e3ffc5edb3a64c8dbfc95c5a701e889c8405af46412752d23bd59201703c84d1c80 SHA512 810ae41d78b5ada6e2200a73065fb83004377129441c1460aab85bb3d008ac789b3810af70e52f8b1d161fa2bf8969c7c33917678d84ec405b2adb904d230f4f
 MISC metadata.xml 348 BLAKE2B 78a8cab4d641fbf3a66632f3f22b66f271f39ec44c6afe18b7e2ee3b049f36a5fa1ffc29964cb293125061f4b2be45ac9f09e136f42aef428375bf3630e92643 SHA512 7da9aaf34df822f6f62b606fb00655a4d2a7bf710cb9e265dea98b887365d64536c927caa2810b9b1d92dbeb8c93f9e09b7e529e4304bdc4de5d4f6d61208c24
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.22.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.22.1.ebuild
deleted file mode 100644
index 93b42aaebd36..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.22.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="https://git.gnome.org/browse/gnome-disk-utility"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="fat gnome systemd"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
-
-COMMON_DEPEND="
-	>=app-arch/xz-utils-5.0.5
-	>=app-crypt/libsecret-0.7
-	>=dev-libs/glib-2.31:2[dbus]
-	dev-libs/libpwquality
-	>=media-libs/libcanberra-0.1[gtk3]
-	>=media-libs/libdvdread-4.2.0
-	>=sys-fs/udisks-2.1.1:2
-	>=x11-libs/gtk+-3.16.0:3
-	>=x11-libs/libnotify-0.7:=
-	systemd? ( >=sys-apps/systemd-209:0= )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	fat? ( sys-fs/dosfstools )
-	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.2
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable gnome gsd-plugin) \
-		$(use_enable systemd libsystemd)
-}
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 94b448885f82..5d622b40975d 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,5 +1,5 @@
-DIST moreutils-0.60.tar.gz 93137 BLAKE2B 223fdcb162ce7a17a12b1b26f9b77d210cdf2b44492632dcfa75005d0a9872ff90153b6240ed5b96a0a413b323b60d5b5380e79f2f2059e401837ecc5dd6aba3 SHA512 b09b81606fc307abe26173fbd2e50ab3ee84db53b7242dc57a0747a83489088b1702435cfad5a171af00d56ab154b9d4c3062a3d4ac7c002dc03315c6fca0cab
 DIST moreutils-0.61.tar.gz 93234 BLAKE2B cfa3c24d68ca0f9ef220ef97e0ac50a77e557cc399ef898d15a56d4e205ba180f494ca7a89a566e4dea28eebf08590fbd94b75f7850f941a8a22eba147f8e61d SHA512 6164680c8bfec02f7a84274b1d4342a1d6c296e14843496dcc9f9ac71b3e3b1663dea72e2251a546a646775afa70589483e8d5da71b388b1022476bb3dd91b56
-EBUILD moreutils-0.60-r1.ebuild 1478 BLAKE2B 92147d9ede5c7b0aabf8e33c132432a240a093e0a9eab2df89e51f34da0f6409885239c4663b9acac2536d21c2cfb994bafc80b0370f3265dfd7836f09125648 SHA512 2837b8041fa09763834a3ac0698bd6a16d246e9d58e1bc7957e2a527f85f0cfed145df81838c3e5f5f90521ac2e84acaeaa4b599befadac86e435cbc23d871a9
+DIST moreutils-0.62.tar.gz 93711 BLAKE2B b8d8cf7c83c3a9fc6a3fb1677954520dcc884ba81eebdf7cde2232f8aea7177f4c79dbce84ff20cf20f924af279c6e02683dfd082ad35237cc0109cddfe30e14 SHA512 100d8129572c1b9ef1381150b69cbcd1762700e66c0ffa0ea849989352bc1bad77b67c5dbc00c159ca6c02905585dbfa3c8a5d88e910da9daaf27b5dba9f2367
 EBUILD moreutils-0.61.ebuild 1478 BLAKE2B 92147d9ede5c7b0aabf8e33c132432a240a093e0a9eab2df89e51f34da0f6409885239c4663b9acac2536d21c2cfb994bafc80b0370f3265dfd7836f09125648 SHA512 2837b8041fa09763834a3ac0698bd6a16d246e9d58e1bc7957e2a527f85f0cfed145df81838c3e5f5f90521ac2e84acaeaa4b599befadac86e435cbc23d871a9
+EBUILD moreutils-0.62.ebuild 1504 BLAKE2B 87b156ba026a3d9213bd993ea3426094d66008c90f4c8a1609e6d43e5e65ee34f7c72ae91483a023edfe88f8dc139e2b28013bc2b34ff1c73611640e07cd99f4 SHA512 9653beffb5939ccc07242d8dbb57f004b92975d207bb3538a13d089d954cb0a6f5465f7a90f45e7fc03cb848e996cc9d5e694ca8e50e8aefb783ab6ac47290ab
 MISC metadata.xml 313 BLAKE2B 66183e9cd23dd84df66abc1f3e229607f3a234f6a07a29cb2246c130cf214fe5ab1275c6f96b5804e27ebc8b867236c49261369756cfaf9dc563dae60f387be5 SHA512 75fcc8c041bbe324b5c1bcd0b006b7cfc17b5b2ae4bf0ef711b9ef4d3233917d4a189320ef06f3165e23f33ac7e6e58d1545cb4c2082eb22a052d09817cecc6f
diff --git a/sys-apps/moreutils/moreutils-0.60-r1.ebuild b/sys-apps/moreutils/moreutils-0.62.ebuild
index b16d74ba1408..2e245cd08c2e 100644
--- a/sys-apps/moreutils/moreutils-0.60-r1.ebuild
+++ b/sys-apps/moreutils/moreutils-0.62.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux"
 IUSE="+doc +perl"
 
 RDEPEND="
@@ -45,7 +45,7 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
-	emake CFLAGS="${CFLAGS}" DOCBOOK2XMAN=docbook2man.pl PREFIX="${EPREFIX}/usr"
+	emake CFLAGS="${CFLAGS}" DOCBOOKXSL=/usr/share/sgml/docbook/xsl-stylesheets PREFIX="${EPREFIX}/usr"
 }
 
 src_install() {
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f35b8b22e26c..d73f54fcdd1d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -14,8 +14,8 @@ EBUILD portage-2.3.14.ebuild 8512 BLAKE2B e32c3ee1a5828cdbe53aad326c4dc6fbdcd57b
 EBUILD portage-2.3.16.ebuild 8360 BLAKE2B e86eb44b2dd331f52d308a63d3db0f94dd2873ba1fba84d9f3a2d0420a18ee656765238c4da0025ebc329a1b42025ab2f665b9374f757e3b7a40b67af2391564 SHA512 993dca2cc7a1b1d102507f11945922cc403771055dc273c10e92b62c55b9f47e9b32136a8d958f66de32476b2c60ce4d211e69cbb1fa7de7003ca0c658944025
 EBUILD portage-2.3.19-r1.ebuild 8410 BLAKE2B 1a3753ecea5555ac11a60b3ded94a75cdffb931a828927fd5d01cc0d544bccbaa35a5ac559001d02c4a8df7cdd61939bb60785cc7c0e518a30470b3a611c1829 SHA512 c91fd81e456c454614c23609776aa10de0a3e1f1114ef6bc03b15db6715109aab31e357e7ce7bb2b5f4873c1e64585ed060d52533874b745c430e1050e929bab
 EBUILD portage-2.3.20.ebuild 8417 BLAKE2B 9810d0113d505f17d79427d42b5d065b07495f1ec024bd853d7390ebb6226fc355aec038a7ade04fece97d21e68ad61fa063a238cc379173f5dd02cf4af42b38 SHA512 96e5a26737bfc3e10805fffd07ab7509d1888e96534b0df113fc00e18040671bfca8c0b7d12336d73e972f64862093af2f3b8cabcad2571234599450406be263
-EBUILD portage-2.3.24.ebuild 8803 BLAKE2B 5076b248daa81e66a9759758529e765bb5529d0d9feb9fc10eaa9f87ac803245e5f56c0a129d72e841445ff013f140276ea8b0db708dc1e080b27ff203a068d2 SHA512 fab0f077cb2504b8b841c8f23a133d72d4e4a8b09b209e6585001790eed67959470311b83c2324dd559208ad490f2c2c15aeb49de79433580ed7d2f48662eb75
+EBUILD portage-2.3.24.ebuild 9060 BLAKE2B 99d54431fbb867be7692140f1b86bb322033f6c27cc37c66ee0e6f752cf976737357fd79b4277b1a2c63ccbad33f82434f47976060aeb18be8cbdf1c68d6fbb9 SHA512 a8ba4d3958fae0c6a13470e7f812fcdc177b6dabc3f7c2f37b0dd47d6ab581e27954b92ea339ca4a8a74ffe475162560492d2fb3055a4b1f1a569f949f6bbe29
 EBUILD portage-2.3.6.ebuild 8638 BLAKE2B 0c50b63b0b233cc9d6d13e914659b0057c7f330e05906d4cd7ee19bef5ad2874749a403e48252e321a42e8109213cb7d6861aa7fffe9616447b2587f5d4a4810 SHA512 a80367ffbeaf00d887e0af09e239a8deb7d37818db50a6f3df59aa2c0ed7b8b6fe233f0520aebfdfad583694f1f6b7252d35d00d9bea2943251fd7b216bee602
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
-EBUILD portage-9999.ebuild 8344 BLAKE2B b63ca7daae0c45896e1430df35edc8268da88f45bbad6c458b90311cba79aa2e54a2c41a8ec3bd08dbd98f7293f3421da528711599f455d665a222878895cb92 SHA512 092b47b4f4b482355bf3efbe84c8bad7c44894e0ac9feece332743693211a6de2d95fd0c4dbc60fedad641261641cd402b8b093919fd82389d94cf0be4a078f1
-MISC metadata.xml 1324 BLAKE2B 3e403e150d3487708ac804f718aee00557810f2ea1c6f3dfa4c37666f3c5ca710b61c00f9fc01404fb88dd96dd675fc81c90021305c3e903dc0ab4f540f206df SHA512 052fc2dd654dbfd81f62646de4c6b6dc38d09637afc2e80e7c98eb20b65acf2e985466700bc8068145f08746cc7ccdb0555c5a549969fb8177b6bd83310669a9
+EBUILD portage-9999.ebuild 8601 BLAKE2B be3f7cbc87ed0f252791536a38b43c7f7a6d834e03f1e3eff2ce91e68724088d369aeb2bc7f2b7ebfd4d89c54048a730c7f968959346f860ea3f8d477c9739b9 SHA512 01b5e4d906383525d8ac25599d480b5d60bb68a7ab87d673d802be49a97ffaf9a5fd970ff8accb59eeabb57e75285ac56cfcc60328d5ef75895fb8a7def9540a
+MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 8d4801007bc4..5d99599f6780 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -11,6 +11,7 @@
   </maintainer>
   <use>
     <flag name="epydoc">Build html API documentation with epydoc.</flag>
+    <flag name="gentoo-dev">Enable features required for Gentoo ebuild development.</flag>
     <flag name="ipc">Use inter-process communication between portage and
         running ebuilds.
     </flag>
diff --git a/sys-apps/portage/portage-2.3.24.ebuild b/sys-apps/portage/portage-2.3.24.ebuild
index 8e5bc50d4eb2..8de39be77589 100644
--- a/sys-apps/portage/portage-2.3.24.ebuild
+++ b/sys-apps/portage/portage-2.3.24.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
-IUSE="build doc epydoc +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
@@ -94,6 +94,13 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i pym/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+	fi
+
 	if use native-extensions; then
 		printf "[build_ext]\nportage-ext-modules=true\n" >> \
 			setup.cfg || die
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 43c081296c77..52fca1f4c12d 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="build doc epydoc +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
@@ -93,6 +93,13 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i pym/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+	fi
+
 	if use native-extensions; then
 		printf "[build_ext]\nportage-ext-modules=true\n" >> \
 			setup.cfg || die