fix RDEPEND/pkg_setup

6 files changed, 32 insertions, 21 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index d2d3728426b7..1704db170fbd 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.87 2004/09/27 11:33:14 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.88 2004/09/27 17:53:42 vapier Exp $
+
+  27 Sep 2004; Mike Frysinger <vapier@gentoo.org> perl-5.8.2-r1.ebuild,
+  perl-5.8.3.ebuild, perl-5.8.4-r1.ebuild, perl-5.8.4.ebuild,
+  perl-5.8.5.ebuild:
+  Add libperl to RDEPEND (since pkg_setup will die otherwise) and make sure
+  pkg_setup() respects $ROOT.
 
   27 Sep 2004; Michael Cummings <mcummings@gentoo.org> perl-5.8.2-r1.ebuild,
   perl-5.8.3.ebuild, perl-5.8.4-r1.ebuild, perl-5.8.4.ebuild,
diff --git a/dev-lang/perl/perl-5.8.2-r1.ebuild b/dev-lang/perl/perl-5.8.2-r1.ebuild
index 2554d4165e8f..484504cebfea 100644
--- a/dev-lang/perl/perl-5.8.2-r1.ebuild
+++ b/dev-lang/perl/perl-5.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r1.ebuild,v 1.20 2004/09/27 11:33:14 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r1.ebuild,v 1.21 2004/09/27 17:53:42 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -27,7 +27,8 @@ DEPEND="!uclibc? ( sys-apps/groff )
 	!<dev-perl/ExtUtils-MakeMaker-6.17
 	!<dev-perl/File-Spec-0.84-r1
 	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND="berkdb? ( sys-libs/db )
+RDEPEND=">=sys-devel/libperl-${PV}
+	berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
 
 pkg_setup() {
@@ -54,10 +55,10 @@ pkg_setup() {
 		ewarn ""
 	fi
 
-	if [ ! -f /usr/lib/${LIBPERL} ]
+	if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ]
 	then
 		# Make sure we have libperl installed ...
-		eerror "Cannot find /usr/lib/${LIBPERL}!  Make sure that you"
+		eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}!  Make sure that you"
 		eerror "have sys-libs/libperl installed properly ..."
 		die "Cannot find /usr/lib/${LIBPERL}!"
 	fi
diff --git a/dev-lang/perl/perl-5.8.3.ebuild b/dev-lang/perl/perl-5.8.3.ebuild
index 929b1a5a47c4..70c5e16a5603 100644
--- a/dev-lang/perl/perl-5.8.3.ebuild
+++ b/dev-lang/perl/perl-5.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.3.ebuild,v 1.13 2004/09/27 11:33:14 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.3.ebuild,v 1.14 2004/09/27 17:53:42 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -27,7 +27,8 @@ DEPEND="sys-apps/groff
 	!<dev-perl/ExtUtils-MakeMaker-6.17
 	!<dev-perl/File-Spec-0.84-r1
 	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND="berkdb? ( sys-libs/db )
+RDEPEND=">=sys-devel/libperl-${PV}
+	berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
 
 pkg_setup() {
@@ -54,10 +55,10 @@ pkg_setup() {
 		ewarn ""
 	fi
 
-	if [ ! -f /usr/lib/${LIBPERL} ]
+	if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ]
 	then
 		# Make sure we have libperl installed ...
-		eerror "Cannot find /usr/lib/${LIBPERL}!  Make sure that you"
+		eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}!  Make sure that you"
 		eerror "have sys-libs/libperl installed properly ..."
 		die "Cannot find /usr/lib/${LIBPERL}!"
 	fi
diff --git a/dev-lang/perl/perl-5.8.4-r1.ebuild b/dev-lang/perl/perl-5.8.4-r1.ebuild
index 31b78bdba420..782bb9c07b27 100644
--- a/dev-lang/perl/perl-5.8.4-r1.ebuild
+++ b/dev-lang/perl/perl-5.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r1.ebuild,v 1.13 2004/09/27 11:33:14 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r1.ebuild,v 1.14 2004/09/27 17:53:42 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -27,7 +27,8 @@ DEPEND="!uclibc? ( sys-apps/groff )
 	!<dev-perl/ExtUtils-MakeMaker-6.17
 	!<dev-perl/File-Spec-0.84-r1
 	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND="berkdb? ( sys-libs/db )
+RDEPEND=">=sys-devel/libperl-${PV}
+	berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
 
 pkg_setup() {
@@ -54,10 +55,10 @@ pkg_setup() {
 		ewarn ""
 	fi
 
-	if [ ! -f /usr/lib/${LIBPERL} ]
+	if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ]
 	then
 		# Make sure we have libperl installed ...
-		eerror "Cannot find /usr/lib/${LIBPERL}!  Make sure that you"
+		eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}!  Make sure that you"
 		eerror "have sys-libs/libperl installed properly ..."
 		die "Cannot find /usr/lib/${LIBPERL}!"
 	fi
diff --git a/dev-lang/perl/perl-5.8.4.ebuild b/dev-lang/perl/perl-5.8.4.ebuild
index 6801ede252b8..1ea2eff200ea 100644
--- a/dev-lang/perl/perl-5.8.4.ebuild
+++ b/dev-lang/perl/perl-5.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4.ebuild,v 1.24 2004/09/27 11:33:14 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4.ebuild,v 1.25 2004/09/27 17:53:42 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -27,7 +27,8 @@ DEPEND="!uclibc? ( sys-apps/groff )
 	!<dev-perl/ExtUtils-MakeMaker-6.17
 	!<dev-perl/File-Spec-0.84-r1
 	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND="berkdb? ( sys-libs/db )
+RDEPEND=">=sys-devel/libperl-${PV}
+	berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
 
 pkg_setup() {
@@ -54,10 +55,10 @@ pkg_setup() {
 		ewarn ""
 	fi
 
-	if [ ! -f /usr/lib/${LIBPERL} ]
+	if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ]
 	then
 		# Make sure we have libperl installed ...
-		eerror "Cannot find /usr/lib/${LIBPERL}!  Make sure that you"
+		eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}!  Make sure that you"
 		eerror "have sys-libs/libperl installed properly ..."
 		die "Cannot find /usr/lib/${LIBPERL}!"
 	fi
diff --git a/dev-lang/perl/perl-5.8.5.ebuild b/dev-lang/perl/perl-5.8.5.ebuild
index 2d3ba854375f..24220e1521c9 100644
--- a/dev-lang/perl/perl-5.8.5.ebuild
+++ b/dev-lang/perl/perl-5.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5.ebuild,v 1.7 2004/09/27 11:33:14 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5.ebuild,v 1.8 2004/09/27 17:53:42 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -27,7 +27,8 @@ DEPEND="!uclibc? ( sys-apps/groff )
 	!<dev-perl/ExtUtils-MakeMaker-6.17
 	!<dev-perl/File-Spec-0.84-r1
 	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND="berkdb? ( sys-libs/db )
+RDEPEND=">=sys-devel/libperl-${PV}
+	berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.3 )"
 
 pkg_setup() {
@@ -54,10 +55,10 @@ pkg_setup() {
 		ewarn ""
 	fi
 
-	if [ ! -f /usr/lib/${LIBPERL} ]
+	if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ]
 	then
 		# Make sure we have libperl installed ...
-		eerror "Cannot find /usr/lib/${LIBPERL}!  Make sure that you"
+		eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}!  Make sure that you"
 		eerror "have sys-libs/libperl installed properly ..."
 		die "Cannot find /usr/lib/${LIBPERL}!"
 	fi