Revision bump to address bug #125646 and #121254

(Portage version: 2.1_pre6-r6)

4 files changed, 118 insertions, 2 deletions

diff --git a/dev-java/libgnome-java/ChangeLog b/dev-java/libgnome-java/ChangeLog
index b411d4230130..bf578a7c2f98 100644
--- a/dev-java/libgnome-java/ChangeLog
+++ b/dev-java/libgnome-java/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/libgnome-java
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.15 2005/12/30 02:48:15 compnerd Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.16 2006/03/28 04:19:13 nichoj Exp $
+
+*libgnome-java-2.12.1-r1 (28 Mar 2006)
+
+  28 Mar 2006; <nichoj@gentoo.org> +libgnome-java-2.12.1-r1.ebuild:
+  Revision bump to address bug #125646 and #121254
 
   30 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org>
   libgnome-java-2.12.1.ebuild:
diff --git a/dev-java/libgnome-java/Manifest b/dev-java/libgnome-java/Manifest
index ac32b5357508..0853a4cfc91c 100644
--- a/dev-java/libgnome-java/Manifest
+++ b/dev-java/libgnome-java/Manifest
@@ -1,11 +1,39 @@
 MD5 8870afd3b49cfe7ac0250aa2c7429260 ChangeLog 3189
+RMD160 d1e08fd16bcd0436610411d19814482c3f13a973 ChangeLog 3189
+SHA256 994003832115c36ade34defcf33ffd90a2df28bcd596a18f97b4bf51025d51fc ChangeLog 3189
 MD5 55fb422ad6119794ac0805432ebdc410 files/digest-libgnome-java-2.10.1 73
+RMD160 8c260b286acf89e60fe24a25a8aa241fb81a19d4 files/digest-libgnome-java-2.10.1 73
+SHA256 69cdf934618c99dbfa295e35f886c1c83eaf1092f70fb9a574aa03c91c454e3b files/digest-libgnome-java-2.10.1 73
 MD5 23d8bb8f12c8d969be6869734210969c files/digest-libgnome-java-2.12.1 72
+RMD160 da4db9f29c6bb167a962f0d3cade82f62bc6a9ad files/digest-libgnome-java-2.12.1 72
+SHA256 c19fa10f83d3d9a15d8e9391594ffb0af427a8ddbcad45ac9901b91f34326aef files/digest-libgnome-java-2.12.1 72
+MD5 9efabeeaf4057ac2b98eec30d2c3d707 files/digest-libgnome-java-2.12.1-r1 262
+RMD160 54f4b1b60aee14ab14cc3baf49a903dfbab50d9d files/digest-libgnome-java-2.12.1-r1 262
+SHA256 e6c3a6868a275eca348b2ceacf36d577d914e308995ed8bd65a2ce4c02f84b75 files/digest-libgnome-java-2.12.1-r1 262
 MD5 efea40cf1a5eb3c48001cde4ead5c123 files/digest-libgnome-java-2.8.3.1 74
+RMD160 13c772f2b838b17af4d5a194aca38aa4290fcc44 files/digest-libgnome-java-2.8.3.1 74
+SHA256 fa745fc9e3dcfde3bd25f9816e0aef152b2cc5e3b54c0b91dedd71841d2e3dee files/digest-libgnome-java-2.8.3.1 74
 MD5 6ab1ec4f4e7665d6f1e73d04e5ffea0d files/libgnome-java-2.10.0_fix-install-dir.patch 409
+RMD160 e80171b517f430116b5e00505f0e61429ad7d969 files/libgnome-java-2.10.0_fix-install-dir.patch 409
+SHA256 9eaf3990c22b2a47730609b391c2a3c0e375e3a4905d976da938433c73a0679f files/libgnome-java-2.10.0_fix-install-dir.patch 409
 MD5 b5f8aad83ed35026438574e04a3122ac files/libgnome-java-2.8.2_gentoo-PN-SLOT.patch 1310
+RMD160 dba30204d12dc8927bbb06c92e52f6578a5016e3 files/libgnome-java-2.8.2_gentoo-PN-SLOT.patch 1310
+SHA256 1fe9b2057bae43a423f9c85c86bd63eed144e8ffa68fa46314c0c36cc0d655f1 files/libgnome-java-2.8.2_gentoo-PN-SLOT.patch 1310
 MD5 d8bbcf350e68bf0a42c37ecbef32c8dd files/libgnome-java-2.8.3.1_gentoo-PN-SLOT.patch 508
