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

5 files changed, 134 insertions, 14 deletions

diff --git a/dev-java/libgnome-java/ChangeLog b/dev-java/libgnome-java/ChangeLog
index 2bbf03f7eda1..9f1e3e30f35c 100644
--- a/dev-java/libgnome-java/ChangeLog
+++ b/dev-java/libgnome-java/ChangeLog
@@ -1,7 +1,20 @@
 # ChangeLog for dev-java/libgnome-java
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.3 2004/12/21 20:31:02 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.4 2004/12/28 12:56:34 axxo Exp $
 
+* libgnome-java-2.8.2-r1 (17 Nov 2004)
+
+  17 Nov 2004; Andrew Cowie <andrew@operationaldynamics.com> +libgnome-java-2.8.2-r1:
+  Added libgnomeui to DEPENDS
+
+* libgnome-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 ebuild is the Java binding around the core GNOME
+  libraries.
+ 
 *libgnome-java-2.8.2 (22 Nov 2004)
 
   22 Nov 2004; Karl Trygve Kalleberg <karltk@gentoo.org> +metadata.xml,
@@ -9,9 +22,8 @@
   +libgnome-java-2.8.2.ebuild:
   Initial import. Fixes #70560.
 
-  08 Nov 2004; Andrew Cowie <andrew@operationaldynamics.com>
+  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 ebuild is the Java binding around the core GNOME
   libraries.
-
diff --git a/dev-java/libgnome-java/Manifest b/dev-java/libgnome-java/Manifest
index cdf66e6a70c0..74de87aaddc9 100644
--- a/dev-java/libgnome-java/Manifest
+++ b/dev-java/libgnome-java/Manifest
@@ -1,5 +1,7 @@
-MD5 9c530d6f88d9e2d9ebeaa22a4298c072 libgnome-java-2.8.2.ebuild 3201
-MD5 1f56da87e33bba4b9909e01805610ae2 ChangeLog 754
+MD5 a1af204707f4602d854d8b17ee5cd33c libgnome-java-2.8.2-r1.ebuild 3098
+MD5 c659fe24d8a6c0559037864bcc82c52a libgnome-java-2.8.2.ebuild 3211
+MD5 e92ad1645f76ffe44d6a12ed4e6f96d4 ChangeLog 1264
 MD5 de0a216d1797f18db9dc83e5aedee360 metadata.xml 1002
+MD5 a8a8cdd7ec44ae7402032003fe1bb7ab files/digest-libgnome-java-2.8.2-r1 72
 MD5 b5f8aad83ed35026438574e04a3122ac files/libgnome-java-2.8.2_gentoo-PN-SLOT.patch 1310
 MD5 a8a8cdd7ec44ae7402032003fe1bb7ab files/digest-libgnome-java-2.8.2 72
diff --git a/dev-java/libgnome-java/files/digest-libgnome-java-2.8.2-r1 b/dev-java/libgnome-java/files/digest-libgnome-java-2.8.2-r1
new file mode 100644
index 000000000000..1f873169f1b0
--- /dev/null
+++ b/dev-java/libgnome-java/files/digest-libgnome-java-2.8.2-r1
@@ -0,0 +1 @@
+MD5 3fa03e9809f032540388b43dbf0cf582 libgnome-java-2.8.2.tar.bz2 126393
diff --git a/dev-java/libgnome-java/libgnome-java-2.8.2-r1.ebuild b/dev-java/libgnome-java/libgnome-java-2.8.2-r1.ebuild
new file mode 100644
index 000000000000..a2898b3dbf7a
--- /dev/null
+++ b/dev-java/libgnome-java/libgnome-java-2.8.2-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.8.2-r1.ebuild,v 1.1 2004/12/28 12:56:34 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 the core GNOME libraries (allow GNOME/GTK applications to be written in Java)"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+RDEPEND=">=gnome-base/libgnome-2.8.0
+	>=gnome-base/libgnomeui-2.8.0
+	>=dev-java/libgtk-java-2.4.6-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}/libgnome-java-2.8.2_gentoo-PN-SLOT.patch
+	sed -i "s|^\(JAVA_INCLUDES = \)|\1 -I\${JDK_HOME}/include -I\${JDK_HOME}/include/linux/|" src/Makefile.in || die "sed failed"
+}
+
+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/libgnome${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/libgnome${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/libgnome-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/gnome${SLOT}.jar" \
+		>> ${D}/usr/share/${PN}-${SLOT}/package.env
+}
diff --git a/dev-java/libgnome-java/libgnome-java-2.8.2.ebuild b/dev-java/libgnome-java/libgnome-java-2.8.2.ebuild
index 7959b0b17c1e..24016688c545 100644
--- a/dev-java/libgnome-java/libgnome-java-2.8.2.ebuild
+++ b/dev-java/libgnome-java/libgnome-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/libgnome-java/libgnome-java-2.8.2.ebuild,v 1.1 2004/11/22 00:22:20 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.8.2.ebuild,v 1.2 2004/12/28 12:56:34 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
 
@@ -22,7 +22,7 @@ RDEPEND=">=gnome-base/libgnome-2.8.0
 	>=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
 #
@@ -55,7 +55,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.
 	#
@@ -64,7 +64,7 @@ src_compile() {
 		--host=${CHOST} \
 		--prefix=/usr \
 			${conf} || die "./configure failed"
-	make || die
+	make || die "compile failed"
 }
 
 src_install() {
@@ -82,7 +82,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
@@ -93,7 +93,7 @@ src_install() {
 	cd ${S}/src/java
 	zip -r ${D}/usr/share/${PN}-${SLOT}/src/libgnome-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?
 
 	echo "DESCRIPTION=${DESCRIPTION}" \