Revision bump to address bug #125646 and #121254

(Portage version: 2.1_pre6-r6)

4 files changed, 115 insertions, 2 deletions

diff --git a/dev-java/libgconf-java/ChangeLog b/dev-java/libgconf-java/ChangeLog
index c89635ef485f..f2c6e46b9aba 100644
--- a/dev-java/libgconf-java/ChangeLog
+++ b/dev-java/libgconf-java/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/libgconf-java
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/ChangeLog,v 1.12 2005/12/30 02:52:06 compnerd Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/ChangeLog,v 1.13 2006/03/28 04:17:17 nichoj Exp $
+
+*libgconf-java-2.12.1-r1 (28 Mar 2006)
+
+  28 Mar 2006; <nichoj@gentoo.org> +libgconf-java-2.12.1-r1.ebuild:
+  Revision bump to address bug #125646 and #121254
 
   30 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org>
   libgconf-java-2.12.1.ebuild:
diff --git a/dev-java/libgconf-java/Manifest b/dev-java/libgconf-java/Manifest
index 157354f2e9be..1294e82a9f31 100644
--- a/dev-java/libgconf-java/Manifest
+++ b/dev-java/libgconf-java/Manifest
@@ -1,11 +1,39 @@
 MD5 f254a0d9c681b983a83a5e1d72d42162 ChangeLog 2203
+RMD160 34618d0cc56b7df7231a2855dba338346025c32d ChangeLog 2203
+SHA256 6b464d017fc94a91b6ba285e0deb9936f54e5d0a32b380eeb04e338922e74aa5 ChangeLog 2203
 MD5 00133abfc0fddd7799314a248ebeb6c9 files/digest-libgconf-java-2.10.1 73
+RMD160 61ec2b0d1cb72676f7291cbae2d50af11dc37347 files/digest-libgconf-java-2.10.1 73
+SHA256 a8b79d336abdbb7c3b459c71f3c83670e07229d19ca79ec6eb664153bc5d7d84 files/digest-libgconf-java-2.10.1 73
 MD5 dc8b79819a91317abf572983bfa156d1 files/digest-libgconf-java-2.12.1 72
+RMD160 71cb60afcf5fb2251f80de46ef7c68c9415bddb0 files/digest-libgconf-java-2.12.1 72
+SHA256 2263e6cbbbd845aa9a79bee2c308bdc8b5560e0ac4cbf60c729549e3919e59bd files/digest-libgconf-java-2.12.1 72
+MD5 817929a8cef5e37f508c3f5e3e5c8514 files/digest-libgconf-java-2.12.1-r1 262
+RMD160 9635fb9f6820c5f0e501ca4261c6915b44e955d4 files/digest-libgconf-java-2.12.1-r1 262
+SHA256 a685d7d9edbce7d67758e79f771a19b340b80252f858195b9bce4d182bc5f140 files/digest-libgconf-java-2.12.1-r1 262
 MD5 fa4698389381ae96bb70cc672750fe57 files/digest-libgconf-java-2.8.3.1 74
+RMD160 d09ead63988210ca2225367efd6d2bc2a1d81763 files/digest-libgconf-java-2.8.3.1 74
+SHA256 a5e49c27988dce36b29e94bd78606393dbfa321724423b4a077ee621f5fbe9ed files/digest-libgconf-java-2.8.3.1 74
 MD5 4028a5325b5787c89a1eceddb66bc437 files/libgconf-java-2.10.0_fix-install-dir.patch 420
+RMD160 907033077c5603f5799ca295742d4bf89dd083f7 files/libgconf-java-2.10.0_fix-install-dir.patch 420
+SHA256 80098bd5bd67a9a40502569ca4db82fa52fcaee3cf1b236532efcb8f290d3820 files/libgconf-java-2.10.0_fix-install-dir.patch 420
 MD5 03c4b5ccb943b51e5259e5046ff30719 files/libgconf-java-2.8.2_gentoo-PN-SLOT.patch 994
+RMD160 137f448141b4b9eb625000a24e014540bf1d54b6 files/libgconf-java-2.8.2_gentoo-PN-SLOT.patch 994
+SHA256 147cb776b03de68d45167ecd5e9374569385f184bdf528b65e77526d7f110acc files/libgconf-java-2.8.2_gentoo-PN-SLOT.patch 994
 MD5 073d974cdf39c3e94b0da21e0b2e9231 files/libgconf-java-2.8.3.1_gentoo-PN-SLOT.patch 508
