Version bump. Dropped ~ppc due to unkeyworded dependencies. Remove old.

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

3 files changed, 35 insertions, 76 deletions

diff --git a/dev-java/java-gnome/ChangeLog b/dev-java/java-gnome/ChangeLog
index 286f2d956f25..45f9eabd9892 100644
--- a/dev-java/java-gnome/ChangeLog
+++ b/dev-java/java-gnome/ChangeLog
@@ -1,6 +1,12 @@
 # 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.70 2008/10/05 11:06:46 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.71 2008/10/13 18:50:38 serkan Exp $
+
+*java-gnome-4.0.9 (13 Oct 2008)
+
+  13 Oct 2008; Serkan Kaba <serkan@gentoo.org> -java-gnome-4.0.5.ebuild,
+  -java-gnome-4.0.6.ebuild, +java-gnome-4.0.9.ebuild:
+  Version bump. Dropped ~ppc due to unkeyworded dependencies. Remove old.
 
 *java-gnome-4.0.8-r2 (05 Oct 2008)
 *java-gnome-4.0.7-r3 (05 Oct 2008)
diff --git a/dev-java/java-gnome/java-gnome-4.0.5.ebuild b/dev-java/java-gnome/java-gnome-4.0.5.ebuild
deleted file mode 100644
index 3e43cd79fe52..000000000000
--- a/dev-java/java-gnome/java-gnome-4.0.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.5.ebuild,v 1.7 2008/01/16 19:40:34 caster Exp $
-
-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.4"
-DEPEND="${RDEPEND}
-		=dev-java/junit-3.8*
-		dev-lang/python
-		>=virtual/jdk-1.4
-		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 --subdir tests/prototype tests/prototype
-	use source && java-pkg_dosrc src/bindings/org
-}
diff --git a/dev-java/java-gnome/java-gnome-4.0.6.ebuild b/dev-java/java-gnome/java-gnome-4.0.9.ebuild
index c65f60e2eb76..7d108f2a6f75 100644
--- a/dev-java/java-gnome/java-gnome-4.0.6.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.0.9.ebuild
@@ -1,55 +1,63 @@
 # 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.6.ebuild,v 1.4 2008/04/27 19:40:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.9.ebuild,v 1.1 2008/10/13 18:50:38 serkan Exp $
 
-EAPI=1
+EAPI=2
 JAVA_PKG_IUSE="doc examples source"
 
 inherit eutils versionator java-pkg-2
 
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
 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"
+SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="4.0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~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.4"
+RDEPEND=">=dev-libs/glib-2.16.1
+	>=x11-libs/gtk+-2.12.11
+	>=gnome-base/libglade-2.6.3
+	>=gnome-base/libgnome-2.22.0
+	>=gnome-base/gnome-desktop-2.22.0
+	>=virtual/jre-1.5
+	>=x11-libs/cairo-1.6.4[svg]"
 DEPEND="${RDEPEND}
-		dev-java/junit:0
-		dev-lang/python
-		>=virtual/jdk-1.4
-		dev-util/pkgconfig"
+	dev-java/junit:0
+	dev-lang/perl
+	>=virtual/jdk-1.5
+	dev-util/pkgconfig"
 
 # Needs X11
 RESTRICT="test"
 
-src_compile() {
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
 	# Handwritten in perl so not using econf
-	./configure --prefix=/usr || die
+	./configure prefix=/usr libdir=/usr/lib/${PN}-${SLOT} jardir=/usr/share/${PN}-${SLOT}/lib|| die
+}
 
+src_compile() {
 	# 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"
+		DISPLAY= emake -j1 doc || die "Making documentation failed"
 	fi
 }
 
 src_install(){
-	java-pkg_doso tmp/*.so
-	java-pkg_dojar tmp/*.jar
+	emake -j1 DESTDIR="${D}" install || die
+	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk-${SLOT}.jar
+	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk.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