Version bump with a mask

(Portage version: 2.0.53_rc7)

6 files changed, 137 insertions, 23 deletions

diff --git a/dev-java/libgtk-java/ChangeLog b/dev-java/libgtk-java/ChangeLog
index 8d69c80a0938..faaf4a66a0e6 100644
--- a/dev-java/libgtk-java/ChangeLog
+++ b/dev-java/libgtk-java/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2005/06/29 15:10:08 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.11 2005/11/12 23:37:57 compnerd Exp $
+
+*libgtk-java-2.8.1 (12 Nov 2005)
+
+  12 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/aclocal_voodoo.patch, metadata.xml, +libgtk-java-2.8.1.ebuild:
+  Version bumping with a mask
 
   29 Jun 2005; Thomas Matthijs <axxo@gentoo.org>
   -libgtk-java-2.4.6-r1.ebuild, -libgtk-java-2.4.6-r2.ebuild,
diff --git a/dev-java/libgtk-java/Manifest b/dev-java/libgtk-java/Manifest
index f6f271d85aca..168949cb8f48 100644
--- a/dev-java/libgtk-java/Manifest
+++ b/dev-java/libgtk-java/Manifest
@@ -1,26 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b022186c8e04efb63e91009731c12120 libgtk-java-2.4.9.ebuild 2892
-MD5 894895a802ebec44935045bc8f800c2f libgtk-java-2.4.8.1.ebuild 3350
-MD5 856b0e851f16dddc9002d7e1ee2c603e libgtk-java-2.6.2-r1.ebuild 2820
-MD5 265e93e30683f886018d493130cda3cd ChangeLog 4030
-MD5 23e70539fce4ef96d51e3043420acb8c metadata.xml 975
-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 8b6c0b34b72b1491de3b70bfc0063ca8 ChangeLog 4223
+MD5 984048712e487cfd26ccdc19f1247e63 files/aclocal_voodoo.patch 733
 MD5 c9b06cd33dfa81082635f38a375da14d files/digest-libgtk-java-2.4.8.1 72
-MD5 40c9acf29309ee98632a536eba5ef6a9 files/libgtk-java-2.4.8.1_fix-TextBuffer.patch 802
+MD5 f4c28fbb216236ce592ffe72a3d4e9ed files/digest-libgtk-java-2.4.9 70
+MD5 5447d20adb67dacfc4ecd80c88386343 files/digest-libgtk-java-2.6.2-r1 70
+MD5 766fa2461a679dad768a21ea8b014bff files/digest-libgtk-java-2.8.1 70
 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 1f2599c8fd250432f6e6b43d598e75db files/libgtk-java-2.4.6_gentoo-PN-SLOT.patch 2013
+MD5 1defc6f20e4684f13955e28a28e47e1f files/libgtk-java-2.4.6_install-doc.patch 740
 MD5 e8a6ddb689376b8e04d3bc41cca48253 files/libgtk-java-2.4.6_no-docbook-autoconf-macro.patch 394
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC3Mlo/rLF9B432nYRAt7wAJ9BVmHhC+s1v1j8XZYqcY3JVnFcgACfY9M0
-V25etx3ZOsLFKVkUtdmniDc=
-=kZGT
------END PGP SIGNATURE-----
+MD5 fc26b5e15e1e19216390e328d36237f2 files/libgtk-java-2.4.8.1_find-jni.patch 662
+MD5 40c9acf29309ee98632a536eba5ef6a9 files/libgtk-java-2.4.8.1_fix-TextBuffer.patch 802
+MD5 4130379b76854eac4060c133f20a765d files/libgtk-java-2.4.8.1_gentoo-PN-SLOT.patch 527
+MD5 894895a802ebec44935045bc8f800c2f libgtk-java-2.4.8.1.ebuild 3350
+MD5 b022186c8e04efb63e91009731c12120 libgtk-java-2.4.9.ebuild 2892
+MD5 856b0e851f16dddc9002d7e1ee2c603e libgtk-java-2.6.2-r1.ebuild 2820
+MD5 3ea203703a08f94f60ea7d4d021b15f8 libgtk-java-2.8.1.ebuild 1976
+MD5 8d139287f93dc4241b670299688f0ae0 metadata.xml 1075
diff --git a/dev-java/libgtk-java/files/aclocal_voodoo.patch b/dev-java/libgtk-java/files/aclocal_voodoo.patch
new file mode 100644
index 000000000000..3330ad559ba1
--- /dev/null
+++ b/dev-java/libgtk-java/files/aclocal_voodoo.patch
@@ -0,0 +1,23 @@
+--- Makefile.am.orig	2005-11-12 14:32:39.000000000 -0600
++++ Makefile.am	2005-11-12 14:33:53.000000000 -0600
+@@ -985,8 +985,8 @@
+ pkgconfig_DATA = gtk2-java.pc
+ 
+ # install the macros used by other java-gnome packages
+-jgmacrodir = $(datadir)/libgtk-java/macros
+-jgmacro_DATA = \
++m4datadir = $(datadir)/aclocal
++m4data_DATA = \
+ 	macros/jg_gtk_java.m4 \
+ 	macros/jg_gnome_java.m4
+ 
+--- gtk2-java.pc.in.orig	2005-11-12 14:34:13.000000000 -0600
++++ gtk2-java.pc.in	2005-11-12 14:34:25.000000000 -0600
+@@ -10,7 +10,6 @@
+ Version: @VERSION@

