From: Petteri Räty Date: Sat, 3 Mar 2007 18:07:48 +0000 (+0000) Subject: Migrate to generation 2 java eclasses and add the doc use flag for javadocs. Thanks... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b0aebfdb4c937e786284daaa1a2dcd6c663de1ab;p=gentoo.git Migrate to generation 2 java eclasses and add the doc use flag for javadocs. Thanks to Alistair Bush . Fixes bug #120264. Package-Manager: portage-2.1.2-r12 --- diff --git a/media-libs/pdflib/ChangeLog b/media-libs/pdflib/ChangeLog index 3e5b6ca3dcdf..7e2cdc42391b 100644 --- a/media-libs/pdflib/ChangeLog +++ b/media-libs/pdflib/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/pdflib # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/ChangeLog,v 1.61 2007/03/01 17:27:03 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/ChangeLog,v 1.62 2007/03/03 18:07:48 betelgeuse Exp $ + +*pdflib-6.0.3-r1 (03 Mar 2007) + + 03 Mar 2007; Petteri Räty + +files/fix-java-compile.patch, +pdflib-6.0.3-r1.ebuild: + Migrate to generation 2 java eclasses and add the doc use flag for javadocs. + Thanks to Alistair Bush . Fixes bug #120264. 01 Mar 2007; pdflib-5.0.4_p1-r1.ebuild, pdflib-6.0.3.ebuild: diff --git a/media-libs/pdflib/Manifest b/media-libs/pdflib/Manifest index 7a12101b3b93..6eb77a5afc89 100644 --- a/media-libs/pdflib/Manifest +++ b/media-libs/pdflib/Manifest @@ -1,17 +1,28 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX fix-java-compile.patch 547 RMD160 c5ebf24dadba624d35bd32b4c53bcc7916aad329 SHA1 f393eca4fdbc06cbadf0738968ba9262c0c5242d SHA256 9cf04367ca4e35f48f51b1d3b1454b60ff09d918b0a59246933cc1f4c88c5f83 +MD5 e385cbb68956bcdc19f62f77d2803309 files/fix-java-compile.patch 547 +RMD160 c5ebf24dadba624d35bd32b4c53bcc7916aad329 files/fix-java-compile.patch 547 +SHA256 9cf04367ca4e35f48f51b1d3b1454b60ff09d918b0a59246933cc1f4c88c5f83 files/fix-java-compile.patch 547 DIST PDFlib-Lite-5.0.4p1-Unix-src.tar.gz 2825309 RMD160 b184e1484d7e908d85a13f8ed7ef22b56154cc29 SHA1 0e2bbbb78e252fb96ba690fd1596911f540453a4 SHA256 7236c07aa80fdda79359ee89a05d4fdb5784a8a1788cdbc79197911cfa4dc422 DIST PDFlib-Lite-6.0.3.tar.gz 3763292 RMD160 c8d74b31f30156be0280865aaa9985883fba6c21 SHA1 93c5d78bdff142e873873967df8be49b70fe3c39 SHA256 7ebd0f907283800e757bf27b038e4f18786c16577f51a547e55da014f9f248ff EBUILD pdflib-5.0.4_p1-r1.ebuild 3628 RMD160 1ea2e57bf858b97c37bb7bfe0a8956199e1e442a SHA1 cb57ed90fa38e6c1e4e77acebe16b42d771db9c4 SHA256 53b0c0812d0b3bde4388e29bca4f46a8851af35512f77d33f2361a5d9f06c6bf MD5 b62af3bb740ce052dbc4a74ade105c7d pdflib-5.0.4_p1-r1.ebuild 3628 RMD160 1ea2e57bf858b97c37bb7bfe0a8956199e1e442a pdflib-5.0.4_p1-r1.ebuild 3628 SHA256 53b0c0812d0b3bde4388e29bca4f46a8851af35512f77d33f2361a5d9f06c6bf pdflib-5.0.4_p1-r1.ebuild 3628 +EBUILD pdflib-6.0.3-r1.ebuild 3561 RMD160 d0fcae07df908631c6e71c3148d96bed363ba175 SHA1 94fe539de916a615edd6c7944c694c2b46b36890 SHA256 301697b706ae61aa5850507d1c072f831771a71e004423634351feaadb6e8231 +MD5 d7fdaebfa9294841a7104dc2d2953042 pdflib-6.0.3-r1.ebuild 3561 +RMD160 d0fcae07df908631c6e71c3148d96bed363ba175 pdflib-6.0.3-r1.ebuild 3561 +SHA256 301697b706ae61aa5850507d1c072f831771a71e004423634351feaadb6e8231 pdflib-6.0.3-r1.ebuild 3561 EBUILD pdflib-6.0.3.ebuild 3614 RMD160 bb7c8fed57cd802b4b8eeb130de527301a4ac281 SHA1 fe14410281cf6a254368b5c570be545804208ffd SHA256 603b49a847b583f1741c213012fb3f6be74499eba2b50f3523275628224bec2e MD5 91fdda096acf8ab533809e3f229e9b81 pdflib-6.0.3.ebuild 3614 RMD160 bb7c8fed57cd802b4b8eeb130de527301a4ac281 pdflib-6.0.3.ebuild 3614 SHA256 603b49a847b583f1741c213012fb3f6be74499eba2b50f3523275628224bec2e pdflib-6.0.3.ebuild 3614 -MISC ChangeLog 8688 RMD160 abe53e44794b0e00f0c144d72d716569e4c2a91e SHA1 ca7c90536a644bd5b710400522eccfe8d80501be SHA256 174170cae563c88b47d469e28002da3216da5464fee21afd8f7dc6c341a00418 -MD5 6c0bd4be4a91c81cc526d56fb45bb41d ChangeLog 8688 -RMD160 abe53e44794b0e00f0c144d72d716569e4c2a91e ChangeLog 8688 -SHA256 174170cae563c88b47d469e28002da3216da5464fee21afd8f7dc6c341a00418 ChangeLog 8688 +MISC ChangeLog 8986 RMD160 b4c715579d02765bbbdb9928223f4e210913b95b SHA1 d1063748a26495a48c5af254fe97b5f0f84cfa99 SHA256 185695cea1af7638b251d15a5ec02301608135313efaf023cd5870531a291955 +MD5 27b0d5ca0635468c9ff3900af678c4ce ChangeLog 8986 +RMD160 b4c715579d02765bbbdb9928223f4e210913b95b ChangeLog 8986 +SHA256 185695cea1af7638b251d15a5ec02301608135313efaf023cd5870531a291955 ChangeLog 8986 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157 @@ -22,3 +33,13 @@ SHA256 8057efe66c257b8ad67d9a7dd75304a5ee812e4b23122bea68b7142e95a97fd4 files/di MD5 2018b15518bb032401f97195b2e32920 files/digest-pdflib-6.0.3 256 RMD160 9e4056694ed788f7ddfcd7d9e7a322039703a51e files/digest-pdflib-6.0.3 256 SHA256 b9e7114b03d531047fd457038d07e74ebcc2cec37e67bdab49e2c52663f43098 files/digest-pdflib-6.0.3 256 +MD5 2018b15518bb032401f97195b2e32920 files/digest-pdflib-6.0.3-r1 256 +RMD160 9e4056694ed788f7ddfcd7d9e7a322039703a51e files/digest-pdflib-6.0.3-r1 256 +SHA256 b9e7114b03d531047fd457038d07e74ebcc2cec37e67bdab49e2c52663f43098 files/digest-pdflib-6.0.3-r1 256 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF6bczcxLzpIGCsLQRArVtAJwKFoT/rpgV3mBkTfbEZ9wGDAwtiwCfcmXY +ZSeOzz9vKC5R+dyqb5fNSiM= +=NViW +-----END PGP SIGNATURE----- diff --git a/media-libs/pdflib/files/digest-pdflib-6.0.3-r1 b/media-libs/pdflib/files/digest-pdflib-6.0.3-r1 new file mode 100644 index 000000000000..101dd33ba572 --- /dev/null +++ b/media-libs/pdflib/files/digest-pdflib-6.0.3-r1 @@ -0,0 +1,3 @@ +MD5 799aeaa3f0f9a13d7a661d730327e9d0 PDFlib-Lite-6.0.3.tar.gz 3763292 +RMD160 c8d74b31f30156be0280865aaa9985883fba6c21 PDFlib-Lite-6.0.3.tar.gz 3763292 +SHA256 7ebd0f907283800e757bf27b038e4f18786c16577f51a547e55da014f9f248ff PDFlib-Lite-6.0.3.tar.gz 3763292 diff --git a/media-libs/pdflib/files/fix-java-compile.patch b/media-libs/pdflib/files/fix-java-compile.patch new file mode 100644 index 000000000000..8a5e21a5e85d --- /dev/null +++ b/media-libs/pdflib/files/fix-java-compile.patch @@ -0,0 +1,11 @@ +--- bind/pdflib/java/Makefile.orig 2007-01-30 17:30:46.000000000 +1300 ++++ bind/pdflib/java/Makefile 2007-01-30 17:32:04.000000000 +1300 +@@ -38,7 +38,7 @@ + pdflib.jar:: pdflib.java PDFlibException.java + $(RM) com + mkdir -p com/pdflib +- javac PDFlibException.java pdflib.java && mv pdflib.class com/pdflib\ ++ javac ${JAVACFLAGS} PDFlibException.java pdflib.java && mv pdflib.class com/pdflib\ + && mv PDFlibException.class com/pdflib/PDFlibException.class + jar cvf pdflib.jar com/pdflib/pdflib.class \ + com/pdflib/PDFlibException.class diff --git a/media-libs/pdflib/pdflib-6.0.3-r1.ebuild b/media-libs/pdflib/pdflib-6.0.3-r1.ebuild new file mode 100644 index 000000000000..6d1fa0e2167b --- /dev/null +++ b/media-libs/pdflib/pdflib-6.0.3-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/pdflib-6.0.3-r1.ebuild,v 1.1 2007/03/03 18:07:48 betelgeuse Exp $ + +# eutils must be inherited since get_libdir() is only +# globally available on baselayout-1.11 (still on ~arch) +inherit base eutils java-pkg-opt-2 flag-o-matic + +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/products/pdflib/download/${PV//./}src/${MY_P}.tar.gz" +LICENSE="Aladdin" +SLOT="5" +KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390" +IUSE="doc tcl perl python java" + +COMMON_DEP=" + >=sys-apps/sed-4 + tcl? ( >=dev-lang/tcl-8.2 ) + perl? ( >=dev-lang/perl-5.1 ) + python? ( >=dev-lang/python-2.2 )" + +DEPEND=" + ${COMMON_DEP} + java? ( >=virtual/jdk-1.4 )" + +RDEPEND=" + ${COMMON_DEP} + java? ( >=virtual/jre-1.4 )" + +PATCHES="${FILESDIR}/fix-java-compile.patch" + +src_compile() { + local myconf + + # Bug #87004 + filter-flags -mcpu=* + filter-flags -mtune=* + + PYVER="$(/usr/bin/python -V 2>&1 | cut -d ' ' -f 2 | cut -d '.' -f 1,2)" + # Necessary for multilib on amd64. Please keep this in future releases. + # BUG #81197 + # Danny van Dyk 2005/02/14 + TCLVER="$(echo 'puts [info tclversion]' | $(which tclsh))" + use tcl \ + && myconf="--with-tclpkg=/usr/$(get_libdir)/tcl${TCLVER}/" \ + || myconf="--with-tcl=no" + use perl || myconf="${myconf} --with-perl=no" + use python \ + && myconf="${myconf} --with-py=/usr --with-pyincl=/usr/include/python${PYVER}" \ + || myconf="${myconf} --with-py=no" + use java \ + && myconf="${myconf} --with-java=${JAVA_HOME}" \ + || myconf="${myconf} --with-java=no" + + econf \ + --enable-cxx \ + ${myconf} || die + + JAVACFLAGS="$(java-pkg_javac-args)" emake || die "emake failed" + if use java && use doc; then + cd ./bind/pdflib/java || die + emake javadoc || die "Failed to generate javadoc" + fi +} + +src_install() { + sed -i \ + -e "s:^\(LANG_LIBDIR\).*= \(.*\):\1\t = ${D}/\2:" \ + "${S}/bind/pdflib/perl/Makefile" \ + || die "sed bind/pdflib/perl/Makefile failed" + + sed -i \ + -e "s:^\(LANG_LIBDIR\).*= \(.*\):\1\t = ${D}/\2:" \ + "${S}/bind/pdflib/python/Makefile" \ + || die "sed bind/pdflib/python/Makefile failed" + + sed -i \ + -e "s:^\(LANG_LIBDIR\).*= \(.*\):\1\t = ${D}/\2:" \ + "${S}/bind/pdflib/tcl/Makefile" \ + || die "sed bind/pdflib/tcl/Makefile failed" + + # ok, this should create the correct lib dirs for perl and python. + # yes, i know it is messy, but as i see it, a ebuild should be generic + # ... ie. you should be able to just use cp to update it + if use perl && [ -x /usr/bin/perl ] ; then + local perlmajver="`/usr/bin/perl -v |grep 'This is perl' \ + |cut -d ' ' -f 4 |cut -d '.' -f 1`" + local perlver="`/usr/bin/perl -v |grep 'This is perl' \ + |cut -d ' ' -f 4`" + local perlarch="`/usr/bin/perl -v |grep 'This is perl' \ + |cut -d ' ' -f 7`" + dodir /usr/$(get_libdir)/perl${perlmajver/v/}/site_perl/${perlver/v/}/${perlarch} + fi + if use python && [ -x /usr/bin/python ] ; then + dodir /usr/$(get_libdir)/python${PYVER}/lib-dynload + fi + #next line required for proper install + dodir /usr/bin + einstall || die + + dodoc readme.txt doc/* + 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 + fi +}