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

(Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64)

4 files changed, 79 insertions, 12 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/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