Revision bump to add patch to get PORTDIR from portageq (Bug 478318).

Package-Manager: portage-2.2.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xDCB4A7FF

4 files changed, 158 insertions, 6 deletions

diff --git a/app-portage/ufed/ChangeLog b/app-portage/ufed/ChangeLog
index 4a93afc2e494..fe6bdd656995 100644
--- a/app-portage/ufed/ChangeLog
+++ b/app-portage/ufed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/ufed
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.99 2013/04/12 14:29:14 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.100 2013/09/11 17:51:19 fuzzyray Exp $
+
+*ufed-0.90_rc2-r1 (11 Sep 2013)
+
+  11 Sep 2013; Paul Varner <fuzzyray@gentoo.org> +ufed-0.90_rc2-r1.ebuild,
+  +files/ufed-0.90_rc2-get_portdir_from_portageq.patch:
+  Revision bump to add patch to get PORTDIR from portageq (Bug 478318).
 
 *ufed-0.90_rc2 (12 Apr 2013)
 
diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index fd886ad69ef6..9f9ec4047456 100644
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -3,19 +3,25 @@ Hash: SHA256
 
 AUX ufed-0.40.2-manpage-URL.patch 855 SHA256 574579a35eebc10501236cf8e13e964b73fef790bee780728b5ba6a68172f17f SHA512 46fe69bd22c225dded01098ea2ea5c856e5b200e04abfe90c0d4a1b602d1b82fc196c92af23088a081c8e24857ec831d15822a525f8f706e0432874770aa743b WHIRLPOOL 0b4385d3e2294ff0899e0925fa5909d7f54fed13ddacb0f6b5f354213235ee227c6054343b08cc7b4a22f2f60a468ec82e042ddae356d75d5949efc0b4b267e0
 AUX ufed-0.40.2-prefix.patch 7490 SHA256 cf9a6ebf6592d889f14e91fe24d133c253c8500a1f3202852eeef93c9888d32d SHA512 4592f6f97f958e2127c6864e42b4e3506974f437173cb85cb3596ea9d8a5c5cf68c3ad2fb6e3fe33fe16ebde3e4eceefe5030bafe3a0656ad4aae235caddb28b WHIRLPOOL 216c79da664b9669128eb444688027a662981a4f4eebd30fbd35191ae11ba9aa6e3c13afd97cdb3d59240af66add6622cc0ffda9b7d5df3c9c7fd69e9b066b13
