bump

(Portage version: 2.1.7.17/cvs/Linux i686)

4 files changed, 194 insertions, 2 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/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
+}