Version bump, remove old

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 15 insertions, 75 deletions

diff --git a/dev-java/lzmajio/ChangeLog b/dev-java/lzmajio/ChangeLog
index a46579204863..47ddb9655359 100644
--- a/dev-java/lzmajio/ChangeLog
+++ b/dev-java/lzmajio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/lzmajio
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lzmajio/ChangeLog,v 1.2 2009/01/22 18:17:14 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lzmajio/ChangeLog,v 1.3 2009/01/26 18:54:49 tommy Exp $
+
+*lzmajio-0.94 (26 Jan 2009)
+
+  26 Jan 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> -files/build.xml,
+  -lzmajio-0.92.ebuild, -lzmajio-0.93.ebuild, +lzmajio-0.94.ebuild:
+  Version bump, remove old
 
 *lzmajio-0.93 (22 Jan 2009)
 
diff --git a/dev-java/lzmajio/Manifest b/dev-java/lzmajio/Manifest
index 9baf712313da..593346100b9c 100644
--- a/dev-java/lzmajio/Manifest
+++ b/dev-java/lzmajio/Manifest
@@ -1,7 +1,4 @@
-AUX build.xml 589 RMD160 30737bc2b0e01deee647d6e98484bba7845b2d7c SHA1 54822d326c04e828e1b5fd919a70f67b1d38ffdd SHA256 1955f09138bff43ee05cc327ce944151c8adab4ec9ffbc1c76693905132d5494
-DIST lzmajio-0.92.tar.gz 20015 RMD160 f7616700b78b5be846eba6304524bd3cdf45ce6b SHA1 3dc1a185545bcaeaad7d79ad62e1f566a22f6beb SHA256 1908025005fbb0771910823e894db44a0b5a97df764d6809e8d90c63244fd2fc
-DIST lzmajio-0.93.tar.gz 20016 RMD160 80348cc3d0f360c81e495ce626eaf30b69ac65ee SHA1 312d7e908cd350587e691eef6a6501614b6eb014 SHA256 f87d969e3e039763017ef74de2617a0f2477bcd4d754a123c5a1008267a0f049
-EBUILD lzmajio-0.92.ebuild 972 RMD160 18311e0da7392ce0b550d88d6788b0cacffea813 SHA1 e662a4a131b11b69b909b026feaf0ccbbccb631e SHA256 d5be2177918392dbec340aaf3d9c550eb2b70b0ca461e29497efe489533695da
-EBUILD lzmajio-0.93.ebuild 968 RMD160 7fb5f347da9518abd3e67bf6b4833d1934391a16 SHA1 7c471589a5a1b3880346be7817fa4614a0385f48 SHA256 952a6a471ed719a53454a4a4372f4e83649f81960319ae820c9d6947541ade21
-MISC ChangeLog 498 RMD160 72feaf93e5a4f1a06b024a83a98db93d37ea3d54 SHA1 1d30e41022bd834553d150f67cd16302a9f71ff4 SHA256 15940a055b639506f4a38404909300a12f01e740c421c6cc42de9a521b0e3a00
+DIST lzmajio-0.94.tar.gz 19978 RMD160 dafb75eefb7e1874b00563368690ca608a12ce0c SHA1 4686bd733b829a2db7efc85fe9a055bb6fa81422 SHA256 4cad0556ac3ecf51031fba73f3413972c4189f365bd260bd1e549cfb247f6c14
+EBUILD lzmajio-0.94.ebuild 905 RMD160 2230a884dffdf9b4cba2e5fa136fe5b9bcc5feb5 SHA1 e6737cd0a64edddf11af51029bb0bade6d1c86d9 SHA256 21aa4d76353c8107eef206ae389cebc41ee1620c86a1a53f4436c8450b93f15d
+MISC ChangeLog 700 RMD160 6405ac4ad4fcc3650923bd65f5bd816e37671bad SHA1 77ca8ad727cb7757e74383fcb036364eff8c70c2 SHA256 f00abce2512ec44018aadcb59fe3ba03eeb007d41d684687c9a0d0039e2db63c
 MISC metadata.xml 262 RMD160 beccaa043c2480f3afbd62f89a4c8ba55ef725f8 SHA1 c05367066b98af14b7089a2122ac09a3fa109281 SHA256 5a48177bba82f308c835efee09c4f2da15fe97eb7bf5a9a9950940dd1b7c95a5
diff --git a/dev-java/lzmajio/files/build.xml b/dev-java/lzmajio/files/build.xml
deleted file mode 100644
index 32b24cbec5cc..000000000000
--- a/dev-java/lzmajio/files/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="lzmajio" default="jar" basedir=".">
-	<target name="init">
-		<mkdir dir="build"/>
-		<mkdir dir="docs"/>
-	</target>
-	<target name="compile" depends="init">
-		<javac srcdir="." destdir="build" classpath="${gentoo.classpath}"/>
-	</target>
-
-	<target name="jar" depends="compile">
-		<jar jarfile="lzmajio.jar" basedir="build"/>
-	</target>
-
-	<target name="javadoc" depends="init">
-		<javadoc destdir="docs" classpath="${gentoo.classpath}">
-			<fileset dir=".">
-				<include name="**/*.java"/>
-			</fileset>
-		</javadoc>
-	</target>
-</project>
diff --git a/dev-java/lzmajio/lzmajio-0.92.ebuild b/dev-java/lzmajio/lzmajio-0.92.ebuild
deleted file mode 100644
index 68e9200edd80..000000000000
--- a/dev-java/lzmajio/lzmajio-0.92.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lzmajio/lzmajio-0.92.ebuild,v 1.2 2009/01/22 05:45:04 mr_bones_ Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Implementations of LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders"
-HOMEPAGE="http://contrapunctus.net/league/haques/lzmajio/"
-SRC_URI="http://comsci.liu.edu/~league/dist/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEP="<=dev-java/lzma-4.60"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-EANT_GENTOO_CLASSPATH="lzma"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	java-pkg_jar-from lzma
-	cp "${FILESDIR}"/build.xml . || die
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc lzmajio
-}
diff --git a/dev-java/lzmajio/lzmajio-0.93.ebuild b/dev-java/lzmajio/lzmajio-0.94.ebuild
index 1d5a1f40c370..df280a01fee2 100644
--- a/dev-java/lzmajio/lzmajio-0.93.ebuild
+++ b/dev-java/lzmajio/lzmajio-0.94.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lzmajio/lzmajio-0.93.ebuild,v 1.1 2009/01/22 18:17:14 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lzmajio/lzmajio-0.94.ebuild,v 1.1 2009/01/26 18:54:49 tommy Exp $
 
 JAVA_PKG_IUSE="doc source"
+EAPI=2
 
 inherit java-pkg-2 java-ant-2
 
@@ -26,15 +27,13 @@ DEPEND=">=virtual/jdk-1.5
 
 EANT_GENTOO_CLASSPATH="lzma"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
+src_prepare() {
 	java-pkg_jar-from lzma
-	cp "${FILESDIR}"/build.xml . || die
 }
 
 src_install() {
 	java-pkg_dojar ${PN}.jar
 	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc lzmajio
+	use source && java-pkg_dosrc net
 }
+