Revision bump to address bug #125646 and #121254

(Portage version: 2.1_pre6-r6)

4 files changed, 94 insertions, 1 deletions

diff --git a/dev-java/libglade-java/ChangeLog b/dev-java/libglade-java/ChangeLog
index b766324312eb..3fee7acb0061 100644
--- a/dev-java/libglade-java/ChangeLog
+++ b/dev-java/libglade-java/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/libglade-java
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/ChangeLog,v 1.14 2006/02/08 00:32:57 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/ChangeLog,v 1.15 2006/03/28 04:18:10 nichoj Exp $
+
+*libglade-java-2.12.2-r1 (28 Mar 2006)
+
+  28 Mar 2006; <nichoj@gentoo.org> +libglade-java-2.12.2-r1.ebuild:
+  Revision bump to address bug #125646 and #121254
 
 *libglade-java-2.12.2 (08 Feb 2006)
 
diff --git a/dev-java/libglade-java/Manifest b/dev-java/libglade-java/Manifest
index 6a3bafb778fc..b225f1d0f832 100644
--- a/dev-java/libglade-java/Manifest
+++ b/dev-java/libglade-java/Manifest
@@ -10,6 +10,9 @@ SHA256 7aecedd111bc583ee818ba22ff6707d5c541270cbe4f6c65fae0077ffc2d8fd1 files/di
 MD5 5eb459e91f6e642961fea913581bf887 files/digest-libglade-java-2.12.2 262
 RMD160 9ed144c3e3f2cc6a0a0ae7579f87273fe305c481 files/digest-libglade-java-2.12.2 262
 SHA256 ce015e994e537369084b85dcf831f608a38c1decd5d08c27f350927e9e0450b3 files/digest-libglade-java-2.12.2 262
+MD5 5eb459e91f6e642961fea913581bf887 files/digest-libglade-java-2.12.2-r1 262
+RMD160 9ed144c3e3f2cc6a0a0ae7579f87273fe305c481 files/digest-libglade-java-2.12.2-r1 262
+SHA256 ce015e994e537369084b85dcf831f608a38c1decd5d08c27f350927e9e0450b3 files/digest-libglade-java-2.12.2-r1 262
 MD5 76a4839bd8baf7f40b90050f11d17277 files/digest-libglade-java-2.8.3.1 74
 RMD160 d824f34d801cd371519275a2c3d662e7493d784b files/digest-libglade-java-2.8.3.1 74
 SHA256 ec3a1e0d2ea34191077453fe405bf78b1008c95c5e3c21c0578c23218d8bef90 files/digest-libglade-java-2.8.3.1 74
@@ -31,6 +34,9 @@ SHA256 4af8fe5d54b2b169f3db1fee4f7d0df96c7704bbbc0b61032825dd3b14fdd925 libglade
 MD5 33b3402a99af0733b451295b9a338d2f libglade-java-2.12.1.ebuild 1903
 RMD160 b257ac0ce5af7f0c42269dfb64dda7196ac7725a libglade-java-2.12.1.ebuild 1903
 SHA256 72fcc699c3eded0427d153ee4fbc00cf0936703a6958f16170a44ed67e20aad7 libglade-java-2.12.1.ebuild 1903
+MD5 82e0af1410422ba38128f8a52d90c8fa libglade-java-2.12.2-r1.ebuild 2154
+RMD160 a45da67fb6e046fe0440e9fc4f8a5d06ba150436 libglade-java-2.12.2-r1.ebuild 2154
+SHA256 8a5df819030998d290ce63e59d0a5999ff13dfb76ef4c8d62fff6f5aba3b69e8 libglade-java-2.12.2-r1.ebuild 2154
 MD5 7c82b9d5f0474fc6b3d65e786747f25a libglade-java-2.12.2.ebuild 1903
 RMD160 a00077caa5e3e931fbcab5fb39cec72fa20bc2ad libglade-java-2.12.2.ebuild 1903
 SHA256 c459ba83b149e775ba2181173782596f1af0ca1a572228715639405db8b58994 libglade-java-2.12.2.ebuild 1903
diff --git a/dev-java/libglade-java/files/digest-libglade-java-2.12.2-r1 b/dev-java/libglade-java/files/digest-libglade-java-2.12.2-r1
new file mode 100644
index 000000000000..42864e7b9036
--- /dev/null
+++ b/dev-java/libglade-java/files/digest-libglade-java-2.12.2-r1
@@ -0,0 +1,3 @@
+MD5 a0b11f2b7ed7c9f998e860212ed3a400 libglade-java-2.12.2.tar.gz 357231
+RMD160 2483e8dec463cfdd20aaaf7bb5f846f76892f88b libglade-java-2.12.2.tar.gz 357231
+SHA256 9e88ab20cf88b5bae80b14aee3c353317efec03163207776e26bec6b7164fcac libglade-java-2.12.2.tar.gz 357231
diff --git a/dev-java/libglade-java/libglade-java-2.12.2-r1.ebuild b/dev-java/libglade-java/libglade-java-2.12.2-r1.ebuild
new file mode 100644
index 000000000000..a524384b2c6a
--- /dev/null
+++ b/dev-java/libglade-java/libglade-java-2.12.2-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2006 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.12.2-r1.ebuild,v 1.1 2006/03/28 04:18:10 nichoj Exp $
+
+# Must be before the gnome.org inherit
+GNOME_TARBALL_SUFFIX="gz"
+
+inherit java-pkg eutils gnome.org
+
+DESCRIPTION="Java bindings for Glade"
+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.12"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gcj gnome source"
+
+DEPS=">=gnome-base/libglade-2.5.1
+	  >=dev-java/glib-java-0.2.3
+	  >=dev-java/libgnome-java-2.8.0
+	  gnome? ( >=gnome-base/libgnomeui-2.12.0 >=gnome-base/libgnomecanvas-2.12.0 )
+		dev-util/pkgconfig"
+
+DEPEND=">=virtual/jdk-1.4
+		>=sys-apps/sed-4
+		${DEPS}"
+RDEPEND=">=virtual/jre-1.4
+		 ${DEPS}"
+JARNAME="glade${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_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) \
+		$(use_with gnome) \
+		--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}/glade-java.pc
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "install failed"
+
+	# Examples as 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/*
+}