From e054c5d15e098af3a6b22f31c593e2687ed19d81 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Thu, 7 Dec 2006 22:56:28 +0000 Subject: [PATCH] Added ~ia64 keyword that seems to have been accidentally dropped with the last version bump and removed old versions. Package-Manager: portage-2.1.2_rc2-r3 --- dev-java/log4j/Manifest | 45 +++++-------------- dev-java/log4j/files/digest-log4j-1.2.11 | 3 -- dev-java/log4j/files/digest-log4j-1.2.12 | 3 -- dev-java/log4j/files/digest-log4j-1.2.13 | 3 -- dev-java/log4j/log4j-1.2.11.ebuild | 52 --------------------- dev-java/log4j/log4j-1.2.12.ebuild | 56 ----------------------- dev-java/log4j/log4j-1.2.13.ebuild | 57 ------------------------ 7 files changed, 11 insertions(+), 208 deletions(-) delete mode 100644 dev-java/log4j/files/digest-log4j-1.2.11 delete mode 100644 dev-java/log4j/files/digest-log4j-1.2.12 delete mode 100644 dev-java/log4j/files/digest-log4j-1.2.13 delete mode 100644 dev-java/log4j/log4j-1.2.11.ebuild delete mode 100644 dev-java/log4j/log4j-1.2.12.ebuild delete mode 100644 dev-java/log4j/log4j-1.2.13.ebuild diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest index 078781d867bd..e3d4f7571229 100644 --- a/dev-java/log4j/Manifest +++ b/dev-java/log4j/Manifest @@ -1,52 +1,29 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -DIST logging-log4j-1.2.11.tar.gz 2779734 RMD160 7e0b7676072b86c67b1b24b35804a6fe22cda9d5 SHA1 e09e1927f7171e34658521ef34f81ab527ff0256 SHA256 f7b0a3d78d992d1472bf61ddb4d8a0a616db30fe905490cd791818c209e367f9 -DIST logging-log4j-1.2.12.tar.gz 2755723 RMD160 aea27652b9c61aab3a672d6bd2f259c3509fe1bc SHA1 ec14052e52209c705f51dc154e11c209d38f512e SHA256 e25043521dc44248771072f429f4ebb4f3c6cfba46c0981c3bffad1dc866941e DIST logging-log4j-1.2.13.tar.gz 2752053 RMD160 223d6b4db3f4ce0e4e79f39baf74ea9e4c859f2d SHA1 2e2ef3c035ef54b86b4be4acbb3a1eacde6f272a SHA256 8bcbacb9bb04af9ca7b4dc5448644c617d34a8f931f3aacde8613e2703957f0f DIST logging-log4j-1.2.14.tar.gz 2771881 RMD160 d640c0182deebe1aabf14105b7b89294601bacce SHA1 2365021f8f277e77e281b0e01333ecea7c721e3e SHA256 51e4fcb3c3677fcdb9fe45ca0f73378680537491c9c9e65a9b63c7f54678f90c DIST logging-log4j-1.2.9.tar.gz 2770729 RMD160 8907d713cd2df3dde63bf620d0ecc2a0f93b06d6 SHA1 7eba48cdcd4ed93743a0a12693c534de9a24213e SHA256 887d9c942d2904328c0af185eae0d0bb7633dd5b931ddd7529517e844827ba6b -EBUILD log4j-1.2.11.ebuild 1794 RMD160 dfeb329a9cb6f19e0cb63110241eb3db0b66033c SHA1 7499f69edf366ab8f8439feb7888bd4ca13605d5 SHA256 639102beba925266a72b08fc59d66835ea39f657e6fedd26042f2b6f0003a32d -MD5 d6366287502774a799a15a25d6266ce2 log4j-1.2.11.ebuild 1794 -RMD160 dfeb329a9cb6f19e0cb63110241eb3db0b66033c log4j-1.2.11.ebuild 1794 -SHA256 639102beba925266a72b08fc59d66835ea39f657e6fedd26042f2b6f0003a32d log4j-1.2.11.ebuild 1794 -EBUILD log4j-1.2.12.ebuild 1983 RMD160 1a8766135cc86899892771663b1a21a799971501 SHA1 2629f48f9f0518185b622225489fd101fa7e280f SHA256 67259c5438291958bff53dbafd2e0dd112e388408037aced2dff85b66a3b17a7 -MD5 2393836ad223c64939dd45eba167dffe log4j-1.2.12.ebuild 1983 -RMD160 1a8766135cc86899892771663b1a21a799971501 log4j-1.2.12.ebuild 1983 -SHA256 67259c5438291958bff53dbafd2e0dd112e388408037aced2dff85b66a3b17a7 log4j-1.2.12.ebuild 1983 EBUILD log4j-1.2.13-r1.ebuild 1971 RMD160 b4946eb68883088d13a99821b02d96deec50b0e3 SHA1 8bad0ef324519410e5699251b66feab6e1b2eb25 SHA256 2ed0201c9c5a113788178f71babb8c8d4b1911cc6f72c3f8e7fb55861ba43467 MD5 045d2e5cb94915a078709a526d2a7144 log4j-1.2.13-r1.ebuild 1971 RMD160 b4946eb68883088d13a99821b02d96deec50b0e3 log4j-1.2.13-r1.ebuild 1971 SHA256 2ed0201c9c5a113788178f71babb8c8d4b1911cc6f72c3f8e7fb55861ba43467 log4j-1.2.13-r1.ebuild 1971 -EBUILD log4j-1.2.13.ebuild 1986 RMD160 efaa1c87d52f1247e7f5125657db3877decf2584 SHA1 8cc59e16d89934af6b6c99096e07fb24f05e0cc1 SHA256 05375e193aecfcac27fb8cabdd1838cc1fa728116318d64676db85e2affb946c -MD5 c9c1cacf426d5ec0be7495002d5cdd81 log4j-1.2.13.ebuild 1986 -RMD160 efaa1c87d52f1247e7f5125657db3877decf2584 log4j-1.2.13.ebuild 1986 -SHA256 05375e193aecfcac27fb8cabdd1838cc1fa728116318d64676db85e2affb946c log4j-1.2.13.ebuild 1986 -EBUILD log4j-1.2.14.ebuild 2092 RMD160 771b362fd92df759730b3cd489ca9d7769155751 SHA1 7ca1ca30640fe96326c6028856c7ce228741ac2c SHA256 687ade6fb439d727f3042022a6dd2c885d17040f28b63ccc32444aa52060e700 -MD5 505186aabf8d3548622a09b1e0028897 log4j-1.2.14.ebuild 2092 -RMD160 771b362fd92df759730b3cd489ca9d7769155751 log4j-1.2.14.ebuild 2092 -SHA256 687ade6fb439d727f3042022a6dd2c885d17040f28b63ccc32444aa52060e700 log4j-1.2.14.ebuild 2092 +EBUILD log4j-1.2.14.ebuild 2098 RMD160 9ce6af2954432121b8cd181278ecc7955f908324 SHA1 2db2e82e1c67e40237a50166599bce319e84da1c SHA256 67b68d08cefc2680eb3fd4a2644b95feed2144eb1cd2cdce5b4b087f90936f63 +MD5 4caa4abb034ca2ffffedbc9a9c359219 log4j-1.2.14.ebuild 2098 +RMD160 9ce6af2954432121b8cd181278ecc7955f908324 log4j-1.2.14.ebuild 2098 +SHA256 67b68d08cefc2680eb3fd4a2644b95feed2144eb1cd2cdce5b4b087f90936f63 log4j-1.2.14.ebuild 2098 EBUILD log4j-1.2.9.ebuild 1731 RMD160 1fae25199ead2950fbe862c205589e1609df69ea SHA1 a86c1c3eb666814f590b13483149b7c8db886a73 SHA256 5c0cb4f1213a89cf4cdbf146f304b5f41a4f2239993e9e2960e58ba8b5c44f80 MD5 21b6c2ab2672ba932439c29884da04e0 log4j-1.2.9.ebuild 1731 RMD160 1fae25199ead2950fbe862c205589e1609df69ea log4j-1.2.9.ebuild 1731 SHA256 5c0cb4f1213a89cf4cdbf146f304b5f41a4f2239993e9e2960e58ba8b5c44f80 log4j-1.2.9.ebuild 1731 -MISC ChangeLog 5720 RMD160 fd2616cf96def6615f47c73b2a3aaccaaceb6030 SHA1 8882326cc6e41d0359e028b24f49d9e98ac1f3cf SHA256 df838a71a832b779758fd7da578b7b28512928fa6165e5f7d83afba27e4bbf29 -MD5 ca959ceb6907ac550ebcb6497eb5328d ChangeLog 5720 -RMD160 fd2616cf96def6615f47c73b2a3aaccaaceb6030 ChangeLog 5720 -SHA256 df838a71a832b779758fd7da578b7b28512928fa6165e5f7d83afba27e4bbf29 ChangeLog 5720 +MISC ChangeLog 5985 RMD160 e3388fd6a8b4a7365128885cd1dd36cacd16025e SHA1 215104db40efeda1cfaa506ce30fe7f564f99f5b SHA256 e151e6f76168681c1f8de9d00d9d1192052ff848f469baf34eb1b893cfd27dba +MD5 8686d538828e88340f168781d6b37579 ChangeLog 5985 +RMD160 e3388fd6a8b4a7365128885cd1dd36cacd16025e ChangeLog 5985 +SHA256 e151e6f76168681c1f8de9d00d9d1192052ff848f469baf34eb1b893cfd27dba ChangeLog 5985 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157 -MD5 3c665bface262b70f9ef2fff87dce1ba files/digest-log4j-1.2.11 265 -RMD160 3225bacea31655442a350d82e0a31ab595c83e48 files/digest-log4j-1.2.11 265 -SHA256 56533983ed010b5f90047d657fdeaaa501d14f381f9992d81657747e1aa6496f files/digest-log4j-1.2.11 265 -MD5 6cef46abc0cb0734974a390bf6f8f444 files/digest-log4j-1.2.12 265 -RMD160 66c4d9324c7d7af784c2c6430d96f6030747655d files/digest-log4j-1.2.12 265 -SHA256 4585e15b5cb888c2021e42dd54a0d8c95ea72009b22c19a0fcfe0ecae2d791fa files/digest-log4j-1.2.12 265 -MD5 c3c93327178d98148eb1befac15c13ed files/digest-log4j-1.2.13 265 -RMD160 0448ab6b19a623983968aaccaba242bb3e9aaec7 files/digest-log4j-1.2.13 265 -SHA256 382bf81b4ab8a767c33e1b6c1f6675b16849bbefce3ab53753b08055c936edd4 files/digest-log4j-1.2.13 265 MD5 c3c93327178d98148eb1befac15c13ed files/digest-log4j-1.2.13-r1 265 RMD160 0448ab6b19a623983968aaccaba242bb3e9aaec7 files/digest-log4j-1.2.13-r1 265 SHA256 382bf81b4ab8a767c33e1b6c1f6675b16849bbefce3ab53753b08055c936edd4 files/digest-log4j-1.2.13-r1 265 @@ -59,7 +36,7 @@ SHA256 1405c8fc60edfa094d310fa2c833fa6f1e13007af54332e11470a202d27c2810 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFeJskcxLzpIGCsLQRAtAHAJ93YGfoKje/ihjbDb40h4HNHkWBMwCeJAnw -2FhK5aYrRP6S46DwD1s5HyU= -=MUQQ +iD8DBQFFeJwXcxLzpIGCsLQRAuzuAJoCTDWcKUQmet834nzH/fPxQXpHLQCeNN1d +JSev0VGmSL4RZbNswzoeC40= +=Ft1U -----END PGP SIGNATURE----- diff --git a/dev-java/log4j/files/digest-log4j-1.2.11 b/dev-java/log4j/files/digest-log4j-1.2.11 deleted file mode 100644 index dc3781a76042..000000000000 --- a/dev-java/log4j/files/digest-log4j-1.2.11 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b67e5a0ebb6eab73edd41b275599f41c logging-log4j-1.2.11.tar.gz 2779734 -RMD160 7e0b7676072b86c67b1b24b35804a6fe22cda9d5 logging-log4j-1.2.11.tar.gz 2779734 -SHA256 f7b0a3d78d992d1472bf61ddb4d8a0a616db30fe905490cd791818c209e367f9 logging-log4j-1.2.11.tar.gz 2779734 diff --git a/dev-java/log4j/files/digest-log4j-1.2.12 b/dev-java/log4j/files/digest-log4j-1.2.12 deleted file mode 100644 index 88c057fb7754..000000000000 --- a/dev-java/log4j/files/digest-log4j-1.2.12 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 95b60d4cf517c9cf3438fb99e2bd231a logging-log4j-1.2.12.tar.gz 2755723 -RMD160 aea27652b9c61aab3a672d6bd2f259c3509fe1bc logging-log4j-1.2.12.tar.gz 2755723 -SHA256 e25043521dc44248771072f429f4ebb4f3c6cfba46c0981c3bffad1dc866941e logging-log4j-1.2.12.tar.gz 2755723 diff --git a/dev-java/log4j/files/digest-log4j-1.2.13 b/dev-java/log4j/files/digest-log4j-1.2.13 deleted file mode 100644 index 22499b38dfcc..000000000000 --- a/dev-java/log4j/files/digest-log4j-1.2.13 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 080a645669672dd3fc22f0d8deaf06ac logging-log4j-1.2.13.tar.gz 2752053 -RMD160 223d6b4db3f4ce0e4e79f39baf74ea9e4c859f2d logging-log4j-1.2.13.tar.gz 2752053 -SHA256 8bcbacb9bb04af9ca7b4dc5448644c617d34a8f931f3aacde8613e2703957f0f logging-log4j-1.2.13.tar.gz 2752053 diff --git a/dev-java/log4j/log4j-1.2.11.ebuild b/dev-java/log4j/log4j-1.2.11.ebuild deleted file mode 100644 index caa0664dd3fb..000000000000 --- a/dev-java/log4j/log4j-1.2.11.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.11.ebuild,v 1.4 2006/10/05 18:05:36 gustavoz Exp $ - -inherit java-pkg - -DESCRIPTION="A low-overhead robust logging package for Java" -SRC_URI="mirror://apache/logging/log4j/${PV}/logging-${P}.tar.gz" -HOMEPAGE="http://logging.apache.org/log4j/" -LICENSE="Apache-1.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="doc javamail jikes jms jmx source" - -RDEPEND=">=virtual/jre-1.4 - javamail? ( dev-java/sun-javamail-bin dev-java/sun-jaf-bin ) - jmx? ( dev-java/sun-jmx ) - jms? ( =dev-java/openjms-bin-0.7.6 )" - -# We should get log4j working with openjms but at the moment that would bring -# a circular dependency. -# jms? ( || (=dev-java/openjms-0.7.6* =dev-java/openjms-bin-0.7.6* ))" -DEPEND=">=virtual/jdk-1.4 - dev-java/ant-core - jikes? ( dev-java/jikes ) - source? ( app-arch/zip ) - ${RDEPEND}" - -S="${WORKDIR}/logging-${P}" - -src_unpack() { - unpack ${A} - cd ${S} - rm -rf dist/ -} - -src_compile() { - local antflags="jar" - use jikes && antflags="${antflags} -Dbuild.compiler=jikes" - use javamail && antflags="${antflags} -Djavamail.jar=$(java-pkg_getjar sun-javamail-bin mail.jar) -Dactivation.jar=$(java-pkg_getjar sun-jaf-bin activation.jar)" - use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)" - #use jms && antflags="${antflags} -Djms.jar=$(java-pkg_getjar openjms jms.jar)" - use jms && antflags="${antflags} -Djms.jar=/opt/openjms/lib/jms-1.0.2a.jar" - ant ${antflags} || die "compilation error" -} - -src_install() { - java-pkg_newjar dist/lib/log4j-${PV}.jar ${PN}.jar - - use doc && java-pkg_dohtml -r docs/* - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/log4j/log4j-1.2.12.ebuild b/dev-java/log4j/log4j-1.2.12.ebuild deleted file mode 100644 index 0784ed351e63..000000000000 --- a/dev-java/log4j/log4j-1.2.12.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.12.ebuild,v 1.6 2006/12/07 22:52:07 betelgeuse Exp $ - -inherit java-pkg - -DESCRIPTION="A low-overhead robust logging package for Java" -SRC_URI="mirror://apache/logging/log4j/${PV}/logging-${P}.tar.gz" -HOMEPAGE="http://logging.apache.org/log4j/" -LICENSE="Apache-1.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -# jikes support disabled: bug #108819 -IUSE="doc javamail jms jmx source" - -RDEPEND=">=virtual/jre-1.4 - javamail? ( dev-java/sun-javamail-bin dev-java/sun-jaf-bin ) - jmx? ( dev-java/sun-jmx ) - jms? ( =dev-java/openjms-bin-0.7.6 )" - -# We should get log4j working with openjms but at the moment that would bring -# a circular dependency. -# jms? ( || (=dev-java/openjms-0.7.6* =dev-java/openjms-bin-0.7.6* ))" - -# Needs the a newer ant-core because otherwise source 1.1 and target 1.1 fails -# on at least blackdown-jdk-1.4.2.02. The other way to go around this is to -# explicitly set the javac.source and javac.target properties in the ebuild. - -DEPEND=">=virtual/jdk-1.4 - >=dev-java/ant-core-1.6.5 - source? ( app-arch/zip ) - ${RDEPEND}" - -S="${WORKDIR}/logging-${P}" - -src_unpack() { - unpack ${A} - cd ${S} - rm -rf dist/ -} - -src_compile() { - local antflags="jar" - use javamail && antflags="${antflags} -Djavamail.jar=$(java-pkg_getjar sun-javamail-bin mail.jar) -Dactivation.jar=$(java-pkg_getjar sun-jaf-bin activation.jar)" - use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)" - #use jms && antflags="${antflags} -Djms.jar=$(java-pkg_getjar openjms jms.jar)" - use jms && antflags="${antflags} -Djms.jar=/opt/openjms/lib/jms-1.0.2a.jar" - ant ${antflags} || die "compilation error" -} - -src_install() { - java-pkg_newjar dist/lib/log4j-${PV}.jar ${PN}.jar - - use doc && java-pkg_dohtml -r docs/* - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/log4j/log4j-1.2.13.ebuild b/dev-java/log4j/log4j-1.2.13.ebuild deleted file mode 100644 index 4627df04f809..000000000000 --- a/dev-java/log4j/log4j-1.2.13.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.13.ebuild,v 1.3 2006/12/07 22:52:07 betelgeuse Exp $ - -inherit java-pkg - -MY_P="logging-${P}" -DESCRIPTION="A low-overhead robust logging package for Java" -SRC_URI="mirror://apache/logging/log4j/${PV}/${MY_P}.tar.gz" -HOMEPAGE="http://logging.apache.org/log4j/" -LICENSE="Apache-1.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -# jikes support disabled: bug #108819 -IUSE="doc javamail jms jmx source" - -RDEPEND=">=virtual/jre-1.4 - javamail? ( dev-java/sun-javamail-bin dev-java/sun-jaf-bin ) - jmx? ( dev-java/sun-jmx ) - jms? ( =dev-java/openjms-bin-0.7.6 )" - -# We should get log4j working with openjms but at the moment that would bring -# a circular dependency. -# jms? ( || (=dev-java/openjms-0.7.6* =dev-java/openjms-bin-0.7.6* ))" - -# Needs the a newer ant-core because otherwise source 1.1 and target 1.1 fails -# on at least blackdown-jdk-1.4.2.02. The other way to go around this is to -# explicitly set the javac.source and javac.target properties in the ebuild. - -DEPEND=">=virtual/jdk-1.4 - >=dev-java/ant-core-1.6.5 - source? ( app-arch/zip ) - ${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd ${S} - rm -rf dist/ -} - -src_compile() { - local antflags="jar" - use javamail && antflags="${antflags} -Djavamail.jar=$(java-pkg_getjar sun-javamail-bin mail.jar) -Dactivation.jar=$(java-pkg_getjar sun-jaf-bin activation.jar)" - use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)" - #use jms && antflags="${antflags} -Djms.jar=$(java-pkg_getjar openjms jms.jar)" - use jms && antflags="${antflags} -Djms.jar=/opt/openjms/lib/jms-1.0.2a.jar" - ant ${antflags} || die "compilation error" -} - -src_install() { - java-pkg_newjar dist/lib/${P}.jar ${PN}.jar - - use doc && java-pkg_dohtml -r docs/* - use source && java-pkg_dosrc src/java/* -} -- 2.26.2