bump

Package-Manager: portage-2.1.7.17/cvs/Linux i686

5 files changed, 199 insertions, 3 deletions

diff --git a/media-libs/pdflib/ChangeLog b/media-libs/pdflib/ChangeLog
index 181a52cc2e21..8782f39c6c1b 100644
--- a/media-libs/pdflib/ChangeLog
+++ b/media-libs/pdflib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/pdflib
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/ChangeLog,v 1.101 2009/07/29 15:38:41 darkside Exp $
+# 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 $
+
+*pdflib-7.0.4_p4 (02 Apr 2010)
+
+  02 Apr 2010; <mabi@gentoo.org> +pdflib-7.0.4_p4.ebuild,
+  +files/pdflib-noexec-stack.patch, +files/pdflib-python-libdir.patch:
+  bump (bug #214920), credit to Rafal Muzylo and Sergey Dryabzhinsky for the
+  ebuild and patches
 
   29 Jul 2009; Jeremy Olexa <darkside@gentoo.org> -pdflib-6.0.3-r1.ebuild,
   -pdflib-7.0.1.ebuild, -pdflib-7.0.2.ebuild:
diff --git a/media-libs/pdflib/Manifest b/media-libs/pdflib/Manifest
index fdfa0d25c9a8..e3fcb31e9ec9 100644
--- a/media-libs/pdflib/Manifest
+++ b/media-libs/pdflib/Manifest
@@ -1,7 +1,11 @@
 AUX fix-java-compile.patch 547 RMD160 c5ebf24dadba624d35bd32b4c53bcc7916aad329 SHA1 f393eca4fdbc06cbadf0738968ba9262c0c5242d SHA256 9cf04367ca4e35f48f51b1d3b1454b60ff09d918b0a59246933cc1f4c88c5f83
 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-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
-MISC ChangeLog 14026 RMD160 d835eb3e914c3fae20457855e9576c248724f2d0 SHA1 25584d8c9c354a849b2c2c2543975462d19a26ec SHA256 c112637f3c555686e7bc38544dfabc67190dfea3d48cc37bc9ce6ce2f21081af
+EBUILD pdflib-7.0.4_p4.ebuild 4317 RMD160 68c16578fe4d9a305924dfa7e33c45c1e2615bcf SHA1 90574685ee75e1f23bd2469de863e74e83bebc05 SHA256 a6366b88d428b9623d5854e0c40969c832c5c76cba2f457f741a101903f9bd26
+MISC ChangeLog 14282 RMD160 5efc9244341e15105d7d66ce13159e31698e453f SHA1 9f4877ab530dca159203b2ea065057039e63ccd4 SHA256 5a3a622062f8bc1659a60172da24b651eb8eb253595bd74d3723121014f10942
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
diff --git a/media-libs/pdflib/files/pdflib-noexec-stack.patch b/media-libs/pdflib/files/pdflib-noexec-stack.patch
new file mode 100644
index 000000000000..e383dcb2c965
--- /dev/null
+++ b/media-libs/pdflib/files/pdflib-noexec-stack.patch
@@ -0,0 +1,9 @@
+--- libs/flate/match.S.old	2009-04-09 13:18:11.000000000 +0200
++++ libs/flate/match.S	2009-05-02 03:51:42.000000000 +0200
+@@ -364,3 +364,6 @@
+ 		popl	%edi
+ 		popl	%ebp
+ match_init:	ret
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/media-libs/pdflib/files/pdflib-python-libdir.patch b/media-libs/pdflib/files/pdflib-python-libdir.patch
new file mode 100644
index 000000000000..577ee9449775
--- /dev/null
+++ b/media-libs/pdflib/files/pdflib-python-libdir.patch
@@ -0,0 +1,14 @@
+--- PDFlib-Lite-7.0.4p4.orig/configure.in	2010-04-02 20:25:18.000000000 +0200
++++ PDFlib-Lite-7.0.4p4/configure.in	2010-04-02 20:26:10.000000000 +0200
+@@ -849,9 +849,8 @@
+ 	    WITH_PYTHON=no
+ 	else
+ 	    PYTHONLIBDIR=`cat << EOF | python
+-import sys
+-import string
+-print string.join(filter(lambda x: -1 != string.find(x, 'dynload'), sys.path))
++import distutils.sysconfig
++print distutils.sysconfig.get_python_lib()
+ EOF
+ `
+ 	    if test "$PYTHONLIBDIR" = "" ; then
diff --git a/media-libs/pdflib/pdflib-7.0.4_p4.ebuild b/media-libs/pdflib/pdflib-7.0.4_p4.ebuild
new file mode 100644
index 000000000000..3e1907359287
--- /dev/null
+++ b/media-libs/pdflib/pdflib-7.0.4_p4.ebuild
@@ -0,0 +1,162 @@
+# 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 $
+
+EAPI="1"
+
+PYTHON_DEPEND="*"
+RUBY_OPTIONAL="yes"
+inherit autotools libtool versionator flag-o-matic toolchain-funcs multilib perl-module java-pkg-opt-2 python ruby
+
+MY_PN="${PN/pdf/PDF}-Lite"
+MY_P="${MY_PN}-${PV/_/}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A library for generating PDF on the fly."
+HOMEPAGE="http://www.pdflib.com/"
+SRC_URI="http://www.pdflib.com/binaries/${PN/pdf/PDF}/$(delete_all_version_separators ${PV/_*/})/${MY_P}.tar.gz"
+LICENSE="PDFLite"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+cxx doc java perl python ruby tcl"
+
+COMMON_DEP="tcl? ( >=dev-lang/tcl-8.2 )
+	    perl? ( >=dev-lang/perl-5.1 )
+	    python? ( >=dev-lang/python-2.2 )
+	    ruby? ( dev-lang/ruby )"
+
+DEPEND="${COMMON_DEP}
+	java? ( >=virtual/jdk-1.4 )"
+
+RDEPEND="
+	${COMMON_DEP}
+	java? ( >=virtual/jre-1.4 )"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use perl && perl-module_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-noexec-stack.patch"
+	epatch "${FILESDIR}/${PN}-python-libdir.patch"
+	sed -ie 's/-module/-module -avoid-version -shared/' config/mkbind.inc.in
+
+	# eautoreconf breaks the build
+	eautoconf
+	elibtoolize
+}
+
+src_compile() {
+	# Bug #87004
+	filter-flags -mcpu=* -mtune=*
+
+	# silence QA warnings, feel free to fix properly
+	append-flags -fno-strict-aliasing
+
+	# fix crosscompile for C++ bindings
+	use cxx && tc-export CXX
+
+	local myconf
+	use cxx || myconf="${myconf} --with-cxx=no"
+
+	use java \
+		&& myconf="${myconf} --with-java=${JAVA_HOME}" \
+		|| myconf="${myconf} --with-java=no"
+
+	use perl || myconf="${myconf} --with-perl=no"
+
+	if use python ; then
+		myconf="${myconf} --with-py=/usr --with-pyincl=$(python_get_includedir)"
+	else
+		myconf="${myconf} --with-py=no"
+	fi
+
+	# Necessary for multilib on amd64. Please keep this in future releases.
+	# BUG #81197
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/02/14
+	if use tcl ; then
+		TCLVER="$(echo 'puts [info tclversion]' | $(type -P tclsh))"
+		myconf="${myconf} --with-tclpkg=/usr/$(get_libdir)/tcl${TCLVER}/"
+	else
+		myconf="${myconf} --with-tcl=no"
+	fi
+
+	# ruby bindings disabled for now, configure uses hardcoded list of paths
+	# for includes that do not cover all supported arches on Gentoo
+	use ruby \
+		&& myconf="${myconf} --with-ruby=${RUBY}" \
+		|| myconf="${myconf} --with-ruby=no"
+
+	# totally screws configure:
+	# econf "--enable-static=no ${myconf}"
+	econf ${myconf}
+
+	if use java; then
+		emake || die "emake failed"
+		if use doc; then
+			cd ./bind/pdflib/java || die
+			emake javadoc || die "Failed to generate javadoc"
+		fi
+	else
+		emake || die "emake failed"
+	fi
+}
+
+src_install() {
+	for binding in perl python tcl ; do
+		sed -i \
+			-e "s:^\(LANG_LIBDIR\).*= \(.*\):\1\t = ${D}/\2:" \
+			"${S}/bind/pdflib/${binding}/Makefile" \
+				|| die "sed bind/pdflib/${binding}/Makefile failed"
+	done
+
+	# this should create the correct lib dir for perl
+	if use perl ; then
+		perlinfo
+		dodir ${SITE_ARCH}
+	fi
+
+	# and no, emake still does not work for install
+	einstall || die "einstall failed"
+
+	dodoc readme.txt doc/*
+	docinto pdflib
+	dodoc doc/pdflib/*
+
+	if use java ; then
+		java-pkg_dojar bind/pdflib/java/pdflib.jar
+		java-pkg_regso "${D}/usr/$(get_libdir)/libpdf_java.so"
+		use doc && java-pkg_dojavadoc ./bind/pdflib/java/javadoc
+	fi
+
+	# Lot of hakku for ruby
+	if use ruby ; then
+		local RUBYLIBDIR=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitelibdir"]')
+		insinto ${RUBYLIBDIR}
+		insopts -m 0755
+		doins ./bind/pdflib/ruby/*.rb
+		RUBYLIBDIR=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
+		dodir ${RUBYLIBDIR}
+		mv "${D}/usr/$(get_libdir)"/PDFlib.* "${D}/${RUBYLIBDIR}"/
+		cp ./bind/pdflib/ruby/pdflib_ruby.lo "${D}/${RUBYLIBDIR}"/pdflib_ruby.so
+		chmod 0755 "${D}/${RUBYLIBDIR}"/*.so*
+	fi
+
+}
+
+pkg_preinst () {
+	perl-module_pkg_preinst
+	has_version "<${CATEGORY}/${PN}-7.0.3"
+	previous_less_than_7_0_3=$?
+}
+
+pkg_postinst() {
+	if [[ $previous_less_than_7_0_3 = 0 ]] ; then
+		ewarn "Please run revdep-rebuild now! All packages linked with"
+		ewarn "previous versions of PDFLib will no longer work unless you do."
+	fi
+}