Drop old ebuilds which nothing depends on and which have illegal qt4 dep (bug 217173). Simplify qt4 dep for remaining ebuilds.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

7 files changed, 15 insertions, 407 deletions

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index d7e4d374a370..f82703b9b186 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/gnu-classpath
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.86 2008/07/27 01:03:32 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.87 2009/06/25 19:12:24 yngwin Exp $
+
+  25 Jun 2009; Ben de Groot <yngwin@gentoo.org> -gnu-classpath-0.90.ebuild,
+  -gnu-classpath-0.92.ebuild, -gnu-classpath-0.93.ebuild,
+  -gnu-classpath-0.97.ebuild, gnu-classpath-0.97-r1.ebuild,
+  gnu-classpath-0.97.2.ebuild:
+  Drop old ebuilds which nothing depends on and which have illegal qt4 dep
+  (bug 217173). Simplify qt4 dep for remaining ebuilds.
 
   27 Jul 2008; Carsten Lohrke <carlo@gentoo.org>
   gnu-classpath-0.97-r1.ebuild, gnu-classpath-0.97.2.ebuild:
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.90.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.90.ebuild
deleted file mode 100644
index 0b1812bac96e..000000000000
--- a/dev-java/gnu-classpath/gnu-classpath-0.90.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.90.ebuild,v 1.15 2007/07/22 09:23:16 graaff Exp $
-
-inherit eutils
-
-MY_P=${P/gnu-/}
-DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java programming language"
-SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/classpath"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-# Add the doc use flag after the upstream build system is improved
-# See their bug 24025
-
-IUSE="alsa cairo debug dssi examples gtk xml"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-		dssi? ( >=media-libs/dssi-0.9 )
-		gtk? ( >=x11-libs/gtk+-2.4
-				>=dev-libs/glib-2.0
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libX11
-				x11-libs/libXtst
-				cairo? ( >=x11-libs/cairo-0.5.0 )
-		     )
-		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
-
-DEPEND="app-arch/zip
-		dev-java/jikes
-		gtk? ( x11-libs/libXrender
-			x11-proto/xextproto
-			x11-proto/xproto
-			 )
-		${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Note: This is written in a way to easily support GCJ and other compilers
-	# at a later point. Currently Gentoo uses mainly GCJ 3.3 (from the
-	# corresponding GCC) which cannot compile GNU Classpath correctly.
-	# Another possibility would be ECJ (from Eclipse).
-	local compiler="--with-jikes"
-
-	# Now this detects fastjar automatically and some people have broken
-	# wrappers in /usr/bin by eselect-compiler. Unfortunately
-	# --without-fastjar does not seem to work.
-	# http://bugs.gentoo.org/show_bug.cgi?id=135688
-	econf ${compiler} \
-		$(use_enable alsa) \
-		$(use_enable cairo gtk-cairo) \
-		$(use_enable debug ) \
-		$(use_enable examples) \
-		$(use_enable gtk gtk-peer) \
-		$(use_enable xml xmlj) \
-		$(use_enable dssi ) \
-		--enable-jni \
-		--disable-dependency-tracking \
-		|| die "configure failed"
-# disabled for now... see above.
-#		$(use_with   doc   gjdoc) \
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
-}
-
-pkg_postinst() {
-	if use gtk && use cairo; then
-		elog "GNU Classpath was compiled with preliminary cairo support."
-		elog "To use that functionality set the system property"
-		elog "gnu.java.awt.peer.gtk.Graphics to Graphics2D at runtime."
-	fi
-}
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.92.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.92.ebuild
deleted file mode 100644
index 161e802dcb40..000000000000
--- a/dev-java/gnu-classpath/gnu-classpath-0.92.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.92.ebuild,v 1.3 2007/07/22 09:23:16 graaff Exp $
-
-inherit eutils multilib
-
-MY_P=${P/gnu-/}
-DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java programming language"
-SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/classpath"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0.92"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# Add the doc use flag after the upstream build system is improved
-# See their bug 24025
-
-IUSE="alsa cairo debug dssi examples gtk xml"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-		dssi? ( >=media-libs/dssi-0.9 )
-		gtk? ( >=x11-libs/gtk+-2.4
-				>=dev-libs/glib-2.0
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libX11
-				x11-libs/libXtst
-				cairo? ( >=x11-libs/cairo-0.5.0 )
-		     )
-		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
-
-DEPEND="app-arch/zip
-		dev-java/jikes
-		gtk? ( x11-libs/libXrender
-			x11-proto/xextproto
-			x11-proto/xproto
-			 )
-		${REPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	unset CLASSPATH JAVA_HOME
-	# We want to force use of jikes, because it is the only way to build
-	# classpath without requiring some sort of Java already available, ie ecj
-	# requires a runtime and gcj already has a bundled version.
-	local compiler="--with-jikes"
-
-	# Now this detects fastjar automatically and some people have broken
-	# wrappers in /usr/bin by eselect-compiler. Unfortunately
-	# --without-fastjar does not seem to work.
-	# http://bugs.gentoo.org/show_bug.cgi?id=135688
-
-	# don't use econf, because it ends up putting things under /usr, which may
-	# collide with other slots of classpath
-	./configure ${compiler} \
-		$(use_enable alsa) \
-		$(use_enable cairo gtk-cairo) \
-		$(use_enable debug ) \
-		$(use_enable examples) \
-		$(use_enable gtk gtk-peer) \
-		$(use_enable xml xmlj) \
-		$(use_enable dssi ) \
-		--enable-jni \
-		--disable-dependency-tracking \
-		--prefix=/opt/${PN}-${SLOT} \
-		|| die "configure failed"
-	# disabled for now... see above.
-	#		$(use_with   doc   gjdoc) \
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "einstall failed"
-	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
-}
-
-pkg_postinst() {
-	if use gtk && use cairo; then
-		elog "GNU Classpath was compiled with preliminary cairo support."
-		elog "To use that functionality set the system property"
-		elog "gnu.java.awt.peer.gtk.Graphics to Graphics2D at runtime."
-	fi
-}
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.93.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.93.ebuild
deleted file mode 100644
index c4a72f8bb302..000000000000
--- a/dev-java/gnu-classpath/gnu-classpath-0.93.ebuild
+++ /dev/null
@@ -1,126 +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/gnu-classpath/gnu-classpath-0.93.ebuild,v 1.7 2008/04/08 16:20:27 armin76 Exp $
-
-inherit autotools eutils flag-o-matic multilib
-
-MY_P=${P/gnu-/}
-DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java programming language"
-SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/classpath"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0.93"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# Add the doc use flag after the upstream build system is improved
-# See their bug 24025
-
-IUSE="alsa cairo debug dssi examples gconf gtk nsplugin xml"
-
-GTK_DEPS="
-		>=x11-libs/gtk+-2.8
-		>=dev-libs/glib-2.0
-		|| (
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libX11
-				x11-libs/libXtst
-		)
-		cairo? ( >=x11-libs/cairo-0.5.0 )
-"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-		dssi? ( >=media-libs/dssi-0.9 )
-		gconf? ( gnome-base/gconf )
-		gtk? ( ${GTK_DEPS} )
-		nsplugin? (
-			${GTK_DEPS}
-			|| (
-				=www-client/mozilla-firefox-2*
-				=net-libs/xulrunner-1.8*
-				=www-client/seamonkey-1*
-				=www-client/seamonkey-bin-1*
-				=www-client/mozilla-firefox-bin-2*
-			)
-		)
-		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
-
-DEPEND="app-arch/zip
-		>=dev-java/jikes-1.22-r13
-		gtk? ( || (
-					x11-libs/libXrender
-					x11-proto/xextproto
-					x11-proto/xproto
-				)
-			)
-		${REPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/0.93-nsplugin.patch"
-	eautoconf
-}
-
-src_compile() {
-	unset CLASSPATH JAVA_HOME
-	# We want to force use of jikes, because it is the only way to build
-	# classpath without requiring some sort of Java already available, ie ecj
-	# requires a runtime and gcj already has a bundled version.
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=163801
-	# for jikes-bin
-	local compiler="--with-jikes=/usr/bin/jikes-bin"
-
-	# Now this detects fastjar automatically and some people have broken
-	# wrappers in /usr/bin by eselect-compiler. Unfortunately
-	# --without-fastjar does not seem to work.
-	# http://bugs.gentoo.org/show_bug.cgi?id=135688
-
-	# The plugin needs the gtk peer or the build fails
-	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27923
-	local myconf
-	if use nsplugin; then
-		myconf="--enable-gtk-peer"
-	else
-		myconf="$(use_enable gtk gtk-peer)"
-	fi
-
-	# TODO: check head and report upstream. If gconf is not installed it
-	# it should set this automatically to file
-	use gconf || myconf="${myconf} --enable-default-preferences-peer=file"
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=168800
-	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31002
-	replace-flags -O3 -O2
-
-	# don't use econf, because it ends up putting things under /usr, which may
-	# collide with other slots of classpath
-	./configure ${compiler} \
-		$(use_enable alsa) \
-		$(use_enable cairo gtk-cairo) \
-		$(use_enable debug ) \
-		$(use_enable examples) \
-		$(use_enable gconf gconf-peer) \
-		$(use_enable nsplugin plugin) \
-		$(use_enable xml xmlj) \
-		$(use_enable dssi ) \
-		${myconf} \
-		--enable-jni \
-		--disable-dependency-tracking \
-		--host=${CHOST} \
-		--prefix=/opt/${PN}-${SLOT} \
-		|| die "configure failed"
-	# disabled for now... see above.
-	#		$(use_with   doc   gjdoc) \
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "einstall failed"
-	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO || die
-}
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild
index e8c533c4805e..34d65706d70c 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.8 2008/07/27 01:03:32 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.9 2009/06/25 19:12:24 yngwin Exp $
 
 EAPI=1
 
