Version bump, remove old

(Portage version: 2.2_rc23/cvs/Linux x86_64)

4 files changed, 12 insertions, 69 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/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
 }
+