sync with Andrew Cowie <andrew@operationaldynamics.com>'s ebuilds

7 files changed, 256 insertions, 20 deletions

diff --git a/dev-java/libgtk-java/ChangeLog b/dev-java/libgtk-java/ChangeLog
index 28662b4c4ee2..37aaece4c6e2 100644
--- a/dev-java/libgtk-java/ChangeLog
+++ b/dev-java/libgtk-java/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for dev-java/libgtk-java
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.3 2004/12/23 12:14:06 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.4 2004/12/28 12:57:07 axxo Exp $
+
+* libgtk-java-2.4.7.2 (27 Dec 2004)
+
+  27 Dec 2004; Andrew Cowie <andrew@operationaldynamics.com> +libgtk-java-2.4.7.2.ebuild:
+  Upstream stable maintenance release. Note that 2.4.7 had a bug which
+  prevented it from building, and that 2.4.7.1 had its internal version numbers
+  wrong.
+
+* libgtk-java-2.4.6-r2 (24 Dec 2004)
+
+  24 Dec 2004; Andrew Cowie <andrew@operationaldynamics.com> +libgtk-java-2.4.6-r2.ebuild, 
+  -libgtk-java-2.4.6-r1.ebuild:
+  Version bump to ensure pickup of Thomas's patch.
+
+  29 Nov 2004; Thomas Matthijs <axxo@gentoo.org> +files/libgtk-java-2.4.6_find_jni.patch,
+  libgtk-java-2.4.6-r1.ebuild:
+  added a patch to set JAVA_INCLUDES when not using gcj, so it can find jni.h
+  & familiy, #72128
+
+* libgtk-java-2.4.6-r1 (15 Nov 2004)
+
+  15 Nov 2004; Andrew Cowie <andrew@operationaldynamics.com> +libgtk-java-2.4.6-r1.ebuild:
+  Dependency on docbook-sgml-utils discovered by karltk; investigation showed
+  it to be highly unnecessary and an artifact of some (currently) unused cruft
+  in the documentation. Fixed by patching the java-gnome autoconf macros to
+  remove the path check for docbook2html.
+
+* libgtk-java-2.4.6 (07 Nov 2004)
+
+  07 Nov 2004; Andrew Cowie <andrew@operationaldynamics.com>:
+  New ebuild. What used to be java-gnome is now multiplexed into various modular
+  subcomponents. Upstream CVS was all re-arranged, and now there is a release
+  tarball for each piece. This ebuild is the java binding around the core GTK
+  libraries (and is the only one of the new pieces which doesn't need the rest of
+  GNOME installed).
 
   29 Nov 2004; Thomas Matthijs <axxo@gentoo.org>
   +files/libgtk-java-2.4.6_find_jni.patch, libgtk-java-2.4.6-r1.ebuild:
@@ -20,10 +55,9 @@
 
 *libgtk-java-2.4.6 (07 Nov 2004)
 
-  07 Nov 2004; Andrew Cowie <andrew@operationaldynamics.com>
+  07 Nov 2004; Andrew Cowie <andrew@operationaldynamics.com>:
   New ebuild. What used to be java-gnome is now multiplexed into various modular
   subcomponents. Upstream CVS was all re-arranged, and now there is a release
   tarball for each piece. This ebuild is the java binding around the core GTK
   libraries (and is the only one of the new pieces which doesn't need the rest of
   GNOME installed).
-
diff --git a/dev-java/libgtk-java/Manifest b/dev-java/libgtk-java/Manifest
index 4c9594a99356..a7c959486fd7 100644
--- a/dev-java/libgtk-java/Manifest
+++ b/dev-java/libgtk-java/Manifest
@@ -1,19 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f238bbfcec2bfc89580dc1cc6ad94395 libgtk-java-2.4.6-r1.ebuild 3032
-MD5 ed4e8335ae855378eddf205b2f92d50c ChangeLog 1338
+MD5 64418c0f092b6abe94d34cb91b1b1764 libgtk-java-2.4.6-r2.ebuild 3043
+MD5 fc7a7c3173bc071cbedcc7e93630bf69 libgtk-java-2.4.7.2.ebuild 3344
+MD5 ecd83955c10abfb7302368afd32eacb4 libgtk-java-2.4.6-r1.ebuild 3007
+MD5 ea053cb7f019ae21f4881feb4323aeb5 ChangeLog 1684
 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 1defc6f20e4684f13955e28a28e47e1f files/libgtk-java-2.4.6_install-doc.patch 740
 MD5 1f2599c8fd250432f6e6b43d598e75db files/libgtk-java-2.4.6_gentoo-PN-SLOT.patch 2013
+MD5 44a67ac512c028ffef92f3a0ed1bc196 files/digest-libgtk-java-2.4.7.2 72
 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.9.10 (GNU/Linux)