@@ -47,7 +47,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 				=www-client/mozilla-firefox-bin-2*
 			)
 		)
-		qt4? ( || ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 ) )
+		qt4? ( x11-libs/qt-gui:4 )
 		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )
 		gstreamer? (
 			>=media-libs/gstreamer-0.10.10
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild
index 3441d0fbf44f..1bd72665c7be 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild,v 1.3 2008/07/27 01:03:32 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild,v 1.4 2009/06/25 19:12:24 yngwin Exp $
 
 EAPI=1
 
@@ -44,7 +44,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 				=www-client/mozilla-firefox-bin-2*
 			)
 		)
-		qt4? ( || ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 ) )
+		qt4? ( x11-libs/qt-gui:4 )
 		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )
 		gstreamer? (
 			>=media-libs/gstreamer-0.10.10
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97.ebuild
deleted file mode 100644
index fb349245f1a9..000000000000
--- a/dev-java/gnu-classpath/gnu-classpath-0.97.ebuild
+++ /dev/null
@@ -1,105 +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/gnu-classpath/gnu-classpath-0.97.ebuild,v 1.2 2008/04/08 16:20:27 armin76 Exp $
-
-inherit eutils flag-o-matic multilib java-pkg-2
-
-MY_P=${P/gnu-/}
-DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java programming language"
-SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/classpath"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0.97"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="alsa debug doc dssi examples gconf gtk gstreamer nsplugin qt4 xml"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-		doc? ( >=dev-java/gjdoc-0.7.8 )
-		dssi? ( >=media-libs/dssi-0.9 )
-		gconf? (
-			>=gnome-base/gconf-2.6.0
-			>=x11-libs/gtk+-2.8
-		)
-		gtk? (
-			>=x11-libs/gtk+-2.8
-			>=dev-libs/glib-2.0
-			media-libs/freetype
-			>=x11-libs/cairo-1.1.9
-			x11-libs/libXrandr
-			x11-libs/libXrender
-			x11-libs/libXtst
-			x11-libs/pango
-		)
-		nsplugin? (
-			>=x11-libs/gtk+-2.8
-			|| (
-				=www-client/mozilla-firefox-2*
-				=net-libs/xulrunner-1.8*
-				=www-client/seamonkey-1*
-				=www-client/seamonkey-bin-1*
-				=www-client/mozilla-firefox-bin-2*
-			)
-		)
-		qt4? ( >=x11-libs/qt-4.1.0 )
-		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )
-		gstreamer? (
-			>=media-libs/gstreamer-0.10.10
-			>=media-libs/gst-plugins-base-0.10.10
-			dev-libs/glib
-		)
-		sys-apps/file"
-
-DEPEND="app-arch/zip
-		>=virtual/jdk-1.6.0
-		gtk? (
-			x11-proto/xextproto
-			x11-proto/xproto
-		)
-		${REPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Upstreams sets proper -source and -target
-	unset JAVACFLAGS
-
-	# Forcing 1.6 for now because of this but perhaps should come up with
-	# something smart
-
-	#if [[ ( ${GENTOO_VM} == sun-jdk-1.5 || ${GENTOO_VM} == ibm-jdk-bin-1.5 ) \
-	#	&& ${GENTOO_COMPILER} == javac ]]; then
-	#	eerror "javac from ${GENTOO_VM} is not able to compile"
-	#	eerror "${CATEGORY}/${P}, use ecj or sun-jdk-1.6 instead"
-	#	die "Unusable JDK + compiler combination"
-	#fi
-
-	# don't use econf, because it ends up putting things under /usr, which may
-	# collide with other slots of classpath
-	./configure ${compiler} \
-		$(use_enable alsa) \
-		$(use_enable debug ) \
-		$(use_enable examples) \
-		$(use_enable gconf gconf-peer) \
-		$(use_enable gtk gtk-peer) \
-		$(use_enable gstreamer gstreamer-peer) \
-		$(use_enable nsplugin plugin) \
-		$(use_enable qt4 qt-peer) \
-		$(use_enable xml xmlj) \
-		$(use_enable dssi ) \
-		$(use_with doc gjdoc) \
-		${myconf} \
-		--enable-jni \
-		--disable-dependency-tracking \
-		--disable-Werror \
-		--host=${CHOST} \
-		--prefix=/opt/${PN}-${SLOT} \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO || die
-}