+AUX ufed-0.90_rc2-get_portdir_from_portageq.patch 2961 SHA256 746c6790701ce0608e5e7b389eb76bbdf1e63a0d16ac7f3eb716c980a3815d11 SHA512 abbe9bda0008904c4351573da3d2f3ceb5472fd00e8f3129486d1af46ab258b6efa74223d0147ea8e041f10eea837c4b72c5cc85b6aa92f22c8323b97285bd20 WHIRLPOOL 59fa53f6b83ce6e3ac85afcede6770f761b44d7117e9b431de996019b18f3e06603e46d2da62425ca6d79bab205bc25c23fadb57d78a6184c0f19800bf837f15
 DIST ufed-0.40.2.tar.bz2 33982 SHA256 d88048e1940ba774d8517e80109cf3f0d93e2113841be9aaad14995da284a3cf SHA512 81b37d92cac9a247c97b8b741410962a5cb55a507d0092863f15d084b00b1482092ab6153277c0d0f4728cdfdbbda41d54431f4d3cf939270ee451f2938a1b3e WHIRLPOOL 36c88488f06b06eea99b1004ee67e69ea579965ae74a37a49e7a9a01fc43dd599a7cc056b270f6f937ab975ce6fd7691acf7ab2a2cde0d4fe0db11dbc01c0fbf
 DIST ufed-0.90_rc1.tar.bz2 51336 SHA256 291c48ed7baa183fac394affaff97d43c448244bfdb0365ac14f650f13e67ee4 SHA512 f1fc03f425d2b7e51d8dba386ae8dfb8b947fb5506270c27f6148d36a8075468b268ef7b0d65f54a44dc9961dc1527050eae310f27472725151468301890d47e WHIRLPOOL ab5a16546171dbea26da098a789baa72c99dcc9bca0e890ae5952478fdcce2e28103e6e20fbad8659ae2addacd3d697d34dbe14df09401ffb46b1f5979163d01
 DIST ufed-0.90_rc2.tar.bz2 51762 SHA256 f85226fffd20e971a9e5c1599e67aa3ae46f10d267eb57f65bba2bfc7321ece8 SHA512 c5ed326596d4c6706ba2a2ad6ecfe0e2700121878fbdb71f4fe7793895649498c3a3bd4e226e5478af6e13d9519ee3e84b3a85dfd47fb986432c6ebb898eae1d WHIRLPOOL 8d639fe966f675b171e420e8ad9b8b30d4beeb62dde6fe4eb0cce7c9a4186035bdedce32d55e9a7a432aafb641e2fb437d72abaa9c64a32337ece961254ae323
 EBUILD ufed-0.40.2-r1.ebuild 1202 SHA256 816e92b22e717803445f744d080c0b1e79b9ed28ba5145f4256c002d919b53fd SHA512 f8cb732fd3f37857e747d7327df920572327c3a1fb1bc3475804d14cb88e0fadb244be3be85b8146b7c4a6d9e82beebcb2e64b4b8e0e0168b1d5a93a03ec81c4 WHIRLPOOL 655a1a00c2c8b9f937c0fdd98298c1d5272498a4e883cc91637148c8c27dd24640ed6a114b4ec76de81c3ce14d3b79a412ef29b9a83234c445b8d9bcb9a9088c
 EBUILD ufed-0.90_rc1.ebuild 1069 SHA256 cdad4e2eaad07f5576bf8344cf0b1cfabbf6a6432b3b5c766ef098f2585ce142 SHA512 fb3a7035817483dd258b9746817b61ae23f41901208612f24b47a4495385196e20c6238f43a87e6a19a6448c59952a482df12b7fe814fc3227aaaf370986d058 WHIRLPOOL 64bfa7b4df12c078b3a38ab3721e6b2e3ab2345edf7353d466f83d1fca79ab01256e461910d655b0abe9b5a37ea638ee2176cf00151367ae0119b9c909abbdd7
+EBUILD ufed-0.90_rc2-r1.ebuild 1184 SHA256 69173577677ef29e2c2f80943678ec4b1a8dd97dc37b61f3cd5bcfd03a400ad6 SHA512 c7b95ea46367f436c7d7b846808f248e8cb8b1b4e771d7e25cedffaa2580ad73542d103f0be36618506a2b89ac7456fefdbff485c00f88d1946599559ef4a87d WHIRLPOOL c71a5e129bce156a39d112893544571fb511aa3253259ae80ee11487faea4f02921566dc3d6cc8cda8d2a769cff51803a0415cae0a17ee374988586c7f90e92e
 EBUILD ufed-0.90_rc2.ebuild 1128 SHA256 d30e457510b14b1ef9f3e119ecb4b282037854a4804d6965496b5ab16014cf0f SHA512 a8215a07dcaf7ef1cdec9bdc1e3f09b5a792ac4e5264fe2a1ab1c5d25fc0fe9abb79ff9f2c8c925de7d60e7e390dccdc33a7ffa54e7fb0024c960aab50d7ec36 WHIRLPOOL 6caf8440b3b387f3884992551a8d144f64d7aa517f2d670c9116e0ce1529f503ed0f19cd93f5f90f9032068c96478b42434a2f8e8aa7afda4670caa6193dc4a3
 EBUILD ufed-9999.ebuild 816 SHA256 2cb78887afa8dea3aaa9e1df53d159f921d4a62f1e350d5bc7e362e96090f4f6 SHA512 0f7b6ea1f6f7568bbbcc5b3182f1dd59470837737fd45a81c6463a195d829fb4bb90a08be2c1baf631513c413ab5d08ce37b25806fdd0937a024851d093e4c88 WHIRLPOOL 58023fd0343734f269bf75742d240f8d1a1e1d21be7430f9dd58fa87b091efa49efaf6058c82eb04e27925f4a6238f1c4a52e7903464afbcabbe3892417fa4c7
