Revision bump to address bug #125646 and #121254

(Portage version: 2.1_pre6-r6)

4 files changed, 109 insertions, 1 deletions

diff --git a/dev-java/libgtk-java/ChangeLog b/dev-java/libgtk-java/ChangeLog
index a14d1ded0488..025593afc19a 100644
--- a/dev-java/libgtk-java/ChangeLog
+++ b/dev-java/libgtk-java/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/libgtk-java
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.17 2006/02/08 00:30:05 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.18 2006/03/28 04:20:13 nichoj Exp $
+
+*libgtk-java-2.8.3-r1 (28 Mar 2006)
+
+  28 Mar 2006; <nichoj@gentoo.org> +libgtk-java-2.8.3-r1.ebuild:
+  Revision bump to address bug #125646 and #121254
 
 *libgtk-java-2.8.3 (08 Feb 2006)
 
diff --git a/dev-java/libgtk-java/Manifest b/dev-java/libgtk-java/Manifest
index 0f9c4a65f316..2fad1e512f64 100644
--- a/dev-java/libgtk-java/Manifest
+++ b/dev-java/libgtk-java/Manifest
@@ -22,6 +22,9 @@ SHA256 9cffb462c41487b3fd8264b99f88e15863a75a23f547a356e60e7c093be947c3 files/di
 MD5 76e14901f21fc3d0a5bba9d257efab75 files/digest-libgtk-java-2.8.3 256
 RMD160 8d9add6acc146446c998648a138116ad389e4e32 files/digest-libgtk-java-2.8.3 256
 SHA256 decd5e474700d86818f7c73b8f28211ad7ada309855f1ab40e5a846728d2e713 files/digest-libgtk-java-2.8.3 256
+MD5 76e14901f21fc3d0a5bba9d257efab75 files/digest-libgtk-java-2.8.3-r1 256
+RMD160 8d9add6acc146446c998648a138116ad389e4e32 files/digest-libgtk-java-2.8.3-r1 256
+SHA256 decd5e474700d86818f7c73b8f28211ad7ada309855f1ab40e5a846728d2e713 files/digest-libgtk-java-2.8.3-r1 256
 MD5 21907163f2b6597c520b7c1a4da20784 files/libgtk-java-2.4.6_find_jni.patch 369
 RMD160 3b8f9d667777aabc75e10bb1d252c3c1c70c8a26 files/libgtk-java-2.4.6_find_jni.patch 369
 SHA256 0b13fdf937bfd5fe7dd92e84ade90de93c8403b611c71eb8f8f85293f8c59696 files/libgtk-java-2.4.6_find_jni.patch 369
@@ -61,6 +64,9 @@ SHA256 412dc7565ca25976b12bc5e8b941e4e9f2e0e63229c6c38f9b3593eb061960ae libgtk-j
 MD5 1529be15d188a0377a6ee2936601b64a libgtk-java-2.8.2.ebuild 2210
 RMD160 5103026cffd3ddbc704b4a4081ae42ab494b272f libgtk-java-2.8.2.ebuild 2210
 SHA256 5531ef46a72380811dad430f9686620a83b7e434cacd45d2256ca80025c289d3 libgtk-java-2.8.2.ebuild 2210
+MD5 b90fe58b1b586ef36879ea974161fd95 libgtk-java-2.8.3-r1.ebuild 2405
+RMD160 03318cfa46f33594f06ecea2d77ad9cf0af215c0 libgtk-java-2.8.3-r1.ebuild 2405
+SHA256 0e6eb555efea73aa510c5ade31f16066addce07a4f9202b4324464f23d407275 libgtk-java-2.8.3-r1.ebuild 2405
 MD5 df67cc33aab5c4bef3328b94e727e20b libgtk-java-2.8.3.ebuild 2212
 RMD160 98e154f9e47c6f6e98b64e4037577609b5debd7d libgtk-java-2.8.3.ebuild 2212
 SHA256 c526292b2a3c3da8c152c642759220463b2d8801966f3e955a993169e98e0da2 libgtk-java-2.8.3.ebuild 2212
diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.8.3-r1 b/dev-java/libgtk-java/files/digest-libgtk-java-2.8.3-r1
new file mode 100644
index 000000000000..1de6db19a831
--- /dev/null
+++ b/dev-java/libgtk-java/files/digest-libgtk-java-2.8.3-r1
@@ -0,0 +1,3 @@
+MD5 0bcf838a3220fdfa685c55c22d664874 libgtk-java-2.8.3.tar.gz 1099065
+RMD160 f9179f032033d02a9a8a667a202111ed71f525a7 libgtk-java-2.8.3.tar.gz 1099065
+SHA256 cdc8a9c37b8b69a2e68d77b6aeaf0780ec9d277fc104c718f18a50f20982fe1c libgtk-java-2.8.3.tar.gz 1099065
diff --git a/dev-java/libgtk-java/libgtk-java-2.8.3-r1.ebuild b/dev-java/libgtk-java/libgtk-java-2.8.3-r1.ebuild
new file mode 100644
index 000000000000..de3459d367b6
--- /dev/null
+++ b/dev-java/libgtk-java/libgtk-java-2.8.3-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2006 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.3-r1.ebuild,v 1.1 2006/03/28 04:20:15 nichoj 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/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="2.8"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gcj source"
+
+DEPS=">=x11-libs/gtk+-2.8.3
+	  >=dev-java/glib-java-0.2.3
+	  >=dev-java/cairo-java-1.0.2
+	  >=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
+		source? ( app-arch/zip )
+		${DEPS}"
+RDEPEND=">=virtual/jre-1.4
+		 ${DEPS}"
+
+JARNAME="gtk${SLOT}.jar"
+
+pkg_setup() {
+	if use gcj ; then
+		if ! built_with_use sys-devel/gcc gcj ; then
+			ewarn
+			ewarn "You must build gcc with the gcj support to build with gcj"
+			ewarn
+			ebeep 5
+			die "No GCJ support found!"
+		fi
+	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() {
+	# this gcj deal is a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=336149
+	local myflags
+	use gcj || myflags="${myflags} --without-gcj-compile"
+	econf ${myflags} \
+		  $(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/${JARNAME}:" \
+		${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 the jars installed by make
+	# and build our own package.env file.
+	# NOTE: dojar puts the jar in the wrong place! (/usr/share/${PN}/lib)
+	cat <<-END > ${D}/usr/share/${PN}-${SLOT}/package.env
+DESCRIPTION=${DESCRIPTION}
+CLASSPATH=/usr/share/${PN}-${SLOT}/lib/${JARNAME}
+END
+
+	use source && java-pkg_dosrc ${S}/src/java/org
+}