Version bump courtesy of Andreas Sturmlechner <andreas.sturmlechner@gmail.com>. Fix...

Package-Manager: portage-2.2.14/cvs/Linux x86_64

diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog
index 0135021996e50a34b4d283208c09e7493c6d3d9c..f391997ced29235d4ae560e61b436ec98f6ffc7b 100644 (file)
--- a/dev-java/commons-logging/ChangeLog
+++ b/dev-java/commons-logging/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/commons-logging
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.72 2014/08/10 20:11:43 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.73 2015/04/22 21:50:06 monsieurp Exp $
+
+*commons-logging-1.2 (22 Apr 2015)
+
+  22 Apr 2015; Patrice Clement <monsieurp@gentoo.org>
+  +commons-logging-1.2.ebuild, +files/commons-logging-1.2-gentoo.patch,
+  +files/commons-logging-1.2-servletapi.patch, commons-logging-1.1.1.ebuild:
+  Version bump courtesy of Andreas Sturmlechner
+  <andreas.sturmlechner@gmail.com>. Fix bug 496036.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   commons-logging-1.1.1.ebuild:

diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 82e29fbbbbd1f50e9ae6372769a3368e852195a9..28e94c29b4f0b32b601ba58c7dedd332fa2df5ab 100644 (file)
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,20 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX commons-logging-1.1-gentoo.patch 927 SHA256 c50883be252e835335c142a6f84e0d21a32403873802eee04a89241ad0c79498 SHA512 c68740b27bc00770406d31ddbb111b6ae0208116537196cea157ca1aa4c20a49fc5b3de81d9e0fbe7b204bcb6179103d6abe62980297ea82e15df521a46de8ba WHIRLPOOL be1168eaef71342ec2e22ab685b5f83895815cb7fd666e72a9873a94536644c85fd7fa91457ae4200ee669a9b16dd3d33c8cfb2bacca704986daa17b5d9381aa
 AUX commons-logging-1.1-manifest 299 SHA256 34a591ce9b09ae23258d1414958bb537fe85ffd421d4de97307985dcb6bbc99d SHA512 07a9e5c68fb919471ca449364dc658f2b6ea801c18e2c4164de13d15967a8e70fc5097971b5015f93c34f063939f0e88b96d732789d62d12dc8a6b277736dd7e WHIRLPOOL 1c54f96913732ca5df4b3fd5c7eb68328b5d64ba1d27b560d8646b48d8ee5bcd5c19802dec6973b43dde0ccdeb3b905c005d2e616ea0ef70d14c4fb77cee1d8d
 AUX commons-logging-1.1-servletapi.patch 1988 SHA256 836afb926d95aae2dcade9234179df3274402f19bbcc54d77a19e18af30317b3 SHA512 90e56ec537bcec18c5bad8f247eb1e215d539914370819a5dda7b932334f8641138f8cbe5d39d2bcd931f08982b967f8358f6448415ae38cc8d836eaf63f3804 WHIRLPOOL 47f0be6bc3e3541c3344abd03bb22988de862549f067a9c71a2dbe901bc5f9aa45676339ac88c60e3838579d40962eb79d79c0a84270108c8e1ed86b1c02916e
 AUX commons-logging-1.1.1-gentoo.patch 907 SHA256 77f6708bb330211def2eaeaf24ffcd1c92fc78d83f506d541292b829d0c393ca SHA512 871a03019bba635d31ca5f769e8aea05d12802a52d22b6d8671c498874b3d48a6927386c315f38c551fc35140c60f1256cb39b1332d446efe86891a0742d3272 WHIRLPOOL ed5ac085a7a1805dc00beb28b6c851e8df9d071800e4a6c41684b088fa1f5693bf82d2b45bdc56d81b8d1106f3bb4cf9fd3ba1ab0f019c3f6e51400c7a631fc4
 AUX commons-logging-1.1.1-manifest 305 SHA256 41e2a1f5cfa42983d5a86a7112bbfd6a1789c68d0353562a94178470f0a54883 SHA512 436f980ba285176624ee872a881d6598954a92a6edb19a27dd114d9d7c11d44739a5d04690e69ad5b34ad07c6de475c3f671ad3d330201f2ea97dbcde56f3128 WHIRLPOOL e77e2c5dbcd046a55351a43786d4448f8e00b8c7b9bab7f64502ae7cd930130df00db41fa842b0dffe34a586868cb0b3a33311f27e3c0cf2d9398edf0fc87805
 AUX commons-logging-1.1.1-servletapi.patch 1870 SHA256 160b09dafb098a064c37a003affaa99d40512c3953964aa5f04300cb7caacd30 SHA512 665b6397e48eda5f971f96d850fe5775622e7476e509da8788b56aeab46c604becabc09c70e930b2829e8402a6cbc60653a6f069324db1e18a7a31f8c7b60ebd WHIRLPOOL 6919f345357ab5b3f38fff81c8cf6d351c4fe3a3f27499da46e79d088ee22e3edc48fdd29c8cf053e8e0294eeffe4dda555c43af9d32e937767a1f867f1254aa
+AUX commons-logging-1.2-gentoo.patch 897 SHA256 21228c67f8ca6b36dd196eac3953e711fc011e6ecf181f52fbddf307a3ff72f8 SHA512 b486f96b1d7ae8e8decb3210fb33a31dbfa147cd30ae8311c60eab4f0d48b71518825bba06f146490aeea746dc3dc996a7191a974d57cf990ca253793b9294a1 WHIRLPOOL a7c4db64662f0a1129094df892124f8046158f0ddf331af3995e011dbb7d227d270a31707b6d70de1ef2ac28b088f487e3834b3e9487fd57fd6921b1fba8732b
+AUX commons-logging-1.2-servletapi.patch 1855 SHA256 286f6565a36ef5539e33f61bd36027e3a330d34d5abdcc0ccd884af2c48bbb55 SHA512 3e608ec37279664249d89eb90eaee7e2f5536ab37efcb6e94a8d586b5284a4641aaa5c58f6ef4730955e51fd22491e82f1a6b5b50303f9c4d7cfd066f751799c WHIRLPOOL cfda499740a07b41de4265012686df0680e9b090ef3b97e8ae71163422c51567c5329676e9bbcc367637b5cb614facdb2b538021a1049290b913898c29ff7c94
 DIST commons-logging-1.1.1-src.tar.gz 190670 SHA256 b49a79fa78ebfae15dc46ae6f0144fee6b94ab608a25518c54609d3419909eb2 SHA512 ccba6cb8078807219dfe4a771c2e6f5569190b52ca00a605a0445b53697d9162c62237fc34ead2960146603b018769f406fe9e47b2eefe0d0fb6ad993c669974 WHIRLPOOL b28ad3dcad851ccbe7fffe9968426b67fb3b6a372de85aa6adb055db5f3eaf621d63f81b9bf74dd6d4958fd681b29272898fc6907b5681a431af0772f876ec16
