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

9 files changed, 270 insertions, 15 deletions

diff --git a/dev-java/libglade-java/ChangeLog b/dev-java/libglade-java/ChangeLog
index 28465158209f..16dc1ffb0b21 100644
--- a/dev-java/libglade-java/ChangeLog
+++ b/dev-java/libglade-java/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for dev-java/libglade-java
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/ChangeLog,v 1.3 2004/12/21 20:15:30 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/ChangeLog,v 1.4 2004/12/28 12:56:02 axxo Exp $
+
+* libglade-java-2.8.2.2 (27 Dec 2004)
+
+  27 Dec 2004; Andrew Cowie <andrew@operationaldynamics.com> +libglade-java-2.8.2.2.ebuild:
+  New upstream with the fix below. Note that 2.8.2.1 had an internal version 
+  number glitch
+
+* libglade-java-2.8.2-r1 (24 Dec 2004)
+
+  24 Dec 2004; Andrew Cowie <andrew@operationaldynamics.com> +libglade-java-2.8.2-r1.ebuild, -libglade-java-2.8.2.ebuild:
+  Nasty little bug with respect to signal connection. Luckily, simple fix.
+  See gnome.org bug #161190 which in turn is based on Red Hat bug #141713. This
+  will go away very shortly if a new upstream is released (largely and only 
+  containing this patch).
+
+  18 Nov 2004; Andrew Cowie <andrew@operationaldynamics.com> libglade-java-2.8.2.ebuild:
+  Marked stable on x86
+
+* libglade-java-2.8.2 (08 Nov 2004)
+
+  08 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 is the Java binding for LibGlade.
 
 * libglade-java-2.8.2 (04 Dec 2004)
 
@@ -12,4 +36,3 @@
   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 is the Java binding for LibGlade.
-
diff --git a/dev-java/libglade-java/Manifest b/dev-java/libglade-java/Manifest
index 079b26fedcab..07028a1d26f6 100644
--- a/dev-java/libglade-java/Manifest
+++ b/dev-java/libglade-java/Manifest
@@ -1,5 +1,10 @@
-MD5 af8505b511150249c7a4362d44ad4d99 libglade-java-2.8.2.ebuild 3281
-MD5 e947694d041fc300319c4595b6515cd5 ChangeLog 663
-MD5 25131e29d5a6eb23196ff70fdf259706 metadata.xml 1306
+MD5 5f81dd012f8a55dbc7ce70adf9cf293e libglade-java-2.8.2-r1.ebuild 3181
+MD5 3750c810331e78e83726a9e34083a98e libglade-java-2.8.2.2.ebuild 3294
+MD5 f3a2f63406a8a4a51919c576191fdf65 libglade-java-2.8.2.ebuild 3291
+MD5 2b49f06517e29a5e87f4a8a84e3ea877 ChangeLog 1203
+MD5 d50086d74d4377e4f0a73922c949eac1 metadata.xml 1305
+MD5 eda99aeb347c072151e20c330b8cc3c4 files/digest-libglade-java-2.8.2-r1 71
+MD5 7ac5fbc0483956edf0634e70b501ce1a files/libglade-java-2.8.2_signal-connection-fix.patch 630
+MD5 c22ae14a58aed3c45a686a82e04094bb files/digest-libglade-java-2.8.2.2 73
 MD5 eda99aeb347c072151e20c330b8cc3c4 files/digest-libglade-java-2.8.2 71
 MD5 c068d53842b2d7d7efdca61acf5d72ca files/libglade-java-2.8.2_gentoo-PN-SLOT.patch 1190
