[gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/, man/, bin/

[Zac Medico]

commit:     11273a03c21fac1f2af89d89d6f2c1b9ba480043
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 08:58:36 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 08:58:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=11273a03

Support RESTRICT=splitdebug

---
 bin/ebuild-helpers/prepstrip |    3 ++-
 bin/repoman                  |    2 +-
 man/ebuild.5                 |    5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip
index eda2212..66aa734 100755
--- a/bin/ebuild-helpers/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
@@ -16,7 +16,7 @@ exp_tf() {
 	done
 }
 exp_tf FEATURES compressdebug installsources nostrip splitdebug xattr
-exp_tf RESTRICT binchecks installsources strip
+exp_tf RESTRICT binchecks installsources splitdebug strip
 
 if ! ___eapi_has_prefix_variables; then
 	EPREFIX= ED=${D}
@@ -120,6 +120,7 @@ save_elf_sources() {
 # Usage: save_elf_debug <elf> [splitdebug file]
 save_elf_debug() {
 	${FEATURES_splitdebug} || return 0
+	${RESTRICT_splitdebug} && return 0
 
 	# NOTE: Debug files must be installed in
 	# ${EPREFIX}/usr/lib/debug/${EPREFIX} (note that ${EPREFIX} occurs

diff --git a/bin/repoman b/bin/repoman
index a2be380..c55fb04 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -446,7 +446,7 @@ for x in missingvars:
 
 valid_restrict = frozenset(["binchecks", "bindist",
 	"fetch", "installsources", "mirror",
-	"primaryuri", "strip", "test", "userpriv"])
+	"primaryuri", "splitdebug", "strip", "test", "userpriv"])
 
 live_eclasses = frozenset([
 	"bzr",

diff --git a/man/ebuild.5 b/man/ebuild.5
index 7e858e0..749a3f3 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -676,6 +676,11 @@ files in \fBSRC_URI\fR will not be downloaded from the \fBGENTOO_MIRRORS\fR.
 .I primaryuri
 fetch from URIs in \fBSRC_URI\fR before \fBGENTOO_MIRRORS\fR.
 .TP
+.I splitdebug
+Disables splitdebug for specific packages. This is for packages with
+binaries that trigger problems with splitdebug, such as file\-collisions
+between symlinks in /usr/lib/debug/.build-id (triggered by bundled libraries).
+.TP
 .I strip
 final binaries/libraries will not be stripped of debug symbols.
 .TP