* [gentoo-commits] gentoo-x86 commit in dev-java/commons-logging: ChangeLog commons-logging-1.1-r6.ebuild commons-logging-1.1-r5.ebuild
@ 2008-01-30 17:30 Vlastimil Babka (caster)
0 siblings, 0 replies; 2+ messages in thread
From: Vlastimil Babka (caster) @ 2008-01-30 17:30 UTC (permalink / raw
To: gentoo-commits
caster 08/01/30 17:30:30
Modified: ChangeLog
Added: commons-logging-1.1-r6.ebuild
commons-logging-1.1-r5.ebuild
Log:
Fix missing jdk14logger (bug #208098), a regression of fix for bug #200918. The -r5 is based on current stable -r2 and straight stabled because -r2 got broken after its stabling and without revbump. The -r6 is based on -r4 and has also EAPI=1 slot deps and few other style tweaks.
(Portage version: 2.1.4, RepoMan options: --force)
Revision Changes Path
1.57 dev-java/commons-logging/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/ChangeLog?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/ChangeLog?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/ChangeLog?r1=1.56&r2=1.57
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ChangeLog 14 Jan 2008 16:22:37 -0000 1.56
+++ ChangeLog 30 Jan 2008 17:30:30 -0000 1.57
@@ -1,6 +1,16 @@
# ChangeLog for dev-java/commons-logging
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.56 2008/01/14 16:22:37 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.57 2008/01/30 17:30:30 caster Exp $
+
+*commons-logging-1.1-r6 (30 Jan 2008)
+*commons-logging-1.1-r5 (30 Jan 2008)
+
+ 30 Jan 2008; Vlastimil Babka <caster@gentoo.org>
+ +commons-logging-1.1-r5.ebuild, +commons-logging-1.1-r6.ebuild:
+ Fix missing jdk14logger (bug #208098), a regression of fix for bug #200918.
+ The -r5 is based on current stable -r2 and straight stabled because -r2 got
+ broken after its stabling and without revbump. The -r6 is based on -r4 and
+ has also EAPI=1 slot deps and few other style tweaks.
*commons-logging-1.1-r4 (14 Jan 2008)
1.1 dev-java/commons-logging/commons-logging-1.1-r6.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r6.ebuild?rev=1.1&content-type=text/plain
Index: commons-logging-1.1-r6.ebuild
===================================================================
# Copyright 1999-2008 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-r6.ebuild,v 1.1 2008/01/30 17:30:30 caster Exp $
EAPI="1"
JAVA_PKG_IUSE="doc source"
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://jakarta.apache.org/commons/logging/"
SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
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.4
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.4
${COMMON_DEP}"
S="${WORKDIR}/${P}-src/"
src_unpack() {
unpack ${A}
cd "${S}"
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
}
EANT_BUILD_TARGET="compile"
src_install() {
java-osgi_newjar-fromfile "target/${P}.jar" "${FILESDIR}/${P}-manifest" "Apache Commons Logging"
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 STATUS.html || die
use doc && java-pkg_dojavadoc target/docs/
use source && java-pkg_dosrc src/java/org
}
1.1 dev-java/commons-logging/commons-logging-1.1-r5.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r5.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r5.ebuild?rev=1.1&content-type=text/plain
Index: commons-logging-1.1-r5.ebuild
===================================================================
# Copyright 1999-2008 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-r5.ebuild,v 1.1 2008/01/30 17:30:30 caster Exp $
inherit java-pkg-2 java-ant-2
DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries."
HOMEPAGE="http://jakarta.apache.org/commons/logging/"
SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
IUSE="avalon-logkit log4j servletapi avalon-framework doc source"
RDEPEND=">=virtual/jre-1.4
avalon-logkit? ( =dev-java/avalon-logkit-1.2* )
log4j? ( =dev-java/log4j-1.2* )
servletapi? ( =dev-java/servletapi-2.3* )
avalon-framework? ( =dev-java/avalon-framework-4.2* )"
# ATTENTION: Add this when log4j-1.3 is out
# =dev-java/log4j-1.3*
DEPEND=">=virtual/jdk-1.4
dev-java/ant-core
source? ( app-arch/zip )
${RDEPEND}"
S="${WORKDIR}/${P}-src/"
src_unpack() {
unpack ${A}
cd "${S}"
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_getjars servletapi-2.3)" >> 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
}
EANT_BUILD_TARGET="compile"
src_install() {
java-pkg_newjar target/${P}.jar ${PN}.jar
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 STATUS.html || die
use doc && java-pkg_dojavadoc target/docs/
use source && java-pkg_dosrc src/java/org
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/commons-logging: ChangeLog commons-logging-1.1-r6.ebuild commons-logging-1.1-r5.ebuild
@ 2008-03-25 19:48 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 2+ messages in thread
From: Petteri Raty (betelgeuse) @ 2008-03-25 19:48 UTC (permalink / raw
To: gentoo-commits
betelgeuse 08/03/25 19:48:40
Modified: ChangeLog
Removed: commons-logging-1.1-r6.ebuild
commons-logging-1.1-r5.ebuild
Log:
Delete old ebuilds.
(Portage version: 2.1.4.4)
Revision Changes Path
1.65 dev-java/commons-logging/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/ChangeLog?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/ChangeLog?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/ChangeLog?r1=1.64&r2=1.65
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ChangeLog 16 Mar 2008 17:44:04 -0000 1.64
+++ ChangeLog 25 Mar 2008 19:48:39 -0000 1.65
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/commons-logging
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.64 2008/03/16 17:44:04 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.65 2008/03/25 19:48:39 betelgeuse Exp $
+
+ 25 Mar 2008; Petteri Räty <betelgeuse@gentoo.org>
+ -commons-logging-1.1-r5.ebuild, -commons-logging-1.1-r6.ebuild:
+ Delete old ebuilds.
16 Mar 2008; Kenneth Prugh <ken69267@gentoo.org>
commons-logging-1.1.1.ebuild:
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-03-25 19:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-30 17:30 [gentoo-commits] gentoo-x86 commit in dev-java/commons-logging: ChangeLog commons-logging-1.1-r6.ebuild commons-logging-1.1-r5.ebuild Vlastimil Babka (caster)
-- strict thread matches above, loose matches on Subject: below --
2008-03-25 19:48 Petteri Raty (betelgeuse)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox