summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Thomson <wltjr@gentoo.org>2008-03-22 19:36:02 +0000
committerWilliam Thomson <wltjr@gentoo.org>2008-03-22 19:36:02 +0000
commitdf684790d5d5c961d8de8a1f4a038ae691a82dd1 (patch)
treeb6c2d1ca1df7e83fc7a342dafcb11021361e969a /dev-java/fop
parentstable x86, bug 214222 (diff)
downloadgentoo-2-df684790d5d5c961d8de8a1f4a038ae691a82dd1.tar.gz
gentoo-2-df684790d5d5c961d8de8a1f4a038ae691a82dd1.tar.bz2
gentoo-2-df684790d5d5c961d8de8a1f4a038ae691a82dd1.zip
Switched to java-virtuals/servlet-api, removed previous revision
(Portage version: 2.1.4.1)
Diffstat (limited to 'dev-java/fop')
-rw-r--r--dev-java/fop/ChangeLog10
-rw-r--r--dev-java/fop/fop-0.94-r1.ebuild (renamed from dev-java/fop/fop-0.94.ebuild)11
2 files changed, 14 insertions, 7 deletions
diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index 0927a63a911f..fc230363bd90 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/fop
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.55 2007/11/10 00:39:01 caster Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.56 2008/03/22 19:36:02 wltjr Exp $
+
+*fop-0.94-r1 (22 Mar 2008)
+
+ 22 Mar 2008; William L. Thomson Jr. <wltjr@gentoo.org> -fop-0.94.ebuild,
+ +fop-0.94-r1.ebuild:
+ Switched to java-virtuals/servlet-api, removed previous revision
*fop-0.94 (10 Nov 2007)
diff --git a/dev-java/fop/fop-0.94.ebuild b/dev-java/fop/fop-0.94-r1.ebuild
index d03549e8ecd5..2900500d21ea 100644
--- a/dev-java/fop/fop-0.94.ebuild
+++ b/dev-java/fop/fop-0.94-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.94.ebuild,v 1.1 2007/11/10 00:39:01 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.94-r1.ebuild,v 1.1 2008/03/22 19:36:02 wltjr Exp $
# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
# be built as it needs forrest which we do not have
# TODO: package and use optional dependency jeuclid
+EAPI=1
JAVA_PKG_IUSE="doc examples source"
WANT_ANT_TASKS="ant-trax"
inherit eutils java-pkg-2 java-ant-2
@@ -25,7 +26,7 @@ COMMON_DEPEND="
>=dev-java/batik-1.6
dev-java/commons-io
dev-java/commons-logging
- =dev-java/servletapi-2.2*
+ java-virtuals/servlet-api:2.2
>=dev-java/xmlgraphics-commons-1.1
dev-java/xalan
jai? ( dev-java/sun-jai-bin )
@@ -54,7 +55,7 @@ pkg_setup() {
}
src_unpack() {
- unpack "${A}"
+ unpack ${A}
cd "${S}"
# automagic is bad
@@ -70,7 +71,7 @@ src_unpack() {
java-pkg_jarfrom commons-io-1 commons-io.jar commons-io-1.3.1.jar
java-pkg_jarfrom commons-logging commons-logging.jar \
commons-logging-1.0.4.jar
- java-pkg_jarfrom servletapi-2.2 servlet.jar servlet-2.2.jar
+ java-pkg_jarfrom --virtual servlet-api-2.2 servlet.jar servlet-2.2.jar
java-pkg_jarfrom xmlgraphics-commons-1 xmlgraphics-commons.jar \
xmlgraphics-commons-1.2.jar
java-pkg_jarfrom xalan xalan.jar xalan-2.7.0.jar