version bump, drop old

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 21 insertions, 76 deletions

diff --git a/dev-java/java-gnome/ChangeLog b/dev-java/java-gnome/ChangeLog
index 12bf6947a8a4..62a17cb16ec5 100644
--- a/dev-java/java-gnome/ChangeLog
+++ b/dev-java/java-gnome/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/java-gnome
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.102 2010/12/15 16:26:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.103 2010/12/29 23:06:59 ken69267 Exp $
+
+*java-gnome-4.0.18 (29 Dec 2010)
+
+  29 Dec 2010; Kenneth Prugh <ken69267@gentoo.org>
+  -java-gnome-4.0.11.ebuild, -java-gnome-4.0.14.ebuild,
+  +java-gnome-4.0.18.ebuild:
+  version bump, drop old
 
   15 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   java-gnome-4.0.16.ebuild:
diff --git a/dev-java/java-gnome/java-gnome-4.0.11.ebuild b/dev-java/java-gnome/java-gnome-4.0.11.ebuild
deleted file mode 100644
index 86ccafbe9840..000000000000
--- a/dev-java/java-gnome/java-gnome-4.0.11.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2009 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.11.ebuild,v 1.4 2009/07/19 13:50:03 nixnut Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils versionator java-pkg-2 multilib
-
-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)/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="4.0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16.1
-	>=x11-libs/gtk+-2.14
-	>=gnome-base/libglade-2.6.3
-	>=gnome-base/libgnome-2.22.0
-	>=gnome-base/gnome-desktop-2.22.0
-	>=x11-libs/cairo-1.6.4[svg]
-	>=virtual/jre-1.5"
-DEPEND="${RDEPEND}
-	dev-java/junit:0
-	dev-lang/perl
-	dev-util/pkgconfig
-	>=virtual/jdk-1.5"
-
-# Needs X11
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-force-unicode.patch
-}
-
-src_configure() {
-	# Handwritten in perl so not using econf
-	./configure prefix=/usr libdir=/usr/$(get_libdir)/${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
-		DISPLAY= emake -j1 doc || die "Making documentation failed"
-	fi
-}
-
-src_install(){
-	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
-}
diff --git a/dev-java/java-gnome/java-gnome-4.0.14.ebuild b/dev-java/java-gnome/java-gnome-4.0.18.ebuild
index e1984f5fcb09..71d1f4f2d831 100644
--- a/dev-java/java-gnome/java-gnome-4.0.14.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.14.ebuild,v 1.3 2010/04/16 16:40:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.18.ebuild,v 1.1 2010/12/29 23:06:59 ken69267 Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source"
@@ -16,19 +16,20 @@ SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="4.0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.16.1
-	>=x11-libs/gtk+-2.16
-	>=gnome-base/libglade-2.6.3
+RDEPEND=">=dev-libs/glib-2.22
+	>=x11-libs/gtk+-2.22.0
+	>=gnome-base/libglade-2.6.4
 	>=gnome-base/libgnome-2.22.0
-	>=gnome-base/gnome-desktop-2.22.0
-	>=x11-libs/cairo-1.6.4[svg]
+	>=gnome-base/gnome-desktop-2.22.0:2
+	>=x11-libs/cairo-1.10.0[svg]
 	>=x11-libs/gtksourceview-2.6.2
 	>=app-text/gtkspell-2.0.15-r1
 	>=x11-libs/libnotify-0.4.5
 	>=dev-libs/libunique-1.0.8
+	>=gnome-base/librsvg-2.32.1
 	>=virtual/jre-1.5"
 DEPEND="${RDEPEND}
 	dev-java/junit:0
@@ -41,6 +42,11 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	#fix dependency typo in configure
+	sed -i -e "s/librsvg-2.0atk/librsvg-2.0 atk/" configure || die "sed failed"
+}
+
 src_configure() {
 	# Handwritten in perl so not using econf
 	./configure prefix=/usr libdir=/usr/$(get_libdir)/${PN}-${SLOT} jardir=/usr/share/${PN}-${SLOT}/lib || die