Use EAPI 2 use deps for x11-libs/cairo:svg. Restrict cairo dependency. Fix indentation.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64

5 files changed, 93 insertions, 15 deletions

diff --git a/dev-java/java-gnome/ChangeLog b/dev-java/java-gnome/ChangeLog
index 0aabff903707..aaa6f516e918 100644
--- a/dev-java/java-gnome/ChangeLog
+++ b/dev-java/java-gnome/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/java-gnome
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.67 2008/09/27 06:23:31 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.68 2008/09/27 13:59:06 serkan Exp $
+
+*java-gnome-4.0.8-r1 (27 Sep 2008)
+*java-gnome-4.0.7-r1 (27 Sep 2008)
+
+  27 Sep 2008; Serkan Kaba <serkan@gentoo.org> java-gnome-4.0.7.ebuild,
+  +java-gnome-4.0.7-r1.ebuild, -java-gnome-4.0.8.ebuild,
+  +java-gnome-4.0.8-r1.ebuild:
+  Use EAPI 2 use deps for x11-libs/cairo:svg. Restrict cairo dependency. Fix
+  indentation.
 
   27 Sep 2008; Kenneth Prugh <ken69267@gentoo.org>
   +files/java-gnome-4.0.8-deprecated.patch, java-gnome-4.0.8.ebuild:
diff --git a/dev-java/java-gnome/Manifest b/dev-java/java-gnome/Manifest
index df496ff9cc57..87576276593e 100644
--- a/dev-java/java-gnome/Manifest
+++ b/dev-java/java-gnome/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX java-gnome-4.0.8-deprecated.patch 718 RMD160 cb1cf203daef208d5c9dfa5df8990df667d1e184 SHA1 c4fa56a8e9173d3b9beea58f3a42b72290e0e3e0 SHA256 0d492bb58380700a8db520ae45cb71371d05682b6c4330274303f100664a4be2
 AUX java-gnome-4.0.8-disable-doc-snapshots.patch 286 RMD160 dd28e098cb70bcbeb45041c497773f896915a5aa SHA1 b8461b94b074f30f4ac992ceff93a17858f585da SHA256 2758ce1ea16aeb7e896e458ca1e6f5c546c6919fbf40c39864ba6368f09ea6b7
 DIST java-gnome-4.0.5.tar.bz2 391733 RMD160 7e420978ed8eedf88bab76434a480c311a21019b SHA1 a8275f0be3f41ccd1c1f020d5e393b6834a96606 SHA256 b8c305fb2b4479861e6238f9e601bb98166a9ed8d8990b1eefe91ec8b9be36da
@@ -6,7 +9,15 @@ DIST java-gnome-4.0.7.tar.bz2 451009 RMD160 8131ff8be7f06cbf8a6312a73b4cb227ccfc
 DIST java-gnome-4.0.8.tar.bz2 464915 RMD160 cb2ed316ec9a18a4dcb696ae67c5d4de04ef99a6 SHA1 9d8d4ba1276ff5a15ebed4ec4b477468f006f659 SHA256 2880b212fb0df16d514f2ccccfb0f63d0f200947e872d19f8c139ebdd4b19e47
 EBUILD java-gnome-4.0.5.ebuild 1474 RMD160 8bbd395e9857fe15671984255887b2efd465f77d SHA1 37a6ad5e1ed80d38785a03afdb6c3db396c320dc SHA256 553d72c8578f3dc01a8befb9d6c7c9a5f581fc30103c1f58239f9e7c89f90431
 EBUILD java-gnome-4.0.6.ebuild 1449 RMD160 1916e36f98aa4af25b19c256ee8a33c73f16231d SHA1 957a51335c2b080ffa8b5108d1c44b04f32fdf81 SHA256 4ef22e37128c74a4ca918a1ff337adf6d32ac1ce01d98ffe264e72512276272a
-EBUILD java-gnome-4.0.7.ebuild 1794 RMD160 4c1379a33c1307e87fab66910fb6fa9443cf4a45 SHA1 70413c3afe10031886605752c94f9545d5df1f38 SHA256 6fb08ccccd293b9676d96de1d62390027ed6f7e9ce38bd19b72e6e1f1f434d26
-EBUILD java-gnome-4.0.8.ebuild 1596 RMD160 1b4186840355591f12ebb300a3e552c7086a5e56 SHA1 d2dfc741dea4d70e6402efdb8c212db387d1547d SHA256 966e90c1e82616670e180115d7b179007c6482defe4c3156c4034b0125483e5e
-MISC ChangeLog 11355 RMD160 d97fa9eb35c4ba684b5cecd2c6afce140093bf13 SHA1 f7e9ea2e0beb5f99d4d2c0d381babffebbfe15a6 SHA256 f551be2952752799a6bc4336aa270b2d1f650117cbbb47368391efb8c53515e7
+EBUILD java-gnome-4.0.7-r1.ebuild 1485 RMD160 d3f7e98eee9511a922552f6f1cb2748e0dd0cdd6 SHA1 cf8e9f800925bb424b70c905b7a8898730280642 SHA256 3c0bce5fbd3192127e5e9c74bec98f3674dbdfc9a602ec95783f7f8e27ec0355
+EBUILD java-gnome-4.0.7.ebuild 1717 RMD160 c5c830ded3e845daca7e3e63becabfe3b5a4509d SHA1 cb5ee517af4dfa9f5851e357efcc36dc5a5787a7 SHA256 9a4cf4618c8918b9eba6234327f5a0849cecc855e5cf78f87464fb9b955044b7
+EBUILD java-gnome-4.0.8-r1.ebuild 1627 RMD160 f01794629339276841e03f04c0888ff06e2f859c SHA1 0176ff50e5170a43f90954ea9a1b2e8f5e5968a7 SHA256 97f3e4ccf5686ab5842e29813248abbbae1c7afb00ac6abb59b951cb4d970481
+MISC ChangeLog 11677 RMD160 24016ec854b416eebccab86fc6c3f7764d8eee98 SHA1 3beec5ef98f89f5194df1eb2919bdf51917b3b23 SHA256 12c5141fc9942526aded49af6ab7a0b059cbbaa1f7529a9af1472434be6baac5
 MISC metadata.xml 1084 RMD160 4bea9b6a1a08b968b94a1212b5f98dfd307c2cca SHA1 900ef9e5e2089937b83868332db0a7a039803611 SHA256 b705cf4e2792eec42ece7e8a70cb3f032f54ce2ad1e0ee88433994e3f71a9ec2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjePDgACgkQRh6X64ivZaJG/gCfZ7P5TpRwNwObYQhg5P+/luDv
+X/QAn0mbdvusI/tb0FJhznhop3uXxf0k
+=osaE
+-----END PGP SIGNATURE-----
diff --git a/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild b/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild
new file mode 100644
index 000000000000..f52c2889d5cb
--- /dev/null
+++ b/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild,v 1.1 2008/09/27 13:59:06 serkan Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils versionator java-pkg-2
+
+DESCRIPTION="Java bindings for GTK and GNOME"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.12.13
+		>=x11-libs/gtk+-2.12
+		>=gnome-base/libglade-2.6.1
+		>=gnome-base/libgnome-2.18.0
+		>=gnome-base/gnome-desktop-2.18.0
+		>=virtual/jre-1.5
+		>=x11-libs/cairo-1.6.4[svg]"
+DEPEND="${RDEPEND}
+		dev-java/junit:0
+		dev-lang/python
+		>=virtual/jdk-1.5
+		dev-util/pkgconfig"
+
+# Needs X11
+RESTRICT="test"
+
+src_compile() {
+	# Handwritten in perl so not using econf
+	./configure --prefix=/usr || die
+
+	# Fails parallel build in case GCJ is detected
+	# See https://bugs.gentoo.org/show_bug.cgi?id=200550
+	emake -j1 || die "Compilation of java-gnome failed"
+
+	if use doc; then
+		emake -j1 doc || die "Making documentation failed"
+	fi
+}
+
+src_install(){
+	java-pkg_doso tmp/*.so
+	java-pkg_dojar tmp/*.jar
+
+	dodoc AUTHORS HACKING NEWS README || die
+
+	use doc && java-pkg_dojavadoc doc/api
+	use examples && java-pkg_doexamples doc/examples
+	use source && java-pkg_dosrc src/bindings/org
+}
diff --git a/dev-java/java-gnome/java-gnome-4.0.7.ebuild b/dev-java/java-gnome/java-gnome-4.0.7.ebuild
index 2137403031eb..c08396f8fd36 100644
--- a/dev-java/java-gnome/java-gnome-4.0.7.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7.ebuild,v 1.4 2008/09/26 21:11:22 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7.ebuild,v 1.5 2008/09/27 13:59:06 serkan Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc examples source"
@@ -32,13 +32,13 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 pkg_setup() {
-        if ! built_with_use x11-libs/cairo svg; then
-                echo
-                eerror "x11-libs/cairo has not been built with svg support."
-                eerror "Please re-emerge cairo with the svg use-flag enabled."
-                die "missing svg flag for x11-libs/cairo"
-        fi
-        java-pkg-2_pkg_setup
+	if ! built_with_use x11-libs/cairo svg; then
+		echo
+		eerror "x11-libs/cairo has not been built with svg support."
+		eerror "Please re-emerge cairo with the svg use-flag enabled."
+		die "missing svg flag for x11-libs/cairo"
+	fi
+	java-pkg-2_pkg_setup
 }
 
 src_compile() {
diff --git a/dev-java/java-gnome/java-gnome-4.0.8.ebuild b/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild
index 5ab69455bef7..98637c352e95 100644
--- a/dev-java/java-gnome/java-gnome-4.0.8.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.8.ebuild,v 1.2 2008/09/27 06:23:31 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild,v 1.1 2008/09/27 13:59:06 serkan Exp $
 
-EAPI=1
+EAPI=2
 JAVA_PKG_IUSE="doc examples source"
 
 inherit eutils versionator java-pkg-2
@@ -21,7 +21,8 @@ RDEPEND=">=dev-libs/glib-2.12.13
 		>=gnome-base/libglade-2.6.1
 		>=gnome-base/libgnome-2.18.0
 		>=gnome-base/gnome-desktop-2.18.0
-		>=virtual/jre-1.5"
+		>=virtual/jre-1.5
+		>=x11-libs/cairo-1.6.4[svg]"
 DEPEND="${RDEPEND}
 		dev-java/junit:0
 		dev-lang/python