Another smash hit from Andrew. Partial fix for #87978.

Package-Manager: portage-2.0.51.19

6 files changed, 212 insertions, 12 deletions

diff --git a/dev-java/libgtk-java/ChangeLog b/dev-java/libgtk-java/ChangeLog
index 1c718c9c34b1..5c1b41d21e92 100644
--- a/dev-java/libgtk-java/ChangeLog
+++ b/dev-java/libgtk-java/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/libgtk-java
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.8 2005/03/12 20:58:16 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.9 2005/05/01 16:20:48 karltk Exp $
+
+*libgtk-java-2.6.2-r1 (01 May 2005)
+*libgtk-java-2.4.9 (01 May 2005)
+
+  01 May 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +libgtk-java-2.4.9.ebuild, +libgtk-java-2.6.2-r1.ebuild:
+  Added new upstream ebuilds by Andrew Cowie 
+  <andrew@operationaldynamics.com>, partial fix for #87978.
 
   12 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
   libgtk-java-2.4.6-r2.ebuild:
diff --git a/dev-java/libgtk-java/Manifest b/dev-java/libgtk-java/Manifest
index 5bdb6685e5f4..0630087ad40f 100644
--- a/dev-java/libgtk-java/Manifest
+++ b/dev-java/libgtk-java/Manifest
@@ -1,16 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 46ca4320033ac90148c3894e3495babe libgtk-java-2.4.9.ebuild 2894
 MD5 2b05aa2234bb74151d373089c076bab2 libgtk-java-2.4.8.1.ebuild 3356
+MD5 8d87c3352d9d71dfa985bcb99a8328bf libgtk-java-2.6.2-r1.ebuild 2823
 MD5 00688add12aaa3eafc2de930a0a6b45b libgtk-java-2.4.6-r2.ebuild 3055
 MD5 5ebc048801e09a96cbc1e0387edf5496 libgtk-java-2.4.7.2.ebuild 3348
 MD5 0521ec467b18c6d5d3ced317cf813912 libgtk-java-2.4.6-r1.ebuild 3012
-MD5 7476d74537672b0f4a1085304f581812 ChangeLog 3532
+MD5 42593ec8869b6abd4c2478601079f14c ChangeLog 3822
 MD5 23e70539fce4ef96d51e3043420acb8c metadata.xml 975
 MD5 d5868ac77f6fa3fcf16ec100095cb0af files/digest-libgtk-java-2.4.6-r1 70
 MD5 d5868ac77f6fa3fcf16ec100095cb0af files/digest-libgtk-java-2.4.6-r2 70
+MD5 5447d20adb67dacfc4ecd80c88386343 files/digest-libgtk-java-2.6.2-r1 70
 MD5 1defc6f20e4684f13955e28a28e47e1f files/libgtk-java-2.4.6_install-doc.patch 740
 MD5 fc26b5e15e1e19216390e328d36237f2 files/libgtk-java-2.4.8.1_find-jni.patch 662
+MD5 f4c28fbb216236ce592ffe72a3d4e9ed files/digest-libgtk-java-2.4.9 70
 MD5 1f2599c8fd250432f6e6b43d598e75db files/libgtk-java-2.4.6_gentoo-PN-SLOT.patch 2013
 MD5 4130379b76854eac4060c133f20a765d files/libgtk-java-2.4.8.1_gentoo-PN-SLOT.patch 527
 MD5 44a67ac512c028ffef92f3a0ed1bc196 files/digest-libgtk-java-2.4.7.2 72