-EBUILD commons-logging-1.1.1.ebuild 2707 SHA256 35f36cde7678f4470e0f334d792af8faa8d632aede558d756e3458e027045a5b SHA512 36daeff5a99cd2b53b40b9397e89274b0620b3f2074777af97de0b08cb4b9595372bf87e3aa33e5704c0d6a554bec2994ec96eba0e69af9fa34cd6af50c71d6e WHIRLPOOL c7fbc0f44553b5349d9787fe562b441271f75b95dd666088ba716955ccf40457bf67c7ffa955c3a0fb246e204720b87dad4fdcb30cbbba41c68105569ed3a43e
-MISC ChangeLog 10357 SHA256 164ba89798d21f9128738c26061e69a01cab704e86d7058ccca47be66daae725 SHA512 3fd0227579a932ad3c92e8ab7f59eb1c604fe7b08da29af926de9731acaf61cf4c2f97c2c6dacb2808883ad0bf07c265cdff805e343c0fc1ce40c43b04deea33 WHIRLPOOL 13303dcfa6da12ff78228f2e29f43fe4536783aba1cfe0b8a76047a41e9934e294d6d056774fa8f08950138c2de560531a97298260782ca7c2507e5e225636ed
+DIST commons-logging-1.2-src.tar.gz 188536 SHA256 49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 WHIRLPOOL fe31832404d9071d73fba940021ab664998ffa9867a88c2078918547cc6a23a06339f33f5d74f8b6ea5aaeeb86cd94c0aef6c6195e454a651b8fc492a1a6b5f8
+EBUILD commons-logging-1.1.1.ebuild 2710 SHA256 44d286f60a3d9768d9135fb15a6c068d8eeb4948fee01c4c0290e0444cb9acf7 SHA512 3ef3909ace007b3dd0bbe69e9deb373f3ea970c952406332243afd126f4808781fce0b8f5fbe2a5a278fb682ab5708b882fa57728fd18d9797c783ab7f270836 WHIRLPOOL de3e2976b5f379a83786b96ccda84d4df15f1a783a928b4fe9e93247628c6291c6bed49dc7382dfa3c0ddf1dd524d184a70d51829640d81824f69e671a1f147a
+EBUILD commons-logging-1.2.ebuild 2744 SHA256 063f599da3de3349ec5c094d50c69a6fd03759b10f81ce33cc3cabbe824a7dec SHA512 95a8eefdffc7d1d7892738fcfc9163a8f2fec08cebd89ea64a8a3c63afdab5c744d298b3fdc17cfdb0bed72a3d0fc9afe93ce44e21f16acaff29e1ba719714cd WHIRLPOOL 10fce56177e31fc6ff877618f1032f0ecc6a2b0b5ed5c3f70febf0b4c30cdcb662f13ad2de9cfafda31f02ddc73c3e644a7dd18e051f6ce8d0105b6ec6eaebc0
+MISC ChangeLog 10700 SHA256 7bc33b5d942e46fbd931159b57bc4636686964e543b508218c7235b7cac30689 SHA512 4ba4d42764fb2cca19f30ebc2d4a0d48840ef8ae5e4b2df7e72e08108c9da2661fc09d145d53838953904814b8de44bfcc34fe8a73965194639fc89d0f0e3630 WHIRLPOOL b0a5772db6dddb946e6641a7b613000bab9682c5c2e4aab8da0c9d871e9f3ad634873e2729a48971de7fa5fbd1aed38dab15ccb2d6fdd7056aad5afb6f3133d9
 MISC metadata.xml 468 SHA256 f0701f13871ed949ad43e6d9f17d13d156437ec39a683df114094ba5740a6edd SHA512 528e5d1d8edf2bc6631363f107f007e325ca1c64838ea9941e1e928278a6a83e3b3d16527af7eda1ef93ec58b588733cab4099d7354c474b94e55b1a00f01441 WHIRLPOOL 35b02424f7e1dd69ae20526157374d5b2df8039eb4ed7e6f451d5b6bd8a0c7cf9aa01b44356e9f477d117af3af9a356a3bad000eb199791ae484fec998fdc938
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlPn0gAACgkQcaHudmEf86pf4wCfaRim1CpYoNVZviG8qW44wJak
-9lUAn08qfmy+HAKnMXWTC6x4BKdWsd/X
-=kI8D
------END PGP SIGNATURE-----

diff --git a/dev-java/commons-logging/commons-logging-1.1.1.ebuild b/dev-java/commons-logging/commons-logging-1.1.1.ebuild
index f49e7aef73e940e0049d4954f10126c9229072c2..8bbcc1c624358a02630cbeb6bf86b11695016c9e 100644 (file)
--- a/dev-java/commons-logging/commons-logging-1.1.1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1.1.ebuild,v 1.13 2014/08/10 20:11:43 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1.1.ebuild,v 1.14 2015/04/22 21:50:06 monsieurp Exp $
 
 EAPI="1"
 JAVA_PKG_IUSE="doc source test"

