Bug 113930, case statement for non-linux. Also (finally) a fix for the installmanpaths (personal bug)

(Portage version: 2.0.53_rc6)

8 files changed, 80 insertions, 89 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index b1ffb57114e9..7e88b78a8bbd 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.172 2005/12/05 11:08:33 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.173 2005/12/05 16:01:26 mcummings Exp $
+
+  05 Dec 2005; <mcumming@gentoo.org> perl-5.8.6-r5.ebuild,
+  perl-5.8.6-r6.ebuild, perl-5.8.6-r7.ebuild, perl-5.8.7-r1.ebuild,
+  perl-5.8.7-r2.ebuild, perl-5.8.7.ebuild:
+  Bug 113930, case statement for non-linux. Also (finally) a fix for the
+  installmanpaths (personal bug)
 
   05 Dec 2005; <mcummings@gentoo.org> perl-5.8.6-r7.ebuild,
   perl-5.8.7-r2.ebuild:
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 38685df5c4ec..f0e451b740b9 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 eaabf9a40b3fa81ee88c659e966e30d6 ChangeLog 45093
 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703
 MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629
@@ -30,16 +27,9 @@ MD5 f7324a62f22aabde3387b7e8a8b2106e files/perl-reorder-INC.patch 1141
 MD5 f98759a75347e0b54190850b8295c2cb files/perl-tempfiles.patch 2023
 MD5 ce442db939c59218a16be167f793b817 files/perl-uclibc.patch 573
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 e377e6ec5a77f51ef1da80ae0600c08c perl-5.8.6-r5.ebuild 17675
-MD5 71c976f23db314752dab5af982dca654 perl-5.8.6-r6.ebuild 18053
-MD5 9b84ac3f176086b81a03589924036c25 perl-5.8.6-r7.ebuild 18121
-MD5 3abc228b743a2fc63223edc90daeff7c perl-5.8.7-r1.ebuild 19533
-MD5 7072d45ca55254ad0fb4fb2e3a8e2862 perl-5.8.7-r2.ebuild 19601
-MD5 3a9ecfb3b8b741ea324c7c05e88c5a65 perl-5.8.7.ebuild 19301
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDlB/ttG5z4I8BtQoRAh+MAJ9aVOVFBoWuV+mmV2C313p9dS/i4gCgi3F/
-AqP3PAGm5LU6P65+PeY6PmA=
-=S9ub
------END PGP SIGNATURE-----
+MD5 98fc0a92a054ffddc10156bc815b0812 perl-5.8.6-r5.ebuild 17658
+MD5 5dfc6784f0c2ec65d1bf9d1561af5e66 perl-5.8.6-r6.ebuild 18037
+MD5 c9b5b6b9ee903433e3439648c4e4d6cf perl-5.8.6-r7.ebuild 18104
+MD5 1ce81241890ce24ba1afe00d9c3295db perl-5.8.7-r1.ebuild 19456
+MD5 79c7fc0d83504a5f857b7cc9c3156efb perl-5.8.7-r2.ebuild 19525
+MD5 cc8b12843b18050671687a6f5518fbab perl-5.8.7.ebuild 19224
diff --git a/dev-lang/perl/perl-5.8.6-r5.ebuild b/dev-lang/perl/perl-5.8.6-r5.ebuild
index b8cd555a8e0d..661077dd5674 100644
--- a/dev-lang/perl/perl-5.8.6-r5.ebuild
+++ b/dev-lang/perl/perl-5.8.6-r5.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/dev-lang/perl/perl-5.8.6-r5.ebuild,v 1.15 2005/11/14 21:39:25 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r5.ebuild,v 1.16 2005/12/05 16:01:26 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -146,14 +146,14 @@ src_configure() {
 	export LC_ALL="C"
 	local myconf=""
 
-	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
-		osname="freebsd"
-	elif [[ ${KERNEL} == "NetBSD" ]]; then
-		osname="netbsd"
-	else
-		# Default setting
-		osname="linux"
-	fi
+	case ${CHOST} in
+		*-freebsd*) osname="freebsd" ;;
+		*-netbsd*) osname="netbsd" ;;
+		*-openbsd*) osname="openbsd" ;;
+		*-darwin*) osname="darwin" ;;
+
+		*) osname="linux" ;;
+	esac
 
 	if use ithreads
 	then
