4 files changed, 59 insertions, 41 deletions
diff --git a/packages/dev-lang/clojure/clojure-1.3.0.exheres-0 b/packages/dev-lang/clojure/clojure-1.3.0.exheres-0
new file mode 100644
index 0000000..af4703b
--- /dev/null
+++ b/packages/dev-lang/clojure/clojure-1.3.0.exheres-0
@@ -0,0 +1,10 @@
+# Copyright 2012 Guillermo Ramos
+# Distributed under the terms of the GNU General Public License v2
+
+MY_MAGIC=6375f36
+
+require clojure
+
+PLATFORMS="amd64 x86"
+SLOT="1.3"
+
diff --git a/packages/dev-lang/clojure/clojure-1.4.0.exheres-0 b/packages/dev-lang/clojure/clojure-1.4.0.exheres-0
index 73feb86..8f6b2db 100644
--- a/packages/dev-lang/clojure/clojure-1.4.0.exheres-0
+++ b/packages/dev-lang/clojure/clojure-1.4.0.exheres-0
@@ -1,46 +1,10 @@
 # Copyright 2012 Guillermo Ramos
 # Distributed under the terms of the GNU General Public License v2
-# Based in part upon 'clojure-1.4.0.ebuild' from Gentoo, which is:
-#     Copyright 1999-2012 Gentoo Foundation
 
-require alternatives ant
+MY_MAGIC=8306949
 
-SUMMARY="Clojure is a dynamic programming language that targets the Java Virtual Machine"
-HOMEPAGE="http://clojure.org/"
-DOWNLOADS="https://github.com/clojure/clojure/tarball/${PNV} -> ${PNV}.tar.gz"
+require clojure
 
-LICENCES="EPL-1.0"
 PLATFORMS="amd64 x86"
 SLOT="1.4"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build:
-        virtual/jdk[>=1.5]
-    run:
-        virtual/jre[>=1.5]
-"
-
-WORK=${WORKBASE}/clojure-clojure-8306949
-SHORT_PNV=${PN}-${SLOT}
-
-ANT_SRC_COMPILE_PARAMS=( jar )
-ANT_SRC_TEST_PARAMS=( test )
-
-src_prepare() { :; }
-
-src_install() {
-    edo mv ${PNV}.jar ${PN}.jar
-
-    insinto /usr/share/${SHORT_PNV}
-    doins ${PN}.jar
-
-    exeinto /usr/bin/
-    doexe ${FILES}/${SHORT_PNV}
-
-    alternatives_for ${PN} ${SLOT} 0 \
-        "/usr/bin/${PN}" "${SHORT_PNV}"
-
-    dodoc changes.md readme.txt
-}
 
diff --git a/packages/dev-lang/clojure/clojure.exlib b/packages/dev-lang/clojure/clojure.exlib
new file mode 100644
index 0000000..6c9ec58
--- /dev/null
+++ b/packages/dev-lang/clojure/clojure.exlib
@@ -0,0 +1,47 @@
+# Copyright 2012 Guillermo Ramos
+# Distributed under the terms of the GNU General Public License v2
+# Based in part upon 'clojure-1.4.0.ebuild' from Gentoo, which is:
+#     Copyright 1999-2012 Gentoo Foundation
+
+require alternatives ant
+
+SUMMARY="Clojure is a dynamic programming language that targets the Java Virtual Machine"
+HOMEPAGE="http://clojure.org/"
+DOWNLOADS="https://github.com/clojure/clojure/tarball/${PNV} -> ${PNV}.tar.gz"
+
+LICENCES="EPL-1.0"
+MYOPTIONS=""
+
+DEPENDENCIES="
+    build:
+        virtual/jdk[>=1.5]
+    run:
+        virtual/jre[>=1.5]
+"
+
+PNS=${PN}-${SLOT}
+WORK=${WORKBASE}/clojure-clojure-${MY_MAGIC}
+
+ANT_SRC_COMPILE_PARAMS=( jar )
+ANT_SRC_TEST_PARAMS=( test )
+
+src_prepare() { :; }
+
+src_install() {
+    edo mv ${PNV}.jar ${PN}.jar
+    insinto /usr/share/${PNS}
+    doins ${PN}.jar
+
+    cat >${PNS} <<EOF
+#!/bin/sh
+java -cp /usr/share/${PNS}/clojure.jar clojure.main "\$@"
+EOF
+    exeinto /usr/bin/
+    doexe ${PNS}
+
+    alternatives_for ${PN} ${SLOT} 0 \
+        "/usr/bin/${PN}" "${PNS}"
+
+    emagicdocs
+}
+
diff --git a/packages/dev-lang/clojure/files/clojure-1.4 b/packages/dev-lang/clojure/files/clojure-1.4
deleted file mode 100644
index 43d178b..0000000
--- a/packages/dev-lang/clojure/files/clojure-1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-java -cp /usr/share/clojure-1.4/clojure.jar clojure.main "$@"