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

7 files changed, 293 insertions, 14 deletions

diff --git a/dev-java/java-gnome/ChangeLog b/dev-java/java-gnome/ChangeLog
index 20e34aaf40d8..4c91e1d307ca 100644
--- a/dev-java/java-gnome/ChangeLog
+++ b/dev-java/java-gnome/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for dev-java/java-gnome
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.20 2004/09/01 08:47:37 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.21 2004/12/28 12:54:11 axxo Exp $
+
+* java-gnome-2.8.2-r3 (27 Dec 2004)
+
+  27 Dec 2004; Andrew Cowie <andrew@operationaldynamics.com> +java-gnome-2.8.2-r3.ebuild:
+  Bump to pick up upstream maint releases to libgtk-java and libglade-java
+
+* java-gnome-2.8.2-r2 (24 Dec 2004)
+
+  24 Dec 2004; Andrew Cowie <andrew@operationaldynamics.com> +java-gnome-2.8.2-r2.ebuild java-gnome-2.8.2-r1.ebuild:
+  Bump to pick up the libglade bugfix
+
+* java-gnome-2.8.2-r1 (17 Nov 2004)
+
+  17 Nov 2004; Andrew Cowie <andrew@operationaldynamics.com> java-gnome-2.8.2-r1.ebuild:
+  Upped dependencies on lib*java for their small ebuild improvements.
+
+  10 Nov 2004; Andrew Cowie <andrew@operationaldynamics.com> java-gnome-2.8.2.ebuild:
+  The java-gnome metapackage now generates JavaDoc for the whole java-gnome
+  suite. There's no point in creating disconnected bits of JavaDoc as anyone
+  developing against it needs the whole pile together.
+
+* java-gnome-2.8.2 (08 Nov 2004)
+
+  08 Nov 2004; Andrew Cowie <andrew@operationaldynamics.com>:
+  MAJOR CHANGE. 
+ 
+  What used to be java-gnome is now multiplexed into various modular
+  subcomponents. Upstream CVS was all re-arranged, and now they release a tarball
+  for each piece. This ebuild is now [only] a meta package which in turn depends
+  on the various individual libraries (libgtk-java, libglade-java, etc) which
+  make up the java-gnome suite.
+
+  Note that this is marked as blocking older java-gnome versions. The 
+  The risk of naming collisions between java-gnome-2.6 and lib*-java-2.8* 
+  is too high.
 
   01 Sep 2004; Thomas Matthijs <axxo@gentoo.org> java-gnome-2.6.0.1-r1.ebuild:
   update depends, closes 62437
diff --git a/dev-java/java-gnome/Manifest b/dev-java/java-gnome/Manifest
index ec8be69b61c0..96a65cbe4c21 100644
--- a/dev-java/java-gnome/Manifest
+++ b/dev-java/java-gnome/Manifest
@@ -1,20 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 90e3c444913def0075d911ad5e608414 java-gnome-0.8.3.ebuild 1719
+MD5 2b28c728ffa6bb77a09504df167b1bab java-gnome-2.8.2-r3.ebuild 3657
 MD5 3eec01d17dab5462a2e5ee8018184c21 java-gnome-2.6.0.1-r1.ebuild 2764
 MD5 f0202da9a3b2534ea914ae6c8b3fc3a4 java-gnome-2.6.0.1.ebuild 2697
-MD5 9607337b773d7b890d62e0b15ee62345 ChangeLog 3237
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 774c4a70e92ff04de744ae52dd0b2006 ChangeLog 4762
+MD5 90071431b860e3979d0039f28b71fba2 metadata.xml 1217
+MD5 9bbbad31b6de0a61a701c6faf12e29ab java-gnome-2.8.2-r2.ebuild 3655
 MD5 95eae7ebf2d8a9d2443cb7f138aab94b files/java-gnome-0.8.3-gentoo.diff 3998
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-java-gnome-2.8.2-r2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-java-gnome-2.8.2-r3 0
 MD5 3b0e994589f54485c4c6f43618005bc7 files/gentoo-java-gnome-2.6.0.1.patch 3574
 MD5 a26e989caf78aa69cbd7e1572f1f6d35 files/digest-java-gnome-2.6.0.1 72
 MD5 a26e989caf78aa69cbd7e1572f1f6d35 files/digest-java-gnome-2.6.0.1-r1 72
 MD5 d0548db82a1916704411084a9a019f05 files/digest-java-gnome-0.8.3 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBNYzv/rLF9B432nYRAmdqAKCy495ul1fSylmuMbg8oaDGJESb8wCgkG8Y