+ api_version=@gtkapiversion@

+ classpath=@INSTALLED_CLASSPATH@

+-macro_dir=@INSTALLED_MACRO_DIR@

+ jnilibs=-L@libdir@ -lgtkjni

+ Libs: -L@libdir@ -lgtkjava

+ Cflags: -I@includedir@/libgtk-java

diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.8.1 b/dev-java/libgtk-java/files/digest-libgtk-java-2.8.1
new file mode 100644
index 000000000000..02b282d09c29
--- /dev/null
+++ b/dev-java/libgtk-java/files/digest-libgtk-java-2.8.1
@@ -0,0 +1 @@
+MD5 f96f147fa2c75e810736c2a80cdcd4bd libgtk-java-2.8.1.tar.gz 1094558
diff --git a/dev-java/libgtk-java/libgtk-java-2.8.1.ebuild b/dev-java/libgtk-java/libgtk-java-2.8.1.ebuild
new file mode 100644
index 000000000000..15edc3836c7b
--- /dev/null
+++ b/dev-java/libgtk-java/libgtk-java-2.8.1.ebuild
@@ -0,0 +1,87 @@
+# 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.8.1.ebuild,v 1.1 2005/11/12 23:37:57 compnerd Exp $
+
+# Must be before the gnome.org inherit
+GNOME_TARBALL_SUFFIX="gz"
+
+inherit java-pkg eutils gnome.org
+
+DESCRIPTION="Java bindings for GTK+"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+
+# Not on gnome.org mirrors yet :-(
+SRC_URI="http://research.operationaldynamics.com/linux/java-gnome/dist/${PF}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="2.8"
+KEYWORDS="~x86"
+IUSE="doc gcj"
+
+DEPS=">=x11-libs/gtk+-2.8.3
+	  >=dev-java/glib-java-0.2.1
+	  >=dev-java/cairo-java-1.0.1
+	  >=dev-libs/glib-2.6.0
+	  >=x11-libs/cairo-1.0.0-r2
+		dev-util/pkgconfig"
+
+DEPEND=">=virtual/jdk-1.4
+		>=sys-apps/sed-4
+		${DEPS}"
+RDEPEND=">=virtual/jre-1.4
+		 ${DEPS}"
+
+pkg_setup() {
+	if use gcj -a ! built_with_use sys-devel/gcc gcc ; then
+		ewarn
+		ewarn "You must build gcc with the gcj support to build with gcj"
+		ewarn
+		ebeep 5
+		die "No GCJ support found!"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/aclocal_voodoo.patch
+
+	# Oh the joys of patching the autotools stuff
+	aclocal || die "aclocal failed"
+	libtoolize --force --copy || die "libtoolize failed"
+	autoconf || die "autoconf failed"
+	automake || die "automake failed"
+}
+
+src_compile() {
+	# JARDIR is a hack for java-config
+	econf $(use_with gcj gcj-compile) \
+		  $(use_with doc javadocs) \
+		  --with-jardir=/usr/share/${PN}-${SLOT}/lib \
+		  || die "configure failed"
+
+	emake || die "compile failed"
+
+	# Fix the broken pkgconfig file
+	sed -i \
+		-e "s:classpath.*$:classpath=\${prefix}/share/${PN}-${SLOT}/lib/${PF}.jar:" \
+		${S}/gtk2-java.pc
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "install failed"
+
+	# Examples are documentation
+	use doc || rm -rf ${D}/usr/share/doc/${PF}/examples
+
+	# use java-pkg_dojar to install the jar
+	rm -rf ${D}/usr/share/${PN}-${SLOT}
+
+	mv ${S}/gtk${SLOT}.jar ${S}/${PF}.jar
+	java-pkg_dojar ${S}/${PF}.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r ${S}/doc
+	fi
+}
diff --git a/dev-java/libgtk-java/metadata.xml b/dev-java/libgtk-java/metadata.xml
index 0ea025b89a5e..eda1607aceb7 100644
--- a/dev-java/libgtk-java/metadata.xml
+++ b/dev-java/libgtk-java/metadata.xml
@@ -6,6 +6,10 @@
 		<email>andrew@operationaldynamics.com</email>
 		<name>Andrew Cowie</name>
 	</maintainer>
+	<maintainer>
+		<email>compnerd@gentoo.org</email>
+		<name>Saleem Abdulrasool</name>
+	</maintainer>
 	<longdescription>
 		An elegant set of language bindings to allow you to write
 		native GTK applications in Java. Works in both normal Java VMs