-MISC ChangeLog 14709 SHA256 281332f8e66cefa85c3403ddeb49bf59abc751b3c4c5e99b03dbb2f9eaca5893 SHA512 2bcb1355f0648f822b2e618eefdfe18aa239f274504e5232b7ba6b809f4a5f9c6152dae33d8330b382e47b623294ceb561d9fb2e493b748b6f6fedb1607172ac WHIRLPOOL 7f1d48e3ef2fc6d6fcaffae4c0a6461d84e26bc530b100a441e237bf0570e1649f29f907d4e33e0d11222c1e804b3e00d2a4203dd696d626cc80a3a5d04ec062
+MISC ChangeLog 14947 SHA256 8da7ad20e0786c1acf543d58bd1dd518507505f1c7d101fa904be4bc4d7aba4b SHA512 8ce80bad2bbb5e7ec0be87c9301aea139393af1981ab909375dfab6626f05026e86865f9c484201b7cab5789bc5bb0603d74aabab0529cc7cd9e5c218c3d3288 WHIRLPOOL 023dfc3df508fc0cb2dd2a418950b789043dfe6d9216eeeb8d47400a995a2a5539466081de9a6aac92312476d2599ef760772a3f9d42ad4fe4f34120f12e403a
 MISC metadata.xml 442 SHA256 aa456321947e3a5090c51b0958d7bc097a309f4a6cbcd38db3a1857b6f355eb7 SHA512 22470024a897ff6229fdad4079664330dfcf64ada56183a7a6087c5ad3793e9b233c7e66c8ee877208e7fe3bc9d350467eb033990df231802aee0570ebb2a70f WHIRLPOOL 215066ff83c325014b718973ea8622e8cba62a037c4b0d6ba25c79bca4b5e566bf1cf7a3302d6a9922b570ed5d982486c766d2877f992028af929701698411ab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iF4EAREIAAYFAlFoGn8ACgkQEDZJwU0mmhsXIgEAryBzWomB0qy/t5wnFYaxqero
-45/BSOBiW8LOaAqTeKsA+wbMbtqM+f0nLIPybTbkt8iVHSImcWVvL0jFYSrLPr7p
-=KTIw
+iQEcBAEBCAAGBQJSMK2pAAoJEOvbN8TctKf/ovcH/3EtGziSVHv2oACIwwzVCaIe
+cZIkMVOmz2efOUxK2+zHREP8TapW4V5a77x+Xijb3UQjrXbbUnH1Jr9qUpZKlox0
++Y+BxECCNtERbUqFkPmvi+cAWk20ac10F7LZx/NuJjbsPVJaU2FiCDmzPgCgesjf
+fztYil8oB/RBH72kBvvsUmgambfSpAbP2RYTknwzlgqvmyY0rr5p5/m5UNWJK7tp
+u6rAanCLMeJbNZSA5cbeOFKATwe67JbNHBJfiUBZ34TFdYHR3nQ13IfR5zQ6RcEE
+WtYfiIJnk/AzZxmzwECGZjMi2PQNXROCJKgRhDS/d/Bomb5wKVh1UHb/8BZFXsg=
+=Ww90
 -----END PGP SIGNATURE-----
