summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Bickel <mabi@gentoo.org>2010-04-02 20:40:17 +0000
committerMatti Bickel <mabi@gentoo.org>2010-04-02 20:40:17 +0000
commitf3378ba66fe78fe7397e45102eecb7834ada067e (patch)
tree2e1bf199da6bc89600ca5685c175f2ebb4b80161
parentruby-ng.eclass: Add support for targets with different flag and executable na... (diff)
downloadgentoo-2-f3378ba66fe78fe7397e45102eecb7834ada067e.tar.gz
gentoo-2-f3378ba66fe78fe7397e45102eecb7834ada067e.tar.bz2
gentoo-2-f3378ba66fe78fe7397e45102eecb7834ada067e.zip
fix bug #298019
(Portage version: 2.1.7.17/cvs/Linux i686)
-rw-r--r--media-libs/pdflib/ChangeLog8
-rw-r--r--media-libs/pdflib/files/pdflib-perl-vendor-dir.patch13
-rw-r--r--media-libs/pdflib/pdflib-7.0.4_p4-r1.ebuild (renamed from media-libs/pdflib/pdflib-7.0.4_p4.ebuild)7
3 files changed, 24 insertions, 4 deletions
diff --git a/media-libs/pdflib/ChangeLog b/media-libs/pdflib/ChangeLog
index 8782f39c6c1b..4434012fb9d6 100644
--- a/media-libs/pdflib/ChangeLog
+++ b/media-libs/pdflib/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/pdflib
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/ChangeLog,v 1.102 2010/04/02 20:15:08 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/ChangeLog,v 1.103 2010/04/02 20:40:17 mabi Exp $
+
+*pdflib-7.0.4_p4-r1 (02 Apr 2010)
+
+ 02 Apr 2010; <mabi@gentoo.org> -pdflib-7.0.4_p4.ebuild,
+ +pdflib-7.0.4_p4-r1.ebuild, +files/pdflib-perl-vendor-dir.patch:
+ include vendor_perl patch from david abbott (bug #298019)
*pdflib-7.0.4_p4 (02 Apr 2010)
diff --git a/media-libs/pdflib/files/pdflib-perl-vendor-dir.patch b/media-libs/pdflib/files/pdflib-perl-vendor-dir.patch
new file mode 100644
index 000000000000..0c2d7f5be296
--- /dev/null
+++ b/media-libs/pdflib/files/pdflib-perl-vendor-dir.patch
@@ -0,0 +1,13 @@
+--- configure.in.orig 2009-12-27 11:04:31.000000000 -0500
++++ configure.in 2009-12-27 13:44:34.000000000 -0500
+@@ -704,8 +704,8 @@
+ AC_MSG_RESULT(unable to determine Perl configuration)
+ WITH_PERL=no
+ fi
+-
+- PERLLIBDIR=`($PERL -e 'use Config; print $Config{sitearchexp};') 2>/dev/null`
++ PERLVENDERLIBDIR=`($PERL -e 'use Config; print $Config{vendorarch};') 2>/dev/null`
++ PERLLIBDIR="${PERLVENDERLIBDIR}/PDFlib"
+ if test -z "$PERLLIBDIR" -o ! -d "$PERLLIBDIR"; then
+ AC_MSG_RESULT( unable to determine perl shared library directory)
+ fi
diff --git a/media-libs/pdflib/pdflib-7.0.4_p4.ebuild b/media-libs/pdflib/pdflib-7.0.4_p4-r1.ebuild
index 3e1907359287..42a7897072d6 100644
--- a/media-libs/pdflib/pdflib-7.0.4_p4.ebuild
+++ b/media-libs/pdflib/pdflib-7.0.4_p4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/pdflib-7.0.4_p4.ebuild,v 1.1 2010/04/02 20:15:08 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/pdflib-7.0.4_p4-r1.ebuild,v 1.1 2010/04/02 20:40:17 mabi Exp $
EAPI="1"
@@ -43,6 +43,7 @@ src_unpack() {
epatch "${FILESDIR}/${PN}-noexec-stack.patch"
epatch "${FILESDIR}/${PN}-python-libdir.patch"
+ epatch "${FILESDIR}/${PN}-perl-vendor-dir.patch"
sed -ie 's/-module/-module -avoid-version -shared/' config/mkbind.inc.in
# eautoreconf breaks the build
@@ -114,10 +115,10 @@ src_install() {
|| die "sed bind/pdflib/${binding}/Makefile failed"
done
- # this should create the correct lib dir for perl
+ # this should create the correct lib dir for perl (bug #298019)
if use perl ; then
perlinfo
- dodir ${SITE_ARCH}
+ fixlocalpod
fi
# and no, emake still does not work for install