From ff8e03ae90d14e2fc8448f5f8929ba5b6b66f5bf Mon Sep 17 00:00:00 2001 From: Matti Bickel Date: Fri, 2 Apr 2010 20:40:17 +0000 Subject: [PATCH] fix bug #298019 Package-Manager: portage-2.1.7.17/cvs/Linux i686 --- media-libs/pdflib/ChangeLog | 8 +++++++- media-libs/pdflib/Manifest | 5 +++-- .../pdflib/files/pdflib-perl-vendor-dir.patch | 13 +++++++++++++ ...ib-7.0.4_p4.ebuild => pdflib-7.0.4_p4-r1.ebuild} | 7 ++++--- 4 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 media-libs/pdflib/files/pdflib-perl-vendor-dir.patch rename media-libs/pdflib/{pdflib-7.0.4_p4.ebuild => pdflib-7.0.4_p4-r1.ebuild} (95%) 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; -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/Manifest b/media-libs/pdflib/Manifest index b36c092cb9b1..b40215911180 100644 --- a/media-libs/pdflib/Manifest +++ b/media-libs/pdflib/Manifest @@ -2,10 +2,11 @@ AUX fix-java-compile.patch 547 RMD160 c5ebf24dadba624d35bd32b4c53bcc7916aad329 S AUX pdflib-7.0.2_p8-gcc-4.3.patch 2021 RMD160 29325b69cc4feb08e19f20497a067b1db668ed24 SHA1 674da3363770a1475501c6bce3c0bea36118336e SHA256 d7ab6fc76e83c509b0ad5fbcfcad35de251ba04aa3ed4c6195fbcd4093004728 AUX pdflib-7.0.2_p8-ruby-configure.patch 403 RMD160 826b06f0bf4aae2af5f641c9c7538245da6f6521 SHA1 a7b0a0f27481e056bc26b71f894bc08b916566e2 SHA256 b19fe8faab95743f7566d193616e88e21eaff35d83421bd9c1aa68bab6fe9425 AUX pdflib-noexec-stack.patch 276 RMD160 c9d1808b22a4f094d9abfe7836b757a265780ced SHA1 36b3c4f0b90819a777d9650778279859afc0356d SHA256 a4ff3e58b1b083d9c1b0bd5bad5c51bb149c988378397c072b78b0a59722e977 +AUX pdflib-perl-vendor-dir.patch 570 RMD160 a10c98f6805cfe44c8553269e44fba96dd273bc5 SHA1 54795ab57ee4bb00bc743e6f5577f58fc3fa8d99 SHA256 24abe2af005cdbae9b6255c5c388084660023786be33571b86268dbbc5203057 AUX pdflib-python-libdir.patch 468 RMD160 0442ac772c4672055851db88740a093f3e101840 SHA1 e077dc32aa3be08f2ee9d5e33c298d0e67c4fb38 SHA256 14a1b20102277ef9bff1026950c1e6d92becc44beda1721de90903153b2c07e7 DIST PDFlib-Lite-7.0.2p8.tar.gz 5788364 RMD160 3d48885d1d9bf7e72bba72ed2b8d6ca1e3200177 SHA1 696783069b5b599a1f2bf88de1930cee60af448f SHA256 b76b4cee4b2d770de80c4b28f8b5611b3bd9dc58098e50ef3d70701369088cfd DIST PDFlib-Lite-7.0.4p4.tar.gz 6264932 RMD160 cb9527120eebc232ef130223a124a956f93e57f1 SHA1 36d3f8cedeed95ec68ae90f489d9bfb40b4c6593 SHA256 c62ed0407038955802e3a15f11724e31bd1f232e1e65ad0bcf23022174c04f4f EBUILD pdflib-7.0.2_p8.ebuild 3759 RMD160 48b06f73ed2c5f85895d456aacb5cb0be28a961f SHA1 4ba379fa030e48d15ea8d44fa7520982b3f31083 SHA256 dcfc6d430723e6a52a570b17332e6f8bb60687bb08bbc704467514337d2cb981 -EBUILD pdflib-7.0.4_p4.ebuild 4317 RMD160 68c16578fe4d9a305924dfa7e33c45c1e2615bcf SHA1 90574685ee75e1f23bd2469de863e74e83bebc05 SHA256 a6366b88d428b9623d5854e0c40969c832c5c76cba2f457f741a101903f9bd26 -MISC ChangeLog 14282 RMD160 5efc9244341e15105d7d66ce13159e31698e453f SHA1 9f4877ab530dca159203b2ea065057039e63ccd4 SHA256 5a3a622062f8bc1659a60172da24b651eb8eb253595bd74d3723121014f10942 +EBUILD pdflib-7.0.4_p4-r1.ebuild 4377 RMD160 ad8d376492d13c7d09b0d8853ea76cdceaa2a883 SHA1 e64dec71ba673a4e3e7bb677be34c7d89202e95b SHA256 0a682e69bd96715fb1fc3b57c9c828ad3b7b25ab8b0e4eaf8c00f6fce1fe22f8 +MISC ChangeLog 14503 RMD160 16b8d928e413c35043032febf915076e9bf6086b SHA1 49b5713589bbc92e75228ba3d848b0aba27ecabb SHA256 fce7e5cea2e0431025b4d57d275d82550e868d73cc0b37e59b6185b68bb24ec5 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 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 similarity index 95% rename from media-libs/pdflib/pdflib-7.0.4_p4.ebuild rename to 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 -- 2.26.2