Marking stable for x86

5 files changed, 9 insertions, 69 deletions

diff --git a/dev-java/velocity/ChangeLog b/dev-java/velocity/ChangeLog
index 9ca143b5ce1f..8dfc48efac82 100644
--- a/dev-java/velocity/ChangeLog
+++ b/dev-java/velocity/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/velocity
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.12 2004/08/10 08:49:13 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.13 2004/08/23 21:57:36 zx Exp $
+
+  23 Aug 2004; Chris Aniszczyk <zx@gentoo.org> -velocity-1.3.ebuild,
+  velocity-1.4.ebuild:
+  Marking stable for x86
 
   10 Aug 2004; Thomas Matthijs <axxo@gentoo.org> velocity-1.4.ebuild:
   fix doc target #59859
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index a0ac5b8e1a7c..de2f708cfca7 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 945e1914193a7a4f1cc53cf032c57de0 velocity-1.4.ebuild 1331
-MD5 c9d7786f50ff0d024153776118bde76b velocity-1.3.ebuild 1326
-MD5 872e4cac3a4496203c8d9802e150a6cc ChangeLog 1632
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 c7bdf6df038fc9fcc34a772e5c5b1838 files/digest-velocity-1.3 128
+MD5 efe7ab7e941302e37545e3db355d2df1 ChangeLog 1748
+MD5 42003eaddc7ef176dd6207754c360800 velocity-1.4.ebuild 1328
 MD5 ebc2b845ee1e201a404b4eceb168952a files/digest-velocity-1.4 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-
-iD8DBQFBGIwc/rLF9B432nYRAoy2AKCAJm+6V0eTCcJJioG79TShUaYL0wCbBW3J
-Q1nEC9sk/75DUYjd1tfpzSs=
-=Iw4Q
------END PGP SIGNATURE-----
diff --git a/dev-java/velocity/files/digest-velocity-1.3 b/dev-java/velocity/files/digest-velocity-1.3
deleted file mode 100644
index 88bfebb49281..000000000000
--- a/dev-java/velocity/files/digest-velocity-1.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5936432301a7d700f61a09c4d3a9fc88 /velocity-1.3.ebuild 1384
-MD5 92df23ed5883f338d62420c14d0f7223 velocity-1.3.tar.gz 4480210
diff --git a/dev-java/velocity/velocity-1.3.ebuild b/dev-java/velocity/velocity-1.3.ebuild
deleted file mode 100644
index 4fbfa2979ab3..000000000000
--- a/dev-java/velocity/velocity-1.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.3.ebuild,v 1.10 2004/07/30 18:44:33 axxo Exp $
-
-DESCRIPTION="A Java-based template engine that allows easy creation/rendering of documents that format and present data."
-HOMEPAGE="http://jakarta.apache.org/velocity/"
-SRC_URI="http://jakarta.apache.org/builds/jakarta-${PN}/release/v${PV}/${PN}-${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="doc j2ee jikes"
-
-DEPEND=">=dev-java/sun-jdk-1.3.1"
-RDEPEND=">=dev-java/sun-jdk-1.3.1
-	>=dev-java/ant-1.5.1
-	>=dev-java/avalon-logkit-bin-1.2
-	>=dev-java/oro-2.0.6
-	j2ee? ( =dev-java/sun-j2ee-1.3.1* )
-	jikes? ( >=dev-java/jikes-1.17 )"
-
-src_compile () {
-	cd ${S}/build
-	local myc
-	if use jikes ; then
-		myc="${myc} -Dbuild.compiler=jikes"
-	fi
-
-	if use j2ee ; then
-		cp /opt/sun-j2ee-1.3.1/lib/j2ee.jar ${S}/build/lib
-		ANT_OPTS=${myc} ant jar-J2EE || die "Java compile failed."
-	else
-		ANT_OPTS=${myc} ant jar || die "Java compile failed"
-	fi
-
-	if use doc ; then
-		ant javadocs || die "Document compile failed"
-	fi
-}
-
-src_install () {
-	cd ${S}
-	if use j2ee ; then
-		dojar bin/${PN}-J2EE-${PV}.jar
-	else
-		dojar bin/${PN}-${PV}.jar
-	fi
-	dodoc LICENSE.txt README.txt
-	use doc && dohtml -r docs/*
-}
diff --git a/dev-java/velocity/velocity-1.4.ebuild b/dev-java/velocity/velocity-1.4.ebuild
index 40f5dce454e4..41132e634404 100644
--- a/dev-java/velocity/velocity-1.4.ebuild
+++ b/dev-java/velocity/velocity-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.4.ebuild,v 1.4 2004/08/10 08:49:13 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.4.ebuild,v 1.5 2004/08/23 21:57:36 zx Exp $
 
 DESCRIPTION="A Java-based template engine that allows easy creation/rendering of documents that format and present data."
 HOMEPAGE="http://jakarta.apache.org/velocity/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://apache/jakarta/velocity/binaries/velocity-${PV}/velocity-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="doc j2ee jikes junit"
 
 DEPEND=">=virtual/jdk-1.3.1"