From eb4ceee3783ca1e7b0b42341d2b102a367f7c24c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Sun, 14 Jan 2007 13:40:18 +0000 Subject: [PATCH] Made jython dependency optional with the python use flag and added a tcl use flag. Package-Manager: portage-2.1.2_rc4-r7 --- dev-java/batik/ChangeLog | 6 +++++- dev-java/batik/Manifest | 22 +++++++++++----------- dev-java/batik/batik-1.6-r3.ebuild | 17 ++++++++++------- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog index fefb248c56a2..38cd0d2841e8 100644 --- a/dev-java/batik/ChangeLog +++ b/dev-java/batik/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/batik # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.44 2007/01/14 13:30:37 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.45 2007/01/14 13:40:18 betelgeuse Exp $ + + 14 Jan 2007; Petteri Räty batik-1.6-r3.ebuild: + Made jython dependency optional with the python use flag and added a tcl use + flag. 14 Jan 2007; Petteri Räty -batik-1.5.1-r5.ebuild: Removed 1.5.1 slot because nothing is using it. diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest index 390d5c8da32c..42c423bf01b6 100644 --- a/dev-java/batik/Manifest +++ b/dev-java/batik/Manifest @@ -23,14 +23,14 @@ EBUILD batik-1.6-r2.ebuild 2117 RMD160 e87bee84134271f7f0862d990f9b6370a910eba2 MD5 9c07b4ad619d8d4c7b0eca6252a47b11 batik-1.6-r2.ebuild 2117 RMD160 e87bee84134271f7f0862d990f9b6370a910eba2 batik-1.6-r2.ebuild 2117 SHA256 661c6d663278a2c80e77f90e797b3167c01cf9754f9a70a5e33e0de47d1d45cf batik-1.6-r2.ebuild 2117 -EBUILD batik-1.6-r3.ebuild 2124 RMD160 87c58817b0a2c0ffc35f7fb949833fac6be1061e SHA1 517465844d5f36a8a8c5e76dce07ac8dcf1ac2e7 SHA256 ec2225d18da83bdfb6389d5b8a4f1e664f910346bd11f6a6d9505ebe694075bc -MD5 5117b854575f9f63ab3ec8e7c525b3fc batik-1.6-r3.ebuild 2124 -RMD160 87c58817b0a2c0ffc35f7fb949833fac6be1061e batik-1.6-r3.ebuild 2124 -SHA256 ec2225d18da83bdfb6389d5b8a4f1e664f910346bd11f6a6d9505ebe694075bc batik-1.6-r3.ebuild 2124 -MISC ChangeLog 6089 RMD160 4c9eec11846d136eeedaf5b0d8b3c0b03e1bd442 SHA1 d7a8bb2da20bb563086371c24468fd864a192ba2 SHA256 c989659fbcedc0bab9716102943f792e3814dc98bfaba4daf892da7b6bdcd2a4 -MD5 b41eb0baf47071362149d1e3ac5f9650 ChangeLog 6089 -RMD160 4c9eec11846d136eeedaf5b0d8b3c0b03e1bd442 ChangeLog 6089 -SHA256 c989659fbcedc0bab9716102943f792e3814dc98bfaba4daf892da7b6bdcd2a4 ChangeLog 6089 +EBUILD batik-1.6-r3.ebuild 2178 RMD160 d85fb387a0bedd6b95bf4da88f870af48e678ba9 SHA1 56dd92346d3fba3791584fdfa342c32569c378a6 SHA256 80d72f1933e1045ea34f81cd517da63a24fbfe6e92b431c57a40bf78fd9b9169 +MD5 885a1a0bcfed7b5a3b9c94b7f30ebf5e batik-1.6-r3.ebuild 2178 +RMD160 d85fb387a0bedd6b95bf4da88f870af48e678ba9 batik-1.6-r3.ebuild 2178 +SHA256 80d72f1933e1045ea34f81cd517da63a24fbfe6e92b431c57a40bf78fd9b9169 batik-1.6-r3.ebuild 2178 +MISC ChangeLog 6251 RMD160 8eafef6acb528908f99bb5b7172ad3c1d18a4bfc SHA1 64210167e6961bea70598806e9f1cae8cd1331dc SHA256 fdaa7416d6ba8d73eb3d1c74be3d69904ba997ae94f0dcb7314ea9bb4948d4db +MD5 c979507f1df57b0aa0eae82161a3f59d ChangeLog 6251 +RMD160 8eafef6acb528908f99bb5b7172ad3c1d18a4bfc ChangeLog 6251 +SHA256 fdaa7416d6ba8d73eb3d1c74be3d69904ba997ae94f0dcb7314ea9bb4948d4db ChangeLog 6251 MISC metadata.xml 374 RMD160 6d3a700a3b332f27c8e9057336d0cf3a28f59cf1 SHA1 5626acb9b3091acbf59b8d69c0ba46f525ee0ce5 SHA256 f71a7581f22225196ad493f9f6c85e5379e3a62f482059827ae35ab66b834437 MD5 370ede5daee1ae9d1bb9251a8f581a13 metadata.xml 374 RMD160 6d3a700a3b332f27c8e9057336d0cf3a28f59cf1 metadata.xml 374 @@ -50,7 +50,7 @@ SHA256 0155a5119496483490605907b767ee25bda39b1208db1fad5735aee4ef12b970 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFqjCHcxLzpIGCsLQRAr0cAJ9O8SL3/LI9cw2Z/HziQCD3OYILWgCeP1Dl -BBl0ePO6Aow0eEIRhxSSZlw= -=3TJY +iD8DBQFFqjLMcxLzpIGCsLQRAhIdAKCeBfgBHtsNxbhCUKQMk4mHpn2biwCdHnBn +8CQDJMyCJN7XbI56zvIhlyg= +=0aPa -----END PGP SIGNATURE----- diff --git a/dev-java/batik/batik-1.6-r3.ebuild b/dev-java/batik/batik-1.6-r3.ebuild index 1b6ef6f911ec..890b12eb6f7e 100644 --- a/dev-java/batik/batik-1.6-r3.ebuild +++ b/dev-java/batik/batik-1.6-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.6-r3.ebuild,v 1.1 2007/01/08 10:59:40 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.6-r3.ebuild,v 1.2 2007/01/14 13:40:18 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 eutils @@ -11,15 +11,13 @@ SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip" LICENSE="Apache-2.0" SLOT="1.6" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc" +IUSE="doc python tcl" -# According to -# http://xmlgraphics.apache.org/batik/install.html#optionalComponents -# jython is optional so should look into making a use flag CDEPEND="=dev-java/rhino-1.5* >=dev-java/xerces-2.7.1 =dev-java/xml-commons-external-1.3* - dev-java/jython" + python? ( dev-java/jython ) + tcl? ( dev-java/jacl )" DEPEND="=virtual/jdk-1.4* dev-java/ant-core app-arch/unzip @@ -36,13 +34,18 @@ src_unpack() { epatch ${FILESDIR}/${P}-jikes.patch epatch ${FILESDIR}/${P}-dont-copy-deps.patch + java-ant_ignore-system-classes + cd lib rm -f *.jar build/*.jar java-pkg_jar-from xml-commons-external-1.3 java-pkg_jar-from xerces-2 + # Can't make rhino optional because + # apps/svgbrowser needs it java-pkg_jar-from rhino-1.5 - java-pkg_jar-from jython + use python && java-pkg_jar-from jython + use tcl && java-pkg_jar-from jacl } src_compile() { -- 2.26.2