| 1 |
tomwij 13/11/30 08:19:53 |
| 2 |
|
| 3 |
Modified: ehcache-1.1-r1.ebuild ehcache-1.2.4-r2.ebuild |
| 4 |
ehcache-1.2.4.ebuild ChangeLog |
| 5 |
Log: |
| 6 |
Quoted multiple S variables. Removed redundant cd ${S} call from start of src_install. |
| 7 |
|
| 8 |
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.4 dev-java/ehcache/ehcache-1.1-r1.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.1-r1.ebuild?rev=1.4&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.1-r1.ebuild?rev=1.4&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.1-r1.ebuild?r1=1.3&r2=1.4 |
| 16 |
|
| 17 |
Index: ehcache-1.1-r1.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.1-r1.ebuild,v |
| 20 |
retrieving revision 1.3 |
| 21 |
retrieving revision 1.4 |
| 22 |
diff -u -r1.3 -r1.4 |
| 23 |
--- ehcache-1.1-r1.ebuild 3 Jan 2010 21:33:56 -0000 1.3 |
| 24 |
+++ ehcache-1.1-r1.ebuild 30 Nov 2013 08:19:52 -0000 1.4 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
-# Copyright 1999-2010 Gentoo Foundation |
| 27 |
+# Copyright 1999-2013 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.1-r1.ebuild,v 1.3 2010/01/03 21:33:56 fauli Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.1-r1.ebuild,v 1.4 2013/11/30 08:19:52 tomwij Exp $ |
| 31 |
|
| 32 |
inherit java-pkg-2 java-ant-2 |
| 33 |
|
| 34 |
@@ -25,27 +25,26 @@ |
| 35 |
|
| 36 |
src_unpack() { |
| 37 |
unpack ${A} |
| 38 |
- cd ${S} |
| 39 |
+ cd "${S}" |
| 40 |
unzip ${P}-src.zip || die |
| 41 |
rm *.jar |
| 42 |
rm -rf src/net/sf/ehcache/hibernate |
| 43 |
} |
| 44 |
|
| 45 |
src_compile() { |
| 46 |
- mkdir ${S}/classes |
| 47 |
- cd ${S}/src |
| 48 |
+ mkdir "${S}"/classes |
| 49 |
+ cd "${S}"/src |
| 50 |
|
| 51 |
- ejavac -d ${S}/classes \ |
| 52 |
+ ejavac -d "${S}"/classes \ |
| 53 |
-classpath $(java-pkg_getjars commons-logging,commons-collections) \ |
| 54 |
$(find . -name "*.java") |
| 55 |
|
| 56 |
- cd ${S}/classes |
| 57 |
- jar cf ${S}/${P}.jar * || die |
| 58 |
+ cd "${S}"/classes |
| 59 |
+ jar cf "${S}"/${P}.jar * || die |
| 60 |
} |
| 61 |
|
| 62 |
src_install() { |
| 63 |
- cd ${S} |
| 64 |
- java-pkg_newjar ${S}/${P}.jar ${PN}.jar |
| 65 |
+ java-pkg_newjar "${S}"/${P}.jar ${PN}.jar |
| 66 |
dodoc *.txt ehcache.xml ehcache.xsd |
| 67 |
if use doc ; then |
| 68 |
unzip ${P}-javadoc.zip || die |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.7 dev-java/ehcache/ehcache-1.2.4-r2.ebuild |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild?rev=1.7&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild?rev=1.7&content-type=text/plain |
| 76 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild?r1=1.6&r2=1.7 |
| 77 |
|
| 78 |
Index: ehcache-1.2.4-r2.ebuild |
| 79 |
=================================================================== |
| 80 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild,v |
| 81 |
retrieving revision 1.6 |
| 82 |
retrieving revision 1.7 |
| 83 |
diff -u -r1.6 -r1.7 |
| 84 |
--- ehcache-1.2.4-r2.ebuild 21 May 2010 17:58:46 -0000 1.6 |
| 85 |
+++ ehcache-1.2.4-r2.ebuild 30 Nov 2013 08:19:52 -0000 1.7 |
| 86 |
@@ -1,6 +1,6 @@ |
| 87 |
-# Copyright 1999-2010 Gentoo Foundation |
| 88 |
+# Copyright 1999-2013 Gentoo Foundation |
| 89 |
# Distributed under the terms of the GNU General Public License v2 |
| 90 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild,v 1.6 2010/05/21 17:58:46 ken69267 Exp $ |
| 91 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild,v 1.7 2013/11/30 08:19:52 tomwij Exp $ |
| 92 |
|
| 93 |
JAVA_PKG_IUSE="doc source" |
| 94 |
|
| 95 |
@@ -33,7 +33,7 @@ |
| 96 |
src_unpack() { |
| 97 |
|
| 98 |
unpack ${A} |
| 99 |
- cd ${S} |
| 100 |
+ cd "${S}" |
| 101 |
|
| 102 |
use doc && unzip -qq ${P}-javadoc.zip |
| 103 |
|
| 104 |
@@ -43,13 +43,13 @@ |
| 105 |
# could use a USE flag, but would result in circular dep |
| 106 |
rm -rf net/sf/ehcache/hibernate |
| 107 |
|
| 108 |
- cd ${S} |
| 109 |
+ cd "${S}" |
| 110 |
rm -f *.jar *.zip |
| 111 |
cp "${FILESDIR}/build.xml-${PVR}" build.xml || die |
| 112 |
mv "${S}/ehcache.xml" "${S}/ehcache-failsafe.xml" || die |
| 113 |
|
| 114 |
- mkdir ${S}/lib |
| 115 |
- cd ${S}/lib |
| 116 |
+ mkdir "${S}"/lib |
| 117 |
+ cd "${S}"/lib |
| 118 |
|
| 119 |
java-pkg_jarfrom commons-logging |
| 120 |
java-pkg_jarfrom commons-collections |
| 121 |
@@ -62,11 +62,9 @@ |
| 122 |
} |
| 123 |
|
| 124 |
src_install() { |
| 125 |
- |
| 126 |
java-pkg_dojar ${PN}.jar |
| 127 |
|
| 128 |
dodoc *.txt ehcache.xsd |
| 129 |
use source && java-pkg_dosrc src/net |
| 130 |
use doc &&java-pkg_dojavadoc docs |
| 131 |
- |
| 132 |
} |
| 133 |
|
| 134 |
|
| 135 |
|
| 136 |
1.2 dev-java/ehcache/ehcache-1.2.4.ebuild |
| 137 |
|
| 138 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.2.4.ebuild?rev=1.2&view=markup |
| 139 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.2.4.ebuild?rev=1.2&content-type=text/plain |
| 140 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.2.4.ebuild?r1=1.1&r2=1.2 |
| 141 |
|
| 142 |
Index: ehcache-1.2.4.ebuild |
| 143 |
=================================================================== |
| 144 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4.ebuild,v |
| 145 |
retrieving revision 1.1 |
| 146 |
retrieving revision 1.2 |
| 147 |
diff -u -r1.1 -r1.2 |
| 148 |
--- ehcache-1.2.4.ebuild 3 Jan 2007 03:17:03 -0000 1.1 |
| 149 |
+++ ehcache-1.2.4.ebuild 30 Nov 2013 08:19:52 -0000 1.2 |
| 150 |
@@ -1,6 +1,6 @@ |
| 151 |
-# Copyright 1999-2007 Gentoo Foundation |
| 152 |
+# Copyright 1999-2013 Gentoo Foundation |
| 153 |
# Distributed under the terms of the GNU General Public License v2 |
| 154 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4.ebuild,v 1.1 2007/01/03 03:17:03 nichoj Exp $ |
| 155 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4.ebuild,v 1.2 2013/11/30 08:19:52 tomwij Exp $ |
| 156 |
|
| 157 |
inherit java-pkg-2 java-ant-2 |
| 158 |
|
| 159 |
@@ -27,26 +27,26 @@ |
| 160 |
|
| 161 |
src_unpack() { |
| 162 |
unpack ${A} |
| 163 |
- cd ${S} |
| 164 |
+ cd "${S}" |
| 165 |
mkdir src && cd src |
| 166 |
unzip -qq ../${P}-sources.jar || die |
| 167 |
rm -rf net/sf/ehcache/hibernate |
| 168 |
} |
| 169 |
|
| 170 |
src_compile() { |
| 171 |
- mkdir ${S}/classes |
| 172 |
- cd ${S}/src |
| 173 |
+ mkdir "${S}"/classes |
| 174 |
+ cd "${S}"/src |
| 175 |
|
| 176 |
- ejavac -d ${S}/classes \ |
| 177 |
+ ejavac -d "${S}"/classes \ |
| 178 |
-classpath $(java-pkg_getjars commons-logging,commons-collections,servletapi-2.4) \ |
| 179 |
$(find . -name "*.java") |
| 180 |
|
| 181 |
- cd ${S}/classes |
| 182 |
- jar cf ${S}/${P}.jar * || die "failed to create jar" |
| 183 |
+ cd "${S}"/classes |
| 184 |
+ jar cf "${S}"/${P}.jar * || die "failed to create jar" |
| 185 |
} |
| 186 |
|
| 187 |
src_install() { |
| 188 |
- java-pkg_newjar ${S}/${P}.jar |
| 189 |
+ java-pkg_newjar "${S}"/${P}.jar |
| 190 |
dodoc *.txt ehcache.xml ehcache.xsd |
| 191 |
use source && java-pkg_dosrc src |
| 192 |
if use doc ; then |
| 193 |
|
| 194 |
|
| 195 |
|
| 196 |
1.15 dev-java/ehcache/ChangeLog |
| 197 |
|
| 198 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ChangeLog?rev=1.15&view=markup |
| 199 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ChangeLog?rev=1.15&content-type=text/plain |
| 200 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ChangeLog?r1=1.14&r2=1.15 |
| 201 |
|
| 202 |
Index: ChangeLog |
| 203 |
=================================================================== |
| 204 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v |
| 205 |
retrieving revision 1.14 |
| 206 |
retrieving revision 1.15 |
| 207 |
diff -u -r1.14 -r1.15 |
| 208 |
--- ChangeLog 21 May 2010 17:58:46 -0000 1.14 |
| 209 |
+++ ChangeLog 30 Nov 2013 08:19:52 -0000 1.15 |
| 210 |
@@ -1,6 +1,11 @@ |
| 211 |
# ChangeLog for dev-java/ehcache |
| 212 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 213 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.14 2010/05/21 17:58:46 ken69267 Exp $ |
| 214 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 215 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.15 2013/11/30 08:19:52 tomwij Exp $ |
| 216 |
+ |
| 217 |
+ 30 Nov 2013; Tom Wijsman <TomWij@g.o> ehcache-1.1-r1.ebuild, |
| 218 |
+ ehcache-1.2.4-r2.ebuild, ehcache-1.2.4.ebuild: |
| 219 |
+ Quoted multiple S variables. Removed redundant cd ${S} call from start of |
| 220 |
+ src_install. |
| 221 |
|
| 222 |
21 May 2010; Kenneth Prugh <ken69267@g.o> ehcache-1.2.4-r2.ebuild: |
| 223 |
amd64 stable, bug #292503 |
| 224 |
@@ -63,4 +68,3 @@ |
| 225 |
|
| 226 |
11 Mar 2005; Lim Swee Tat <st_lim@g.o> +ehcache-1.1.ebuild: |
| 227 |
Initial commit of ehcache. There is no src file nor a build.xml. |
| 228 |
- |
Archives