summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2004-12-07 14:51:47 +0000
committerThomas Matthijs <axxo@gentoo.org>2004-12-07 14:51:47 +0000
commit4056a522048efc9b2bccd1981b6efc779bf382a1 (patch)
tree955847e9008b82fa4d627ceae9087e659ee0d89a
parentfixed digests (Manifest recommit) (diff)
downloadgentoo-2-4056a522048efc9b2bccd1981b6efc779bf382a1.tar.gz
gentoo-2-4056a522048efc9b2bccd1981b6efc779bf382a1.tar.bz2
gentoo-2-4056a522048efc9b2bccd1981b6efc779bf382a1.zip
fixes #73387
-rw-r--r--dev-java/nice/ChangeLog6
-rw-r--r--dev-java/nice/Manifest16
-rw-r--r--dev-java/nice/files/nice-0.9.9.patch10
-rw-r--r--dev-java/nice/nice-0.9.9.ebuild7
4 files changed, 13 insertions, 26 deletions
diff --git a/dev-java/nice/ChangeLog b/dev-java/nice/ChangeLog
index c813a40944f3..43b4f26f3190 100644
--- a/dev-java/nice/ChangeLog
+++ b/dev-java/nice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/nice
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nice/ChangeLog,v 1.1 2004/11/14 13:22:19 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nice/ChangeLog,v 1.2 2004/12/07 14:51:46 axxo Exp $
+
+ 07 Dec 2004; Thomas Matthijs <axxo@gentoo.org> files/nice-0.9.9.patch,
+ nice-0.9.9.ebuild:
+ fixes #73387
*nice-0.9.9 (14 Nov 2004)
diff --git a/dev-java/nice/Manifest b/dev-java/nice/Manifest
index 3d5aa2f2d3f4..461cf12d62b8 100644
--- a/dev-java/nice/Manifest
+++ b/dev-java/nice/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ac4ed211ee282f71de72e4ac38378f2b nice-0.9.9.ebuild 1090
-MD5 cd2d4e5b22168bd765d8493fc754bc06 ChangeLog 410
+MD5 9bdf2ded7d0fcb64ae6b50e6e0b2af37 nice-0.9.9.ebuild 1263
+MD5 498b45e023b19ab1cf1a29f137b9c689 ChangeLog 520
MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
MD5 e5ec5690efd96c71d7f1437a92d7daaa files/digest-nice-0.9.9 70
-MD5 1da45564d5fbf7c40edf23127ba00131 files/nice-0.9.9.patch 653
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBl1wj/rLF9B432nYRArRYAKCpeLN0GO5RGZcIXL8fTFd2GYreswCgqwTc
-6XCJg3Fm46pzotxf6yo3V5o=
-=a6Fo
------END PGP SIGNATURE-----
+MD5 56f8c0ea533ef5f0061a0564c2affa6a files/nice-0.9.9.patch 294
diff --git a/dev-java/nice/files/nice-0.9.9.patch b/dev-java/nice/files/nice-0.9.9.patch
index ac91f7053a87..f1455305c2a7 100644
--- a/dev-java/nice/files/nice-0.9.9.patch
+++ b/dev-java/nice/files/nice-0.9.9.patch
@@ -8,13 +8,3 @@
BINDIR= ${PREFIX}/bin
DOCDIR= ${PREFIX}/share/doc/nice
MANDIR= ${PREFIX}/share/man/man1
---- bin/nicec 2004-11-14 14:06:26.000000000 +0100
-+++ bin/nicec 2004-11-14 14:08:43.370862376 +0100
-@@ -53,6 +53,7 @@
- if [ -z "$NICEC_JAR" ]; then
- find_home "$scriptName"
- NICEC_JAR=${APPHOME}/share/java/nice.jar
-+ NICEC_JAR=`java-config -p nice`
- fi
-
- # Having a trailing ":" at the end of CLASSPATH seems to act as ":." on some platforms
diff --git a/dev-java/nice/nice-0.9.9.ebuild b/dev-java/nice/nice-0.9.9.ebuild
index 4ff035920aed..eac8c4a448e1 100644
--- a/dev-java/nice/nice-0.9.9.ebuild
+++ b/dev-java/nice/nice-0.9.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nice/nice-0.9.9.ebuild,v 1.1 2004/11/14 13:22:19 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nice/nice-0.9.9.ebuild,v 1.2 2004/12/07 14:51:47 axxo Exp $
inherit java-pkg eutils
@@ -23,6 +23,8 @@ src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/${P}.patch
+ cp bin/nicec bin/nicec-gentoo
+ sed -i 's/NICEC_JAR=.*/NICEC_JAR=`java-config -p nice`/' bin/nicec-gentoo || die "sed failed"
cd ${S}/external
java-pkg_jar-from javacc
@@ -39,8 +41,9 @@ src_compile() {
src_test() { :; }
src_install() {
- dobin bin/nicec || die "nicec is missing"
+ newbin bin/nicec-gentoo nicec || die "nicec is missing"
dosym nicec /usr/bin/niceunit
+ dosym nicedoc /usr/bin/niceunit
java-pkg_dojar share/java/nice.jar
doman man/*.1
dohtml man/nicec.html