* [gentoo-commits] gentoo-x86 commit in dev-java/ehcache: ehcache-1.1-r1.ebuild ehcache-1.2.4-r2.ebuild ehcache-1.2.4.ebuild ChangeLog
@ 2013-11-30 8:19 Tom Wijsman (tomwij)
0 siblings, 0 replies; only message in thread
From: Tom Wijsman (tomwij) @ 2013-11-30 8:19 UTC (permalink / raw
To: gentoo-commits
tomwij 13/11/30 08:19:53
Modified: ehcache-1.1-r1.ebuild ehcache-1.2.4-r2.ebuild
ehcache-1.2.4.ebuild ChangeLog
Log:
Quoted multiple S variables. Removed redundant cd ${S} call from start of src_install.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.4 dev-java/ehcache/ehcache-1.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.1-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.1-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.1-r1.ebuild?r1=1.3&r2=1.4
Index: ehcache-1.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.1-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ehcache-1.1-r1.ebuild 3 Jan 2010 21:33:56 -0000 1.3
+++ ehcache-1.1-r1.ebuild 30 Nov 2013 08:19:52 -0000 1.4
@@ -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 @@
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
1.7 dev-java/ehcache/ehcache-1.2.4-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild?rev=1.7&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild?r1=1.6&r2=1.7
Index: ehcache-1.2.4-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ehcache-1.2.4-r2.ebuild 21 May 2010 17:58:46 -0000 1.6
+++ ehcache-1.2.4-r2.ebuild 30 Nov 2013 08:19:52 -0000 1.7
@@ -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 @@
src_unpack() {
unpack ${A}
- cd ${S}
+ cd "${S}"
use doc && unzip -qq ${P}-javadoc.zip
@@ -43,13 +43,13 @@
# 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_install() {
-
java-pkg_dojar ${PN}.jar
dodoc *.txt ehcache.xsd
use source && java-pkg_dosrc src/net
use doc &&java-pkg_dojavadoc docs
-
}
1.2 dev-java/ehcache/ehcache-1.2.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.2.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.2.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ehcache-1.2.4.ebuild?r1=1.1&r2=1.2
Index: ehcache-1.2.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ehcache-1.2.4.ebuild 3 Jan 2007 03:17:03 -0000 1.1
+++ ehcache-1.2.4.ebuild 30 Nov 2013 08:19:52 -0000 1.2
@@ -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 @@
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
1.15 dev-java/ehcache/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ehcache/ChangeLog?r1=1.14&r2=1.15
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog 21 May 2010 17:58:46 -0000 1.14
+++ ChangeLog 30 Nov 2013 08:19:52 -0000 1.15
@@ -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.
-
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-11-30 8:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-30 8:19 [gentoo-commits] gentoo-x86 commit in dev-java/ehcache: ehcache-1.1-r1.ebuild ehcache-1.2.4-r2.ebuild ehcache-1.2.4.ebuild ChangeLog Tom Wijsman (tomwij)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox