Migrate to EAPI 2 to fix the dependencies.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.27-gentoo-r2 x86_64

3 files changed, 19 insertions, 25 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/Manifest b/dev-java/fop/Manifest
index cdc4b8863573..19d47398eff1 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 DIST fop-0.93-src.tar.gz 11719875 RMD160 c047f7512a08120cfed07536c0849b2a999e96d4 SHA1 3efc0020fdbf14a12851acf6020ea723aebe2af6 SHA256 020a94181750b0653749cd977561283eb018689fb425dfa36fd02c50295a34c2
 DIST fop-0.94-src.tar.gz 11853559 RMD160 36f0b928f3511a8da7746b767c31112f3f0f45a2 SHA1 77bdaa5eaa1ba2c5d0c15925e74059680eb1c855 SHA256 b1db5b7a46c529a4b5034a3986b013320452dd2af0984f294b1ddc8a852fa099
-EBUILD fop-0.93-r1.ebuild 3405 RMD160 f449cbba6fb97079983b6bf41a53c260e4f4a114 SHA1 b4a08b45526b36410b6ca6de84589550916b15df SHA256 86886a012742eea68ffff185cdbe1775189b3c8b21707c5f01b6750a4e75c011
+EBUILD fop-0.93-r1.ebuild 3106 RMD160 22aa1c42b614d3d10433ebcb1720be4c613319fc SHA1 8cf133f0a8f1c5c49346c2297eca11819db0e5a9 SHA256 f61b90b9f64599609ef922d80084f7c3fe9037fa9a908889212225fd67aa1760
 EBUILD fop-0.94-r1.ebuild 3235 RMD160 eb024934461f860107a0dd9b3692a13a3c2461ec SHA1 58da7fdd52a37db18a237ed53b3d83a7ac87246f SHA256 52351a7cb9181f8dcc3697876374c2031e5c44b2a4f7df667739dd82e44b5897
-MISC ChangeLog 7864 RMD160 d7398da62f12ad06dfab36a2e0263ee3d2ccd0f2 SHA1 1cca69a9b3fa3c3d4f00a20b82a894aa824f3b57 SHA256 52717452a352ae429ad31417e34e859ef36f72c124e600e28ae3e5ea1cb2e425
+MISC ChangeLog 7973 RMD160 75dfb74abf36ca85a24c022ac57dfe48067dbb28 SHA1 c17b95145397abf4fd7c5c11c945c9c78caddb7b SHA256 a6f730784ddb2100132e3c7e1383ad34e65fe10ac98d637441228c1598cc4ca3
 MISC metadata.xml 427 RMD160 c01df4ec3df7d28b39560a96df475e6f010ddcba SHA1 2d6f93956f852096914452f8e44a0620e3951e55 SHA256 0b6fb333d87a73eff05b69a66715578f1853ed64584307dcaee983ea627af25a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjeGKQACgkQcxLzpIGCsLSdVwCgnGVLg8q0k3mO/PjqZa7r69J0
-t3MAoJO3gqNVqKEHLr1XXDHxWgzfcKQV
-=MsJL
+iEYEARECAAYFAklibVMACgkQRh6X64ivZaI/4QCfSC78BxseMGFExZuZ/u2QCYwv
+DPsAn0v0gJX3jeTVhpGAdf/+AdJl8FNx
+=Tr8h
 -----END PGP SIGNATURE-----
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}"