[patch] Diff from 7.0.2_p8 to 7.0.4_p1

pdflib-7.0.2_p8-to-7.0.4.ebuild.diff (text/plain), 4.44 KB, created by Sergey Dryabzhinsky on 2009-04-26 18:55:25 UTC

--- pdflib-7.0.2_p8.ebuild	2009-04-26 22:36:03.000000000 +0400
+++ pdflib-7.0.4_p1.ebuild	2009-04-26 22:38:06.000000000 +0400
@@ -1,28 +1,28 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/pdflib-7.0.2_p8.ebuild,v 1.10 2008/11/05 00:37:56 vapier Exp $
+# $Header: $
 
 EAPI="1"
 
-# RUBY_OPTIONAL="yes"
-inherit autotools libtool versionator flag-o-matic toolchain-funcs multilib perl-module java-pkg-opt-2 python # ruby
+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"
+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 tcl" # ruby
+SLOT="5" # Should it be changed to 6?
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+cxx doc java perl python ruby tcl"
 
+# Should we bump deps versions?
 COMMON_DEP="tcl? ( >=dev-lang/tcl-8.2 )
 	    perl? ( >=dev-lang/perl-5.1 )
-	    python? ( >=dev-lang/python-2.2 )"
-	    # ruby? ( virtual/ruby )
+	    python? ( >=dev-lang/python-2.2 )
+	    ruby? ( virtual/ruby )"
 
 DEPEND="${COMMON_DEP}
 	java? ( >=virtual/jdk-1.4 )"
@@ -31,8 +31,10 @@
 	${COMMON_DEP}
 	java? ( >=virtual/jre-1.4 )"
 
+S="${WORKDIR}/${MY_P}"
+
 pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
 	use perl && perl-module_pkg_setup
 }
 
@@ -40,11 +42,7 @@
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
-
-	# fix broken configure option for ruby bindings.
 	# do NOT call eautoreconf here, it breaks configure horribly.
-	epatch "${FILESDIR}"/${P}-ruby-configure.patch
 	eautoconf
 	elibtoolize
 }
@@ -61,7 +59,7 @@
 	use cxx && tc-export CXX
 
 	local myconf
-	use cxx || myconf="${myconf} --with-cxx=no"
+	use cxx || myconf="${myconf} --disable-cxx"
 
 	use java \
 		&& myconf="${myconf} --with-java=${JAVA_HOME}" \
@@ -88,14 +86,14 @@
 
 	# 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"
+	use ruby \
+		&& myconf="${myconf} --with-ruby=${RUBY}" \
+		|| myconf="${myconf} --with-ruby=no"
 
-	econf --with-ruby=no ${myconf}
+	econf ${myconf}
 
 	if use java; then
-		JAVACFLAGS="$(java-pkg_javac-args)" emake || die "emake failed"
+		emake || die "emake failed"
 		if use doc; then
 			cd ./bind/pdflib/java || die
 			emake javadoc || die "Failed to generate javadoc"
@@ -130,21 +128,34 @@
 	docinto pdflib
 	dodoc doc/pdflib/*
 
-	# seemant: seems like the makefiles for pdflib generate the .jar file anyway
-	use java && java-pkg_dojar bind/pdflib/java/pdflib.jar
-	if use java && use doc; then
-		java-pkg_dojavadoc ./bind/pdflib/java/javadoc
+	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.1"
-	previous_less_than_7_0_1=$?
+	has_version "<${CATEGORY}/${PN}-7.0.3"
+	previous_less_than_7_0_3=$?
 }
 
 pkg_postinst() {
-	if [[ $previous_less_than_7_0_1 = 0 ]] ; then
+	if [[ $previous_less_than_7_0_3 = 0 ]] ; then
 		ewarn "Please run revdep-rebuild now! All packages that linked with"
 		ewarn "previous versions of PDFLib will no longer work unless you"
 		ewarn "run it."