diff options
Diffstat (limited to 'dev-java/commons-logging')
5 files changed, 16 insertions, 13 deletions
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest index 002ff3946c09..60ec7a48ebff 100644 --- a/dev-java/commons-logging/Manifest +++ b/dev-java/commons-logging/Manifest @@ -1,6 +1,6 @@ -AUX commons-logging-1.2-gentoo.patch 897 BLAKE2B 353550109ecc13bfa897217d845ca9cb6e315d29f1a565462d4905cb02b3092eb3a97b16b992f80d13cfdd6938467c064c91e214b62e0ab1160b3b557c3c870f SHA512 b486f96b1d7ae8e8decb3210fb33a31dbfa147cd30ae8311c60eab4f0d48b71518825bba06f146490aeea746dc3dc996a7191a974d57cf990ca253793b9294a1 -AUX commons-logging-1.2-servletapi.patch 1855 BLAKE2B d3c7cb640563f200fde0a72fc1f7e74a89d3072d74593c2c7829162a71df385af9dfbda5cbd3cc82b78a8fadb353eb1dcc6fba0ff30ac425c4306fed9ec7e731 SHA512 3e608ec37279664249d89eb90eaee7e2f5536ab37efcb6e94a8d586b5284a4641aaa5c58f6ef4730955e51fd22491e82f1a6b5b50303f9c4d7cfd066f751799c +AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027 +AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 -EBUILD commons-logging-1.2-r1.ebuild 2206 BLAKE2B c9e0282cd31a7d47abb7420a69d1146f674e176bf7753803475a37e15a735189928b5debdd1ec7866b26d89b8b74768c71f096d7058520c945395279b93ef0b0 SHA512 a883053e3a6b7916ba5ce9c58a857df1a3d19ef739d1b466fd9109ff8b91b4ddc4259917a8b2a1f87019f2713b4fafd5702b549f073062c35964a8b84ac8e710 -EBUILD commons-logging-1.2-r2.ebuild 2303 BLAKE2B ef5024e9757c4272af167353900ddd68b6352755238cba889622e1ee0e8d0f9f39ffc29db992d62ad67023ae1b6269f772280b8cf861318c0266430d42845e54 SHA512 7907674ff580c95ece78dfb6481a6510bf6c570c0e6337254c2e01857fbd54ca4f36bb8e68feedfe479b69f196cd7af58b0c449e620d165dc3d8c5f36412bff7 +EBUILD commons-logging-1.2-r1.ebuild 2212 BLAKE2B b91b91b4e26f1d9a5aea2a3743f979df0eb0f884ec00b5ac10087d0859828e6ca0b981fdcdcd520272d224b3f0b377eac8cb1da1566fd08671e3c9d6a6343153 SHA512 63621491db41bc2627c1a673c161218c4b999a3b925493f92e2442a053d9c6feffc5bf8a7c35f05d1a7c6f26504e0e87d723829d25496359c5bea71e4cd3d646 +EBUILD commons-logging-1.2-r2.ebuild 2303 BLAKE2B 3c11c135b650f00c703dfad89cb12648dcbe61bf251de7a7428bce266a51c980187cfbc902e4a7500b5d7c2b457c21d556bd547754ec5fc011a4eb5b7cd62830 SHA512 39b7fd0405164b07c062f300b7f0b71e29650b25d06873fb83171f6571dc63852238a47b71a1f1253fe7f3398556a09441f45220ae621dbbde694fe5daece285 MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild index be6e19cbc56a..d31cbb5b606b 100644 --- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild +++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild @@ -8,8 +8,9 @@ JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 java-osgi DESCRIPTION="An ultra-thin bridge between different Java logging libraries" -HOMEPAGE="http://commons.apache.org/logging/" +HOMEPAGE="https://commons.apache.org/logging/" SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz" + LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" @@ -21,10 +22,12 @@ CDEPEND="avalon-framework? ( dev-java/avalon-framework:4.2 ) log4j? ( dev-java/log4j:0 ) servletapi? ( java-virtuals/servlet-api:3.1 )" -RDEPEND="${CDEPEND} +RDEPEND=" + ${CDEPEND} >=virtual/jre-1.6" -DEPEND="${CDEPEND} +DEPEND=" + ${CDEPEND} >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 )" diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild index 4aae5b05685c..0f4bba416ed0 100644 --- a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild +++ b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild @@ -43,9 +43,9 @@ DOCS=( RELEASE-NOTES.txt PROPOSAL.html ) src_prepare() { default - epatch "${FILESDIR}/${P}-gentoo.patch" + eapply "${FILESDIR}/${P}-gentoo.patch" # patch to make the build.xml respect no servletapi - epatch "${FILESDIR}/${P}-servletapi.patch" + eapply "${FILESDIR}/${P}-servletapi.patch" # bug #208098 echo "jdk.1.4.present=true" > build.properties || die 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 index f359e8e224bf..a654ce1fc763 100644 --- a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch +++ b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch @@ -1,5 +1,5 @@ ---- a/build.xml 2013-05-16 22:04:22.000000000 +0200 -+++ b/build.xml 2013-12-25 23:58:47.447266535 +0100 +--- a/build.xml ++++ b/build.xml @@ -773,4 +773,23 @@ </fail> </target> 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 index 96299c131f1b..a9fccba8d5c1 100644 --- a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch +++ b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch @@ -1,5 +1,5 @@ ---- a/build.xml 2013-12-26 00:00:51.019721667 +0100 -+++ b/build.xml 2013-12-26 00:22:27.616511976 +0100 +--- a/build.xml ++++ b/build.xml @@ -279,6 +279,8 @@ classpathref="compile.classpath" classname="org.apache.log.Logger"/> |