dev-lisp/abcl: bump to version 0.12.0

5 files changed, 55 insertions, 134 deletions

diff --git a/dev-lisp/abcl/Manifest b/dev-lisp/abcl/Manifest
index adbdad36..d4210787 100644
--- a/dev-lisp/abcl/Manifest
+++ b/dev-lisp/abcl/Manifest
@@ -1,4 +1,4 @@
-DIST abcl-0.0.10.tar.gz 632987 RMD160 3ba587b45f75dc481dad62431c2557bd549acf89 SHA1 fafca12aaba83a67063fe673cc8370ec8b8eb39e SHA256 4139f38ba1a156f49f72f50e0621b2bbd421aa000c7da90ce27c54a1ed4d55f6
-EBUILD abcl-0.0.10.ebuild 1796 RMD160 afb1f43afb75a18443da7964f4342535c4081232 SHA1 204a7a43e39acd52391075c1737c85ee652a6c9c SHA256 a76429b921e256ccdf41be0e0f3ad6622ac5c60fda7334f8ebd3f4cb78dd05df
-EBUILD abcl-9999.ebuild 1984 RMD160 5c45d89179739abe5f4a533a8a652d83fbd2b242 SHA1 f0498063d1a1e6508e63e3ab4459a0c561a7270d SHA256 1f2e697c5e82aa0cfe4f8d6e10bb0294af109a403234ff47ec27796e3022e86e
-MISC metadata.xml 164 RMD160 5edb79931b874dc3a72128f0742b9d4c4eb3c8c1 SHA1 2f781e1fca36d790a027079805d56cf397e6a6f8 SHA256 f8efc9385015233c71f279f85bd0a327525b7136cf8714cc04449d8bea4ce22f
+DIST abcl-src-0.12.0.tar.gz 656652 RMD160 4039a7156e24cc5fcee7725882b2e3025cb88af8 SHA1 a89e49b40a6dbfb4167245f76f5e9ab18c4d42d9 SHA256 94f9bf38902b1c9b9cb87606900ebdc5f2346e64f8ffdb35fe84cefbae3e9000
+EBUILD abcl-0.12.0.ebuild 824 RMD160 f0b92115a352308c8313c6795e4e8887a42ea45f SHA1 9512e472ffb6c27e64a24722dac837215853f8ea SHA256 30e172f25df6b1219c1147cbf0c7769615add209e6d294dde7fd418a6d575122
+EBUILD abcl-9999.ebuild 801 RMD160 4b2c0738eba53b0602b477aed3baffad50a42988 SHA1 22ff53a9fb9b08c3f43050445399902433ee3612 SHA256 6eb5a251785ff1158fa98158d3473fc19d5a38c3b24bf7f02af2961b6ef26356
+MISC metadata.xml 432 RMD160 e3d3aa6905272b7982526f4fe34c79298b22f480 SHA1 bf9215d56b2a8019f0b86e78cbdbf2e033a08272 SHA256 e0de2002a008addd1cadf351fffaac084e3ad30d47942c574e60afa5d48918b3
diff --git a/dev-lisp/abcl/abcl-0.0.10.ebuild b/dev-lisp/abcl/abcl-0.0.10.ebuild
deleted file mode 100644
index 078567e4..00000000
--- a/dev-lisp/abcl/abcl-0.0.10.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils java-utils-2
-
-DESCRIPTION="Armed Bear Common Lisp is a Common Lisp implementation for the JVM."
-HOMEPAGE="http://armedbear.org/abcl.html"
-SRC_URI="http://armedbear.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="jad clisp cmucl"
-
-RDEPEND=">=virtual/jdk-1.4
-	jad? ( dev-java/jad-bin )"
-DEPEND="${RDEPEND}
-	!cmucl? ( !clisp? ( dev-lisp/sbcl ) )
-	cmucl? ( dev-lisp/cmucl )
-	clisp? ( dev-lisp/clisp )"
-
-src_unpack() {
-	unpack ${A}
-	cat > "${S}"/customizations.lisp <<EOF
-(in-package #:build-abcl)
-(setf
-*javac-options* "-g"
-*jdk* "$(java-config --jdk-home)/"
-*java-compiler* "javac"
-*jar* "jar")
-EOF
-	echo ; einfo "Building with the following customizations.lisp:"
-	while read line; do einfo "${line}"; done < "${S}"/customizations.lisp
-	cat > "${S}"/build.lisp <<EOF
-(load "build-abcl")
-(funcall 'build-abcl:build-abcl :clean t :full t)
-#+sbcl (sb-ext:quit)
-#+clisp (ext:quit)
-#+cmu (ext:quit)
-EOF
-}
-
-src_compile() {
-	local lisp_compiler lisp_compiler_args
-	if use clisp; then
-		lisp_compiler="clisp"
-		lisp_compiler_args="-ansi build.lisp"
-	elif use cmucl; then
-		lisp_compiler="lisp"
-		lisp_compiler_args="-noinit -nositeinit -batch -load build.lisp"
-	else
-		lisp_compiler="sbcl"
-		lisp_compiler_args="--sysinit /dev/null --userinit /dev/null \
-							--disable-debugger --load build.lisp"
-	fi
-	${lisp_compiler} ${lisp_compiler_args} || die "Failed to compiled ABCL"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/abcl
-	doexe src/org/armedbear/lisp/libabcl.so
-	java-pkg_dojar abcl.jar
-	java-pkg_dolauncher "${PN}" \
-		--main "org.armedbear.lisp.Main" \
-		--java_args "-server -Xrs -Djava.library.path=/usr/$(get_libdir)/${PN}/"
-	dodoc README
-}
diff --git a/dev-lisp/abcl/abcl-0.12.0.ebuild b/dev-lisp/abcl/abcl-0.12.0.ebuild
new file mode 100644
index 00000000..38181609
--- /dev/null
+++ b/dev-lisp/abcl/abcl-0.12.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Armed Bear Common Lisp is a Common Lisp implementation for the JVM."
+HOMEPAGE="http://common-lisp.net/project/armedbear/"
+SRC_URI="mirror://sourceforge/armedbear-j/${PN}-src-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="jad"
+
+RDEPEND=">=virtual/jre-1.5
+	jad? ( dev-java/jad-bin )"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}"/${PN}-src-${PV}
+
+src_compile() {
+	eant abcl.compile || die "Can't compile ABCL"
+	eant abcl.jar || die "Can't make ABCL jar archive"
+}
+
+src_install() {
+	java-pkg_dojar dist/abcl.jar
+	java-pkg_dolauncher ${PN} --java_args "-server -Xrs" --main org.armedbear.lisp.Main
+	dodoc README || die "Can't install README"
+}
diff --git a/dev-lisp/abcl/abcl-9999.ebuild b/dev-lisp/abcl/abcl-9999.ebuild
index cfb8798a..fae4b64f 100644
--- a/dev-lisp/abcl/abcl-9999.ebuild
+++ b/dev-lisp/abcl/abcl-9999.ebuild
@@ -2,78 +2,28 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-ECVS_SERVER="armedbear-j.cvs.sourceforge.net:/cvsroot/armedbear-j"
-if [ -z "${ECVS_BRANCH}" ]; then
-	ECVS_BRANCH="HEAD"
-fi
-ECVS_MODULE="j"
-ECVS_USER="anonymous"
-ECVS_PASS=""
-ECVS_CVS_OPTIONS="-dP"
-
-inherit eutils java-utils-2 cvs
+inherit eutils subversion java-pkg-2 java-ant-2
 
 DESCRIPTION="Armed Bear Common Lisp is a Common Lisp implementation for the JVM."
-HOMEPAGE="http://armedbear.org/abcl.html"
+HOMEPAGE="http://common-lisp.net/project/armedbear/"
+ESVN_REPO_URI="svn://common-lisp.net/project/armedbear/svn/trunk/j"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="jad clisp cmucl"
+IUSE="jad"
 
-RDEPEND=">=virtual/jdk-1.4
+RDEPEND=">=virtual/jre-1.5
 	jad? ( dev-java/jad-bin )"
-DEPEND="${RDEPEND}
-	!cmucl? ( !clisp? ( dev-lisp/sbcl ) )
-	cmucl? ( dev-lisp/cmucl )
-	clisp? ( dev-lisp/clisp )"
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-src_unpack() {
-	cvs_src_unpack
-
-	cat > "${S}"/customizations.lisp <<EOF
-(in-package #:build-abcl)
-(setf
-*javac-options* "-g"
-*jdk* "$(java-config --jdk-home)/"
-*java-compiler* "javac"
-*jar* "jar")
-EOF
-	echo ; einfo "Building with the following customizations.lisp:"
-	while read line; do einfo "${line}"; done < "${S}"/customizations.lisp
-	cat > "${S}"/build.lisp <<EOF
-(load "build-abcl")
-(funcall 'build-abcl:build-abcl :clean t :full t)
-#+sbcl (sb-ext:quit)
-#+clisp (ext:quit)
-#+cmu (ext:quit)
-EOF
-}
+DEPEND=">=virtual/jdk-1.5"
 
 src_compile() {
-	local lisp_compiler lisp_compiler_args
-	if use clisp; then
-		lisp_compiler="clisp"
-		lisp_compiler_args="-ansi build.lisp"
-	elif use cmucl; then
-		lisp_compiler="lisp"
-		lisp_compiler_args="-noinit -nositeinit -batch -load build.lisp"
-	else
-		lisp_compiler="sbcl"
-		lisp_compiler_args="--sysinit /dev/null --userinit /dev/null \
-							--disable-debugger --load build.lisp"
-	fi
-	${lisp_compiler} ${lisp_compiler_args} || die "Failed to compiled ABCL"
+	eant abcl.compile || die "Can't compile ABCL"
+	eant abcl.jar || die "Can't make ABCL jar archive"
 }
 
 src_install() {
-	exeinto /usr/$(get_libdir)/abcl
-	doexe src/org/armedbear/lisp/libabcl.so
-	java-pkg_dojar abcl.jar
-	java-pkg_dolauncher "${PN}" \
-		--main "org.armedbear.lisp.Main" \
-		--java_args "-server -Xrs -Djava.library.path=/usr/$(get_libdir)/${PN}/"
-	dodoc README
+	java-pkg_dojar dist/abcl.jar
+	java-pkg_dolauncher ${PN} --java_args "-server -Xrs" --main org.armedbear.lisp.Main
+	dodoc README || die "Can't install README"
 }
diff --git a/dev-lisp/abcl/metadata.xml b/dev-lisp/abcl/metadata.xml
index f418045b..84e0e03a 100644
--- a/dev-lisp/abcl/metadata.xml
+++ b/dev-lisp/abcl/metadata.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>common-lisp</herd>
+	<herd>common-lisp</herd>
+	<herd>java</herd>
+	<longdescription>
+		Armed Bear Common Lisp (ABCL) is an implementation of ANSI Common
+		Lisp that runs in a Java virtual machine.
+	</longdescription>
+	<use>
+	<flag name='jad'>Enable support for disassembling compiled code using JAD</flag>
+	</use>
 </pkgmetadata>