stable on x86, fixed xerces depend and added ~amd64 to KEYWORDS.

Package-Manager: portage-2.0.51.20-r5

5 files changed, 21 insertions, 40 deletions

diff --git a/app-text/trang/ChangeLog b/app-text/trang/ChangeLog
index 3f7153307a32..8b96688ece5a 100644
--- a/app-text/trang/ChangeLog
+++ b/app-text/trang/ChangeLog
@@ -1,6 +1,10 @@
 # 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.9 2005/01/20 15:35:32 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/trang/ChangeLog,v 1.10 2005/05/03 14:59:31 luckyduck Exp $
+
+  03 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -trang-20030619.ebuild,
+  trang-20030619-r1.ebuild:
+  stable on x86, fixed xerces depend and added ~amd64 to KEYWORDS.
 
   20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> trang-20030619-r1.ebuild:
   added missing dependencies (jikes, unzip)
diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest
index e56c12d8dc18..c09c461d012a 100644
--- a/app-text/trang/Manifest
+++ b/app-text/trang/Manifest
@@ -1,7 +1,15 @@
-MD5 6d86f1fb3b074ad73812cbd5d5e8c2ea trang-20030619.ebuild 763
-MD5 356d4ea16322b57ba5b0ffa5c8d7876e ChangeLog 1129
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cffc1e6b74e26c822fc00e2c9659bec1 ChangeLog 1302
 MD5 79a5dd1b805e5bca495aec6d6a73826b metadata.xml 176
-MD5 23f94174fc62bdc8da861846dc9cdcb8 trang-20030619-r1.ebuild 1151
-MD5 15d93b4d4f695718d4ab66cf366b1e42 files/digest-trang-20030619 63
+MD5 3b380cfd48c5546a7b69c4fbaab1a865 trang-20030619-r1.ebuild 1146
 MD5 15d93b4d4f695718d4ab66cf366b1e42 files/digest-trang-20030619-r1 63
 MD5 4067ed3d01d556519f8f66f469e56374 files/build.xml 669
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCd5Hp06ebR+OMO78RAsz7AJ4m2b5kS82YkmH8U35THVugERoKlACfeFUq
+2ib6jE+kn2d2Q6PwA011Gd4=
+=ogm/
+-----END PGP SIGNATURE-----
diff --git a/app-text/trang/files/digest-trang-20030619 b/app-text/trang/files/digest-trang-20030619
deleted file mode 100644
index efbefdef57f6..000000000000
--- a/app-text/trang/files/digest-trang-20030619
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9611ea59fda0f62fecc4a5017a72984e trang-20030619.zip 941382
diff --git a/app-text/trang/trang-20030619-r1.ebuild b/app-text/trang/trang-20030619-r1.ebuild
index a4098148ddd7..6af2281ac15a 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
 # 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.3 2005/01/20 15:35:32 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619-r1.ebuild,v 1.4 2005/05/03 14:59:31 luckyduck Exp $
 
 inherit java-pkg
 
@@ -9,10 +9,10 @@ HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
 SRC_URI="http://www.thaiopensource.com/download/trang-${PV}.zip"
 LICENSE="BSD Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE="jikes"
 DEPEND="dev-java/saxon-bin
-	=dev-java/xerces-1.3.1
+	=dev-java/xerces-1.3*
 	>=virtual/jdk-1.4
 	app-arch/unzip
 	jikes? ( dev-java/jikes )"
@@ -45,6 +45,5 @@ src_install() {
 exec `java-config --java` -jar `java-config -p trang` "$@"
 EOF
 	dobin trang
-	dohtml *.html
-	dodoc copying.txt
+	java-pkg_dohtml *.html
 }
diff --git a/app-text/trang/trang-20030619.ebuild b/app-text/trang/trang-20030619.ebuild
deleted file mode 100644
index d39c413e25b3..000000000000
--- a/app-text/trang/trang-20030619.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619.ebuild,v 1.8 2005/01/01 16:39:04 eradicator Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Trang: Multi-format schema converter based on RELAX NG"
-HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
-SRC_URI="http://www.thaiopensource.com/download/trang-${PV}.zip"
-LICENSE="BSD Apache-1.1"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-RDEPEND=">=virtual/jdk-1.3
-	dev-java/saxon-bin
-	dev-java/xerces"
-DEPEND="app-arch/unzip"
-
-
-src_install() {
-	java-pkg_dojar trang.jar
-	cat >trang <<'EOF'
-#!/bin/sh
-exec `java-config --java` -jar `java-config -p trang` "$@"
-EOF
-	dobin trang
-	dohtml *.html
-	dodoc copying.txt
-}