diff --git a/app-portage/ufed/files/ufed-0.90_rc2-get_portdir_from_portageq.patch b/app-portage/ufed/files/ufed-0.90_rc2-get_portdir_from_portageq.patch
new file mode 100644
index 000000000000..b66398a824f6
--- /dev/null
+++ b/app-portage/ufed/files/ufed-0.90_rc2-get_portdir_from_portageq.patch
@@ -0,0 +1,99 @@
+--- a/Portage.pm	2013-09-11 08:34:10.792161194 +0200
++++ b/Portage.pm	2013-09-11 09:00:45.737142232 +0200
+@@ -46,11 +46,13 @@
+ our $used_make_conf = "";
+ 
+ # --- private members ---
+-my %_environment  = ();
+-my $_EPREFIX        = "";
+-my @_profiles     = ();
+-my %_use_eh_safe  = (); ## USE_EXPAND_HIDDEN safe hash. See _read_make_defaults()
+-my %_use_order    = ();
++my %_environment     = ();
++my $_EPREFIX         = "";
++my $_PORTDIR         = "";
++my $_PORTDIR_OVERLAY = "";
++my @_profiles        = ();
++my %_use_eh_safe     = (); ## USE_EXPAND_HIDDEN safe hash. See _read_make_defaults()
++my %_use_order       = ();
+ 
+ # $_use_temp - hashref that represents the current state of
+ # all known flags. This is for data gathering, the public
+@@ -87,7 +89,7 @@
+ # --- private methods ---
+ sub _add_flag;
+ sub _add_temp;
+-sub _determine_eprefix;
++sub _determine_eprefix_portdir;
+ sub _determine_make_conf;
+ sub _determine_profiles;
+ sub _final_cleaning;
+@@ -112,7 +114,7 @@
+ # --- Package initialization ---
+ INIT {
+ 	$_environment{$_} = {} for qw{USE USE_EXPAND USE_EXPAND_HIDDEN};
+-	_determine_eprefix;
++	_determine_eprefix_portdir;
+ 	_determine_make_conf;
+ 	_determine_profiles;
+ 	_read_make_globals;
+@@ -223,14 +225,29 @@
+ }
+ 
+ 
+-# Determine the value for EPREFIX and save it
+-# in $_EPREFIX. This is done using 'portageq'.
++# Determine the values for EPREFIX, PORTDIR
++# and PORTDIR_OVERLAY. These are saved in
++# $_EPREFIX, $_PORTDIR and $_PORTDIR_OVERLAY.
++# This is done using 'portageq'.
+ # Other output from portageq is printed on
+ # STDERR.
+ # No parameters accepted.
+-sub _determine_eprefix {
++sub _determine_eprefix_portdir {
+ 	my $tmp = "/tmp/ufed_$$.tmp";
+-	$_EPREFIX = qx{portageq envvar EPREFIX 2>$tmp};
++	my @res = map {
++		my $x = $_;
++		chomp $x;
++		$x =~ s/'//g;
++		$x
++	} qx{portageq envvar -v EPREFIX PORTDIR PORTDIR_OVERLAY 2>$tmp};
++	
++	while (my $res = shift @res) {
++		if ($res =~ /^(.*)=(.*)$/) {
++			"EPREFIX"         eq $1 and $_EPREFIX         = $2;
++			"PORTDIR"         eq $1 and $_PORTDIR         = $2;
++			"PORTDIR_OVERLAY" eq $1 and $_PORTDIR_OVERLAY = $2;
++		}
++	}
+ 	die "Couldn't determine EPREFIX from Portage" if $? != 0;
+ 
+ 	if ( -s $tmp ) {
+@@ -241,7 +258,6 @@
+ 	}
+ 	-e $tmp and unlink $tmp;
+ 
+-	chomp($_EPREFIX);
+ 	return;
+ }
+ 
+@@ -631,13 +647,11 @@
+ 	}
+ 	
+ 	# Add PORTDIR and overlays to @_profiles
+-	defined ($_environment{PORTDIR})
+-		and push @_profiles, "$_environment{PORTDIR}/profiles"
++	length ($_PORTDIR)
++		and push @_profiles, "${_PORTDIR}/profiles"
+ 		or  die("Unable to determine PORTDIR!\nSomething is seriously broken here!\n");
+-	defined ($_environment{PORTDIR_OVERLAY})
+-		and push @_profiles,
+-				map { my $x=$_; $x =~ s/^\s*(\S+)\s*$/$1\/profiles/mg ; $x }
+-				split('\n', $_environment{PORTDIR_OVERLAY});
++	length ($_PORTDIR_OVERLAY)
++		and push @_profiles, split(' ', $_PORTDIR_OVERLAY);
+ 	-e "${_EPREFIX}/etc/portage/profile"
+ 		and push @_profiles, "${_EPREFIX}/etc/portage/profile";
+ 	return;
diff --git a/app-portage/ufed/ufed-0.90_rc2-r1.ebuild b/app-portage/ufed/ufed-0.90_rc2-r1.ebuild
new file mode 100644
index 000000000000..dde0e40d7f91
--- /dev/null
+++ b/app-portage/ufed/ufed-0.90_rc2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.90_rc2-r1.ebuild,v 1.1 2013/09/11 17:51:19 fuzzyray Exp $
+
+EAPI=5
+
+inherit base eutils multilib autotools
+
+DESCRIPTION="Gentoo Linux USE flags editor"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+COMMON_DEPEND="sys-libs/ncurses"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+# Populate the patches array for patches applied for -rX releases
+# It is an array of patch file names of the form:
+# "${FILESDIR}"/${P}-make.globals-path.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-get_portdir_from_portageq.patch
+)
+
+src_prepare() {
+	base_src_prepare
+	# Change the version number to reflect the ebuild version
+	sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
+}