Revision bump to address bug #125646 and #121254

(Portage version: 2.1_pre6-r6)

4 files changed, 104 insertions, 4 deletions

diff --git a/dev-java/glib-java/ChangeLog b/dev-java/glib-java/ChangeLog
index f842ed85c0c6..4354e6ede024 100644
--- a/dev-java/glib-java/ChangeLog
+++ b/dev-java/glib-java/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/glib-java
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glib-java/ChangeLog,v 1.6 2006/03/04 22:24:15 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glib-java/ChangeLog,v 1.7 2006/03/28 04:00:39 nichoj Exp $
+
+*glib-java-0.2.3-r1 (28 Mar 2006)
+
+  28 Mar 2006; <nichoj@gentoo.org> +glib-java-0.2.3-r1.ebuild:
+  Revision bump to address bug #125646 and #121254
 
   04 Mar 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   glib-java-0.2.2.ebuild, glib-java-0.2.3.ebuild:
diff --git a/dev-java/glib-java/Manifest b/dev-java/glib-java/Manifest
index 8e335021c402..77f131cf60ef 100644
--- a/dev-java/glib-java/Manifest
+++ b/dev-java/glib-java/Manifest
@@ -1,6 +1,6 @@
-MD5 87f1af2123dabf158c9274b35db3ffec ChangeLog 1139
-RMD160 56db936530a41f795db0e6077d50425f5aa68f0b ChangeLog 1139
-SHA256 c291288e7a2235182eff8e296c7dc8df1c2bbf82cd21269d30b33ab34747475b ChangeLog 1139
+MD5 d3cb67c266f07edb2d0262f212645c30 ChangeLog 1289
+RMD160 274af306eb3a30c371aaa26e1794e6410f472ed2 ChangeLog 1289
+SHA256 a96cf0a79336445c7c8ef4df2ca3660c7501939b30c4433db188ca569c69b2b3 ChangeLog 1289
 MD5 6f1550893a37966aca2b2c7ceb220b71 files/aclocal_voodoo.patch 749
 RMD160 ae731fbbcb529dfb0231f85430aacb912d7040f3 files/aclocal_voodoo.patch 749
 SHA256 5129cfd8bffc258fa132dd2a16a01d0f95c9bd16d437219e5b75e906e38e98ef files/aclocal_voodoo.patch 749
@@ -13,6 +13,9 @@ SHA256 b49859be6b5db9178fa3826ced50c512e0777c2bfafda0e82c99f5aa70ac3436 files/di
 MD5 6fefbc436dfe3bc884f2587845ee88fe files/digest-glib-java-0.2.3 247
 RMD160 7f2e9be95b15a40aa25ffda3b77a00378e0553d4 files/digest-glib-java-0.2.3 247
 SHA256 bd3b924cdfd5e5e660414294ff4234c5015f64f7b8b83a0a4c3f83130fae0d66 files/digest-glib-java-0.2.3 247
+MD5 6fefbc436dfe3bc884f2587845ee88fe files/digest-glib-java-0.2.3-r1 247
+RMD160 7f2e9be95b15a40aa25ffda3b77a00378e0553d4 files/digest-glib-java-0.2.3-r1 247
+SHA256 bd3b924cdfd5e5e660414294ff4234c5015f64f7b8b83a0a4c3f83130fae0d66 files/digest-glib-java-0.2.3-r1 247
 MD5 b1e11a9eba5947c307093c7e951155fe files/jg_common-macromagic.patch 482
 RMD160 e5bc048435a96c0592aab2a4396985f6d48ea723 files/jg_common-macromagic.patch 482
 SHA256 a3bcb5dbee0062864e6d73333925c922e0b4cca488ee8e7021db42f399934296 files/jg_common-macromagic.patch 482
@@ -22,6 +25,9 @@ SHA256 d608b7f11073fdb46fa3e53e165b8f3dee90b2e4d72d4bd90e4c9f56cdaf9816 glib-jav
 MD5 4a88692583319263f67ae2994e3093dd glib-java-0.2.2.ebuild 2016
 RMD160 4a79176c3f8254464c8881ef1ba1e68ae0d97020 glib-java-0.2.2.ebuild 2016
 SHA256 36f3f3c4a3f9fe8e985cdcda6ba6095c14d15706118b5440f1aa36b6900bae11 glib-java-0.2.2.ebuild 2016
+MD5 26166ebba5ecccf79140b334a7ea5426 glib-java-0.2.3-r1.ebuild 2193
+RMD160 4b75b1edba29ca7ae26583412746606de69530fd glib-java-0.2.3-r1.ebuild 2193
+SHA256 6f1b50419c3da3046d9d25873af0d445a0ef9e75ebeb778250e84c6cf7e9fa8a glib-java-0.2.3-r1.ebuild 2193
 MD5 3485d5c52dc53f492baa14776998ca34 glib-java-0.2.3.ebuild 2016
 RMD160 e8c9d684535f382710aa0396e6a443b03f3d0eba glib-java-0.2.3.ebuild 2016
 SHA256 78b607b0a8d07f230ea80bc1e5d174e2088d1c92ac739427b5e07fdcf36fe40a glib-java-0.2.3.ebuild 2016
diff --git a/dev-java/glib-java/files/digest-glib-java-0.2.3-r1 b/dev-java/glib-java/files/digest-glib-java-0.2.3-r1
new file mode 100644
index 000000000000..7b1185a66336
--- /dev/null
+++ b/dev-java/glib-java/files/digest-glib-java-0.2.3-r1
@@ -0,0 +1,3 @@
+MD5 dabe425330fe2474d5e28afc08835a57 glib-java-0.2.3.tar.gz 325579
+RMD160 5527f17459f326094c09e7b62f38af417e21a45c glib-java-0.2.3.tar.gz 325579
+SHA256 7659ca0bb56955ab468ece9229261e0f80eb731eb78a657048230fa907c60a5b glib-java-0.2.3.tar.gz 325579
diff --git a/dev-java/glib-java/glib-java-0.2.3-r1.ebuild b/dev-java/glib-java/glib-java-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..ffe6591a26ee
--- /dev/null
+++ b/dev-java/glib-java/glib-java-0.2.3-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glib-java/glib-java-0.2.3-r1.ebuild,v 1.1 2006/03/28 04:00:39 nichoj Exp $
+
+# Must be before the gnome.org inherit
+GNOME_TARBALL_SUFFIX="gz"
+
+inherit java-pkg eutils gnome.org
+
+DESCRIPTION="Java bindings for glib"
+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="0.2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gcj source"
+
+DEPS=">=dev-libs/glib-2.8.1
+		dev-util/pkgconfig"
+
+DEPEND=">=virtual/jdk-1.4
+		>=sys-apps/sed-4
+		source? ( app-arch/zip )
+		${DEPS}"
+RDEPEND=">=virtual/jre-1.4
+		 ${DEPS}"
+
+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 -I macros || 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/glib${SLOT}.jar:" \
+		${S}/${PN}.pc
+
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "install failed"
+
+	# 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/glib${SLOT}.jar
+END
+
+	use source && java-pkg_dosrc ${S}/src/java/org
+}