Spring cleaning.

(Portage version: 2.1.4.4)

6 files changed, 6 insertions, 233 deletions

diff --git a/kde-base/kdejava/ChangeLog b/kde-base/kdejava/ChangeLog
index 138253eaf36b..bfddd411f66f 100644
--- a/kde-base/kdejava/ChangeLog
+++ b/kde-base/kdejava/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdejava
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.66 2008/01/31 15:30:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.67 2008/02/17 03:15:34 ingmar Exp $
+
+  17 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -files/kdejava-3.4.0_rc1-classpath.diff, -kdejava-3.5.5.ebuild,
+  -kdejava-3.5.5-r1.ebuild, -kdejava-3.5.6-r1.ebuild, -kdejava-3.5.7.ebuild:
+  Spring cleaning
 
   31 Jan 2008; Brent Baude <ranger@gentoo.org> kdejava-3.5.8.ebuild:
   Marking kdejava-3.5.8 ppc for bug 207634
diff --git a/kde-base/kdejava/files/kdejava-3.4.0_rc1-classpath.diff b/kde-base/kdejava/files/kdejava-3.4.0_rc1-classpath.diff
deleted file mode 100644
index 74caab518ba5..000000000000
--- a/kde-base/kdejava/files/kdejava-3.4.0_rc1-classpath.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdejava/koala/org/kde/koala/Makefile.am.orig	2004-10-29 23:36:58.640919896 +0200
-+++ kdejava/koala/org/kde/koala/Makefile.am	2004-10-29 23:36:46.479768672 +0200
-@@ -12,6 +12,6 @@
- 
- JAVAROOT = ../../..
- CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir)
--JAVACFLAGS = -classpath $(CLASSPATH)
-+JAVACFLAGS = -classpath _CLASSPATH_:$(CLASSPATH)
- # Prevent stupid automake from putting JAVAC=javac in Makefile.in
- JAVAC = @JAVAC@
diff --git a/kde-base/kdejava/kdejava-3.5.5-r1.ebuild b/kde-base/kdejava/kdejava-3.5.5-r1.ebuild
deleted file mode 100644
index 1b85df6f5338..000000000000
--- a/kde-base/kdejava/kdejava-3.5.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.5-r1.ebuild,v 1.6 2007/04/07 22:35:11 josejx Exp $
-
-KMNAME=kdebindings
-KMEXTRACTONLY=qtjava
-KMCOPYLIB="libqtjavasupport qtjava/javalib/qtjava"
-KM_MAKEFILESREV=1
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit java-pkg-2 kde-meta
-
-DESCRIPTION="KDE java bindings"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-COMMONDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)
-	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
-	$(deprange 3.5.2 $MAXKDEVER kde-base/qtjava)"
-DEPEND=">=virtual/jdk-1.4 $COMMONDEPEND"
-RDEPEND=">=virtual/jre-1.4 $COMMONDEPEND"
-OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk"
-
-PATCHES="${FILESDIR}/no-gtk-glib-check.diff
-	${FILESDIR}/${PN}-${SLOT}-javacflags.patch"
-
-# Probably missing other kdebase, kdepim etc deps
-# Needs to be compiled with just kdelibs installed to make sure
-
-# both eclasses define pkg_setup
-pkg_setup() {
-	kde_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	kde-meta_src_unpack
-
-	local cp="$(java-pkg_getjars qtjava-${SLOT})"
-	local mf="${S}/kdejava/koala/org/kde/koala/Makefile.am"
-	sed -i -e "s#_CLASSPATH_#${cp}#" "${mf}" \
-		|| die "sed CLASSPATH failed"
-	sed -i -e "s#_JAVACFLAGS_#${JAVACFLAGS}#" "${mf}" \
-		|| die "sed JAVACFLAGS failed"
-}
-
-src_compile() {
-	myconf="${myconf} --with-java=${JDK_HOME}"
-	kde-meta_src_compile
-}
-
-src_install() {
-	kde-meta_src_install
-
-	local libdir="${D}/usr/kde/${SLOT}/$(get_libdir)"
-	rm -rf "${libdir}/java" || die "rm failed"
-
-	java-pkg_dojar ${S}/${PN}/koala/koala.jar
-	java-pkg_regso "${libdir}"/*.so
-}
diff --git a/kde-base/kdejava/kdejava-3.5.5.ebuild b/kde-base/kdejava/kdejava-3.5.5.ebuild
deleted file mode 100644
index 1836b987de13..000000000000
--- a/kde-base/kdejava/kdejava-3.5.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.5.ebuild,v 1.7 2007/07/11 01:08:47 mr_bones_ Exp $
-
-KMNAME=kdebindings
-KMEXTRACTONLY=qtjava
-KMCOPYLIB="libqtjavasupport qtjava/javalib/qtjava"
-KM_MAKEFILESREV=1
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta
-
-DESCRIPTION="KDE java bindings"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-COMMONDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)
-	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
-	$(deprange 3.5.2 $MAXKDEVER kde-base/qtjava)"
-DEPEND="virtual/jdk $COMMONDEPEND"
-RDEPEND="virtual/jre $COMMONDEPEND"
-OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk"
-
-PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/kdejava-3.4.0_rc1-classpath.diff"
-
-# Probably missing other kdebase, kdepim etc deps
-# Needs to be compiled with just kdelibs installed to make sure
-
-# Someone who knows about java-in-gentoo should look at this and the
-# other java kdebindings, and fix the stupid thing
-src_unpack() {
-	kde-meta_src_unpack
-
-	# $PREFIX-dependant, so don't go into the makefile tarballs
-	cd $S/kdejava/koala/org/kde/koala
-	for x in Makefile.am Makefile.in; do
-		mv $x $x.orig
-		sed -e "s:_CLASSPATH_:$(java-config -p qtjava):" $x.orig > $x
-		rm $x.orig
-	done
-}
-
-src_compile() {
-	myconf="$myconf --with-java=`java-config --jdk-home`"
-	kde-meta_src_compile
-}
diff --git a/kde-base/kdejava/kdejava-3.5.6-r1.ebuild b/kde-base/kdejava/kdejava-3.5.6-r1.ebuild
deleted file mode 100644
index d5e371935115..000000000000
--- a/kde-base/kdejava/kdejava-3.5.6-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.6-r1.ebuild,v 1.2 2007/02/01 13:47:59 caster Exp $
-
-KMNAME=kdebindings
-KMEXTRACTONLY=qtjava
-KMCOPYLIB="libqtjavasupport qtjava/javalib/qtjava"
-KM_MAKEFILESREV=1
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit java-pkg-2 kde-meta
-
-DESCRIPTION="KDE java bindings"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-COMMONDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)
-	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
-	$(deprange $PV $MAXKDEVER kde-base/qtjava)"
-DEPEND=">=virtual/jdk-1.4 $COMMONDEPEND"
-RDEPEND=">=virtual/jre-1.4 $COMMONDEPEND"
-OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk"
-
-PATCHES="${FILESDIR}/no-gtk-glib-check.diff
-	${FILESDIR}/${PN}-${SLOT}-javacflags.patch"
-
-# Probably missing other kdebase, kdepim etc deps
-# Needs to be compiled with just kdelibs installed to make sure
-
-# both eclasses define pkg_setup
-pkg_setup() {
-	kde_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	kde-meta_src_unpack
-
-	local cp="$(java-pkg_getjars qtjava-${SLOT})"
-	local mf="${S}/kdejava/koala/org/kde/koala/Makefile.am"
-	sed -i -e "s#_CLASSPATH_#${cp}#" "${mf}" \
-		|| die "sed CLASSPATH failed"
-	sed -i -e "s#_JAVACFLAGS_#${JAVACFLAGS}#" "${mf}" \
-		|| die "sed JAVACFLAGS failed"
-}
-
-src_compile() {
-	myconf="${myconf} --with-java=${JDK_HOME}"
-	kde-meta_src_compile
-}
-
-src_install() {
-	kde-meta_src_install
-
-	local libdir="${D}/usr/kde/${SLOT}/$(get_libdir)"
-	rm -rf "${libdir}/java" || die "rm failed"
-
-	java-pkg_dojar ${S}/${PN}/koala/koala.jar
-	java-pkg_regso "${libdir}"/*.so
-}
diff --git a/kde-base/kdejava/kdejava-3.5.7.ebuild b/kde-base/kdejava/kdejava-3.5.7.ebuild
deleted file mode 100644
index a12b787fc658..000000000000
--- a/kde-base/kdejava/kdejava-3.5.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.7.ebuild,v 1.6 2007/08/11 17:34:09 armin76 Exp $
-
-KMNAME=kdebindings
-KMEXTRACTONLY=qtjava
-KMCOPYLIB="libqtjavasupport qtjava/javalib/qtjava"
-KM_MAKEFILESREV=1
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit java-pkg-2 kde-meta
-
-DESCRIPTION="KDE java bindings"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-COMMONDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)
-	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
-	$(deprange $PV $MAXKDEVER kde-base/qtjava)"
-DEPEND=">=virtual/jdk-1.4 $COMMONDEPEND"
-RDEPEND=">=virtual/jre-1.4 $COMMONDEPEND"
-OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk"
-
-PATCHES="${FILESDIR}/no-gtk-glib-check.diff
-	${FILESDIR}/${PN}-${SLOT}-javacflags.patch"
-
-# Probably missing other kdebase, kdepim etc deps
-# Needs to be compiled with just kdelibs installed to make sure
-
-# both eclasses define pkg_setup
-pkg_setup() {
-	kde_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	kde-meta_src_unpack
-
-	local cp="$(java-pkg_getjars qtjava-${SLOT})"
-	local mf="${S}/kdejava/koala/org/kde/koala/Makefile.am"
-	sed -i -e "s#_CLASSPATH_#${cp}#" "${mf}" \
-		|| die "sed CLASSPATH failed"
-	sed -i -e "s#_JAVACFLAGS_#${JAVACFLAGS}#" "${mf}" \
-		|| die "sed JAVACFLAGS failed"
-}
-
-src_compile() {
-	myconf="${myconf} --with-java=${JDK_HOME}"
-	kde-meta_src_compile
-}
-
-src_install() {
-	kde-meta_src_install
-
-	local libdir="${D}/usr/kde/${SLOT}/$(get_libdir)"
-	rm -rf "${libdir}/java" || die "rm failed"
-
-	java-pkg_dojar ${S}/${PN}/koala/koala.jar
-	java-pkg_regso "${libdir}"/*.so
-}