@@ -239,8 +239,8 @@ src_configure() {
 		-Dscriptdir=/usr/bin \
 		-Dman1dir=/usr/share/man/man1 \
 		-Dman3dir=/usr/share/man/man3 \
-		-Dinstallman1dir=${D}/usr/share/man/man1 \
-		-Dinstallman3dir=${D}/usr/share/man/man3 \
+		-Dinstallman1dir=/usr/share/man/man1 \
+		-Dinstallman3dir=/usr/share/man/man3 \
 		-Dman1ext='1' \
 		-Dman3ext='3pm' \
 		-Dinc_version_list="$inclist" \
diff --git a/dev-lang/perl/perl-5.8.6-r6.ebuild b/dev-lang/perl/perl-5.8.6-r6.ebuild
index 9705b42c4967..fdd8aa771ba9 100644
--- a/dev-lang/perl/perl-5.8.6-r6.ebuild
+++ b/dev-lang/perl/perl-5.8.6-r6.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/dev-lang/perl/perl-5.8.6-r6.ebuild,v 1.9 2005/11/14 21:39:25 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r6.ebuild,v 1.10 2005/12/05 16:01:26 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -150,15 +150,15 @@ src_configure() {
 
 	export LC_ALL="C"
 	local myconf=""
+	
+	case ${CHOST} in
+		*-freebsd*) osname="freebsd" ;;
+		*-netbsd*) osname="netbsd" ;;
+		*-openbsd*) osname="openbsd" ;;
+		*-darwin*) osname="darwin" ;;
 
-	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
-		osname="freebsd"
-	elif [[ ${KERNEL} == "NetBSD" ]]; then
-		osname="netbsd"
-	else
-		# Default setting
-		osname="linux"
-	fi
+		*) osname="linux" ;;
+	esac
 
 	if use ithreads
 	then
@@ -250,8 +250,8 @@ src_configure() {
 		-Dscriptdir=/usr/bin \
 		-Dman1dir=/usr/share/man/man1 \
 		-Dman3dir=/usr/share/man/man3 \
-		-Dinstallman1dir=${D}/usr/share/man/man1 \
-		-Dinstallman3dir=${D}/usr/share/man/man3 \
+		-Dinstallman1dir=/usr/share/man/man1 \
+		-Dinstallman3dir=/usr/share/man/man3 \
 		-Dman1ext='1' \
 		-Dman3ext='3pm' \
 		-Dinc_version_list="$inclist" \
diff --git a/dev-lang/perl/perl-5.8.6-r7.ebuild b/dev-lang/perl/perl-5.8.6-r7.ebuild
index 2975545b6bb3..f2765ef7665f 100644
--- a/dev-lang/perl/perl-5.8.6-r7.ebuild
+++ b/dev-lang/perl/perl-5.8.6-r7.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/dev-lang/perl/perl-5.8.6-r7.ebuild,v 1.5 2005/12/05 11:08:34 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r7.ebuild,v 1.6 2005/12/05 16:01:26 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -154,14 +154,14 @@ src_configure() {
 	export LC_ALL="C"
 	local myconf=""
 
-	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
-		osname="freebsd"
-	elif [[ ${KERNEL} == "NetBSD" ]]; then
-		osname="netbsd"
-	else
-		# Default setting
-		osname="linux"
-	fi
+	case ${CHOST} in
+		*-freebsd*) osname="freebsd" ;;
+		*-netbsd*) osname="netbsd" ;;
+		*-openbsd*) osname="openbsd" ;;
+		*-darwin*) osname="darwin" ;;
+
+		*) osname="linux" ;;
+	esac
 
 	if use ithreads
 	then
@@ -253,8 +253,8 @@ src_configure() {
 		-Dscriptdir=/usr/bin \
 		-Dman1dir=/usr/share/man/man1 \
 		-Dman3dir=/usr/share/man/man3 \
-		-Dinstallman1dir=${D}/usr/share/man/man1 \
-		-Dinstallman3dir=${D}/usr/share/man/man3 \
+		-Dinstallman1dir=/usr/share/man/man1 \
+		-Dinstallman3dir=/usr/share/man/man3 \
 		-Dman1ext='1' \
 		-Dman3ext='3pm' \
 		-Dinc_version_list="$inclist" \
diff --git a/dev-lang/perl/perl-5.8.7-r1.ebuild b/dev-lang/perl/perl-5.8.7-r1.ebuild
index 6642767a0d10..6d512d3218a9 100644
--- a/dev-lang/perl/perl-5.8.7-r1.ebuild
+++ b/dev-lang/perl/perl-5.8.7-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/dev-lang/perl/perl-5.8.7-r1.ebuild,v 1.6 2005/11/14 21:39:25 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7-r1.ebuild,v 1.7 2005/12/05 16:01:26 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -145,16 +145,14 @@ src_configure() {
 	export LC_ALL="C"
 	local myconf=""
 
-	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
-		osname="freebsd"
-	elif [[ ${KERNEL} == "NetBSD" ]]; then
-		osname="netbsd"
-	elif [[ ${USERLAND} == "Darwin" ]]; then
-		osname="darwin"
-	else
-		# Default setting
-		osname="linux"
-	fi
+	case ${CHOST} in
+		*-freebsd*) osname="freebsd" ;;
+		*-netbsd*) osname="netbsd" ;;
+		*-openbsd*) osname="openbsd" ;;
+		*-darwin*) osname="darwin" ;;
+
+		*) osname="linux" ;;
+	esac
 
 	if use ithreads
 	then
