diff options
| author |   Serkan Kaba <serkan@gentoo.org> | 2009-01-05 20:27:57 +0000 |
|---|---|---|
| committer | Serkan Kaba <serkan@gentoo.org> | 2009-01-05 20:27:57 +0000 |
| commit | 0294be6565ce02d685721e49a24d2ab08033ec1b (patch) | |
| tree | be5a90a6c2523b8b6d97987d9c5a15463d50a27b /dev-java | |
| parent | Add ~sparc keyword, bug #253453 (diff) | |
| download | gentoo-2-0294be6565ce02d685721e49a24d2ab08033ec1b.tar.gz gentoo-2-0294be6565ce02d685721e49a24d2ab08033ec1b.tar.bz2 gentoo-2-0294be6565ce02d685721e49a24d2ab08033ec1b.zip | |
Migrate to EAPI 2 to fix the dependencies.
(Portage version: 2.2_rc20/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/fop/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/fop/fop-0.93-r1.ebuild | 27 |
2 files changed, 14 insertions, 20 deletions
diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog index 9316bbc80900..eecd08ec8bd5 100644 --- a/dev-java/fop/ChangeLog +++ b/dev-java/fop/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/fop -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.60 2008/09/27 11:27:19 betelgeuse Exp $ +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.61 2009/01/05 20:27:57 serkan Exp $ + + 05 Jan 2009; Serkan Kaba <serkan@gentoo.org> fop-0.93-r1.ebuild: + Migrate to EAPI 2 to fix the dependencies. 27 Sep 2008; Petteri Räty <betelgeuse@gentoo.org> fop-0.94-r1.ebuild: Migrate to EAPI 2 for USE dependencies. diff --git a/dev-java/fop/fop-0.93-r1.ebuild b/dev-java/fop/fop-0.93-r1.ebuild index 19b3252573ef..93162adfac8d 100644 --- a/dev-java/fop/fop-0.93-r1.ebuild +++ b/dev-java/fop/fop-0.93-r1.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.93-r1.ebuild,v 1.8 2007/09/18 22:18:32 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.93-r1.ebuild,v 1.9 2009/01/05 20:27:57 serkan 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="2" JAVA_PKG_IUSE="doc examples source" WANT_ANT_TASKS="ant-trax" inherit eutils java-pkg-2 java-ant-2 @@ -21,12 +22,12 @@ KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86" IUSE="hyphenation jai jimi" COMMON_DEPEND=" - >=dev-java/avalon-framework-4.2 - >=dev-java/batik-1.6 + dev-java/avalon-framework:4.2 + dev-java/batik:1.6 dev-java/commons-io dev-java/commons-logging - =dev-java/servletapi-2.2* - >=dev-java/xmlgraphics-commons-1.1 + dev-java/servletapi:2.2 + dev-java/xmlgraphics-commons:1[jpeg] jai? ( dev-java/sun-jai-bin ) jimi? ( dev-java/sun-jimi )" @@ -35,24 +36,14 @@ RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPEND}" DEPEND=">=virtual/jdk-1.4 - =dev-java/eclipse-ecj-3.2* + dev-java/eclipse-ecj:3.2 hyphenation? ( dev-java/offo-hyphenation ) ${COMMON_DEPEND}" # test? ( -# =dev-java/junit-3.8* +# dev-java/junit:0 # dev-java/xmlunit # )" -pkg_setup() { - if ! built_with_use dev-java/xmlgraphics-commons jpeg; then - msg="${CATEGORY}/${P} needs dev-java/xmlgraphics-commons built with" - msg="${msg} the jpeg use flag" - eerror ${msg} - die "Recompile dev-java/xmlgraphics-commons with the jpeg use flag" - fi - java-pkg-2_pkg_setup -} - src_unpack() { unpack "${A}" cd "${S}" |