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

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 34 insertions, 52 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/Manifest b/media-video/projectx/Manifest
index 3fad73a862b7..27edb38abd37 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -10,9 +10,9 @@ DIST projectx-patches-0.90.4.00-r3.tbz2 1394 RMD160 05e2c2936bcbbcb3344ca22ae037
 DIST projectx-patches-0.90.4.00-r4.tbz2 1394 RMD160 05e2c2936bcbbcb3344ca22ae0379e9e1d33a37c SHA1 e73aa3bc14e8015029ceeacbc2928b551b9354aa SHA256 57cb89ac50fc6418ae30cc68a4003fc3cc2c0eace8c7f9e108a863a1424fcde6
 DIST projectx-patches-0.90.4.00_p26.tbz2 1020 RMD160 0b6405e1b3191b855422ca1b047197593233d2c6 SHA1 cc4c1f157f9687295d0e3aa6dee0632ac2aea81c SHA256 5c9564f824cc4cbc56dd0bc6a5f75112e5833cefd45e89974cfa7f97bde23000
 DIST projectx-patches-0.90.4.00_p32.tbz2 1020 RMD160 0b6405e1b3191b855422ca1b047197593233d2c6 SHA1 cc4c1f157f9687295d0e3aa6dee0632ac2aea81c SHA256 5c9564f824cc4cbc56dd0bc6a5f75112e5833cefd45e89974cfa7f97bde23000
-EBUILD projectx-0.90.4.00-r3.ebuild 3056 RMD160 7015a2c20c4eb33d9fbb073e37ee8bae16980fc0 SHA1 6bd3199481623c6b2681373e9c80d04a31ef052e SHA256 3972757a08c08226cd5967f03cd74abc11118dacd801fb03e905b81569a47077
+EBUILD projectx-0.90.4.00-r3.ebuild 3056 RMD160 53d544393c9a667438d92b9cf94f70140a95d011 SHA1 b10c6a79c4e78153fdf1c983192cb7c9b43e59e5 SHA256 edbf4bd453827a532114feeab78f97ebb3463454e4fc0ee8fac209772ed84220
 EBUILD projectx-0.90.4.00-r4.ebuild 3107 RMD160 b002678fc6a034701e56a390f332c20e6ce247a7 SHA1 fe9f44f44db7ffb9539f36ae704329a27a19bc6a SHA256 d9abf89f5221ed1991b7775fa0fd419be84342c9243b2b316ea39fdaedc75088
-EBUILD projectx-0.90.4.00_p26.ebuild 3613 RMD160 1e3b20bee182c0f27a169c2554aa22196281b77c SHA1 05870cc5b7d6f7c267f472236b039856f400a8a2 SHA256 c6650f66e7530bdbbe41dbab837e3b335f4f880e7619a4c4bd5158687b0184a7
-EBUILD projectx-0.90.4.00_p32.ebuild 3483 RMD160 78302d339fb56966bebaadf038241605815696e5 SHA1 cacf7439da135fc1e1e6411c029b8ec56cfc2dd3 SHA256 ed34d7cd18f4a3e7daccc55f636e3b28d9992a4ed14e46db72e256d9fec4affb
-MISC ChangeLog 3768 RMD160 9e616b4bda769340270be22f335ab8bb6d992be9 SHA1 5659534a3f971e2aa18527fd60118c5231129610 SHA256 dc48f327327e73259d3526736543e046c901151b25ef4cd7699222fb93f31f54
+EBUILD projectx-0.90.4.00_p26.ebuild 3147 RMD160 ff2a93509ed8c0f7b0a9cf7cb0dabc89ac60e445 SHA1 ac7012d5a57c67f8215f834180a930ac1d6c205e SHA256 4448e144db5c17ea3cda7b2fbc1b2f2e63d64a996e696e54496d051bc4a3b77b
+EBUILD projectx-0.90.4.00_p32.ebuild 3039 RMD160 6ac160d5c53e4e4d580ad3024acec8408168e9ae SHA1 8b26a786fb8094257df78e1d14bda127c4aaa4f2 SHA256 35e4571ffe6097f6bdda0396a1667b50e1b2dac3c454fa7440eb890123e90426
+MISC ChangeLog 3976 RMD160 d0ade03b4492186e9510c6281bea66556565b235 SHA1 0af64bca40dda96158c50e3d3f5c195f53aec193 SHA256 47382e7676c5416170efc78657405efd4d6603bfe4d4f1d7f11d0acd6d732d12
 MISC metadata.xml 648 RMD160 08c95d7596fa4b9c15412d618a8776a2c4a4b4d5 SHA1 08509daf9306b49f7753133791b3618724f76e1a SHA256 02f9b720480dac25585b7c9e5f8c39caf0560bef841f75788215f2dbc28a3940
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