version bump, drop old

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 24 insertions, 81 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/Manifest b/dev-java/java-gnome/Manifest
index 46fcd9f0dbea..f1baff6e497b 100644
--- a/dev-java/java-gnome/Manifest
+++ b/dev-java/java-gnome/Manifest
@@ -1,14 +1,12 @@
 AUX java-gnome-4.0.11-force-unicode.patch 3276 RMD160 a3c972b752e2f97bbc4b9526308fdfb956892f0d SHA1 3dfcf64ab6d72bb09ea024b4a1e0c2f9365a8498 SHA256 6589e4cdf29b95c2696999e22dc912b6a99ffe9273619af0426cab76338c7921
 AUX java-gnome-4.0.15-docfix.patch 8696 RMD160 4ef1016cb3c2944f16b384e010dad79708a83490 SHA1 d76313aa8a02598b49f4ae3799cbb02dda7c12d4 SHA256 362f16180a3fbf228d4b2bb13b190edf849a0a9703d3091757864d7bd21accc2
-DIST java-gnome-4.0.11.tar.bz2 820857 RMD160 cc9ba6e08f3e866a7a3236507b872901e9b78881 SHA1 5afda43f7be3319b1e26f308573d8b7c3f5852e1 SHA256 3dcb1a519c8acbf321a75190d76773e77e75a2b4a4a1fbdffb40579dc81358f7
-DIST java-gnome-4.0.14.tar.bz2 890717 RMD160 ebb8da4fc644bd77041b961d6941f961c75773b6 SHA1 0e4d701a7a8db7595bfba6ed603ea94dd1e09979 SHA256 9bbcabe30efec3fde194b964893974c406acad2d9ae6d6606036fce698f248f5
 DIST java-gnome-4.0.15.tar.bz2 918336 RMD160 c6c38641c7b64f5e037e3f1d3bc62c96bdfe0444 SHA1 6123b9590c8b919d2a60cb62a39cf32645ee6997 SHA256 9d13bae33a2af0d71ce7c3e20b4f8681abe7cf82345a1e34fef97738ca74dc05
 DIST java-gnome-4.0.16.tar.bz2 931646 RMD160 a6008cc2e66a9e8c437a3710fe4e7458049484e2 SHA1 beb0ae9d454a5446acdfb7c3664d9f4e6f8f6c20 SHA256 04e417145528f3173f3516c7548bc8773c83ed30957887ed797644b39018bd61
 DIST java-gnome-4.0.17.tar.bz2 949207 RMD160 bc2bb8f4da6f53afea65912d9bc937399c54a9e9 SHA1 8b58ad400963348fdf3159c894a2f32c96a5835d SHA256 350cd6c4d75995c309785794b8e216bf5c09568e52975f26ff0be7d79bb2a422
-EBUILD java-gnome-4.0.11.ebuild 1820 RMD160 b4d29c9b301275670f1b454b4f101692a61d15c5 SHA1 9e2d835e3e655cd908be11c8f2f197cead72859c SHA256 7e3f8b9f6af44a5d63c900c63c0a725fd9f144bfbe37cf8a700dfece845e4347
-EBUILD java-gnome-4.0.14.ebuild 1875 RMD160 188d2b0bae96026f0f3a78567923fda0544ccb66 SHA1 8f492638a6f8aad36ec82629b092c2c358148472 SHA256 cf677bc43fe9f2afba63c5c722deed03105db92b9995b8d95571784f5e6c4d91
+DIST java-gnome-4.0.18.tar.bz2 1045240 RMD160 dde16ad68e0f634666e651959d3a96d66f3b93db SHA1 70f22ef55f5d26bfdbf25b9e7ff8254f2f9a95f6 SHA256 2f606fda2d89961cfbbddc7f391a35302078030a5391699e3bc44b6972b3928d
 EBUILD java-gnome-4.0.15.ebuild 1929 RMD160 9f9fa041663830d7cf9dbfcc2c2696129c04f846 SHA1 cde9d0f6fec57e6e6d8b2dc41fe070fa502be6a4 SHA256 3549bfa755c1c7e4b13b7a4a0e5478d8a58f195e6f06731c11173d27319ed276
 EBUILD java-gnome-4.0.16.ebuild 1877 RMD160 c9702f6ef4bf691d4a6f92e2e7162b77a8ea4313 SHA1 720eebfa9187e1fbddb862d6b8a818f27e0179dd SHA256 c79ee352d42b2a339ab78ff24c1f83d4c8e979251ccb348fd38004f1cd73dc90
 EBUILD java-gnome-4.0.17.ebuild 1879 RMD160 1cff4b1e8f0756a5de271a0482a9fe53d8f3fdba SHA1 2665716fb4c5452985e4f93676762dc659667963 SHA256 ea65410dec2b738be21721be062ab455897095b8894d4d5ae900267e69c25785
-MISC ChangeLog 16805 RMD160 c734fbb1146042553e0ef77ca62632bacfb50622 SHA1 3a2fec34fdeb09c582a8a8aa00953918869d3cc1 SHA256 bf1f9de424f120ac2b2e9a190c856c471a6c5313ab658ad7a9ca700c3c58764b
+EBUILD java-gnome-4.0.18.ebuild 2040 RMD160 89fc3677c09197d91d069086df994138f9275849 SHA1 7d03d7a269ef2446535d21c47cb50ed450546f3a SHA256 7b1b09cebccad229e808d9eeb93a787d54a3b80c9651a1e4195d4c57ef075a4b
+MISC ChangeLog 16999 RMD160 beff8c7ef2626a9873545e59461f6d9bb454d4d8 SHA1 a2deba6bd9e5c556b4b483e9e9e47d80f757ca1d SHA256 2518fec70be038594128488b2fdd4c872793cc87ac18fa0b34166bad3c278915
 MISC metadata.xml 1084 RMD160 4bea9b6a1a08b968b94a1212b5f98dfd307c2cca SHA1 900ef9e5e2089937b83868332db0a7a039803611 SHA256 b705cf4e2792eec42ece7e8a70cb3f032f54ce2ad1e0ee88433994e3f71a9ec2
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