@@ -19,10 +20,3 @@ MD5 40c9acf29309ee98632a536eba5ef6a9 files/libgtk-java-2.4.8.1_fix-TextBuffer.pa
 MD5 21907163f2b6597c520b7c1a4da20784 files/libgtk-java-2.4.6_find_jni.patch 369
 MD5 40956547f4eb0b797359f67f6c6910bb files/libgtk-java-2.4.6_gcj-autoconf-macro-fix.patch 689
 MD5 e8a6ddb689376b8e04d3bc41cca48253 files/libgtk-java-2.4.6_no-docbook-autoconf-macro.patch 394
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCM1fz06ebR+OMO78RApGFAJoCXPjGowP5uWGu8/9ZCqCD2h5VWwCeMZRF
-8+nG1dbCxiOhWrCFMvGRxbI=
-=u0ZV
------END PGP SIGNATURE-----
diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.4.9 b/dev-java/libgtk-java/files/digest-libgtk-java-2.4.9
new file mode 100644
index 000000000000..6989a73a1e61
--- /dev/null
+++ b/dev-java/libgtk-java/files/digest-libgtk-java-2.4.9
@@ -0,0 +1 @@
+MD5 ec930621f8375f1101fdb56aed8619f6 libgtk-java-2.4.9.tar.bz2 746109
diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.6.2-r1 b/dev-java/libgtk-java/files/digest-libgtk-java-2.6.2-r1
new file mode 100644
index 000000000000..f528fdfcfed7
--- /dev/null
+++ b/dev-java/libgtk-java/files/digest-libgtk-java-2.6.2-r1
@@ -0,0 +1 @@
+MD5 17d558597494261ff92b155a10a27d20 libgtk-java-2.6.2.tar.bz2 801951
diff --git a/dev-java/libgtk-java/libgtk-java-2.4.9.ebuild b/dev-java/libgtk-java/libgtk-java-2.4.9.ebuild
new file mode 100644
index 000000000000..2c1a26a6dd07
--- /dev/null
+++ b/dev-java/libgtk-java/libgtk-java-2.4.9.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.4.9.ebuild,v 1.1 2005/05/01 16:20:48 karltk Exp $
+
+#
+# WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 
+# it has, like any GNOME project, a massive autoconf setup, and unlike many 
+# other java libraries, it has its own [necessary] `make install` step.
+# As a result, this ebuild is VERY sensitive to the internal layout of the
+# upstream project. Because these issues are currently evolving upstream,
+# simply version bumping this ebuild is not likely to work but FAILURES WILL
+# BE VERY SUBTLE IF IT DOES NOT WORK.
+# 
+
+inherit eutils gnome.org
+
+DESCRIPTION="Java bindings for GTK libraries (allow GTK applications to be written in Java)"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+RDEPEND=">=x11-libs/gtk+-2.4
+	>=virtual/jre-1.2"
+
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.2
+	app-arch/zip"
+
+#
+# Critical that this match gtkapiversion
+#
+SLOT="2.4"
+LICENSE="LGPL-2.1"
+KEYWORDS="x86 ~ppc"
+IUSE="gcj"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# I know it's better to use ${P}, but I don't feel like duplicating 
+	# the patch files for every bloody point release. I'll copy them at 
+	# major version releases.
+
+	epatch ${FILESDIR}/libgtk-java-2.4.8.1_gentoo-PN-SLOT.patch
+
+	use gcj || epatch ${FILESDIR}/libgtk-java-2.4.8.1_find-jni.patch
+
+	# Rediculous glitch from upstream's packaging.
+	rm -f ${S}/config.cache
+}
+
+src_compile() {
+	local conf
+
+	use gcj	|| conf="${conf} --without-gcj-compile"
+
+	cd ${S}
+
+	#
+	# Ordinarily, moving things around post `make install` would do 
+	# the trick, but there are paths hard coded in .pc files and in the
+	# `make install` step itself that need to be influenced.
+	#
+	# NOTE: THIS RELIES ON PORTAGE PASSING $PN AND $SLOT IN THE ENVIRONMENT
+	#
+
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+			${conf} || die "./configure failed"
+	make || die
+}
+
+src_install() {
+	make prefix=${D}/usr install || die
+
+	mv ${D}/usr/share/doc/libgtk${SLOT}-java ${D}/usr/share/doc/${PF}
+
+	# the upstream install scatters things around a bit. The following cleans
+	# that up to make it policy compliant.
+
+	# I originally tried java-pkg_dojar here, but it has a few glitches 
+	# like not copying symlinks as symlinks which makes a mess.
+
+	dodir /usr/share/${PN}-${SLOT}/lib
+	mv ${D}/usr/share/java/*.jar ${D}/usr/share/${PN}-${SLOT}/lib
+	rm -rf ${D}/usr/share/java
+
+	mkdir ${D}/usr/share/${PN}-${SLOT}/src
+	cd ${S}/src/java
+	zip -r ${D}/usr/share/${PN}-${SLOT}/src/libgtk-java-${PV}.src.zip *
+
+	# again, with dojar misbehaving, better do to this manually for the 
+	# time being.
+
+	echo "DESCRIPTION=${DESCRIPTION}" \
+		>  ${D}/usr/share/${PN}-${SLOT}/package.env
+
+	echo "CLASSPATH=/usr/share/${PN}-${SLOT}/lib/gtk${SLOT}.jar" \
+		>> ${D}/usr/share/${PN}-${SLOT}/package.env
+}
diff --git a/dev-java/libgtk-java/libgtk-java-2.6.2-r1.ebuild b/dev-java/libgtk-java/libgtk-java-2.6.2-r1.ebuild
new file mode 100644
index 000000000000..5f277d1216bc
--- /dev/null
+++ b/dev-java/libgtk-java/libgtk-java-2.6.2-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.6.2-r1.ebuild,v 1.1 2005/05/01 16:20:48 karltk Exp $
+
+#
+# WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 
+# it has, like any GNOME project, a massive autoconf setup, and unlike many 
+# other java libraries, it has its own [necessary] `make install` step.
+# As a result, this ebuild is VERY sensitive to the internal layout of the
+# upstream project. Because these issues are currently evolving upstream,
+# simply version bumping this ebuild is not likely to work but FAILURES WILL
+# BE VERY SUBTLE IF IT DOES NOT WORK.
+# 
+
+inherit eutils gnome.org
+
+DESCRIPTION="Java bindings for GTK libraries (allow GTK applications to be written in Java)"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=virtual/jre-1.2"
+
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.2
+	app-arch/zip"
+
+#
+# Critical that this match gtkapiversion
+#
+SLOT="2.6"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc"
+IUSE="gcj"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	#fixed in 2.6.2?
+	#use gcj || epatch ${FILESDIR}/libgtk-java-2.6.1.1_fix-jni-include.patch
+
+	# Rediculous glitch from upstream's packaging.
+	rm -f ${S}/config.cache
+
+	# adjust for Gentoo Java policy locations
+	# thanks to yselkowitz@hotmail.com for the suggestion of using sed
+	sed -i \
+		-e "s:/share/${PN}/:/share/${PN}-${SLOT}/:" \
+		-e "s:/share/java/:/share/${PN}-${SLOT}/lib/:" \
+		configure || die "sed configure error"
+}
+
+src_compile() {
+	local conf
+
+	use gcj	|| conf="${conf} --without-gcj-compile"
+
+	cd ${S}
+
+	#
+	# Ordinarily, moving things around post `make install` would do 
+	# the trick, but there are paths hard coded in .pc files and in the
+	# `make install` step itself that need to be influenced.
+	#
+	# NOTE: THIS RELIES ON PORTAGE PASSING $PN AND $SLOT IN THE ENVIRONMENT
+	#
+
+	export JAVADOC_OPTIONS="-public -use"
+
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--with-jardir=/usr/share/${PN}-${SLOT}/lib \
+			${conf} || die "./configure failed"
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install step failed"
+
+	mv ${D}/usr/share/doc/libgtk${SLOT}-java ${D}/usr/share/doc/${PF}
+
+	# the upstream install scatters things around a bit. The following cleans
+	# that up to make it policy compliant.
+
+	dodir /usr/share/${PN}-${SLOT}/src
+	cd ${S}/src/java
+	find . -name '*.java' | xargs zip ${D}/usr/share/${PN}-${SLOT}/src/libgtk-java-${PV}.src.zip
+
+	# again, with dojar misbehaving, better do to this manually for the 
+	# time being.
+
+	echo "DESCRIPTION=${DESCRIPTION}" \
+		>  ${D}/usr/share/${PN}-${SLOT}/package.env
+
+	echo "CLASSPATH=/usr/share/${PN}-${SLOT}/lib/gtk${SLOT}.jar" \
+		>> ${D}/usr/share/${PN}-${SLOT}/package.env
+}