+RMD160 b829747e70d87ef5fd72849936f87cb696668b8c files/libgnome-java-2.8.3.1_gentoo-PN-SLOT.patch 508
+SHA256 f2968c6c85365728e455922d7967a9e3cb4960470653603121f9f9b62af5ffc7 files/libgnome-java-2.8.3.1_gentoo-PN-SLOT.patch 508
 MD5 677f2ff3ed6ec775266bf63bf1f2987d libgnome-java-2.10.1.ebuild 2725
+RMD160 9cbfbf2a59be86a789189e4cf7a0143597dccd10 libgnome-java-2.10.1.ebuild 2725
+SHA256 225750e4ade2063555eba9320c4c23a73831a81711361f942ea26ebf5d530c08 libgnome-java-2.10.1.ebuild 2725
+MD5 ddbec47337da5318ca8d69b3e7a5ec24 libgnome-java-2.12.1-r1.ebuild 2138
+RMD160 92238b410df2045fe481472210762c19b46cfe48 libgnome-java-2.12.1-r1.ebuild 2138
+SHA256 3f08852cfe42080d49a9adba80f6a4f7463828760b744252f92803a3e24e3894 libgnome-java-2.12.1-r1.ebuild 2138
 MD5 b229141f6f370a5f89d89d94f8f8a939 libgnome-java-2.12.1.ebuild 1889
+RMD160 7d675af6a1796504084437ca4b31c3814c80e4ae libgnome-java-2.12.1.ebuild 1889
+SHA256 4afdcdc37446b91829b7af8c2a2847a06c6c9a55d2ac3b2a9196ed640e06b4ae libgnome-java-2.12.1.ebuild 1889
 MD5 acbe31cfb56cfba1a61ab0197a594370 libgnome-java-2.8.3.1.ebuild 3062
+RMD160 e7d31be3289840910f9f023c0857ea8641501783 libgnome-java-2.8.3.1.ebuild 3062
+SHA256 011a9895c256e930971b92a35a7d8df47be30f6cda234e023564836dc2f8f886 libgnome-java-2.8.3.1.ebuild 3062
 MD5 fb1bed94b41f514c97fb402200db1eec metadata.xml 1102
+RMD160 cc274645cdc175d43196cd98b9082897b970ab66 metadata.xml 1102
+SHA256 fd6fbb05867269ce3815259340783e515c765ac2d80e1e2180b74bddc91c9eaf metadata.xml 1102
diff --git a/dev-java/libgnome-java/files/digest-libgnome-java-2.12.1-r1 b/dev-java/libgnome-java/files/digest-libgnome-java-2.12.1-r1
new file mode 100644
index 000000000000..be000a264af1
--- /dev/null
+++ b/dev-java/libgnome-java/files/digest-libgnome-java-2.12.1-r1
@@ -0,0 +1,3 @@
+MD5 30ec2b1404929aabe650e868b5b08ca7 libgnome-java-2.12.1.tar.gz 478475
+RMD160 dbeeee7dbc09b6e7c3f78165c748bf0364faf23a libgnome-java-2.12.1.tar.gz 478475
+SHA256 4d0904b48eb45b6757275286de179b9a578cf71f49b1a156a47ebdfc8fabbbac libgnome-java-2.12.1.tar.gz 478475
diff --git a/dev-java/libgnome-java/libgnome-java-2.12.1-r1.ebuild b/dev-java/libgnome-java/libgnome-java-2.12.1-r1.ebuild
new file mode 100644
index 000000000000..3cc86ecfb3b6
--- /dev/null
+++ b/dev-java/libgnome-java/libgnome-java-2.12.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.12.1-r1.ebuild,v 1.1 2006/03/28 04:19:13 nichoj Exp $
+
+# Must be before the gnome.org inherit
+GNOME_TARBALL_SUFFIX="gz"
+
+inherit java-pkg eutils gnome.org
+
+DESCRIPTION="Java bindings for GNOME"
+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/libgnome-2.10.0
+	  >=gnome-base/libgnomeui-2.12.0
+	  >=gnome-base/libgnomecanvas-2.12.0
+	  >=dev-java/glib-java-0.2.1
+	  >=dev-java/libgtk-java-2.8.1
+		dev-util/pkgconfig"
+
+DEPEND=">=virtual/jdk-1.4
+		>=sys-apps/sed-4
+		${DEPS}"
+RDEPEND=">=virtual/jre-1.4
+		 ${DEPS}"
+
+JARNAME="gnome${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}/gnome2-java.pc
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "install failed"
+
+	# Examples and tutorial as documentation
+	use doc || rm -rf ${D}/usr/share/doc/${PF}/{examples,tutorial}
+
+	# 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/*
+}