sys-apps/portage: add gentoo-dev USE

The gentoo-dev USE flag will be use to enable stricter default
settings that are intended for use by ebuild developers.
This flag is not recommended for non-developers, since it
might enable settings that are not ready for general use.

This flag makes emerge default to --dynamic-deps=n.

https://bugs.gentoo.org/645550
https://bugs.gentoo.org/646458
Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 8d4801007bc432fa4228a73a58832584c5f84e83..5d99599f67803f365839e3413768ae51d4631ea9 100644 (file)
--- 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 8e5bc50d4eb21adad0c4faa1a60767a2ac970a55..8de39be775894b6d5ef5945f4fefea4ecdee1c85 100644 (file)
--- 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 43c081296c77f5a50136bfb2ddcb42c46842a8af..52fca1f4c12d1b00e23b39d7e6bffc8e654e09eb 100644 (file)
--- 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