5 files changed, 66 insertions, 66 deletions
diff --git a/libre/beanshell/PKGBUILD b/libre/beanshell/PKGBUILD
new file mode 100644
index 000000000..10004d2b1
--- /dev/null
+++ b/libre/beanshell/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer (Arch): AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+
+pkgname=beanshell
+_pkgname=bsh
+pkgver=2.0b6
+pkgrel=1.parabola1
+pkgdesc="Small, free, embeddable, source level Java interpreter with object based scripting language features written in Java"
+arch=('any')
+url="https://github.com/beanshell/beanshell"
+license=('Apache')
+depends=('java-runtime')
+provides=('bsh')
+replaces=('beanshell2')
+conflicts=('beanshell2')
+makedepends=('apache-ant' 'java-commons-bsf2' 'jh' 'tomcat7')
+source=("https://github.com/beanshell/beanshell/releases/download/$pkgver/bsh-$pkgver-src.zip")
+sha1sums=('76497846de1f3d2ef438d79e31328107658d10be')
+
+# beanshell2 fork is dead
+# http://stackoverflow.com/questions/26549307/current-state-of-beanshell
+# https://github.com/stain/beanshell2 - google code got removed and only this fork is left and outdated 
+# original url http://www.beanshell.org - unmaintained
+
+# Fedora and our only package making use of it use the follow up of the old beanshell:
+# https://github.com/beanshell/beanshell
+
+prepare() {
+  cd "$srcdir/BeanShell-$pkgver"
+  rm -v $(find . -name \*.jar)
+
+  ln -s /usr/share/java/tomcat7/servlet-api.jar lib/servlet.jar
+}
+
+build() {
+  cd "$srcdir/BeanShell-$pkgver"
+  ant dist
+}
+
+package() {
+  cd "$srcdir/BeanShell-$pkgver"
+
+  # Install license file
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # Install documentation
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  cp -r javadoc "$pkgdir/usr/share/doc/$pkgname"
+
+  # Install Maven artifact
+  export DESTDIR=$pkgdir
+  jh mvn-install org.apache-extras.beanshell bsh $pkgver \
+    "dist/${_pkgname}-$pkgver.pom" \
+    "dist/${_pkgname}-$pkgver.jar" \
+    "${_pkgname}-$pkgver.jar"
+
+  ln -s "/usr/share/java/${_pkgname}-$pkgver.jar" \
+    "$pkgdir/usr/share/java/${_pkgname}.jar"
+
+  # Install jars
+  for _jar in bsf classgen classpath commands core engine reflect util; do
+    install -Dm644 dist/${_pkgname}-${_jar}-$pkgver.jar \
+      "${pkgdir}/usr/share/java/${_pkgname}-${_jar}.jar"
+  done
+}
diff --git a/libre/beanshell2/PKGBUILD b/libre/beanshell2/PKGBUILD
deleted file mode 100644
index 2518448be..000000000
--- a/libre/beanshell2/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $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/beanshell2/bsh-desktop.sh b/libre/beanshell2/bsh-desktop.sh
deleted file mode 100755
index d95777877..000000000
--- a/libre/beanshell2/bsh-desktop.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec java -jar /usr/share/java/bsh.jar
diff --git a/libre/beanshell2/bsh-window.sh b/libre/beanshell2/bsh-window.sh
deleted file mode 100755
index 12f571bcc..000000000
--- a/libre/beanshell2/bsh-window.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-export CLASSPATH="/usr/share/java/bsh.jar${CLASSPATH:+:$CLASSPATH}"
-exec java bsh.util.AWTConsole
diff --git a/libre/beanshell2/bsh.sh b/libre/beanshell2/bsh.sh
deleted file mode 100755
index 70d30211d..000000000
--- a/libre/beanshell2/bsh.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-export CLASSPATH="/usr/share/java/bsh.jar${CLASSPATH:+:$CLASSPATH}"
-exec java bsh.Interpreter