diff --git a/dev-java/libglade-java/files/digest-libglade-java-2.8.2-r1 b/dev-java/libglade-java/files/digest-libglade-java-2.8.2-r1
new file mode 100644
index 000000000000..6998c06972dd
--- /dev/null
+++ b/dev-java/libglade-java/files/digest-libglade-java-2.8.2-r1
@@ -0,0 +1 @@
+MD5 428aad7b148cb2e4d695a04593b52435 libglade-java-2.8.2.tar.bz2 31557
diff --git a/dev-java/libglade-java/files/digest-libglade-java-2.8.2.2 b/dev-java/libglade-java/files/digest-libglade-java-2.8.2.2
new file mode 100644
index 000000000000..4fd1fa4341de
--- /dev/null
+++ b/dev-java/libglade-java/files/digest-libglade-java-2.8.2.2
@@ -0,0 +1 @@
+MD5 ff3d2120538c1e0d1ef3f7f813dddbd7 libglade-java-2.8.2.2.tar.bz2 81449
diff --git a/dev-java/libglade-java/files/libglade-java-2.8.2_signal-connection-fix.patch b/dev-java/libglade-java/files/libglade-java-2.8.2_signal-connection-fix.patch
new file mode 100644
index 000000000000..1649e47571b1
--- /dev/null
+++ b/dev-java/libglade-java/files/libglade-java-2.8.2_signal-connection-fix.patch
@@ -0,0 +1,14 @@
+diff -u -r1.3 LibGlade.java.in
+--- libglade-java/src/java/org/gnu/glade/LibGlade.java.in	24 Oct 2004 12:19:55 -0000	1.3
++++ libglade-java/src/java/org/gnu/glade/LibGlade.java.in	24 Dec 2004 00:39:38 -0000
+@@ -88,8 +88,9 @@
+ 		/* When you call glade_xml_new_from_buffer, it looses
+ 		 * information about what the glade file was, and later runs
+ 		 * into issues if you try to instantiate anything that needs a
+-		 * path relative to that file for example, a GtkPibuf */
++		 * path relative to that file for example, a GtkPixbuf */
+ 
++		this.owner = owner;
+ 		glade_xml_new(file, root);
+ 		glade_xml_signal_autoconnect_full();
+ 	}
diff --git a/dev-java/libglade-java/libglade-java-2.8.2-r1.ebuild b/dev-java/libglade-java/libglade-java-2.8.2-r1.ebuild
new file mode 100644
index 000000000000..c2d91dea81cf
--- /dev/null
+++ b/dev-java/libglade-java/libglade-java-2.8.2-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/libglade-java-2.8.2-r1.ebuild,v 1.1 2004/12/28 12:56:02 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 [Lib]Glade (allows GNOME/GTK applications writen in Java to be generate their user interface based on Glade description files)"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+RDEPEND=">=gnome-base/libglade-2.3.6
+	>=dev-java/libgtk-java-2.4.6-r2
+	>=dev-java/libgnome-java-2.8.2-r1
+	>=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.8"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc"
+IUSE="gcj"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/libglade-java-2.8.2_gentoo-PN-SLOT.patch
+	epatch ${FILESDIR}/libglade-java-2.8.2_signal-connection-fix.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.
+	#
+
+	./autogen.sh \
+		--host=${CHOST} \
+		--prefix=/usr \
+			${conf} || die "./configure failed"
+	make || die "compile failed"
+}
+
+src_install() {
+	# workaround Makefile bug not creating necessary parent directories
+	mkdir -p ${D}/usr/lib
+	mkdir -p ${D}/usr/share/java
+	mkdir -p ${D}/usr/lib/pkgconfig
+	mkdir -p ${D}/usr/share/doc/libglade${SLOT}-java
+
+	make prefix=${D}/usr install || die
+
+	# actually, at time of writing, there were no DOCUMENTS, but leave it here...
+	mv ${D}/usr/share/doc/libglade${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/libglade-java-${PV}.src.zip *
+
+	# again, with dojar misbehaving, better do to this manually for the
+	# time being. Yes, this is bad hard coding, but what in this ebuild isn't?
+
+	echo "DESCRIPTION=${DESCRIPTION}" \
+		>  ${D}/usr/share/${PN}-${SLOT}/package.env
+
+	echo "CLASSPATH=/usr/share/${PN}-${SLOT}/lib/glade${SLOT}.jar" \
+		>> ${D}/usr/share/${PN}-${SLOT}/package.env
+}
diff --git a/dev-java/libglade-java/libglade-java-2.8.2.2.ebuild b/dev-java/libglade-java/libglade-java-2.8.2.2.ebuild
new file mode 100644
index 000000000000..eb6e777679a9
--- /dev/null
+++ b/dev-java/libglade-java/libglade-java-2.8.2.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/libglade-java/libglade-java-2.8.2.2.ebuild,v 1.1 2004/12/28 12:56:02 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 [Lib]Glade (allows GNOME/GTK applications writen in Java to be generate their user interface based on Glade description files)"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+RDEPEND=">=gnome-base/libglade-2.3.6
+	>=dev-java/libgtk-java-2.4.7.1
+	>=dev-java/libgnome-java-2.8.2-r1
+	>=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
+		sys-devel/autoconf
+		sys-devel/automake"
+
+#
+# Critical that this match gtkapiversion
+#
+SLOT="2.8"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc"
+IUSE="gcj"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/libglade-java-2.8.2_gentoo-PN-SLOT.patch
+#	fixed upstream, will remove next release.
+#	epatch ${FILESDIR}/libglade-java-2.8.2_signal-connection-fix.patch
+	sed -i "s|^\(JAVA_INCLUDES = \)|\1 -I\${JDK_HOME}/include -I\${JDK_HOME}/include/linux/|" src/Makefile.in || die "sed failed"
+
+	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.
+	#
+
+	./autogen.sh \
+		--host=${CHOST} \
+		--prefix=/usr \
+			${conf} || die "./configure failed"
+	make || die "compile failed"
+}
+
+src_install() {
+	# workaround Makefile bug not creating necessary parent directories
+	mkdir -p ${D}/usr/lib
+	mkdir -p ${D}/usr/share/java
+	mkdir -p ${D}/usr/lib/pkgconfig
+	mkdir -p ${D}/usr/share/doc/libglade${SLOT}-java
+
+	make prefix=${D}/usr install || die
+
+	# actually, at time of writing, there were no DOCUMENTS, but leave it here...
+	mv ${D}/usr/share/doc/libglade${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/libglade-java-${PV}.src.zip *
+
+	# again, with dojar misbehaving, better do to this manually for the
+	# time being. Yes, this is bad hard coding, but what in this ebuild isn't?
+
+	echo "DESCRIPTION=${DESCRIPTION}" \
+		>  ${D}/usr/share/${PN}-${SLOT}/package.env
+
+	echo "CLASSPATH=/usr/share/${PN}-${SLOT}/lib/glade${SLOT}.jar" \
+		>> ${D}/usr/share/${PN}-${SLOT}/package.env
+}
diff --git a/dev-java/libglade-java/libglade-java-2.8.2.ebuild b/dev-java/libglade-java/libglade-java-2.8.2.ebuild
index d4bce9b6e09b..e31bf4b51f8f 100644
--- a/dev-java/libglade-java/libglade-java-2.8.2.ebuild
+++ b/dev-java/libglade-java/libglade-java-2.8.2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/libglade-java-2.8.2.ebuild,v 1.1 2004/12/04 13:42:25 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/libglade-java-2.8.2.ebuild,v 1.2 2004/12/28 12:56:02 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 
+# 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 DOESN NOT WORK.
-# 
+#
 
 inherit eutils gnome.org
 
@@ -21,7 +21,7 @@ RDEPEND=">=gnome-base/libglade-2.3.6
 	>=virtual/jre-1.2"
 
 #
-# Unfortunately we need to run autogen to do the variable substitutions, so 
+# 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
 #
@@ -54,7 +54,7 @@ src_compile() {
 	cd ${S}
 
 	#
-	# Ordinarily, moving things around post `make install` would do 
+	# 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.
 	#
@@ -63,7 +63,7 @@ src_compile() {
 		--host=${CHOST} \
 		--prefix=/usr \
 			${conf} || die "./configure failed"
-	make || die
+	make || die "compile failed"
 }
 
 src_install() {
@@ -81,7 +81,7 @@ src_install() {
 	# 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 
+	# 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
@@ -92,7 +92,7 @@ src_install() {
 	cd ${S}/src/java
 	zip -r ${D}/usr/share/${PN}-${SLOT}/src/libglade-java-${PV}.src.zip *
 
-	# again, with dojar misbehaving, better do to this manually for the 
+	# again, with dojar misbehaving, better do to this manually for the
 	# time being. Yes, this is bad hard coding, but what in this ebuild isn't?
 
 	# karltk: Missing generation of dependencies, should be fixed.
diff --git a/dev-java/libglade-java/metadata.xml b/dev-java/libglade-java/metadata.xml
index a2cde9581845..c336c9beef75 100644
--- a/dev-java/libglade-java/metadata.xml
+++ b/dev-java/libglade-java/metadata.xml
@@ -6,7 +6,6 @@
 		<email>andrew@operationaldynamics.com</email>
 		<name>Andrew Cowie</name>
 	</maintainer>
-
 	<longdescription>
 		An elegant set of language bindings to allow you to write
 		native GNOME applications in Java. Works with both traditional