bug #89903, no warning about /etc/make.profile if there's no problem

(Portage version: 1.586-cvs)

5 files changed, 29 insertions, 6 deletions

diff --git a/app-portage/ufed/ChangeLog b/app-portage/ufed/ChangeLog
index 1812cb2d6dff..324bf8e560d3 100644
--- a/app-portage/ufed/ChangeLog
+++ b/app-portage/ufed/ChangeLog
@@ -1,6 +1,14 @@
 # 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.25 2005/04/20 23:14:36 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.26 2005/04/21 22:54:37 truedfx Exp $
+
+*ufed-0.37-r2 (21 Apr 2005)
+
+  21 Apr 2005; Harald van Dijk <truedfx@gentoo.org>
+  +files/ufed-0.37-profilesymlink.patch, -ufed-0.37-r1.ebuild,
+  +ufed-0.37-r2.ebuild:
+  don't complain that /etc/make.profile isn't a symlink for no reason when it
+  is (bug #89903)
 
 *ufed-0.37-r1 (20 Apr 2005)
 
diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index 0f7778868378..1ad5620622ce 100644
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -1,7 +1,8 @@
-MD5 145b766bb17a2ca93087406778d58b86 ChangeLog 3458
+MD5 26d761e6039592ef9430a11fa7977923 ChangeLog 3723
 MD5 5b239a48dca80f4d77638418f77c1534 metadata.xml 175
-MD5 5034f2ba9f829ad884537987ae38872d ufed-0.37-r1.ebuild 774
 MD5 e0b0654bdb84c335b99618eb130b606f ufed-0.36.ebuild 661
-MD5 6137dcf4b761f66c0d4d187a74b93bf8 files/digest-ufed-0.37-r1 61
-MD5 8057c0b574856c637b63cb0db9a26560 files/ufed-0.37-nooverlay.patch 433
+MD5 2463c89351a981f897bb071c904626d1 ufed-0.37-r2.ebuild 820
 MD5 4c94b074dd20cd29d231b0bf50bea06c files/digest-ufed-0.36 61
+MD5 8057c0b574856c637b63cb0db9a26560 files/ufed-0.37-nooverlay.patch 433
+MD5 6137dcf4b761f66c0d4d187a74b93bf8 files/digest-ufed-0.37-r2 61
+MD5 82113ff824f59261f1bdd2206b8e4846 files/ufed-0.37-profilesymlink.patch 363
diff --git a/app-portage/ufed/files/digest-ufed-0.37-r1 b/app-portage/ufed/files/digest-ufed-0.37-r2
index 7d89539c600c..7d89539c600c 100644
--- a/app-portage/ufed/files/digest-ufed-0.37-r1
+++ b/app-portage/ufed/files/digest-ufed-0.37-r2
diff --git a/app-portage/ufed/files/ufed-0.37-profilesymlink.patch b/app-portage/ufed/files/ufed-0.37-profilesymlink.patch
new file mode 100644
index 000000000000..6d9f4fb46930
--- /dev/null
+++ b/app-portage/ufed/files/ufed-0.37-profilesymlink.patch
@@ -0,0 +1,13 @@
+--- ufed-0.37.orig/ufed.pl
++++ ufed-0.37/ufed.pl
+@@ -237,8 +237,8 @@
+ }
+ 
+ sub read_profiles() {
+-	$_ = readlink '/etc/make.profile';
+-	die "/etc/make.profile is not a symlink\n" if $!;
++	$_ = readlink '/etc/make.profile' or
++	die "/etc/make.profile is not a symlink\n";
+ 	@profiles = norm_path '/etc', $_;
+ 	PARENT: {
+ 		for(noncomments "$profiles[0]/parent") {
diff --git a/app-portage/ufed/ufed-0.37-r1.ebuild b/app-portage/ufed/ufed-0.37-r2.ebuild
index c358ea88d990..22a8bf96d3e8 100644
--- a/app-portage/ufed/ufed-0.37-r1.ebuild
+++ b/app-portage/ufed/ufed-0.37-r2.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.37-r1.ebuild,v 1.1 2005/04/20 23:14:36 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.37-r2.ebuild,v 1.1 2005/04/21 22:54:37 truedfx Exp $
 
 inherit eutils
 
@@ -23,6 +23,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-nooverlay.patch
+	epatch ${FILESDIR}/${P}-profilesymlink.patch
 }
 
 src_install() {