+RMD160 04fc9f9f4900d92d834d5d1cd1fe634de398382c files/libgconf-java-2.8.3.1_gentoo-PN-SLOT.patch 508
+SHA256 1bcd4e9ad4ec8b9647af4643a7dc5f0b68617fe3d9b466be6dd491ba6b195776 files/libgconf-java-2.8.3.1_gentoo-PN-SLOT.patch 508
 MD5 48b501573839b1a057b784392842ecc8 libgconf-java-2.10.1.ebuild 2277
+RMD160 edfaa98bfcc081aa95a184daf3b9677f4ddb9589 libgconf-java-2.10.1.ebuild 2277
+SHA256 febd6edd69385a8d5b1c2e2e51a8ecef70ce8d8d6a8ca0090a28131264bc264d libgconf-java-2.10.1.ebuild 2277
+MD5 03b205f5550f4a780b9072fb7413d759 libgconf-java-2.12.1-r1.ebuild 2070
+RMD160 74a249f595e714491d781440fd822e06c3a46af2 libgconf-java-2.12.1-r1.ebuild 2070
+SHA256 5aa71efd54663f84476a25a5aa433b793f3f8a8af7715434266841f89b83d073 libgconf-java-2.12.1-r1.ebuild 2070
 MD5 e5afa6fd39aff6f6198875a86392558f libgconf-java-2.12.1.ebuild 1823
+RMD160 aee0b5087f8c44d00dab5ce4597fb6234d6e1165 libgconf-java-2.12.1.ebuild 1823
+SHA256 aa62b2c656cd9af0cc87324abd74ec51538158d18eedfbc71e33c9ba0c1a24d0 libgconf-java-2.12.1.ebuild 1823
 MD5 d172708ae5e53ab4f75b1c3eabc95712 libgconf-java-2.8.3.1.ebuild 2912
+RMD160 43829d009db1e19ca2ced16d8169650bf9525326 libgconf-java-2.8.3.1.ebuild 2912
+SHA256 46407a219169ce3065105016e42292b0fbc121ea086c92b4019023a9dd2bde0b libgconf-java-2.8.3.1.ebuild 2912
 MD5 7fb48767f052a6a6dee17d585c1cbd32 metadata.xml 1142
+RMD160 b4cfcc9105c24f92718989ddb9ebac713b83a15f metadata.xml 1142
+SHA256 3be4774da8d2b91eb1ba59d3476f524409f12e39d7b1b00097b46ead89425b06 metadata.xml 1142
diff --git a/dev-java/libgconf-java/files/digest-libgconf-java-2.12.1-r1 b/dev-java/libgconf-java/files/digest-libgconf-java-2.12.1-r1
new file mode 100644
index 000000000000..ac6a7efea28f
--- /dev/null
+++ b/dev-java/libgconf-java/files/digest-libgconf-java-2.12.1-r1
@@ -0,0 +1,3 @@
+MD5 0b696a7228f78f63fd897e64d1278955 libgconf-java-2.12.1.tar.gz 336474
+RMD160 f05354004358ad64fc71ec65389dbb7f733dec90 libgconf-java-2.12.1.tar.gz 336474
+SHA256 07521e12151e82ae7e621a6cf26263ec8d76c7abd11d7b184d9f7988b3592f44 libgconf-java-2.12.1.tar.gz 336474
diff --git a/dev-java/libgconf-java/libgconf-java-2.12.1-r1.ebuild b/dev-java/libgconf-java/libgconf-java-2.12.1-r1.ebuild
new file mode 100644
index 000000000000..05858be7080f
--- /dev/null
+++ b/dev-java/libgconf-java/libgconf-java-2.12.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.12.1-r1.ebuild,v 1.1 2006/03/28 04:17:17 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 source"
+
+DEPS=">=gnome-base/gconf-2.12.0
+	  >=dev-java/glib-java-0.2.1
+	  >=dev-java/libgtk-java-2.8.1
+	  >=dev-java/libgnome-java-2.8.0
+		dev-util/pkgconfig"
+
+DEPEND=">=virtual/jdk-1.4
+		>=sys-apps/sed-4
+		${DEPS}"
+RDEPEND=">=virtual/jre-1.4
+		 ${DEPS}"
+JARNAME="gconf${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) \
+		--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}/gconf-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 src/java/*
+}