@@ -245,8 +243,8 @@ src_configure() {
 		-Dscriptdir=/usr/bin \
 		-Dman1dir=/usr/share/man/man1 \
 		-Dman3dir=/usr/share/man/man3 \
-		-Dinstallman1dir=${D}/usr/share/man/man1 \
-		-Dinstallman3dir=${D}/usr/share/man/man3 \
+		-Dinstallman1dir=/usr/share/man/man1 \
+		-Dinstallman3dir=/usr/share/man/man3 \
 		-Dman1ext='1' \
 		-Dman3ext='3pm' \
 		-Dinc_version_list="$inclist" \
diff --git a/dev-lang/perl/perl-5.8.7-r2.ebuild b/dev-lang/perl/perl-5.8.7-r2.ebuild
index abcdc6bde8eb..bea6f435587d 100644
--- a/dev-lang/perl/perl-5.8.7-r2.ebuild
+++ b/dev-lang/perl/perl-5.8.7-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/dev-lang/perl/perl-5.8.7-r2.ebuild,v 1.5 2005/12/05 11:08:34 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7-r2.ebuild,v 1.6 2005/12/05 16:01:26 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -130,6 +130,7 @@ src_unpack() {
 
 	# Bug 114113
 	cd ${S}; epatch ${FILESDIR}/perl-exp_intwrap.patch
+
 }
 
 src_configure() {
@@ -148,16 +149,14 @@ src_configure() {
 	export LC_ALL="C"
 	local myconf=""
 
-	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
-		osname="freebsd"
-	elif [[ ${KERNEL} == "NetBSD" ]]; then
-		osname="netbsd"
-	elif [[ ${USERLAND} == "Darwin" ]]; then
-		osname="darwin"
-	else
-		# Default setting
-		osname="linux"
-	fi
+	case ${CHOST} in
+		*-freebsd*) osname="freebsd" ;;
+		*-netbsd*) osname="netbsd" ;;
+		*-openbsd*) osname="openbsd" ;;
+		*-darwin*) osname="darwin" ;;
+
+		*) osname="linux" ;;
+	esac
 
 	if use ithreads
 	then
@@ -248,8 +247,8 @@ src_configure() {
 		-Dscriptdir=/usr/bin \
 		-Dman1dir=/usr/share/man/man1 \
 		-Dman3dir=/usr/share/man/man3 \
-		-Dinstallman1dir=${D}/usr/share/man/man1 \
-		-Dinstallman3dir=${D}/usr/share/man/man3 \
+		-Dinstallman1dir=/usr/share/man/man1 \
+		-Dinstallman3dir=/usr/share/man/man3 \
 		-Dman1ext='1' \
 		-Dman3ext='3pm' \
 		-Dinc_version_list="$inclist" \
diff --git a/dev-lang/perl/perl-5.8.7.ebuild b/dev-lang/perl/perl-5.8.7.ebuild
index 0be7a4c33f3a..3303bd3fcc3d 100644
--- a/dev-lang/perl/perl-5.8.7.ebuild
+++ b/dev-lang/perl/perl-5.8.7.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/dev-lang/perl/perl-5.8.7.ebuild,v 1.13 2005/11/14 21:39:25 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7.ebuild,v 1.14 2005/12/05 16:01:26 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -140,16 +140,14 @@ src_configure() {
 	export LC_ALL="C"
 	local myconf=""
 
-	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
-		osname="freebsd"
-	elif [[ ${KERNEL} == "NetBSD" ]]; then
-		osname="netbsd"
-	elif [[ ${USERLAND} == "Darwin" ]]; then
-		osname="darwin"
-	else
-		# Default setting
-		osname="linux"
-	fi
+	case ${CHOST} in
+		*-freebsd*) osname="freebsd" ;;
+		*-netbsd*) osname="netbsd" ;;
+		*-openbsd*) osname="openbsd" ;;
+		*-darwin*) osname="darwin" ;;
+
+		*) osname="linux" ;;
+	esac
 
 	if use ithreads
 	then
@@ -240,8 +238,8 @@ src_configure() {
 		-Dscriptdir=/usr/bin \
 		-Dman1dir=/usr/share/man/man1 \
 		-Dman3dir=/usr/share/man/man3 \
-		-Dinstallman1dir=${D}/usr/share/man/man1 \
-		-Dinstallman3dir=${D}/usr/share/man/man3 \
+		-Dinstallman1dir=/usr/share/man/man1 \
+		-Dinstallman3dir=/usr/share/man/man3 \
 		-Dman1ext='1' \
 		-Dman3ext='3pm' \
 		-Dinc_version_list="$inclist" \