Fix bug #111902

Package-Manager: portage-2.0.53_rc7

diff --git a/app-portage/ufed/ChangeLog b/app-portage/ufed/ChangeLog
index 2244163d9fb550301f19dccabdabc8aba0f50bd3..202d59345f9e6e6ba38edcda58c41521755797af 100644 (file)
--- a/app-portage/ufed/ChangeLog
+++ b/app-portage/ufed/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/ufed
 # Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.29 2005/11/04 09:48:04 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.30 2005/11/09 13:39:40 truedfx Exp $
+
+*ufed-0.40_rc-r1 (09 Nov 2005)
+
+  09 Nov 2005; Harald van Dijk <truedfx@gentoo.org>
+  +files/ufed-usedefaults.patch, -ufed-0.40_rc.ebuild,
+  +ufed-0.40_rc-r1.ebuild:
+  Fix handling of use.defaults (bug #111902)
 
 *ufed-0.40_rc (04 Nov 2005)
 

diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index dfb01948f41b915413dbff24d0db787ada4288bf..97b639a5d97e8d420d5acdebdab811df602c2246 100644 (file)
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f030f8f64ded02a10cdbae51bf8fe4e0 ChangeLog 4338
+MD5 8e87c7104e363ca6bf3d90e7d785205f ChangeLog 4550
 MD5 4c94b074dd20cd29d231b0bf50bea06c files/digest-ufed-0.36 61
 MD5 773221c03c705b595a0aa42d003532ab files/digest-ufed-0.39 61
-MD5 2e234ab448009a536f3d6825360eb9e8 files/digest-ufed-0.40_rc 64
+MD5 2e234ab448009a536f3d6825360eb9e8 files/digest-ufed-0.40_rc-r1 64
+MD5 50d8b74fa71b0979ef40431c076b87d7 files/ufed-usedefaults.patch 514
 MD5 5ccf37e59ee3f6c65bd263050cf2d85e metadata.xml 265
 MD5 e0b0654bdb84c335b99618eb130b606f ufed-0.36.ebuild 661
 MD5 b5afc70abeaaee4f62f36a700488fe7e ufed-0.39.ebuild 674
-MD5 86f03cb8396463e7a1aaf508fb86d819 ufed-0.40_rc.ebuild 826
+MD5 777f48a830f80b1e93420ae097c06a18 ufed-0.40_rc-r1.ebuild 917
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2 (FreeBSD)
 
-iD8DBQFDay5twnQyISwouHwRAleYAJ9riKZsKW4u4UNe7gNwSVR4TgUTOgCgr3EQ
-T+f5Qgg1KkjLc4IY9hbECJQ=
-=Zp/5
+iD8DBQFDcfwrwnQyISwouHwRAjbHAJ42xxG6ANqI9rUFqFG9xH4XDpN4BACgqr6u
+6HOZbwuUmYGzKYWg6aZr4E0=
+=BQeR
 -----END PGP SIGNATURE-----

diff --git a/app-portage/ufed/files/digest-ufed-0.40_rc b/app-portage/ufed/files/digest-ufed-0.40_rc-r1
similarity index 100%
rename from app-portage/ufed/files/digest-ufed-0.40_rc
rename to app-portage/ufed/files/digest-ufed-0.40_rc-r1

diff --git a/app-portage/ufed/files/ufed-usedefaults.patch b/app-portage/ufed/files/ufed-usedefaults.patch
new file mode 100644 (file)
index 0000000..059aa45
--- /dev/null
+++ b/app-portage/ufed/files/ufed-usedefaults.patch
@@ -0,0 +1,11 @@
+--- ufed-0.40/Portage.pm
++++ ufed-0.40/Portage.pm
+@@ -156,7 +156,7 @@
+                       if(open my $provide, '<', "/var/db/pkg/$cat/$pkg/PROVIDE") {
+                               if(open my $use, '<', "/var/db/pkg/$cat/$pkg/USE") {
+                                       # could be shortened, but make sure not to strip off part of the name
+-                                      s/-\d+(?:\.\d+)*\w?(?:_(?:alpha|beta|pre|rc|p)\d*)?(?:-r\d+)?$//;
++                                      $pkg =~ s/-\d+(?:\.\d+)*\w?(?:_(?:alpha|beta|pre|rc|p)\d*)?(?:-r\d+)?$//;
+                                       $packages{"$cat/$pkg"} = 1;
+                                       local $/;
+                                       my @provide = split ' ', <$provide>;

diff --git a/app-portage/ufed/ufed-0.40_rc.ebuild b/app-portage/ufed/ufed-0.40_rc-r1.ebuild
similarity index 84%
rename from app-portage/ufed/ufed-0.40_rc.ebuild
rename to app-portage/ufed/ufed-0.40_rc-r1.ebuild
index 594b9d95f0446ea000e3aa7693e5b62858efa580..923ac6773b2a31a60a83925311a923c911e6f76e 100644 (file)
--- a/app-portage/ufed/ufed-0.40_rc.ebuild
+++ b/app-portage/ufed/ufed-0.40_rc-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40_rc.ebuild,v 1.1 2005/11/04 09:48:04 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40_rc-r1.ebuild,v 1.1 2005/11/09 13:39:40 truedfx Exp $
 
 inherit flag-o-matic
 
@@ -18,6 +18,12 @@ RDEPEND="${DEPEND}
        dev-lang/perl"
 S=${WORKDIR}/${P%_*}
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${PN}-usedefaults.patch
+}
+
 src_compile() {
        ./configure || die "configure failed"
        emake || die "make failed"