Remove java5 and java6 flags and cleanup per bug #304639.

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

4 files changed, 30 insertions, 48 deletions

diff --git a/media-video/projectx/ChangeLog b/media-video/projectx/ChangeLog
index c58034d24ab2..e5c1aee01f9b 100644
--- a/media-video/projectx/ChangeLog
+++ b/media-video/projectx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/projectx
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.33 2009/10/08 18:29:21 billie Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.34 2010/02/11 23:03:14 caster Exp $
+
+  11 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  projectx-0.90.4.00-r3.ebuild, projectx-0.90.4.00_p26.ebuild,
+  projectx-0.90.4.00_p32.ebuild:
+  Remove java5 and java6 flags and cleanup per bug #304639.
 
 *projectx-0.90.4.00_p32 (08 Oct 2009)
 
diff --git a/media-video/projectx/projectx-0.90.4.00-r3.ebuild b/media-video/projectx/projectx-0.90.4.00-r3.ebuild
index 3c54b18bd25f..ee68881a30bc 100644
--- a/media-video/projectx/projectx-0.90.4.00-r3.ebuild
+++ b/media-video/projectx/projectx-0.90.4.00-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.90.4.00-r3.ebuild,v 1.7 2008/04/03 14:50:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.90.4.00-r3.ebuild,v 1.8 2010/02/11 23:03:14 caster Exp $
 
 inherit eutils toolchain-funcs java-pkg-2 java-ant-2
 
@@ -28,10 +28,10 @@ IUSE="X doc source mmx"
 COMMON_DEP="dev-java/commons-net
 	X? ( =dev-java/browserlauncher2-1* )"
 
-RDEPEND=">=virtual/jre-1.4
+RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEP}"
 
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.5
 	${COMMON_DEP}
 	app-arch/unzip
 	dev-java/ant-core
diff --git a/media-video/projectx/projectx-0.90.4.00_p26.ebuild b/media-video/projectx/projectx-0.90.4.00_p26.ebuild
index 7003d248c677..2f7647f571a1 100644
--- a/media-video/projectx/projectx-0.90.4.00_p26.ebuild
+++ b/media-video/projectx/projectx-0.90.4.00_p26.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.90.4.00_p26.ebuild,v 1.1 2008/12/06 22:46:22 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.90.4.00_p26.ebuild,v 1.2 2010/02/11 23:03:14 caster Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit eutils toolchain-funcs java-pkg-2 java-ant-2
 
@@ -23,24 +25,18 @@ SRC_URI="http://sbriesen.de/gentoo/distfiles/${MY_PN}_Source_${PV}.tbz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="X doc source mmx java5 java6"
+IUSE="X mmx"
 
 COMMON_DEP="dev-java/commons-net
 	X? ( =dev-java/browserlauncher2-1* )"
 
-RDEPEND="java6? ( >=virtual/jre-1.6 )
-	!java6? ( java5? ( >=virtual/jre-1.5 ) )
-	!java6? ( !java5? ( >=virtual/jre-1.4 ) )
+RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEP}"
 
-DEPEND="java6? ( >=virtual/jdk-1.6 )
-	!java6? ( java5? ( >=virtual/jdk-1.5 ) )
-	!java6? ( !java5? ( >=virtual/jdk-1.4 ) )
+DEPEND=">=virtual/jdk-1.5
 	${COMMON_DEP}
 	app-arch/unzip
-	>=sys-apps/sed-4
-	dev-java/ant-core
-	source? ( app-arch/zip )"
+	>=sys-apps/sed-4"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -54,15 +50,7 @@ src_unpack() {
 	cd "${S}"
 
 	# copy build.xml
-	if use java6; then
-		sed 's:\(value=\"\)1\.4\(\"\):\11.6\2:g' \
-			"${FILESDIR}/build-${PV%.*}.xml" > build.xml
-	elif use java5; then
-		sed 's:\(value=\"\)1\.4\(\"\):\11.5\2:g' \
-			"${FILESDIR}/build-${PV%.*}.xml" > build.xml
-	else
-		cp -f "${FILESDIR}/build-${PV%.*}.xml" build.xml
-	fi
+	cp -f "${FILESDIR}/build-${PV%.*}.xml" build.xml || die
 
 	# patch location of executable
 	sed -i -e "s:^\(Exec=\).*:\1${PN}:g" *.desktop
diff --git a/media-video/projectx/projectx-0.90.4.00_p32.ebuild b/media-video/projectx/projectx-0.90.4.00_p32.ebuild
index 6cab1553924b..4dbbf388a9d4 100644
--- a/media-video/projectx/projectx-0.90.4.00_p32.ebuild
+++ b/media-video/projectx/projectx-0.90.4.00_p32.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.90.4.00_p32.ebuild,v 1.1 2009/10/08 18:29:21 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.90.4.00_p32.ebuild,v 1.2 2010/02/11 23:03:14 caster Exp $
 
 EAPI="2"
 
+JAVA_PKG_IUSE="doc source"
+
 inherit eutils toolchain-funcs java-pkg-2 java-ant-2
 
 MY_PN="ProjectX"
@@ -25,21 +27,16 @@ SRC_URI="mirror://gentoo/${MY_PN}_Source_${PV}.tbz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="X doc source mmx java5 java6"
+IUSE="X mmx"
 
 COMMON_DEP="dev-java/commons-net
 	X? ( =dev-java/browserlauncher2-1* )"
 
-RDEPEND="java6? ( >=virtual/jre-1.6 )
-	!java6? ( java5? ( >=virtual/jre-1.5 ) )
-	!java6? ( !java5? ( >=virtual/jre-1.4 ) )
+RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEP}"
 
-DEPEND="java6? ( >=virtual/jdk-1.6 )
-	!java6? ( java5? ( >=virtual/jdk-1.5 ) )
-	!java6? ( !java5? ( >=virtual/jdk-1.4 ) )
-	${COMMON_DEP}
-	source? ( app-arch/zip )"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -48,17 +45,9 @@ mainclass() {
 	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF"
 }
 
-src_prepare() {
+java_prepare() {
 	# copy build.xml
-	if use java6; then
-		sed 's:\(value=\"\)1\.4\(\"\):\11.6\2:g' \
-			"${FILESDIR}/build-${PV%.*}.xml" > build.xml
-	elif use java5; then
-		sed 's:\(value=\"\)1\.4\(\"\):\11.5\2:g' \
-			"${FILESDIR}/build-${PV%.*}.xml" > build.xml
-	else
-		cp -f "${FILESDIR}/build-${PV%.*}.xml" build.xml
-	fi
+	cp -f "${FILESDIR}/build-${PV%.*}.xml" build.xml || die
 
 	# patch location of executable
 	sed -i -e "s:^\(Exec=\).*:\1${PN}:g" *.desktop