summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cummings <mcummings@gentoo.org>2006-04-01 15:58:29 +0000
committerMichael Cummings <mcummings@gentoo.org>2006-04-01 15:58:29 +0000
commit8720d20c3304a73ca28c44709ecb32c9798cd14b (patch)
tree2cfb3c5d89f500045d0af0b33aa3bfa26a3ae251
parentRestricted test feature (diff)
downloadgentoo-2-8720d20c3304a73ca28c44709ecb32c9798cd14b.tar.gz
gentoo-2-8720d20c3304a73ca28c44709ecb32c9798cd14b.tar.bz2
gentoo-2-8720d20c3304a73ca28c44709ecb32c9798cd14b.zip
Bug 128364, note that perldoc rules
-rw-r--r--eclass/perl-app.eclass14
-rw-r--r--eclass/perl-module.eclass19
2 files changed, 22 insertions, 11 deletions
diff --git a/eclass/perl-app.eclass b/eclass/perl-app.eclass
index d7fc9d178a15..c8ced4b76f16 100644
--- a/eclass/perl-app.eclass
+++ b/eclass/perl-app.eclass
@@ -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/eclass/perl-app.eclass,v 1.1 2005/11/27 22:22:22 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-app.eclass,v 1.2 2006/04/01 15:58:29 mcummings Exp $
#
# Author: Michael Cummings <mcummings@gentoo.org>
@@ -23,7 +23,12 @@ perl-app_src_prep() {
SRC_PREP="yes"
- if [ -f ${S}/Build.PL ] && [ "${USE_BUILDER}" == "yes" ]; then
+ if [ -f ${S}/Makefile.PL ]; then
+ einfo "Using ExtUtils::MakeMaker"
+ #perl Makefile.PL ${myconf} \
+ perl Makefile.PL ${myconf} INSTALLMAN3DIR='none'\
+ PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}
+ elif [ -f ${S}/Build.PL ] && [ "${USE_BUILDER}" == "yes" ]; then
einfo "Using Module::Build"
if [ -z ${BUILDER_VER} ]; then
eerror
@@ -37,9 +42,8 @@ perl-app_src_prep() {
perl ${S}/Build.PL installdirs=vendor destdir=${D}
fi
else
- einfo "Using ExtUtils::MakeMaker"
- perl Makefile.PL ${myconf} \
- prefiX=/usr INSTALLDIRS=vendor DESTDIR=${D}
+ einfo "No Make or Build file detect..."
+ return
fi
}
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index cab036d12b16..f85a3584a962 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -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/eclass/perl-module.eclass,v 1.84 2006/03/10 19:23:04 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.85 2006/04/01 15:58:29 mcummings Exp $
#
# Author: Seemant Kulleen <seemant@gentoo.org>
# Maintained by the Perl herd <perl@gentoo.org>
@@ -95,7 +95,12 @@ perl-module_src_prep() {
SRC_PREP="yes"
- if [ -f ${S}/Build.PL ] && [ "${USE_BUILDER}" == "yes" ]; then
+ if [ -f ${S}/Makefile.PL ]; then
+ einfo "Using ExtUtils::MakeMaker"
+ #perl Makefile.PL ${myconf} \
+ perl Makefile.PL ${myconf} INSTALLMAN3DIR='none'\
+ PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}
+ elif [ -f ${S}/Build.PL ] && [ "${USE_BUILDER}" == "yes" ]; then
einfo "Using Module::Build"
if [ -z ${BUILDER_VER} ]; then
eerror
@@ -109,10 +114,8 @@ perl-module_src_prep() {
perl ${S}/Build.PL installdirs=vendor destdir=${D} libdoc=
fi
else
- einfo "Using ExtUtils::MakeMaker"
- #perl Makefile.PL ${myconf} \
- perl Makefile.PL ${myconf} INSTALLMAN3DIR='none'\
- PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}
+ einfo "No Make or Build file detect..."
+ return
fi
}
@@ -179,6 +182,8 @@ perl-module_pkg_preinst() {
perl-module_pkg_postinst() {
+ einfo "Man pages are not installed for most modules now."
+ einfo "Please use perldoc instad."
updatepod
}
@@ -219,6 +224,7 @@ perlinfo() {
VENDOR_ARCH=${installvendorarch}
if [ "${USE_BUILDER}" == "yes" ]; then
+ if [ ! -f ${S}/Makefile.PL ]; then
if [ -f ${S}/Build.PL ]; then
if [ ${PN} == "module-build" ]; then
BUILDER_VER="1" # A bootstrapping if you will
@@ -226,6 +232,7 @@ perlinfo() {
BUILDER_VER=`perl -MModule::Build -e 'print "$Module::Build::VERSION;"' `
fi
fi
+ fi
fi
if [ -f /usr/bin/perl ]