From c8a4910b619b9d2494e7bf0c6a9d9b6cc4844b16 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Fri, 24 Nov 2006 18:56:30 +0000 Subject: [PATCH] added dependency on xerces-2 in -r1, as reported in bug #121599 by Josh Sled . -r2 is a version ported to new Java system witht the help from three Java guys on IRC: nichoj, caster and betelgeuse, they spotted a lot! Hand-crafted launcher removed, we use java-dolauncher now; correct header date; some cosmetic changes (obsolte cd ${S} e.g.); compiler selection via java-config not by USE flags Package-Manager: portage-2.1.1-r2 --- app-text/trang/ChangeLog | 15 ++++++- app-text/trang/Manifest | 38 ++++++++++++---- app-text/trang/files/digest-trang-20030619-r1 | 2 + app-text/trang/files/digest-trang-20030619-r2 | 3 ++ app-text/trang/trang-20030619-r1.ebuild | 10 +++-- app-text/trang/trang-20030619-r2.ebuild | 45 +++++++++++++++++++ 6 files changed, 100 insertions(+), 13 deletions(-) create mode 100644 app-text/trang/files/digest-trang-20030619-r2 create mode 100644 app-text/trang/trang-20030619-r2.ebuild diff --git a/app-text/trang/ChangeLog b/app-text/trang/ChangeLog index a45e6c4f7bfa..b5e9264f0b35 100644 --- a/app-text/trang/ChangeLog +++ b/app-text/trang/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for app-text/trang -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/trang/ChangeLog,v 1.12 2005/07/12 18:35:58 axxo Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/trang/ChangeLog,v 1.13 2006/11/24 18:56:29 opfer Exp $ + +*trang-20030619-r2 (24 Nov 2006) + + 24 Nov 2006; Christian Faulhammer + trang-20030619-r1.ebuild, +trang-20030619-r2.ebuild: + added dependency on xerces-2 in -r1, as reported in bug #121599 by Josh Sled + . -r2 is a version ported to new Java system + with the help from three Java guys on IRC: nichoj, caster and betelgeuse, + they spotted a lot! Hand-crafted launcher removed, we use java-dolauncher + now; correct header date; some cosmetic changes (obsolte cd ${S} e.g.); + compiler selection via java-config not by USE flags 12 Jul 2005; Thomas Matthijs trang-20030619-r1.ebuild: Deps/Style fixs diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest index 7d83a32d947e..d57cf318bb3e 100644 --- a/app-text/trang/Manifest +++ b/app-text/trang/Manifest @@ -1,15 +1,37 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 421e1792b26b5fce7e151732fd6b2f24 ChangeLog 1490 -MD5 79a5dd1b805e5bca495aec6d6a73826b metadata.xml 176 -MD5 10616d13878d4ed7a5645204fc70d41c trang-20030619-r1.ebuild 1158 -MD5 15d93b4d4f695718d4ab66cf366b1e42 files/digest-trang-20030619-r1 63 +AUX build.xml 669 RMD160 2d209cc9cf0b1e280a96e76d4fa4a4a3e3085077 SHA1 f3b90555788e59c62a99fd468ac737fe43e3676f SHA256 618c79a8178de6713c50d289471550db4bd2500fba66de5090ad10763eaeaaf9 MD5 4067ed3d01d556519f8f66f469e56374 files/build.xml 669 +RMD160 2d209cc9cf0b1e280a96e76d4fa4a4a3e3085077 files/build.xml 669 +SHA256 618c79a8178de6713c50d289471550db4bd2500fba66de5090ad10763eaeaaf9 files/build.xml 669 +DIST trang-20030619.zip 941382 RMD160 f7dea9e4aae3e753fad2faae1304d865e30a5f6e SHA1 ed1c371f11c7e3c329baab6fa2997549f03458d0 SHA256 049ede1c5524fdc2958b47fe49bcf11620e36c4c6ede08f9df530eae12243343 +EBUILD trang-20030619-r1.ebuild 1245 RMD160 34216c1b22dab45ad3cb0c064ca0b5073d2b5cb9 SHA1 4acb766d8d1144597e5725fbf8b1df1f115e1e88 SHA256 980804d3186bb31c1525e4e276b38538dd5f6c40dc74b69109d16ec193c0c169 +MD5 53188da24a49a93d10bedb460966fb9d trang-20030619-r1.ebuild 1245 +RMD160 34216c1b22dab45ad3cb0c064ca0b5073d2b5cb9 trang-20030619-r1.ebuild 1245 +SHA256 980804d3186bb31c1525e4e276b38538dd5f6c40dc74b69109d16ec193c0c169 trang-20030619-r1.ebuild 1245 +EBUILD trang-20030619-r2.ebuild 1032 RMD160 5f033b470bb2a99444e2f2e3e803bc94b7e61836 SHA1 0564773803a200e886c19dbf6014d03a60ba0d95 SHA256 fe341f44fcbd4420cc1f5bbd4f1ae935dcc636271cdc63264dfe85afd55ab449 +MD5 ea74d6ebf1e9a7be630d9939d6c59ffd trang-20030619-r2.ebuild 1032 +RMD160 5f033b470bb2a99444e2f2e3e803bc94b7e61836 trang-20030619-r2.ebuild 1032 +SHA256 fe341f44fcbd4420cc1f5bbd4f1ae935dcc636271cdc63264dfe85afd55ab449 trang-20030619-r2.ebuild 1032 +MISC ChangeLog 2073 RMD160 8277f7d54f086ae951ad9e855c5f206848e454ac SHA1 5c9e44c9793f9dc36f94eb5aac54f22296c790eb SHA256 91f5ebfa93fb42f2db42740139af66bb1e437e78d008e2b9e278f97e81424608 +MD5 5ced48fdb17cdf7f88aa3b1108ac4cd4 ChangeLog 2073 +RMD160 8277f7d54f086ae951ad9e855c5f206848e454ac ChangeLog 2073 +SHA256 91f5ebfa93fb42f2db42740139af66bb1e437e78d008e2b9e278f97e81424608 ChangeLog 2073 +MISC metadata.xml 176 RMD160 7b9811f5e25a1acb5d5bb2d9112f4b7165ecd50d SHA1 e7dded9a52a425251f7aa7127a79289fc776cbcd SHA256 54961b0f82bee2e683d1a4fdd717a964a254afad757cf4f55415b5ffd72d1424 +MD5 79a5dd1b805e5bca495aec6d6a73826b metadata.xml 176 +RMD160 7b9811f5e25a1acb5d5bb2d9112f4b7165ecd50d metadata.xml 176 +SHA256 54961b0f82bee2e683d1a4fdd717a964a254afad757cf4f55415b5ffd72d1424 metadata.xml 176 +MD5 58ed1e8e5816bfaf5eee7abb48a9b49e files/digest-trang-20030619-r1 235 +RMD160 c9bdda85f07ed48251b14468f01d5f73c6a4f234 files/digest-trang-20030619-r1 235 +SHA256 49fa5bd04111bce566eb43802219fb046f3a5a6aff99b2dc12978b0f9e567af1 files/digest-trang-20030619-r1 235 +MD5 58ed1e8e5816bfaf5eee7abb48a9b49e files/digest-trang-20030619-r2 235 +RMD160 c9bdda85f07ed48251b14468f01d5f73c6a4f234 files/digest-trang-20030619-r2 235 +SHA256 49fa5bd04111bce566eb43802219fb046f3a5a6aff99b2dc12978b0f9e567af1 files/digest-trang-20030619-r2 235 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFC1A2p/rLF9B432nYRAhRaAKCzfPcU7/aRIw3fg6yebuzCkPNUXwCgiHnd -/3ypf5HA74Pg3Pn+XWxJgyQ= -=MZyS +iD8DBQFFZ0BuNQqtfCuFneMRAlZgAKCX/J4gTeDvJIqGAO79HoA1wmBX4QCdG3nn +7WX4DaywZeyADuZgs7XiWGA= +=aVKX -----END PGP SIGNATURE----- diff --git a/app-text/trang/files/digest-trang-20030619-r1 b/app-text/trang/files/digest-trang-20030619-r1 index efbefdef57f6..e7b29322316c 100644 --- a/app-text/trang/files/digest-trang-20030619-r1 +++ b/app-text/trang/files/digest-trang-20030619-r1 @@ -1 +1,3 @@ MD5 9611ea59fda0f62fecc4a5017a72984e trang-20030619.zip 941382 +RMD160 f7dea9e4aae3e753fad2faae1304d865e30a5f6e trang-20030619.zip 941382 +SHA256 049ede1c5524fdc2958b47fe49bcf11620e36c4c6ede08f9df530eae12243343 trang-20030619.zip 941382 diff --git a/app-text/trang/files/digest-trang-20030619-r2 b/app-text/trang/files/digest-trang-20030619-r2 new file mode 100644 index 000000000000..e7b29322316c --- /dev/null +++ b/app-text/trang/files/digest-trang-20030619-r2 @@ -0,0 +1,3 @@ +MD5 9611ea59fda0f62fecc4a5017a72984e trang-20030619.zip 941382 +RMD160 f7dea9e4aae3e753fad2faae1304d865e30a5f6e trang-20030619.zip 941382 +SHA256 049ede1c5524fdc2958b47fe49bcf11620e36c4c6ede08f9df530eae12243343 trang-20030619.zip 941382 diff --git a/app-text/trang/trang-20030619-r1.ebuild b/app-text/trang/trang-20030619-r1.ebuild index 8900aeb00642..14b5be1f290f 100644 --- a/app-text/trang/trang-20030619-r1.ebuild +++ b/app-text/trang/trang-20030619-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619-r1.ebuild,v 1.6 2005/07/12 18:35:58 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619-r1.ebuild,v 1.7 2006/11/24 18:56:29 opfer Exp $ inherit java-pkg @@ -12,7 +12,9 @@ SLOT="0" KEYWORDS="x86 amd64" IUSE="jikes" RDEPEND=">=virtual/jre-1.4 - =dev-java/xerces-1.3*" + =dev-java/xerces-1.3* + =dev-java/xerces-2*" + DEPEND=">=virtual/jdk-1.4 ${RDEPEND} app-arch/unzip @@ -27,7 +29,9 @@ src_unpack() { cp ${FILESDIR}/build.xml src cd src/lib + rm *.jar java-pkg_jar-from xerces-1.3 xerces.jar + java-pkg_jar-from xerces-2 xercesImpl.jar xerces.jar } src_compile() { diff --git a/app-text/trang/trang-20030619-r2.ebuild b/app-text/trang/trang-20030619-r2.ebuild new file mode 100644 index 000000000000..2af455e52936 --- /dev/null +++ b/app-text/trang/trang-20030619-r2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619-r2.ebuild,v 1.1 2006/11/24 18:56:30 opfer Exp $ + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Trang: Multi-format schema converter based on RELAX NG" +HOMEPAGE="http://thaiopensource.com/relaxng/trang.html" +SRC_URI="http://www.thaiopensource.com/download/${P}.zip" +LICENSE="BSD Apache-1.1" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="" +RDEPEND=">=virtual/jre-1.4 + =dev-java/xerces-1.3* + =dev-java/xerces-2*" + +DEPEND=">=virtual/jdk-1.4 + ${RDEPEND} + app-arch/unzip" + +src_unpack() { + unpack ${A} + cd ${S} + + mkdir -p src/lib + unzip -d src src.zip || die "failed too unzip" + cp ${FILESDIR}/build.xml src + + cd src/lib + java-pkg_jar-from xerces-1.3 xerces.jar + java-pkg_jar-from xerces-2 xercesImpl.jar xerces.jar +} + +src_compile() { + cd ${S}/src + + eant jar +} + +src_install() { + java-pkg_dojar jar/trang.jar + java-pkg_dolauncher trang --jar ${PN}.jar + java-pkg_dohtml *.html +} -- 2.26.2