5 files changed, 49 insertions, 34 deletions
diff --git a/dev-java/ehcache/ChangeLog b/dev-java/ehcache/ChangeLog
index 575cb70a465f..0c451e2aee4e 100644
--- a/dev-java/ehcache/ChangeLog
+++ b/dev-java/ehcache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ehcache
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.14 2010/05/21 17:58:46 ken69267 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.15 2013/11/30 08:19:52 tomwij Exp $
+
+  30 Nov 2013; Tom Wijsman <TomWij@gentoo.org> ehcache-1.1-r1.ebuild,
+  ehcache-1.2.4-r2.ebuild, ehcache-1.2.4.ebuild:
+  Quoted multiple S variables. Removed redundant cd ${S} call from start of
+  src_install.
 
   21 May 2010; Kenneth Prugh <ken69267@gentoo.org> ehcache-1.2.4-r2.ebuild:
   amd64 stable, bug #292503
@@ -63,4 +68,3 @@
 
   11 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> +ehcache-1.1.ebuild:
   Initial commit of ehcache.  There is no src file nor a build.xml.
-
diff --git a/dev-java/ehcache/Manifest b/dev-java/ehcache/Manifest
index 32bfacc39589..0fd1180bb237 100644
--- a/dev-java/ehcache/Manifest
+++ b/dev-java/ehcache/Manifest
@@ -1,8 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX build.xml-1.2.4-r2 605 SHA256 f0e595f3de8ef425c5b69df443d3fa08a29b09dce90632d17ab31f3d6a78cfc5 SHA512 caf712a79a709269973d284f7bce951ac85843745bcb7fda1fd34f674e74c4c1bfd97e01219aa1ffac3c7febefd7eb0289d5b1a8019274daf17f9dc2679e76a9 WHIRLPOOL b457086fc5f82dbbcc9deeddf100db2658b0f213928ce9a26d4ed946f96c08698521ac4c1fa5da6ec49e4bc2e784035f2c199e5846ae33fc022e33d593b40e66
 DIST ehcache-1.1.tgz 228733 SHA256 b1709cdb27a7dee9c3f6beb8967a2f64549d9cc32af7867f8fa43b0d5b4bf226 SHA512 15d37d4a2579fe1b720b87954a135307af34c42c6a925b13cca0f8d861e92c3802696480e3a8c3e478e905f0a231b0d93c135ff75fb934e7a968ba790713d9d5 WHIRLPOOL c32e92bae557e20cab01421104da3cba7f02654c8f262403fcd1f93598afb62570a14aadc3989a07a6de68ba8a34ad8dc04402b3a6a4f62f6fddc291e7aed34a
 DIST ehcache-1.2.4.tgz 1330344 SHA256 47b5dad87d8c75773e66aef471b1b464118956f8ce3bf9ca0e0292f020a20a64 SHA512 a8d3e7c47eeeab568fbe2f4b923db96cf0f93d8ae0f727aa107b0ce5c5abd035a3967ea58617ff10e9c81109dcb8d904cbad86ec2c77d9be159e1a0a2c44d4ed WHIRLPOOL ed7913a200c45119f565912118b1b7c9e9e6ffc29fe8e227c7eca3d66f2333636d214af6e39ba9cf41c6eb0cf4568e26e1b511c06b66b3abdde8a6cba814178e