-6o7KspGQZPupctQY/RlCRTk=
-=vUaL
------END PGP SIGNATURE-----
diff --git a/dev-java/java-gnome/files/digest-java-gnome-2.8.2-r2 b/dev-java/java-gnome/files/digest-java-gnome-2.8.2-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/dev-java/java-gnome/files/digest-java-gnome-2.8.2-r2
diff --git a/dev-java/java-gnome/files/digest-java-gnome-2.8.2-r3 b/dev-java/java-gnome/files/digest-java-gnome-2.8.2-r3
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/dev-java/java-gnome/files/digest-java-gnome-2.8.2-r3
diff --git a/dev-java/java-gnome/java-gnome-2.8.2-r2.ebuild b/dev-java/java-gnome/java-gnome-2.8.2-r2.ebuild
new file mode 100644
index 000000000000..049d336b20cc
--- /dev/null
+++ b/dev-java/java-gnome/java-gnome-2.8.2-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-2.8.2-r2.ebuild,v 1.1 2004/12/28 12:54:11 axxo Exp $
+
+inherit eutils
+
+DESCRIPTION="A meta package for all the bindings libraries necessary to write GNOME/GTK applicatons in Java"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+DEPEND="!<dev-java/java-gnome-2.8
+	>=dev-java/libgtk-java-2.4.6-r2
+	>=dev-java/libgnome-java-2.8.2-r1
+	>=dev-java/libgconf-java-2.8.2
+	>=dev-java/libglade-java-2.8.2-r1
+	doc? ( >=virtual/jdk-1.2 )"
+
+SLOT="2.8"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc"
+IUSE="doc"
+
+pkg_setup() {
+
+	einfo ""
+	einfo "The java-gnome project has made considerably changes to its internal"
+	einfo "structure. Instead of one monolithic java-gnome package, there are"
+	einfo "now indiviudal builds for libgtk-java, libgnome-java, libglade-java, etc"
+	einfo ""
+	einfo "This java-gnome ebuild is now a meta package which simply depends on"
+	einfo "the various new ebuilds"
+	einfo ""
+	ewarn "While this ebuild is slotted 2.8, it is marked as being blocked by"
+	ewarn "the presence of older versions of java-gnome if they exist on your"
+	ewarn "system. Not only were the 2.6 bindings really buggy, but with the"
+	ewarn "major re-organization of this package into modular pieces, the"
+	ewarn "risk of library and/or jar naming collisions is too high."
+	einfo ""
+	einfo "By the time you see this message, the above issues have been"
+	einfo "resolved (ie the new lib*-java packages will all be merged,"
+	einfo "and any old java-gnome packages are now removed)."
+	einfo ""
+}
+
+src_compile() {
+	use doc || return
+
+	#
+	# Upstream's reorg led to a total mess with the generated Javadoc.
+	# This attempts to replace it for the time being, creating Javadoc
+	# for all the java-gnome libraries at one go (which makes way more sense
+	# than one per library scattered all over)
+	#
+
+	cd ${WORKDIR}
+
+	# Yes, this is terrible hard coding. I'd welcome someone telling me
+	# how to do this better.
+
+	unzip -o -q /usr/share/libgtk-java-2.4/src/libgtk-java-2.4.6.src.zip -d java
+	unzip -o -q /usr/share/libgnome-java-2.8/src/libgnome-java-2.8.2.src.zip -d java
+	unzip -o -q /usr/share/libgconf-java-2.8/src/libgconf-java-2.8.2.src.zip -d java
+	unzip -o -q /usr/share/libglade-java-2.8/src/libglade-java-2.8.2.src.zip -d java
+
+	javadoc \
+		-public -use -version -author \
+		-windowtitle "java-gnome ${PV} API Reference" \
+		-doctitle "API reference for <B><TT>java-gnome</TT></B>, version ${PV}" \
+		-d api \
+		-sourcepath java \
+			org.gnu.glib \
+			org.gnu.pango \
+			org.gnu.atk \
+			org.gnu.gdk \
+			org.gnu.gtk \
+			org.gnu.gtk.event \
+			org.gnu.gnome \
+			org.gnu.gnome.event \
+			org.gnu.glade \
+			org.gnu.gconf
+}
+
+src_install() {
+	einfo "creating symlinks for convenience and backwards compatability"
+
+	#
+	# This is just here for convenience and for legacy compatability.
+	#
+	# This isn't meant to be Java policy compliant. There is no
+	# package.env file for this ebuild because the individual libraries
+	# it depends on all have proper package.env (which this uses, in fact).
+	#
+
+	mkdir -p ${D}/usr/share/java-gnome/lib
+	cd ${D}/usr/share/java-gnome/lib
+
+	gtk_jar=`java-config -p libgtk-java-2.4`
+	ln -s $gtk_jar `basename $gtk_jar`
+
+	gnome_jar=`java-config -p libgnome-java-2.8`
+	ln -s $gnome_jar `basename $gnome_jar`
+
+	glade_jar=`java-config -p libglade-java-2.8`
+	ln -s $glade_jar `basename $glade_jar`
+
+	gconf_jar=`java-config -p libgconf-java-2.8`
+	ln -s $gconf_jar `basename $gconf_jar`
+
+
+	use doc || return
+
+	mkdir -p ${D}/usr/share/doc/${PF}
+	mv ${WORKDIR}/api ${D}/usr/share/doc/${PF}
+}
+
diff --git a/dev-java/java-gnome/java-gnome-2.8.2-r3.ebuild b/dev-java/java-gnome/java-gnome-2.8.2-r3.ebuild
new file mode 100644
index 000000000000..a985c6375c88
--- /dev/null
+++ b/dev-java/java-gnome/java-gnome-2.8.2-r3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-2.8.2-r3.ebuild,v 1.1 2004/12/28 12:54:11 axxo Exp $
+
+inherit eutils
+
+DESCRIPTION="A meta package for all the bindings libraries necessary to write GNOME/GTK applicatons in Java"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+DEPEND="!<dev-java/java-gnome-2.8
+	>=dev-java/libgtk-java-2.4.7.2
+	>=dev-java/libgnome-java-2.8.2-r1
+	>=dev-java/libgconf-java-2.8.2
+	>=dev-java/libglade-java-2.8.2.2
+	doc? ( >=virtual/jdk-1.2 )"
+
+SLOT="2.8"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc"
+IUSE="doc"
+
+pkg_setup() {
+
+	einfo ""
+	einfo "The java-gnome project has made considerably changes to its internal"
+	einfo "structure. Instead of one monolithic java-gnome package, there are"
+	einfo "now indiviudal builds for libgtk-java, libgnome-java, libglade-java, etc"
+	einfo ""
+	einfo "This java-gnome ebuild is now a meta package which simply depends on"
+	einfo "the various new ebuilds"
+	einfo ""
+	ewarn "While this ebuild is slotted 2.8, it is marked as being blocked by"
+	ewarn "the presence of older versions of java-gnome if they exist on your"
+	ewarn "system. Not only were the 2.6 bindings really buggy, but with the"
+	ewarn "major re-organization of this package into modular pieces, the"
+	ewarn "risk of library and/or jar naming collisions is too high."
+	einfo ""
+	einfo "By the time you see this message, the above issues have been"
+	einfo "resolved (ie the new lib*-java packages will all be merged,"
+	einfo "and any old java-gnome packages are now removed)."
+	einfo ""
+}
+
+src_compile() {
+	use doc || return
+
+	#
+	# Upstream's reorg led to a total mess with the generated Javadoc.
+	# This attempts to replace it for the time being, creating Javadoc
+	# for all the java-gnome libraries at one go (which makes way more sense
+	# than one per library scattered all over)
+	#
+
+	cd ${WORKDIR}
+
+	# Yes, this is terrible hard coding. I'd welcome someone telling me
+	# how to do this better.
+
+	unzip -o -q /usr/share/libgtk-java-2.4/src/libgtk-java-2.4.7.2.src.zip -d java
+	unzip -o -q /usr/share/libgnome-java-2.8/src/libgnome-java-2.8.2.src.zip -d java
+	unzip -o -q /usr/share/libgconf-java-2.8/src/libgconf-java-2.8.2.src.zip -d java
+	unzip -o -q /usr/share/libglade-java-2.8/src/libglade-java-2.8.2.2.src.zip -d java
+
+	javadoc \
+		-public -use -version -author \
+		-windowtitle "java-gnome ${PV} API Reference" \
+		-doctitle "API reference for <B><TT>java-gnome</TT></B>, version ${PV}" \
+		-d api \
+		-sourcepath java \
+			org.gnu.glib \
+			org.gnu.pango \
+			org.gnu.atk \
+			org.gnu.gdk \
+			org.gnu.gtk \
+			org.gnu.gtk.event \
+			org.gnu.gnome \
+			org.gnu.gnome.event \
+			org.gnu.glade \
+			org.gnu.gconf
+}
+
+src_install() {
+	einfo "creating symlinks for convenience and backwards compatability"
+
+	#
+	# This is just here for convenience and for legacy compatability.
+	#
+	# This isn't meant to be Java policy compliant. There is no
+	# package.env file for this ebuild because the individual libraries
+	# it depends on all have proper package.env (which this uses, in fact).
+	#
+
+	mkdir -p ${D}/usr/share/java-gnome/lib
+	cd ${D}/usr/share/java-gnome/lib
+
+	gtk_jar=`java-config -p libgtk-java-2.4`
+	ln -s $gtk_jar `basename $gtk_jar`
+
+	gnome_jar=`java-config -p libgnome-java-2.8`
+	ln -s $gnome_jar `basename $gnome_jar`
+
+	glade_jar=`java-config -p libglade-java-2.8`
+	ln -s $glade_jar `basename $glade_jar`
+
+	gconf_jar=`java-config -p libgconf-java-2.8`
+	ln -s $gconf_jar `basename $gconf_jar`
+
+
+	use doc || return
+
+	mkdir -p ${D}/usr/share/doc/${PF}
+	mv ${WORKDIR}/api ${D}/usr/share/doc/${PF}
+}
+
diff --git a/dev-java/java-gnome/metadata.xml b/dev-java/java-gnome/metadata.xml
index 838c00a4a448..0bdbe3a60dd3 100644
--- a/dev-java/java-gnome/metadata.xml
+++ b/dev-java/java-gnome/metadata.xml
@@ -1,5 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<maintainer>
+		<email>andrew@operationaldynamics.com</email>
+		<name>Andrew Cowie</name>
+	</maintainer>
+	<longdescription>
+		An elegant set of language bindings to allow you to write
+		native GNOME/GTK applications in Java. Works with both
+		traditional Java VMs and also with GCJ, allowing the creation
+		of native Linux executable binaries.
+
+		These libraries all come from the java-gnome project, which in
+		turn is part of the official suite of GNOME language bindings.
+
+		As of java-gnome 2.8, the previously monolithic package was
+		split into numerous individual libraries to allow more
+		modular use. Those libraries are libgtk-java, libgnome-java,
+		libgconf-java, libglade-java, etc.
+
+		This ebuild is a meta package which simply depends on the
+		various libraries which make up the complete java-gnome suite.
+
+		In all likelihood (especially if you're developing apps) this
+		is what you want to emerge.
+	</longdescription>
 </pkgmetadata>