5 files changed, 58 insertions, 52 deletions
diff --git a/libre/beanshell/PKGBUILD b/libre/beanshell/PKGBUILD
deleted file mode 100644
index 80c947a96..000000000
--- a/libre/beanshell/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch:beanshell2): AndyRTR <andyrtr at archlinux.org>
-
-pkgname=beanshell
-pkgver=2.0b4
-pkgrel=3
-pkgdesc="Lightweight scripting for Java"
-url="http://www.beanshell.org/"
-license=('LGPL')
-
-arch=('any')
-depends=('java-runtime')
-makedepends=('apache-ant' 'java-commons-bsf2' 'javacc' 'tomcat7')
-source=("http://www.beanshell.org/bsh-${pkgver}-src.jar"
-        'bsh.sh'
-        'bsh-desktop.sh'
-        'bsh-window.sh')
-sha1sums=('69b36df249654a04e777ab899046c50b8cc844ac'
-          'dcf00fb8f445de72da1e77c42cc2d759291af5f1'
-          '4188603afd4834d73b91e5006ef2476a83954a04'
-          '5a125e0eb68d825d437f6c0c6a5d17afa2d76b93')
-
-prepare() {
-  cd "$srcdir"/BeanShell-$pkgver
-
-  rm lib/*.jar
-  ln -s /usr/share/java/bsf2.jar lib/
-  ln -s /usr/share/java/javacc.jar lib/
-  ln -s /usr/share/java/tomcat7/servlet-api.jar lib/servlet.jar
-}
-
-build() {
-  cd "$srcdir"/BeanShell-$pkgver
-  ant dist
-}
-
-check() {
-  cd "$srcdir"/BeanShell-$pkgver
-  ant test
-}
-
-package() {
-  cd "$srcdir"/BeanShell-$pkgver/dist
-  local artifact
-  for artifact in $(printf '%s\n' *.jar|sed 's/-[0-9b.]*\.jar$//'); do
-    install -Dm644 $artifact-$pkgver.jar "${pkgdir}"/usr/share/java/$artifact.jar
-  done
-  local exe
-  for exe in bsh bsh-desktop bsh-window; do
-    install -Dm755 "${srcdir}"/$exe.sh "${pkgdir}"/usr/bin/$exe
-  done
-}
diff --git a/libre/beanshell2/PKGBUILD b/libre/beanshell2/PKGBUILD
new file mode 100644
index 000000000..2518448be
--- /dev/null
+++ b/libre/beanshell2/PKGBUILD
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer (Arch): AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+
+pkgname=beanshell2
+pkgver=2.1.8
+pkgrel=1.parabola1
+pkgdesc="Small, free, embeddable, source level Java interpreter with object based scripting language features written in Java"
+arch=('any')
+url="https://code.google.com/p/beanshell2/"
+license=('LGPL')
+depends=('java-runtime')
+provides=('bsh' 'beanshell')
+conflicts=('beanshell')
+replaces=('beanshell')
+makedepends=('apache-ant' 'java-commons-bsf2' 'javacc' 'tomcat7')
+source=("https://beanshell2.googlecode.com/svn/branches/v2.1/downloads/bsh-${pkgver}-src.zip"
+        'bsh.sh'
+        'bsh-desktop.sh'
+        'bsh-window.sh')
+sha1sums=('c3d5f844316051ebba1f57c226a9b3466138d9d4'
+          'dcf00fb8f445de72da1e77c42cc2d759291af5f1'
+          '4188603afd4834d73b91e5006ef2476a83954a04'
+          '5a125e0eb68d825d437f6c0c6a5d17afa2d76b93')
+
+prepare() {
+  cd "${srcdir}/BeanShell2-${pkgver}"
+
+  rm -v lib/*.jar
+  rm -rv downloads
+  ln -s /usr/share/java/bsf2.jar lib/
+  ln -s /usr/share/java/javacc.jar lib/
+  ln -s /usr/share/java/tomcat7/servlet-api.jar lib/servlet.jar
+  sed -i 's/ 1\.8/ 1\.9/g' build.xml
+  sed -i 's/"1\.8/"1\.9/g' build.xml
+}
+
+build() {
+  cd "${srcdir}/BeanShell2-${pkgver}"
+  ant dist
+}
+
+check() {
+  cd "${srcdir}/BeanShell2-${pkgver}"
+  ant test
+}
+
+package() {
+  cd "${srcdir}/BeanShell2-${pkgver}/dist"
+  local artifact
+  for artifact in $(printf '%s\n' *.jar|sed 's/-[0-9b.]*\.jar$//'); do
+    install -Dm644 ${artifact}-${pkgver}.jar "${pkgdir}/usr/share/java/${artifact}.jar"
+  done
+  local exe
+  for exe in bsh bsh-desktop bsh-window; do
+    install -Dm755 "${srcdir}/${exe}.sh" "${pkgdir}/usr/bin/${exe}"
+  done
+}
diff --git a/libre/beanshell/bsh-desktop.sh b/libre/beanshell2/bsh-desktop.sh
index d95777877..d95777877 100755
--- a/libre/beanshell/bsh-desktop.sh
+++ b/libre/beanshell2/bsh-desktop.sh
diff --git a/libre/beanshell/bsh-window.sh b/libre/beanshell2/bsh-window.sh
index 12f571bcc..12f571bcc 100755
--- a/libre/beanshell/bsh-window.sh
+++ b/libre/beanshell2/bsh-window.sh
diff --git a/libre/beanshell/bsh.sh b/libre/beanshell2/bsh.sh
index 70d30211d..70d30211d 100755
--- a/libre/beanshell/bsh.sh
+++ b/libre/beanshell2/bsh.sh