version bump

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 63 insertions, 6 deletions

diff --git a/dev-lang/clojure/ChangeLog b/dev-lang/clojure/ChangeLog
index 71e7ac55f9a7..11823cf8c2c1 100644
--- a/dev-lang/clojure/ChangeLog
+++ b/dev-lang/clojure/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/clojure
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/clojure/ChangeLog,v 1.1 2010/07/20 16:29:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/clojure/ChangeLog,v 1.2 2010/08/20 07:16:36 mr_bones_ Exp $
+
+*clojure-1.2.0 (20 Aug 2010)
+
+  20 Aug 2010; Michael Sterrett <mr_bones_@gentoo.org> clojure-1.1.0.ebuild,
+  +clojure-1.2.0.ebuild:
+  version bump
 
 *clojure-1.1.0 (20 Jul 2010)
 
diff --git a/dev-lang/clojure/clojure-1.1.0.ebuild b/dev-lang/clojure/clojure-1.1.0.ebuild
index a91731e3be04..00d678c4e33d 100644
--- a/dev-lang/clojure/clojure-1.1.0.ebuild
+++ b/dev-lang/clojure/clojure-1.1.0.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/clojure/clojure-1.1.0.ebuild,v 1.1 2010/07/20 16:29:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/clojure/clojure-1.1.0.ebuild,v 1.2 2010/08/20 07:16:36 mr_bones_ Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="source test"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="Clojure is a dynamic programming language that targets the Java Virtual Machine."
+DESCRIPTION="Clojure is a dynamic programming language that targets the Java Virtual Machine"
 HOMEPAGE="http://clojure.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="EPL-1.0"
 SLOT="1.1"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="source"
 
 RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
+DEPEND=">=virtual/jdk-1.5"
 
 java_prepare() {
 	rm -v ${PN}.jar || die "Failed to remove compile jar."
diff --git a/dev-lang/clojure/clojure-1.2.0.ebuild b/dev-lang/clojure/clojure-1.2.0.ebuild
new file mode 100644
index 000000000000..0b35fc42dbf3
--- /dev/null
+++ b/dev-lang/clojure/clojure-1.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/clojure/clojure-1.2.0.ebuild,v 1.1 2010/08/20 07:16:36 mr_bones_ Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Clojure is a dynamic programming language that targets the Java Virtual Machine"
+HOMEPAGE="http://clojure.org/"
+SRC_URI="http://github.com/downloads/clojure/clojure/${P}.zip"
+
+LICENSE="EPL-1.0"
+SLOT="1.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="source"
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+java_prepare() {
+	rm -v ${PN}.jar || die "Failed to remove compile jar."
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar ${P/_/-}.jar
+	java-pkg_dolauncher  ${PN}-${SLOT} --main clojure.main
+	dodoc changes.txt readme.txt || die
+
+	if use source; then
+		local zip_name="${PN}-src.zip"
+		local zip_path="${T}/${zip_name}"
+		pushd src/jvm >/dev/null || die "Problem entering Java source directory"
+		zip -q -r ${zip_path} . -i '*.java'
+		popd >/dev/null
+		pushd src/clj >/dev/null || die "Problem entering Clojure source directory"
+		zip -q -r ${zip_path} . -i '*.clj'
+		popd >/dev/null
+
+		INSDESTTREE=${JAVA_PKG_SOURCESPATH} \
+			doins ${zip_path} || die "Failed to install source"
+
+		JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}"
+		java-pkg_do_write_
+	fi
+}