| 1 |
commit: 46adfd1c48e6f38ec90dfeb1f4b7326ebebc2ae9 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 3 12:08:18 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 3 14:43:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46adfd1c |
| 7 |
|
| 8 |
sys-apps/portage: add gentoo-dev USE |
| 9 |
|
| 10 |
The gentoo-dev USE flag will be use to enable stricter default |
| 11 |
settings that are intended for use by ebuild developers. |
| 12 |
This flag is not recommended for non-developers, since it |
| 13 |
might enable settings that are not ready for general use. |
| 14 |
|
| 15 |
This flag makes emerge default to --dynamic-deps=n. |
| 16 |
|
| 17 |
https://bugs.gentoo.org/645550 |
| 18 |
https://bugs.gentoo.org/646458 |
| 19 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 20 |
|
| 21 |
sys-apps/portage/metadata.xml | 1 + |
| 22 |
sys-apps/portage/portage-2.3.24.ebuild | 9 ++++++++- |
| 23 |
sys-apps/portage/portage-9999.ebuild | 9 ++++++++- |
| 24 |
3 files changed, 17 insertions(+), 2 deletions(-) |
| 25 |
|
| 26 |
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml |
| 27 |
index 8d4801007bc..5d99599f678 100644 |
| 28 |
--- a/sys-apps/portage/metadata.xml |
| 29 |
+++ b/sys-apps/portage/metadata.xml |
| 30 |
@@ -11,6 +11,7 @@ |
| 31 |
</maintainer> |
| 32 |
<use> |
| 33 |
<flag name="epydoc">Build html API documentation with epydoc.</flag> |
| 34 |
+ <flag name="gentoo-dev">Enable features required for Gentoo ebuild development.</flag> |
| 35 |
<flag name="ipc">Use inter-process communication between portage and |
| 36 |
running ebuilds. |
| 37 |
</flag> |
| 38 |
|
| 39 |
diff --git a/sys-apps/portage/portage-2.3.24.ebuild b/sys-apps/portage/portage-2.3.24.ebuild |
| 40 |
index 8e5bc50d4eb..8de39be7758 100644 |
| 41 |
--- a/sys-apps/portage/portage-2.3.24.ebuild |
| 42 |
+++ b/sys-apps/portage/portage-2.3.24.ebuild |
| 43 |
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
| 44 |
LICENSE="GPL-2" |
| 45 |
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
| 46 |
SLOT="0" |
| 47 |
-IUSE="build doc epydoc +ipc +native-extensions +rsync-verify selinux xattr" |
| 48 |
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" |
| 49 |
|
| 50 |
DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 51 |
>=app-arch/tar-1.27 |
| 52 |
@@ -94,6 +94,13 @@ pkg_setup() { |
| 53 |
python_prepare_all() { |
| 54 |
distutils-r1_python_prepare_all |
| 55 |
|
| 56 |
+ if use gentoo-dev; then |
| 57 |
+ einfo "Disabling --dynamic-deps by default for gentoo-dev..." |
| 58 |
+ sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ |
| 59 |
+ -i pym/_emerge/create_depgraph_params.py || \ |
| 60 |
+ die "failed to patch create_depgraph_params.py" |
| 61 |
+ fi |
| 62 |
+ |
| 63 |
if use native-extensions; then |
| 64 |
printf "[build_ext]\nportage-ext-modules=true\n" >> \ |
| 65 |
setup.cfg || die |
| 66 |
|
| 67 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild |
| 68 |
index 43c081296c7..52fca1f4c12 100644 |
| 69 |
--- a/sys-apps/portage/portage-9999.ebuild |
| 70 |
+++ b/sys-apps/portage/portage-9999.ebuild |
| 71 |
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
| 72 |
LICENSE="GPL-2" |
| 73 |
KEYWORDS="" |
| 74 |
SLOT="0" |
| 75 |
-IUSE="build doc epydoc +ipc +native-extensions +rsync-verify selinux xattr" |
| 76 |
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" |
| 77 |
|
| 78 |
DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 79 |
>=app-arch/tar-1.27 |
| 80 |
@@ -93,6 +93,13 @@ pkg_setup() { |
| 81 |
python_prepare_all() { |
| 82 |
distutils-r1_python_prepare_all |
| 83 |
|
| 84 |
+ if use gentoo-dev; then |
| 85 |
+ einfo "Disabling --dynamic-deps by default for gentoo-dev..." |
| 86 |
+ sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ |
| 87 |
+ -i pym/_emerge/create_depgraph_params.py || \ |
| 88 |
+ die "failed to patch create_depgraph_params.py" |
| 89 |
+ fi |
| 90 |
+ |
| 91 |
if use native-extensions; then |
| 92 |
printf "[build_ext]\nportage-ext-modules=true\n" >> \ |
| 93 |
setup.cfg || die |
Archives