Version Bump.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 140 insertions, 2 deletions

diff --git a/dev-java/sat4j-core/ChangeLog b/dev-java/sat4j-core/ChangeLog
index 04aede6f6c68..24d721d8921a 100644
--- a/dev-java/sat4j-core/ChangeLog
+++ b/dev-java/sat4j-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sat4j-core
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-core/ChangeLog,v 1.2 2010/03/20 13:50:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-core/ChangeLog,v 1.3 2010/04/05 07:29:10 ali_bush Exp $
+
+*sat4j-core-2.1.1 (05 Apr 2010)
+
+  05 Apr 2010; Alistair Bush <ali_bush@gentoo.org> +sat4j-core-2.1.1.ebuild:
+  Version Bump.
 
   20 Mar 2010; Pacho Ramos <pacho@gentoo.org> sat4j-core-2.1.ebuild:
   amd64 stable, bug 310181
diff --git a/dev-java/sat4j-core/sat4j-core-2.1.1.ebuild b/dev-java/sat4j-core/sat4j-core-2.1.1.ebuild
new file mode 100644
index 000000000000..6b1a5786d843
--- /dev/null
+++ b/dev-java/sat4j-core/sat4j-core-2.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-core/sat4j-core-2.1.1.ebuild,v 1.1 2010/04/05 07:29:10 ali_bush Exp $
+
+EAPI="2"
+
+MY_PN="org.${PN//-/.}"
+MY_PV="20090826"
+BUILD_PV="2.4"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lightweight constraint programming with a SAT solver"
+HOMEPAGE="http://www.sat4j.org/"
+SRC_URI="http://download.forge.objectweb.org/sat4j/${PN}-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=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${PN}-v${MY_PV}.zip
+}
+
+java_prepare() {
+	mkdir -p core/{lib,src} || die
+
+	# Don't complain about missing javadoc stylesheet.
+	touch core/lib/stylesheet.css
+
+	# Grab build.xml. Don't fetch from CVS.
+	sed 's/depends="prepare,getsource"/depends="prepare"/g' \
+		"${DISTDIR}/${P}-build.xml" > build.xml || die
+
+	# Unpack manifest.
+	cd core || die
+	jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
+
+	# Unpack sources.
+	cd src || die
+	jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
+}
+
+EANT_BUILD_TARGET="core"
+EANT_DOC_TARGET="javadoc -Dmodule=core -Dlib=core/lib"
+
+src_install() {
+	java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
+	use doc && java-pkg_dojavadoc api/core
+	use source && java-pkg_dosrc core/src/org
+}
diff --git a/dev-java/sat4j-pseudo/ChangeLog b/dev-java/sat4j-pseudo/ChangeLog
index c0180c129656..7f8dc9c7e1d4 100644
--- a/dev-java/sat4j-pseudo/ChangeLog
+++ b/dev-java/sat4j-pseudo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2010/03/20 13:52:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-pseudo/ChangeLog,v 1.3 2010/04/05 07:32:47 ali_bush Exp $
+
+*sat4j-pseudo-2.1.1 (05 Apr 2010)
+
+  05 Apr 2010; Alistair Bush <ali_bush@gentoo.org>
+  +sat4j-pseudo-2.1.1.ebuild:
+  Version Bump
 
   20 Mar 2010; Pacho Ramos <pacho@gentoo.org> sat4j-pseudo-2.1.ebuild:
   amd64 stable, bug 310181
diff --git a/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.1.ebuild b/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.1.ebuild
new file mode 100644
index 000000000000..ecfb46685f26
--- /dev/null
+++ b/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.1.ebuild
@@ -0,0 +1,69 @@
+# 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.1 2010/04/05 07:32:47 ali_bush 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
+}