-EBUILD ehcache-1.1-r1.ebuild 1259 SHA256 04de230608257e2fc0c0d39582342b55f2c69b5f7d03a5e224b1b158121a8aef SHA512 79ec5939d07100f98b8e6ee0c83c5c889ee36c51fcfc6a0380e85097c11b899d437595643de59621ff8083eb70709682237c9eee1fb4204480e87d1f64096a92 WHIRLPOOL 99578a104c85ab139f9374742bc8d72f5bcd1f4b9ea31017d9f5e521ccde5164ef8e3040aa294195aa3d8a1ae27908277d09055fb922553e9e2116d9513f4b97
-EBUILD ehcache-1.2.4-r2.ebuild 1531 SHA256 aea5122acbfb8cfbaf0d75471ee3841d3b25af24a4cf52ca07140f063b6eab53 SHA512 d8ba1432b4010b447688c83159f85e6483f58d6899d0ab38a6727bb916badbd1fe750f5af88c7baf2844c658d009d8c001b4ad9e15ad7261db217aef3bf12083 WHIRLPOOL a09013090c530b4cbb35809aac3eb2ff9aeb05158d9f7942c4b87b263b50ed17568e7c99fdbe8097c535da2455016ac723e8f5fd43cd17613cc134da45eff31c
-EBUILD ehcache-1.2.4.ebuild 1364 SHA256 f3b0ce7443e0eeb058e8a918390e276983c28f67017888a10c958c34fdc55149 SHA512 dc55e38551e7445c7dd1bf257809a9d1051de073c9f8df17e532936fb1fac030b59ab2089afa66a03c00f036d4fc8d64d674305d8352211ab8858c400b071a43 WHIRLPOOL 0b637fe58f53919fa5cbc804669cbc6f14ae79aaa5d09d12cf30f08c8c1dd7a5346a8d5ef0db5f72f2ea6cf963a05a296fa0de8918bc44325497a5ae3df6237e
-MISC ChangeLog 2336 SHA256 4a263f83be24bce02c3dd1ce26b4644c8dacb82469f07e828c57a29f8c35a841 SHA512 aa7f08695d104fdb2ad18fb09130813268bd41177e6fa134a18c52e7236096c1a90c331ff5ff698b8d17ff26ed575055af3170f06292bccf21ad6c1ce32e9628 WHIRLPOOL 813bc1fb1fe83ffe3f126da8d62ee12cf102285e44baae8d23d881ebeb08c410ef8a77d31cf08d1116d07e7a02999ff82db600b772b59d305aa0da2a206e03de
+EBUILD ehcache-1.1-r1.ebuild 1265 SHA256 cd9465f158435bd7a1ff6688369b5552a76ad09278dd195ecc0396e51ddc14b4 SHA512 7bd244468a74b2320c8eedb6908d918509d10f16e520fe4ee21f30810299127600788aad5a139a3c810cf0c9eee5294149e3a44c683df38ae27a67ea7ae97a99 WHIRLPOOL 9def6ab67fefeceaa7dc38c10791e83a2e40a758204dd987251d15868061e5ec73e37786cc5fb8fe771b9aabcc83eb54a105144c2f67088940fdcda4647876fc
+EBUILD ehcache-1.2.4-r2.ebuild 1535 SHA256 2d9ce3923e5bd3d52618a9db89c3305b3923dac29246f003f8a1937f5bb96d55 SHA512 843f159fd22cd26f19cf67d136f238ca9d53958c404ded4d6f731ed400317d4b413a3f7bc16fe38819cfc91ca951b6946c709a017de69626024ab4ae07d2ffb9 WHIRLPOOL d2497d9c834ebe68ebc428db3d6bbed1d906e5f7c7c661bd738318ad0c4a669ee7070f4a3e1689e1b8c9a1af1bc5fd43dc02baab062339d4b87e30c6e8cb6ed0
+EBUILD ehcache-1.2.4.ebuild 1378 SHA256 1ad4c6d2c9b84e9ee42ac68af3cd9d80c31f054bdd69d303659f445f2b77f180 SHA512 d8f7d8b64d1f577d4c2cbc4704cd0c7e53491b8bc60a88bfb6e4e3e2156132ad32536f45e21050bde29587cc77593135f9f36be653eb714f39c1505a770af8ff WHIRLPOOL 0dceb7e0fa9b39960da3ca29449e2b047b1b7362257e370e9b62cbbf9cc5947b4744c8edce9603e757f305036de36b4b1e1cb51cf747a9b1e32c4c8f0b7d2156
+MISC ChangeLog 2544 SHA256 15022ebcb24856454e9b91911974f0bc7800d385b74432c3126b17715d1643fe SHA512 b84fe97c14bfdc1ae78e522c4351b205ff2508e9c5a144b20851665f3fbc48c1a6c622d6472c9bcc33f94e2743f734d9a20326d40ac914abd60c101a0fbe3896 WHIRLPOOL c1216d4da201987901b81d1e922201b4c2c7ccdfa9ecb8db2b9e225059dccc25ee96cd451e724f619c438b7cd2e8d04a8ce1165d0c12b83bfb6c0358896df66e
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSmZ9iAAoJEJWyH81tNOV9nxkH/1F48CP50CsFJtThma0a/PYJ
+DBw0W0PWTppP+OD1QeS9f2dxjG+vcP0fq8LacVTjKrtOfE2Hv3v5nP69cHfklimg
+mhN84FrU2iJpsKeWiZwr5Xsk6V1oB0wTv7ub3YOkIY3udnc1mJoKZljzSHYmTk3W
+ayKMSFA2u1M8ylsrL4XVNCo57df0FKQpgiJqhLoR2AmWFeOMHefG3YcX1+3JxFX0
+BCJEV5Jwbe5UN3e2lIAXEPtvhqaQQHX5cfEflxHXOKKIVn+md+U8Cat8s1XC92jI
+Hs4ueA0CujkEGj01VHwr52aqCaWHgjlVvn5tYwX0PfjXzRFYzQHspaw5GVMCHFk=
+=oycr
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ehcache/ehcache-1.1-r1.ebuild b/dev-java/ehcache/ehcache-1.1-r1.ebuild
index aea1bcb65d40..6b43d0dea7af 100644
--- a/dev-java/ehcache/ehcache-1.1-r1.ebuild
+++ b/dev-java/ehcache/ehcache-1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.1-r1.ebuild,v 1.3 2010/01/03 21:33:56 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.1-r1.ebuild,v 1.4 2013/11/30 08:19:52 tomwij Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -25,27 +25,26 @@ DEPEND=">=virtual/jdk-1.4
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	unzip ${P}-src.zip || die
 	rm *.jar
 	rm -rf src/net/sf/ehcache/hibernate
 }
 
 src_compile() {
-	mkdir ${S}/classes
-	cd ${S}/src
+	mkdir "${S}"/classes
+	cd "${S}"/src
 
-	ejavac -d ${S}/classes \
+	ejavac -d "${S}"/classes \
 		-classpath 	$(java-pkg_getjars commons-logging,commons-collections) \
 		$(find . -name "*.java")
 
-	cd ${S}/classes
-	jar cf ${S}/${P}.jar * || die
+	cd "${S}"/classes
+	jar cf "${S}"/${P}.jar * || die
 }
 
 src_install() {
-	cd ${S}
-	java-pkg_newjar ${S}/${P}.jar ${PN}.jar
+	java-pkg_newjar "${S}"/${P}.jar ${PN}.jar
 	dodoc *.txt ehcache.xml ehcache.xsd
 	if use doc ; then
 		unzip ${P}-javadoc.zip || die
diff --git a/dev-java/ehcache/ehcache-1.2.4-r2.ebuild b/dev-java/ehcache/ehcache-1.2.4-r2.ebuild
index 020c6d7f9996..11afcfcf2d3e 100644
--- a/dev-java/ehcache/ehcache-1.2.4-r2.ebuild
+++ b/dev-java/ehcache/ehcache-1.2.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -33,7 +33,7 @@ JAVA_PKG_WANT_TARGET="1.4"
 src_unpack() {
 
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	use doc && unzip -qq ${P}-javadoc.zip
 
@@ -43,13 +43,13 @@ src_unpack() {
 	# could use a USE flag, but would result in circular dep
 	rm -rf net/sf/ehcache/hibernate
 
-	cd ${S}
+	cd "${S}"
 	rm -f *.jar *.zip
 	cp "${FILESDIR}/build.xml-${PVR}" build.xml || die
 	mv "${S}/ehcache.xml" "${S}/ehcache-failsafe.xml" || die
 
-	mkdir ${S}/lib
-	cd ${S}/lib
+	mkdir "${S}"/lib
+	cd "${S}"/lib
 
 	java-pkg_jarfrom commons-logging
 	java-pkg_jarfrom commons-collections
@@ -62,11 +62,9 @@ src_compile() {
 }
 
 src_install() {
-
 	java-pkg_dojar ${PN}.jar
 
 	dodoc *.txt ehcache.xsd
 	use source && java-pkg_dosrc src/net
 	use doc &&java-pkg_dojavadoc docs
-
 }
diff --git a/dev-java/ehcache/ehcache-1.2.4.ebuild b/dev-java/ehcache/ehcache-1.2.4.ebuild
index 90ee8b411087..ed2f88973b64 100644
--- a/dev-java/ehcache/ehcache-1.2.4.ebuild
+++ b/dev-java/ehcache/ehcache-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4.ebuild,v 1.1 2007/01/03 03:17:03 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4.ebuild,v 1.2 2013/11/30 08:19:52 tomwij Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -27,26 +27,26 @@ DEPEND=">=virtual/jdk-1.4
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	mkdir src && cd src
 	unzip -qq ../${P}-sources.jar || die
 	rm -rf net/sf/ehcache/hibernate
 }
 
 src_compile() {
-	mkdir ${S}/classes
-	cd ${S}/src
+	mkdir "${S}"/classes
+	cd "${S}"/src
 
-	ejavac -d ${S}/classes \
+	ejavac -d "${S}"/classes \
 		-classpath 	$(java-pkg_getjars commons-logging,commons-collections,servletapi-2.4) \
 		$(find . -name "*.java")
 
-	cd ${S}/classes
-	jar cf ${S}/${P}.jar * || die "failed to create jar"
+	cd "${S}"/classes
+	jar cf "${S}"/${P}.jar * || die "failed to create jar"
 }
 
 src_install() {
-	java-pkg_newjar ${S}/${P}.jar
+	java-pkg_newjar "${S}"/${P}.jar
 	dodoc *.txt ehcache.xml ehcache.xsd
 	use source && java-pkg_dosrc src
 	if use doc ; then