| 1 |
radhermit 13/08/27 05:32:29 |
| 2 |
|
| 3 |
Modified: ChangeLog java-utils-2.eclass |
| 4 |
Log: |
| 5 |
Don't add subslots to JAVA_PKG_NAME (bug #482270 by chutzpah). |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.938 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.938&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.938&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.937&r2=1.938 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.937 |
| 18 |
retrieving revision 1.938 |
| 19 |
diff -u -r1.937 -r1.938 |
| 20 |
--- ChangeLog 26 Aug 2013 14:39:36 -0000 1.937 |
| 21 |
+++ ChangeLog 27 Aug 2013 05:32:28 -0000 1.938 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.937 2013/08/26 14:39:36 anarchy Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.938 2013/08/27 05:32:28 radhermit Exp $ |
| 27 |
+ |
| 28 |
+ 27 Aug 2013; Tim Harder <radhermit@g.o> java-utils-2.eclass: |
| 29 |
+ Don't add subslots to JAVA_PKG_NAME (bug #482270 by chutzpah). |
| 30 |
|
| 31 |
26 Aug 2013; <anarchy@g.o> mozcoreconf-2.eclass: |
| 32 |
Fix bug #415805, unset MOZCONFIG |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.154 eclass/java-utils-2.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.154&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.154&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.153&r2=1.154 |
| 41 |
|
| 42 |
Index: java-utils-2.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v |
| 45 |
retrieving revision 1.153 |
| 46 |
retrieving revision 1.154 |
| 47 |
diff -u -r1.153 -r1.154 |
| 48 |
--- java-utils-2.eclass 17 Apr 2013 18:01:48 -0000 1.153 |
| 49 |
+++ java-utils-2.eclass 27 Aug 2013 05:32:28 -0000 1.154 |
| 50 |
@@ -6,7 +6,7 @@ |
| 51 |
# |
| 52 |
# Licensed under the GNU General Public License, v2 |
| 53 |
# |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.153 2013/04/17 18:01:48 sera Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.154 2013/08/27 05:32:28 radhermit Exp $ |
| 56 |
|
| 57 |
# ----------------------------------------------------------------------------- |
| 58 |
# @eclass-begin |
| 59 |
@@ -2331,10 +2331,10 @@ |
| 60 |
debug-print-function ${FUNCNAME} $* |
| 61 |
|
| 62 |
local pkg_name |
| 63 |
- if [[ "$SLOT" == "0" ]] ; then |
| 64 |
+ if [[ "${SLOT%/*}" == "0" ]] ; then |
| 65 |
JAVA_PKG_NAME="${PN}" |
| 66 |
else |
| 67 |
- JAVA_PKG_NAME="${PN}-${SLOT}" |
| 68 |
+ JAVA_PKG_NAME="${PN}-${SLOT%/*}" |
| 69 |
fi |
| 70 |
|
| 71 |
JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" |
Archives