This package can compile with jikes now

7 files changed, 20 insertions, 82 deletions

diff --git a/app-admin/portagemaster/ChangeLog b/app-admin/portagemaster/ChangeLog
index d6b0e682dba5..47999953cf28 100644
--- a/app-admin/portagemaster/ChangeLog
+++ b/app-admin/portagemaster/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/portagemaster
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/portagemaster/ChangeLog,v 1.12 2003/02/12 02:26:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/portagemaster/ChangeLog,v 1.13 2003/08/15 06:34:14 strider Exp $
+
+  15 Aug 2003; Adrian Almenar <strider@gentoo.org> portagemaster-0.2.0.ebuild:
+  Now this package can compile with jikes, updated sparc keyword to stable.
 
 *portagemaster-0.2.0 (11 Oct 2002)
 
diff --git a/app-admin/portagemaster/Manifest b/app-admin/portagemaster/Manifest
index f13a9aa7d4b1..d4eaa32387a7 100644
--- a/app-admin/portagemaster/Manifest
+++ b/app-admin/portagemaster/Manifest
@@ -1,7 +1,3 @@
-MD5 fec906c64ead7aa3c6c648cd4b94eee8 ChangeLog 1983
-MD5 7895b5fa72bcc69040a672a1055b2733 portagemaster-0.1.5.ebuild 686
-MD5 f4f1c377165ececb08b3c71862ca4457 portagemaster-0.1.8.ebuild 1163
-MD5 b78cab51845d19cb5275574a8d1735c5 portagemaster-0.2.0.ebuild 1233
-MD5 b798fe10c396ec71d8ce986366ce1778 files/digest-portagemaster-0.1.5 71
-MD5 cb7c39297283bd80e0229f959401834a files/digest-portagemaster-0.1.8 71
+MD5 bc8cdb5ab1ed026474db5d10656bb8fb portagemaster-0.2.0.ebuild 1500
+MD5 d2a497b7d63c96c9053f91463f3215eb ChangeLog 2140
 MD5 8a940fc25ce6a223c06dfed054da2669 files/digest-portagemaster-0.2.0 71
diff --git a/app-admin/portagemaster/files/digest-portagemaster-0.1.5 b/app-admin/portagemaster/files/digest-portagemaster-0.1.5
deleted file mode 100644
index 297782fb73ea..000000000000
--- a/app-admin/portagemaster/files/digest-portagemaster-0.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 52e248f0d1d918c2ee2057cefcc4554e portagemaster-0.1.5.tar.bz2 69026
diff --git a/app-admin/portagemaster/files/digest-portagemaster-0.1.8 b/app-admin/portagemaster/files/digest-portagemaster-0.1.8
deleted file mode 100644
index cfab3e2d67c7..000000000000
--- a/app-admin/portagemaster/files/digest-portagemaster-0.1.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 481130389e2906f950997b483c54348b portagemaster-0.1.8.tar.bz2 31869
diff --git a/app-admin/portagemaster/portagemaster-0.1.5.ebuild b/app-admin/portagemaster/portagemaster-0.1.5.ebuild
deleted file mode 100644
index f6d91d5af268..000000000000
--- a/app-admin/portagemaster/portagemaster-0.1.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/portagemaster/portagemaster-0.1.5.ebuild,v 1.13 2003/02/28 22:23:07 vapier Exp $
-
-DESCRIPTION="A java portage browser and installer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://portagemaster.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
-
-DEPEND=""
-RDEPEND="virtual/jre"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	dodir /opt/${PN}
-	cp portagemaster-${PV}.jar ${D}/opt/${PN}
-	
-	into /usr
-	dobin portagemaster
-	ln -s /opt/${PN}/portagemaster-${PV}.jar ${D}/opt/${PN}/portagemaster.jar
-}
diff --git a/app-admin/portagemaster/portagemaster-0.1.8.ebuild b/app-admin/portagemaster/portagemaster-0.1.8.ebuild
deleted file mode 100644
index 6a32f7754661..000000000000
--- a/app-admin/portagemaster/portagemaster-0.1.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/portagemaster/portagemaster-0.1.8.ebuild,v 1.11 2003/02/28 22:23:07 vapier Exp $
-
-DESCRIPTION="A java portage browser and installer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://portagemaster.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc sparc"
-
-DEPEND=">=dev-java/sun-jdk-1.4.0-r5
-	>=dev-java/ant-1.4.1-r3
-	>=dev-java/jikes-1.16"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	local foo
-	foo=`java-config --java-version 2>&1 | grep "1.4."`
-	if [ -z "$foo" ] ; then
-		eerror "You have to set the 1.4.0 JDK as your system default to compile this package."
-		einfo "Use java-config --set-system-vm=sun-jdk-1.4.0 (or more recent) to set it."
-		exit 1
-	fi
-}
-
-src_compile() {
-	ant
-	cp src/portagemaster src/portagemaster.orig
-	sed -e s:/usr/share/portagemaster/portagemaster.jar:/usr/share/portagemaster/lib/portagemaster-${PV}.jar: \
-		< src/portagemaster.orig \
-		> src/portagemaster || die
-}
-
-src_install() {
-	dojar packages/portagemaster-${PV}.jar
-	dobin src/portagemaster
-}
diff --git a/app-admin/portagemaster/portagemaster-0.2.0.ebuild b/app-admin/portagemaster/portagemaster-0.2.0.ebuild
index a390fd1e855a..dcccae2e0fe3 100644
--- a/app-admin/portagemaster/portagemaster-0.2.0.ebuild
+++ b/app-admin/portagemaster/portagemaster-0.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/portagemaster/portagemaster-0.2.0.ebuild,v 1.10 2003/02/28 22:23:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/portagemaster/portagemaster-0.2.0.ebuild,v 1.11 2003/08/15 06:34:14 strider Exp $
 
 DESCRIPTION="A java portage browser and installer"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -8,12 +8,13 @@ HOMEPAGE="http://portagemaster.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc ~sparc"
+KEYWORDS="x86 -ppc sparc"
+IUSE="jikes"
 
-DEPEND=">=dev-java/sun-jdk-1.4.0-r5
-	>=dev-java/ant-1.4.1-r3
-	>=dev-java/jikes-1.16"
-RDEPEND=">=dev-java/sun-jdk-1.4.0-r5"
+DEPEND=">=dev-java/sun-jdk-1.4.1-r5
+	>=dev-java/ant-1.5.1-r3
+	jikes? ( >=dev-java/jikes-1.16 )"
+RDEPEND=">=dev-java/sun-jdk-1.4.1-r5"
 
 S=${WORKDIR}/${PN}
 
@@ -21,8 +22,8 @@ pkg_setup() {
 	local foo
 	foo=`java-config --java-version 2>&1 | grep "1.4."`
 	if [ -z "$foo" ] ; then
-		eerror "You have to set the 1.4.0 JDK as your system default to compile this package."
-		einfo "Use java-config --set-system-vm=sun-jdk-1.4.0 (or more recent) to set it."
+		eerror "You have to set the 1.4.1 JDK as your system default to compile this package."
+		einfo "Use java-config --set-system-vm=sun-jdk-1.4.1 (or more recent) to set it."
 		exit 1
 	fi
 }
@@ -32,6 +33,11 @@ src_unpack() {
 }
 
 src_compile() {
+	if [ -z "`use jikes`" ] ; then
+		einfo "Configuring build for Jikes"	
+		cp build.xml build.xml.orig
+		sed 's!<property name="build.compiler" value="jikes"/>!<property name="build.compiler" value="modern"/>!' < build.xml.orig > build.xml
+	fi	
 	ant
 	cp src/portagemaster src/portagemaster.orig
 	sed -e s:/usr/share/portagemaster/portagemaster.jar:/usr/share/portagemaster/lib/portagemaster-${PV}.jar: \