version bump

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

4 files changed, 67 insertions, 8 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/Manifest b/dev-lang/clojure/Manifest
index 9b65438a9e6c..bca374c4df30 100644
--- a/dev-lang/clojure/Manifest
+++ b/dev-lang/clojure/Manifest
@@ -1,4 +1,6 @@
 DIST clojure-1.1.0.tar.bz2 1968209 RMD160 0ad97bb2711cd861dac86d671417c7a7c6348991 SHA1 6e082d9f8b7e0ee3c32533e19de908251e591643 SHA256 409b5f0275cdf76a893f4bcf5a0ffa3c2759a685d054a759beb4315688cdee0c
-EBUILD clojure-1.1.0.ebuild 1373 RMD160 138e9f36ffb7a014c739ab3ee7a0699002173f9a SHA1 6e78af1244401e6202f17585c4aec7eb371ab85f SHA256 203646b95808acf7a2f4873b948e14dc54f83be2d6396ec7657ee2ac9add322d
-MISC ChangeLog 410 RMD160 2495ecb64c5bbc2108271061ca9713c90156394f SHA1 f66cd8c27a0fb593ffecac5e388aa7bfee9012b6 SHA256 77132ea6a77df46dde332a45d9457d3c7af0336b9b501c00e8b5faf64192ab86
+DIST clojure-1.2.0.zip 3586231 RMD160 80a87879beb0dcd6751ec4f6800cde1eca41d7b6 SHA1 4b0cf4d5d31816c1b7a616f4b74b136b62bd4e35 SHA256 1334773cb13793bdc0588de0fe5b5aec602bb98ca84858d7374b4e063864d207
+EBUILD clojure-1.1.0.ebuild 1362 RMD160 0ea878729aeb5d53a49597509311d3b49874ed13 SHA1 69da02f02ee3e745f9705fb03308dab0bbded043 SHA256 4ac3b5a6fcc614f31e6e407e6d04f9ff9decc3ec0fe0df14050f154e9191735b
+EBUILD clojure-1.2.0.ebuild 1402 RMD160 450086609304e22316c4cfab4334d880a47f2e27 SHA1 5bf8173ebbce04ab42d660dbc6c8c4b2b528cbf7 SHA256 8323efeeceafd112af892b39a39eabf9cab683f4d83792a8ab462e9a11bd2024
+MISC ChangeLog 558 RMD160 d5563df7fa3df745760b8afd79ad6dd460032cdb SHA1 8c309deb84688722d6aef02b891eb2546311d886 SHA256 d3ba4678de2a1ccd59e077c58139b5cf70daadeaf0fbe43c9b6abb546ec71907
 MISC metadata.xml 260 RMD160 8baa9b09c924c0a9b39c5bfbd9bc9e72419d79b9 SHA1 281c84d058ad6da3eb68ea3487d427deb423e716 SHA256 94245d5d4f4b6da05d002c1ce323efcf35d398e516069e27f994e3d75bee0352
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
+}