-
-iD8DBQFByww7I1lqEGTUzyQRAuHDAJwMajbvTZ8QbgosDHgNji5WRSMllACaAz4i
-44WjC2PAxGLJoMuh4HhObh4=
-=gZEm
------END PGP SIGNATURE-----
diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r2 b/dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r2
new file mode 100644
index 000000000000..1f417fd76435
--- /dev/null
+++ b/dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r2
@@ -0,0 +1 @@
+MD5 3f4533073d2c51cb444d16ecf91e9d08 libgtk-java-2.4.6.tar.bz2 438133
diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.4.7.2 b/dev-java/libgtk-java/files/digest-libgtk-java-2.4.7.2
new file mode 100644
index 000000000000..5312c4ea6cb3
--- /dev/null
+++ b/dev-java/libgtk-java/files/digest-libgtk-java-2.4.7.2
@@ -0,0 +1 @@
+MD5 a91852eb5a0ff7b5487f55a17f2eb13b libgtk-java-2.4.7.2.tar.bz2 458397
diff --git a/dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild b/dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild
index b05e73ea66f3..de14bdee957a 100644
--- a/dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild
+++ b/dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.6-r1.ebuild,v 1.2 2004/11/29 15:35:33 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild,v 1.3 2004/12/28 12:57:07 axxo Exp $
 
 #
 # WARNING: Because java-gnome is a set of bindings to native GNOME libraries,
@@ -27,9 +27,7 @@ RDEPEND=">=x11-libs/gtk+-2.4
 
 DEPEND="${RDEPEND}
 		>=virtual/jdk-1.2
-		app-arch/zip
-		sys-devel/autoconf
-		sys-devel/automake"
+		app-arch/zip"
 
 #
 # Critical that this match gtkapiversion
@@ -66,7 +64,7 @@ src_compile() {
 		--host=${CHOST} \
 		--prefix=/usr \
 			${conf} || die "./configure failed"
-	make || die
+	make || die "compile failed"
 }
 
 src_install() {
diff --git a/dev-java/libgtk-java/libgtk-java-2.4.6-r2.ebuild b/dev-java/libgtk-java/libgtk-java-2.4.6-r2.ebuild
new file mode 100644
index 000000000000..9f176ce4d232
--- /dev/null
+++ b/dev-java/libgtk-java/libgtk-java-2.4.6-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2004 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.6-r2.ebuild,v 1.1 2004/12/28 12:57:07 axxo 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"
+
+#
+# Unfortunately we need to run autogen to do the variable substitutions, so
+# regardless of whether or not there is an upstream ./configure [at time of
+# writing there isn't] we need to recreate it
+#
+
+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}
+	epatch ${FILESDIR}/libgtk-java-2.4.6_gcj-autoconf-macro-fix.patch
+	epatch ${FILESDIR}/libgtk-java-2.4.6_gentoo-PN-SLOT.patch
+	epatch ${FILESDIR}/libgtk-java-2.4.6_install-doc.patch
+	epatch ${FILESDIR}/libgtk-java-2.4.6_no-docbook-autoconf-macro.patch
+	use gcj || epatch ${FILESDIR}/${P}_find_jni.patch
+}
+
+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
+	#
+
+	./autogen.sh \
+		--host=${CHOST} \
+		--prefix=/usr \
+			${conf} || die "./configure failed"
+	make || die "compile failed"
+}
+
+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.4.7.2.ebuild b/dev-java/libgtk-java/libgtk-java-2.4.7.2.ebuild
new file mode 100644
index 000000000000..4636259c6c54
--- /dev/null
+++ b/dev-java/libgtk-java/libgtk-java-2.4.7.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2004 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.7.2.ebuild,v 1.1 2004/12/28 12:57:07 axxo 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"
+
+#
+# Unfortunately we need to run autogen to do the variable substitutions, so
+# regardless of whether or not there is an upstream ./configure [at time of
+# writing there isn't] we need to recreate it
+#
+
+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.
+
+#	Fixed upstream, will remove next release
+#	epatch ${FILESDIR}/libgtk-java-2.4.6_gcj-autoconf-macro-fix.patch
+
+	epatch ${FILESDIR}/libgtk-java-2.4.6_gentoo-PN-SLOT.patch
+	epatch ${FILESDIR}/libgtk-java-2.4.6_install-doc.patch
+	epatch ${FILESDIR}/libgtk-java-2.4.6_no-docbook-autoconf-macro.patch
+	use gcj || epatch ${FILESDIR}/libgtk-java-2.4.6_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
+	#
+
+	./autogen.sh \
+		--host=${CHOST} \
+		--prefix=/usr \
+			${conf} || die "./configure failed"
+			make || die "compile failed"
+}
+
+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
+}