Fix USE=java - remove the bundled jar file. Has 1.5 bytecode, breaking build with 1.4 JDK, besides others. Revbump so that everyone installs the same file.

Package-Manager: portage-2.1.4.4

3 files changed, 82 insertions, 2 deletions

diff --git a/net-dns/libidn/ChangeLog b/net-dns/libidn/ChangeLog
index 4cb95876c5a6..b17f5a75ee58 100644
--- a/net-dns/libidn/ChangeLog
+++ b/net-dns/libidn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/libidn
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.75 2008/02/29 10:06:33 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.76 2008/02/29 14:21:52 caster Exp $
+
+*libidn-1.5-r1 (29 Feb 2008)
+
+  29 Feb 2008; Vlastimil Babka <caster@gentoo.org> +libidn-1.5-r1.ebuild:
+  Fix USE=java - remove the bundled jar file. Has 1.5 bytecode, breaking build
+  with 1.4 JDK, besides others. Revbump so that everyone installs the same
+  file.
 
   29 Feb 2008; Santiago M. Mola <coldwind@gentoo.org> libidn-1.0-r1.ebuild:
   amd64 stable wrt bug #211857
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index e5f19dc20bce..613ee9300700 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -7,6 +7,7 @@ EBUILD libidn-0.6.5-r1.ebuild 1336 RMD160 d9b6c780f740500afcffa4ef8392536d97d84a
 EBUILD libidn-0.6.9-r1.ebuild 1407 RMD160 3781aa1da13bd5995fe8e05eada473c747912b44 SHA1 736ff29d11d7edc1b469a8598b091939ba3296a9 SHA256 5b16315c6f7a0a1d63dc9c0ae1933e9dc766008c74beb3169ab6a2a28338e29d
 EBUILD libidn-0.6.9-r2.ebuild 1843 RMD160 dfe44d26150bc94b26f51e182e1e6aaeff1c14af SHA1 8153a867c5bd5c4cb35455116b456a02ddf3eff4 SHA256 e5f6a8300de9d5a80b8f69bf3499ee7d2c6451a226c9dbf9d64567b9332ea463
 EBUILD libidn-1.0-r1.ebuild 1735 RMD160 42f4c57cb89c20bbbbe45f39995afe4584b2b645 SHA1 c927a55b1ca61b6631ed0d25bbff54d03070a9f5 SHA256 deaaef68a176f970d29f1620537bd7c29b67786307cf724f1b52ee7d393c4ed9
+EBUILD libidn-1.5-r1.ebuild 1832 RMD160 e04baeafc65c223ddb2309a5716f928e229d697b SHA1 aab721a6ab336839330f155964686dbbdda360fd SHA256 d75c26c5fb8784fac850e5b2a02f750903b8c23a35a051c03f3917cfeca2cce0
 EBUILD libidn-1.5.ebuild 1734 RMD160 c9c9ff421e303e999e80176e888ff9174d9f81ec SHA1 390b9e50b4f78984102ef64e5e0f467153d0749b SHA256 e714e19d866445402cb4fa13d3129f692d3bd80ad5645c674ba004655e85315a
-MISC ChangeLog 9415 RMD160 edfdc7fcbe33aa12cda30b67c91f82514291cae6 SHA1 9a4fbfd2cec155e192d0030e47823c8cc26bf529 SHA256 efdf28f387f86b95a2e0a396658b8e5d93dea40c661f5e1a0c1ec0d5ed507011
+MISC ChangeLog 9680 RMD160 fa02639a5b5787657dc4796098b6393db3c5bd29 SHA1 fe1ae0ff118e3dfa93fd51d9c65280458492e0c3 SHA256 c35bb2962facb425dd4ce8db30dc0f5a8acda91f9879ca1d2a98b2cbb5274984
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
diff --git a/net-dns/libidn/libidn-1.5-r1.ebuild b/net-dns/libidn/libidn-1.5-r1.ebuild
new file mode 100644
index 000000000000..4cacfd93faf9
--- /dev/null
+++ b/net-dns/libidn/libidn-1.5-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.5-r1.ebuild,v 1.1 2008/02/29 14:21:52 caster Exp $
+
+inherit java-pkg-opt-2 mono autotools elisp-common
+
+DESCRIPTION="Internationalized Domain Names (IDN) implementation"
+HOMEPAGE="http://www.gnu.org/software/libidn/"
+SRC_URI="ftp://alpha.gnu.org/pub/gnu/libidn/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="java doc emacs mono nls"
+
+DEPEND="mono? ( >=dev-lang/mono-0.95 )
+	java? ( >=virtual/jdk-1.4 dev-java/gjdoc )"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+	mono? ( >=dev-lang/mono-0.95 )
+	emacs? ( virtual/emacs )"
+
+src_unpack() {
+	unpack ${A}
+	# bundled, with wrong bytecode
+	rm "${S}/java/${P}.jar" || die
+}
+
+src_compile() {
+	local myconf=" --disable-csharp"
+
+	use mono && myconf="--enable-csharp=mono"
+	use emacs && myconf="${myconf} --with-lispdir=${SITELISP}/${PN}"
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable java) \
+		${myconf} \
+		|| die
+
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO || die
+
+	use emacs || rm -rf "${D}/usr/share/emacs"
+	#use xemacs || rm -rf "${D}/usr/lib/xemacs"
+
+	if use doc ; then
+		dohtml -r doc/reference/html/* || die
+	fi
+
+	if use java ; then
+		java-pkg_newjar "${D}"/usr/share/java/${P}.jar || die
+		rm -rf "${D}"/usr/share/java || die
+
+		if use doc ; then
+			java-pkg_dojavadoc doc/java
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use emacs ; then
+		elog "activate Emacs support by adding the following lines"
+		elog "to your ~/.emacs file:"
+		elog "   (add-to-list 'load-path \"${SITELISP}/${PN}\")"
+		elog "   (load idna)"
+		elog "   (load punycode)"
+	fi
+}