java fixes

(Portage version: 2.0.51.22-r2)

4 files changed, 11 insertions, 69 deletions

diff --git a/app-portage/portagemaster/ChangeLog b/app-portage/portagemaster/ChangeLog
index d6c161252255..68a63f5f7664 100644
--- a/app-portage/portagemaster/ChangeLog
+++ b/app-portage/portagemaster/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/portagemaster
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/ChangeLog,v 1.16 2005/04/24 11:32:20 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/ChangeLog,v 1.17 2005/07/20 16:25:57 axxo Exp $
+
+  20 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
+  -portagemaster-0.2.0.ebuild, portagemaster-0.2.1.ebuild:
+  java fixes
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   portagemaster-0.2.1.ebuild:
diff --git a/app-portage/portagemaster/files/digest-portagemaster-0.2.0 b/app-portage/portagemaster/files/digest-portagemaster-0.2.0
deleted file mode 100644
index 8dc9bb1142c2..000000000000
--- a/app-portage/portagemaster/files/digest-portagemaster-0.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 66aa80f8665924e6b0ca5f7232550f43 portagemaster-0.2.0.tar.bz2 33475
diff --git a/app-portage/portagemaster/portagemaster-0.2.0.ebuild b/app-portage/portagemaster/portagemaster-0.2.0.ebuild
deleted file mode 100644
index 78f7cd2f7162..000000000000
--- a/app-portage/portagemaster/portagemaster-0.2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/portagemaster-0.2.0.ebuild,v 1.10 2005/01/01 15:54:41 eradicator Exp $
-
-inherit java-pkg
-
-DESCRIPTION="A java portage browser and installer"
-HOMEPAGE="http://portagemaster.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -ppc sparc"
-IUSE="jikes"
-
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-1.5.1-r3
-	jikes? ( >=dev-java/jikes-1.16 )"
-RDEPEND=">=virtual/jre-1.4
-		 virtual/x11"
-
-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.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."
-		die
-	fi
-}
-
-src_compile() {
-	if ! 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
-	sed -i \
-		-e s:/usr/share/portagemaster/portagemaster.jar:/usr/share/portagemaster/lib/portagemaster-${PV}.jar: \
-		src/portagemaster || die
-}
-
-src_install() {
-	java-pkg_dojar packages/portagemaster-${PV}.jar
-	dobin src/portagemaster
-}
diff --git a/app-portage/portagemaster/portagemaster-0.2.1.ebuild b/app-portage/portagemaster/portagemaster-0.2.1.ebuild
index 44982e94667e..d8d5e6dceffa 100644
--- a/app-portage/portagemaster/portagemaster-0.2.1.ebuild
+++ b/app-portage/portagemaster/portagemaster-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/portagemaster-0.2.1.ebuild,v 1.15 2005/04/24 11:32:20 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/portagemaster-0.2.1.ebuild,v 1.16 2005/07/20 16:25:57 axxo Exp $
 
 inherit java-pkg
 
@@ -13,31 +13,19 @@ SLOT="0"
 KEYWORDS="x86 amd64 sparc ppc"
 IUSE="jikes"
 
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-1.5.1-r3
+DEPEND=">=virtual/jdk-1.4.1
+	dev-java/ant-core
 	jikes? ( >=dev-java/jikes-1.16 )"
-RDEPEND=">=virtual/jre-1.4
+RDEPEND=">=virtual/jre-1.4.1
 		 virtual/x11"
 
 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.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."
-		die
-	fi
-}
-
 src_compile() {
 	if ! 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
+		sed -e 's!<property name="build.compiler" value="jikes"/>!<property	name="build.compiler" value="modern"/>!' -i build.xml
 	fi
-	ant
+	ant || die
 	sed -i \
 		-e s:/usr/share/portagemaster/portagemaster.jar:/usr/share/portagemaster/lib/portagemaster-${PV}.jar: \
 		src/portagemaster || die