3 files changed, 5 insertions, 139 deletions
diff --git a/dev-java/sat4j-pseudo/ChangeLog b/dev-java/sat4j-pseudo/ChangeLog
index 3e354b0c713f..91a6261066b8 100644
--- a/dev-java/sat4j-pseudo/ChangeLog
+++ b/dev-java/sat4j-pseudo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sat4j-pseudo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-pseudo/ChangeLog,v 1.9 2010/09/21 20:08:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-pseudo/ChangeLog,v 1.10 2010/10/17 12:32:35 caster Exp $
+
+  17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -sat4j-pseudo-2.1.ebuild,
+  -sat4j-pseudo-2.1.1.ebuild:
+  Remove old.
 
   21 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
   sat4j-pseudo-2.2.0.ebuild:
diff --git a/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.1.ebuild b/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.1.ebuild
deleted file mode 100644
index 032af8aa16b3..000000000000
--- a/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.1.ebuild,v 1.3 2010/06/25 22:24:23 angelos Exp $
-
-EAPI="2"
-
-MY_PN="org.sat4j.pb"
-MY_PV="20090826"
-BUILD_PV="2.4"
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Pseudo Boolean solvers"
-HOMEPAGE="http://www.sat4j.org/"
-SRC_URI="http://download.forge.objectweb.org/sat4j/sat4j-pb-v${MY_PV}.zip
-	http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-java/sat4j-core:2"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack sat4j-pb-v${MY_PV}.zip
-}
-
-java_prepare() {
-	mkdir -p {core,pb}/{lib,src} || die
-
-	# Don't complain about missing javadoc stylesheet.
-	touch core/lib/stylesheet.css
-
-	# Grab build.xml. Don't fetch from CVS. Don't build core.
-	sed -e 's/depends="core"//g' \
-		-e 's/depends="prepare,getsource"/depends="prepare"/g' \
-		"${DISTDIR}/${P}-build.xml" > build.xml || die
-
-	# This is the version identifier used for custom builds.
-	echo 'CUSTOM' > core/src/sat4j.version || die
-
-	# Unpack manifest.
-	cd pb || die
-	jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
-
-	# Unpack sources.
-	cd src || die
-	jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_TARGET="pseudo"
-EANT_GENTOO_CLASSPATH="sat4j-core-2"
-EANT_DOC_TARGET="javadoc -Dmodule=pb -Dlib=pb/lib"
-
-src_install() {
-	java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
-	use doc && java-pkg_dojavadoc api/pb
-	use source && java-pkg_dosrc pb/src/org
-}
diff --git a/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.ebuild b/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.ebuild
deleted file mode 100644
index 03dfcb19965a..000000000000
--- a/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.ebuild,v 1.3 2010/04/13 11:59:41 fauli Exp $
-
-EAPI="2"
-
-MY_PN="org.sat4j.pb"
-MY_PV="20090520"
-BUILD_PV="2.4"
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Pseudo Boolean solvers"
-HOMEPAGE="http://www.sat4j.org/"
-SRC_URI="http://download.forge.objectweb.org/sat4j/sat4j-pb-v${MY_PV}.zip
-	http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-java/sat4j-core:2"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack sat4j-pb-v${MY_PV}.zip
-}
-
-java_prepare() {
-	mkdir -p {core,pb}/{lib,src} || die
-
-	# Don't complain about missing javadoc stylesheet.
-	touch core/lib/stylesheet.css
-
-	# Grab build.xml. Don't fetch from CVS. Don't build core.
-	sed -e 's/depends="core"//g' \
-		-e 's/depends="prepare,getsource"/depends="prepare"/g' \
-		"${DISTDIR}/${P}-build.xml" > build.xml || die
-
-	# This is the version identifier used for custom builds.
-	echo 'CUSTOM' > core/src/sat4j.version || die
-
-	# Unpack manifest.
-	cd pb || die
-	jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
-
-	# Unpack sources.
-	cd src || die
-	jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_TARGET="pseudo"
-EANT_GENTOO_CLASSPATH="sat4j-core-2"
-EANT_DOC_TARGET="javadoc -Dmodule=pb -Dlib=pb/lib"
-
-src_install() {
-	java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
-	use doc && java-pkg_dojavadoc api/pb
-	use source && java-pkg_dosrc pb/src/org
-}