fixes #73387

diff --git a/dev-java/nice/ChangeLog b/dev-java/nice/ChangeLog
index c813a40944f3a9a87dc9eb736f4c6bd3d62b66d4..43b4f26f3190d71cf3781e40160c23eaf9f59f69 100644 (file)
--- 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 3d5aa2f2d3f4b50114a0499d2c03fe07bd035421..c186dc6616877b60e6f669448380cd4020df7653 100644 (file)
--- a/dev-java/nice/Manifest
+++ b/dev-java/nice/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ac4ed211ee282f71de72e4ac38378f2b nice-0.9.9.ebuild 1090
-MD5 cd2d4e5b22168bd765d8493fc754bc06 ChangeLog 410
+MD5 90dc6cc057f588a4d86e40c0e0aec8e6 nice-0.9.9.ebuild 1263
+MD5 66e34bbfc7270ed4193b5edb15832e84 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
+MD5 56f8c0ea533ef5f0061a0564c2affa6a files/nice-0.9.9.patch 294
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBl1wj/rLF9B432nYRArRYAKCpeLN0GO5RGZcIXL8fTFd2GYreswCgqwTc
-6XCJg3Fm46pzotxf6yo3V5o=
-=a6Fo
+iD8DBQFBtcOS/rLF9B432nYRAoeSAKCYoMDYMGRAtnuYjNzFN/EtRV9KcQCgtzIo
+1kSYGmjZp8LZ1z85aNGppUA=
+=uBRH
 -----END PGP SIGNATURE-----

diff --git a/dev-java/nice/files/nice-0.9.9.patch b/dev-java/nice/files/nice-0.9.9.patch
index ac91f7053a87c65398fc9f2d07749c7e07781c7e..f1455305c2a7d539060c192806bd0be002885d8f 100644 (file)
--- 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 4ff035920aed905fe486392ee509716e00290a18..eac8c4a448e1e8b99e8a063f9d86f54a022931c6 100644 (file)
--- 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