diff --git a/dev-java/commons-logging/commons-logging-1.2.ebuild b/dev-java/commons-logging/commons-logging-1.2.ebuild
new file mode 100644 (file)
index 0000000..eed0f39
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.2.ebuild,v 1.1 2015/04/22 21:50:06 monsieurp Exp $
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries"
+HOMEPAGE="http://commons.apache.org/logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="avalon-logkit log4j servletapi avalon-framework"
+
+COMMON_DEP="
+       avalon-logkit? ( dev-java/avalon-logkit:1.2 )
+       log4j? ( dev-java/log4j:0 )
+       servletapi? ( java-virtuals/servlet-api:2.3 )
+       avalon-framework? ( dev-java/avalon-framework:4.2 )"
+# ATTENTION: Add this when log4j-1.3 is out
+#      =dev-java/log4j-1.3*
+RDEPEND=">=virtual/jre-1.6
+       ${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+       ${COMMON_DEP}
+       test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src/"
+
+RESTRICT="!servletapi? ( test )"
+
+java_prepare() {
+       epatch "${FILESDIR}/${P}-gentoo.patch"
+       # patch to make the build.xml respect no servletapi
+       # TODO file upstream -nichoj
+       epatch "${FILESDIR}/${P}-servletapi.patch"
+
+       # bug 200918
+       java-ant_ignore-system-classes
+
+       # bug #208098
+       echo "jdk.1.4.present=true" > build.properties
+       use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties
+       # ATTENTION: Add this when log4j-1.3 is out (check the SLOT)
+       #echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties
+       use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
+       use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-2.3 servlet.jar)" >> build.properties
+       use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
+       java-pkg_filter-compiler jikes ecj-3.2
+
+       if use test && ! use servletapi; then
+               eerror "Tests need use servletapi, tests not executed"
+       fi
+}
+
+EANT_BUILD_TARGET="compile"
+
+src_install() {
+       java-osgi_newjar "target/${P}.jar" "org.apache.commons.logging" "Apache Commons Logging" "org.apache.commons.logging;version=\"${PV}\", org.apache.commons.logging.impl;version=\"${PV}\""
+       java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
+       java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
+
+       dodoc RELEASE-NOTES.txt || die
+       dohtml PROPOSAL.html || die
+       use doc && java-pkg_dojavadoc target/docs/
+       use source && java-pkg_dosrc src/main/java/org
+}

diff --git a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
new file mode 100644 (file)
index 0000000..f359e8e
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
@@ -0,0 +1,26 @@
+--- a/build.xml        2013-05-16 22:04:22.000000000 +0200
++++ b/build.xml        2013-12-25 23:58:47.447266535 +0100
+@@ -773,4 +773,23 @@
+     </fail>
+   </target>
+ 
++  <target depends="" name="javadoc" description="o Generate javadoc" >
++    <mkdir dir="${build.home}/docs" >
++    </mkdir>
++    <tstamp >
++      <format pattern="2001-yyyy" property="year" >
++      </format>
++    </tstamp>
++    <property name="copyright" value="Copyright &amp;copy;  The Apache Software Foundation. All Rights Reserved." >
++    </property>
++    <property name="title" value="Logging 1.1 API" >
++    </property>
++    <javadoc use="true" author="true" sourcepath="src/main/java" destdir="${build.home}/docs" version="true" private="true" packagenames="org.apache.commons.logging.*" >
++      <classpath >
++        <path refid="javadoc.classpath" >
++        </path>
++      </classpath>
++    </javadoc>
++  </target>
++
+ </project>

diff --git a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
new file mode 100644 (file)
index 0000000..96299c1
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
@@ -0,0 +1,42 @@
+--- a/build.xml        2013-12-26 00:00:51.019721667 +0100
++++ b/build.xml        2013-12-26 00:22:27.616511976 +0100
+@@ -279,6 +279,8 @@
+                classpathref="compile.classpath"
+                classname="org.apache.log.Logger"/>
+ 
++    <available classname="javax.servlet.ServletContextEvent" property="servletapi.present" classpathref="compile.classpath" ignoresystemclasses="true" ></available>
++
+     <available property="avalon-framework.present"
+                classpathref="compile.classpath"
+                classname="org.apache.avalon.framework.logger.Logger"/>
+@@ -315,6 +317,13 @@
+     </echo>
+   </target>
+   
++  <target depends="init,discovery" unless="servletapi.present" name="servletapi-warning" >
++    <echo >
++    *** WARNING ***
++    ServletAPI not found: Cannot Build ServletContextCleaner
++      </echo>
++  </target>
++  
+   <target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'>
+     <echo>
+     *** WARNING ***
+@@ -337,7 +346,7 @@
+   </target>
+     
+   <target name='warning' 
+-    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/>
++    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/>
+ 
+   <target name="compile-only" 
+     depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/>
+@@ -365,6 +374,7 @@
+     
+       <exclude name="org/apache/commons/logging/impl/Log4J*.java"/>
+ 
++        <exclude unless="servletapi.present" name="org/apache/commons/logging/impl/ServletContextCleaner.java" ></exclude>
+       <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
+                unless="jdk.1.4.present"/>
+       <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"