summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Trygve Kalleberg <karltk@gentoo.org>2002-09-21 18:49:06 +0000
committerKarl Trygve Kalleberg <karltk@gentoo.org>2002-09-21 18:49:06 +0000
commit6980f351a683ad202219a538c0de16392a6f38af (patch)
tree95243c9cc57204f36ac0fc31070dff5833f8cd1f /app-admin
parentFixes #8187 (diff)
downloadgentoo-2-6980f351a683ad202219a538c0de16392a6f38af.tar.gz
gentoo-2-6980f351a683ad202219a538c0de16392a6f38af.tar.bz2
gentoo-2-6980f351a683ad202219a538c0de16392a6f38af.zip
Fixes 7875.
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/portagemaster/ChangeLog6
-rw-r--r--app-admin/portagemaster/portagemaster-0.1.8.ebuild12
2 files changed, 16 insertions, 2 deletions
diff --git a/app-admin/portagemaster/ChangeLog b/app-admin/portagemaster/ChangeLog
index cff6b99e430e..7e47ac0be1c9 100644
--- a/app-admin/portagemaster/ChangeLog
+++ b/app-admin/portagemaster/ChangeLog
@@ -1,9 +1,13 @@
# ChangeLog for app-admin/portagemaster
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-admin/portagemaster/ChangeLog,v 1.5 2002/09/08 20:41:04 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/portagemaster/ChangeLog,v 1.6 2002/09/21 18:49:06 karltk Exp $
*portagemaster-0.1.8 (08 Sep 2002)
+ 21 Sep 2002; Karl Trygve Kalleberg <karltk@gentoo.org> portagemaster-0.1.8.ebuild :
+ Added check to ensure it will be compiled by a 1.4.x JDK. Fixes #7875.
+ Probably need a better solution to this one in the future.
+
08 Sep 2002; Karl Trygve Kalleberg <karltk@gentoo.org> portagemaster-0.1.8.ebuild files/digest-portagemaster-0.1.8 :
New upstream version. Ebuild submitted by Robin Cull
<robin@digitalevacuation.org>, <milosn@slingshot.co.nz> and Jelmer
diff --git a/app-admin/portagemaster/portagemaster-0.1.8.ebuild b/app-admin/portagemaster/portagemaster-0.1.8.ebuild
index 8281f56c6ee3..b61a2a1323cc 100644
--- a/app-admin/portagemaster/portagemaster-0.1.8.ebuild
+++ b/app-admin/portagemaster/portagemaster-0.1.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-admin/portagemaster/portagemaster-0.1.8.ebuild,v 1.1 2002/09/08 20:34:47 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/portagemaster/portagemaster-0.1.8.ebuild,v 1.2 2002/09/21 18:49:06 karltk Exp $
S=${WORKDIR}/${PN}
DESCRIPTION="A java portage browser and installer."
@@ -15,6 +15,16 @@ DEPEND=">=dev-java/sun-jdk-1.4.0-r5
>=dev-java/ant-1.4.1-r3
>=dev-java/jikes-1.16"
+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_unpack() {
unpack ${A}
}