Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

13 files changed, 174 insertions, 41 deletions

diff --git a/java/apache-ant/PKGBUILD b/java/apache-ant/PKGBUILD
index 9f9c77c28..dfda3c28d 100644
--- a/java/apache-ant/PKGBUILD
+++ b/java/apache-ant/PKGBUILD
@@ -12,9 +12,10 @@ provides=("apache-ant-libre=$pkgver")
 replaces=("apache-ant-libre")
 conflicts=("apache-ant-libre")
 
-pkgrel=2
+pkgrel=3
 arch=('any')
 depends=('java-environment')
+makedepends=('jh')
 
 _mirror=http://archive.apache.org/dist
 source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2
@@ -98,9 +99,18 @@ package() {
   install -d "${pkgdir}"/usr/share/doc/${pkgname}
   install -d "${pkgdir}"/usr/share/licenses/${pkgname}
 
+  cd "${pkgdir}"/${ANT_HOME}/lib
+  for pom in *.pom; do
+    a=${pom%.pom}
+    base=$(jh mvn-basename org.apache.ant $a $pkgver)
+    install -d "${pkgdir}${base%/*}"
+    ln -sf ${ANT_HOME}/lib/$a.pom "${pkgdir}${base}".pom
+    ln -sf ${ANT_HOME}/lib/$a.jar "${pkgdir}${base}".jar
+  done
+
   cd "${pkgdir}"/${ANT_HOME}
   for prog in bin/*; do
-      ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin
+    ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin
   done
   ln -sf ${ANT_HOME}/{README,WHATSNEW} "${pkgdir}"/usr/share/doc/${pkgname}
   ln -sf ${ANT_HOME}/docs "${pkgdir}"/usr/share/doc/${pkgname}/html
diff --git a/java/beanshell/PKGBUILD b/java/beanshell/PKGBUILD
new file mode 100644
index 000000000..95b14d379
--- /dev/null
+++ b/java/beanshell/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): AndyRTR <andyrtr at archlinux.org>
+
+pkgname=beanshell
+pkgver=2.0b4
+pkgrel=2.1
+pkgdesc="Lightweight scripting for Java"
+url="http://www.beanshell.org/"
+license=('LGPL')
+
+provides=('bsh')
+
+arch=('any')
+depends=('java-runtime')
+makedepends=('apache-ant' 'java-commons-bsf2' 'javacc' 'java-servlet3.0-tomcat')
+source=("http://www.beanshell.org/bsh-${pkgver}-src.jar")
+
+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/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
+  install -d "${pkgdir}"/usr/share/java/
+  for artifact in $(printf '%s\n' *.jar|sed 's/-[0-9b.]*\.jar$//'); do
+    install -m644 $artifact-$pkgver.jar "${pkgdir}"/usr/share/java/$artifact.jar
+  done
+}
+
+sha1sums=('69b36df249654a04e777ab899046c50b8cc844ac')
diff --git a/java/java-commons-bsf/PKGBUILD b/java/java-commons-bsf2/PKGBUILD
index 57a9dfc1a..57a9dfc1a 100644
--- a/java/java-commons-bsf/PKGBUILD
+++ b/java/java-commons-bsf2/PKGBUILD
diff --git a/java/java-jarjar/PKGBUILD b/java/java-jarjar/PKGBUILD
index 8d1d1120b..c78d5539e 100644
--- a/java/java-jarjar/PKGBUILD
+++ b/java/java-jarjar/PKGBUILD
@@ -9,30 +9,28 @@ pkgver=1.2
 _pkgrev=132 # v1.2 wasn't tagged, but this is clearly it
 pkgdesc="Java static linker (instead of the normal dynamic linking)"
 url="https://code.google.com/p/jarjar/"
-license=('Apache2')
+license=('Apache')
 
-pkgrel=1
+pkgrel=2
 arch=('any')
 depends=('java-runtime')
-makedepends=('apache-ant' 'java-asm3' 'junit' 'maven' 'jh')
-source=("svn+http://jarjar.googlecode.com/svn/trunk/jarjar#revision=$_pkgrev")
+makedepends=('apache-ant' 'java-asm3' 'junit' 'maven')
 
+source=("libre://${_pkgname}-${pkgver}.tar.gz")
+mksource=("${_pkgname}-${pkgver}::svn+http://jarjar.googlecode.com/svn/trunk/jarjar#revision=$_pkgrev")
 mksource() {
-  cd "$srcdir/$_pkgname"
-  rm -f src/test/*.{class,jar}
+  cd "$srcdir/$_pkgname-$pkgver"
   rm -f lib/*.jar
 }
 
 build() {
-  cd "$srcdir/$_pkgname"
-  eval `jh mksource`
+  cd "$srcdir/$_pkgname-$pkgver"
 
-  ln -s /usr/share/java/asm-3.jar             lib/asm-3.3.1.jar
-  ln -s /usr/share/java/asm-commons-3.jar     lib/asm-commons-3.3.1.jar
-  ln -s /usr/share/java/junit.jar             lib/junit-4.8.1.jar
-  ln -s /opt/maven/lib/maven-plugin-api-*.jar lib/maven-plugin-api.jar
-
-  ln -s /opt/apache-ant/lib/ant.jar lib/
+  ln -sf /usr/share/java/asm-3.jar             lib/asm-3.3.1.jar
+  ln -sf /usr/share/java/asm-commons-3.jar     lib/asm-commons-3.3.1.jar
+  ln -sf /usr/share/java/junit.jar             lib/junit-4.8.1.jar
+  ln -sf /opt/maven/lib/maven-plugin-api-*.jar lib/maven-plugin-api.jar
+  ln -sf /opt/apache-ant/lib/ant.jar           lib/ant.jar
 
   export CLASSPATH=/usr/share/java/asm-3.jar
   echo 'includeantruntime false' > build.properties
@@ -40,10 +38,11 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
+  cd "$srcdir/$_pkgname-$pkgver"
   install -d "$pkgdir/usr/share/java/$_pkgname"
   install -D "dist/$_pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$_pkgname"
   ln -s "$_pkgname/$_pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$_pkgname.jar"
 }
 
-md5sums=('SKIP')
+mkmd5sums=('SKIP')
+md5sums=('cc2698a58f93cdb22c51f039a1b8a56e')
diff --git a/java/java-rxtx/PKGBUILD b/java/java-rxtx/PKGBUILD
index 4fcabe2a4..ceb0d9bab 100644
--- a/java/java-rxtx/PKGBUILD
+++ b/java/java-rxtx/PKGBUILD
@@ -10,16 +10,18 @@ pkgver=${_pkgver//-/.}
 pkgdesc="A native library providing serial and parallel communication for Java"
 license=(LGPL2.1)
 
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 depends=('java-runtime')
-makedepends=('java-environment' 'pacman>4.0.3')
+makedepends=('java-environment')
 
 case "$_pkgver" in
     *arduino*)
 	url="https://github.com/arduino/RXTX"
-	source=("git://github.com/arduino/RXTX.git#${_gitver}")
-	md5sums=('SKIP')
+	source=("libre://RXTX-$pkgver.tar.gz")
+	md5sums=('a71156587dc8d28d1ff4ece376bc0140')
+	mksource=("git://github.com/arduino/RXTX.git#${_gitver}")
+	mkmd5sums=('SKIP')
 	_dirname=RXTX
 	;;
     *)
diff --git a/java/java-sonatype-oss-parent/PKGBUILD b/java/java-sonatype-oss-parent/PKGBUILD
index f42f6adc5..b62c971ac 100644
--- a/java/java-sonatype-oss-parent/PKGBUILD
+++ b/java/java-sonatype-oss-parent/PKGBUILD
@@ -5,23 +5,17 @@ pkgver=7
 pkgdesc="Metadata file for Maven-based build systems to inherit from"
 license='Apache2'
 
-_groupId=org/sonatype/oss
+_groupId=org.sonatype.oss
 _artifactId=oss-parent
 
 pkgrel=1
 arch=('any')
-depends=('maven')
-makedepends=('java-sonatype-oss-parent=7' 'jh')
+makedepends=('jh')
 source=("http://search.maven.org/remotecontent?filepath=$_groupId/$_artifactId/$pkgver/$_artifactId-$pkgver.pom")
 
-build() {
-  :
-}
-
 package() {
   cd "$srcdir"
-  install -Dm644 $_artifactId-$pkgver.pom \
-      "$pkgdir/`jh mvn-basename $_groupId $_artifactId $pkgver`".pom
+  DESTDIR=$pkgdir jh mvn-install $_groupId $_artifactId $pkgver $_artifactId-$pkgver.pom
 }
 
 md5sums=('3e418cf7f2607bf359e6c514a992cb38')
diff --git a/java-ugly/maven/PKGBUILD b/java/maven/PKGBUILD
index 3f8e5071d..3f8e5071d 100644
--- a/java-ugly/maven/PKGBUILD
+++ b/java/maven/PKGBUILD
diff --git a/java-ugly/maven/maven.csh b/java/maven/maven.csh
index f5750cfc8..f5750cfc8 100644
--- a/java-ugly/maven/maven.csh
+++ b/java/maven/maven.csh
diff --git a/java-ugly/maven/maven.sh b/java/maven/maven.sh
index b6655cc22..b6655cc22 100644
--- a/java-ugly/maven/maven.sh
+++ b/java/maven/maven.sh
diff --git a/java-ugly/not-working/java-bnd/PKGBUILD b/java/not-working/java-bnd/PKGBUILD
index 86820469a..86820469a 100644
--- a/java-ugly/not-working/java-bnd/PKGBUILD
+++ b/java/not-working/java-bnd/PKGBUILD
diff --git a/pcr/amsynth/PKGBUILD b/pcr/amsynth/PKGBUILD
index 1cd3cccf6..7142d6c9f 100644
--- a/pcr/amsynth/PKGBUILD
+++ b/pcr/amsynth/PKGBUILD
@@ -1,26 +1,25 @@
 # Maintainer : Guest One <theguestone at gmail dot com>
 
 pkgname=amsynth
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Analogue Modeling SYNTHesizer"
 arch=('i686' 'x86_64')
-url="http://code.google.com/p/amsynth/"
+url="http://code.google.com/p/$pkgname/"
 license=('GPL')
-depends=('gtkmm' 'jack' 'liblo')
-makedepends=('desktop-file-utils' 'dssi' 'libtool' 'ladspa')
+depends=('gtkmm' 'jack' 'liblo' 'ladspa')
+makedepends=('desktop-file-utils' 'dssi' 'libtool')
 install="$pkgname.install"
-source=("http://amsynth.googlecode.com/files/amSynth-$pkgver.tar.gz")
-md5sums=('991329e433bb8c496f9ca5158faf0bca')
+source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+md5sums=('9193d334c89996cf44e98422e03318bb')
 
 build() {
-  cd "$srcdir/amSynth-$pkgver"
-  libtoolize
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/amSynth-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
 }
diff --git a/pcr/perl-crypt-dh/PKGBUILD b/pcr/perl-crypt-dh/PKGBUILD
new file mode 100644
index 000000000..e2c9b5a3c
--- /dev/null
+++ b/pcr/perl-crypt-dh/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer (AUR): Michael Witten
+#
+# Derived from perl-crypt-blowfish:
+#   Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+#   Contributor: Charles Mauch <cmauch@gmail.com>
+#
+# Contributor: Pedro Alejandro López-Valencia <palopezv@gmail.com>
+
+pkgname=perl-crypt-dh
+pkgver=0.07
+pkgrel=3
+
+pkgdesc='Perl/CPAN Module Crypt::DH: Diffie-Hellman key exchange system'
+
+_cpan_name=Crypt-DH-$pkgver
+url=http://search.cpan.org/~mithaldu/$_cpan_name/lib/Crypt/DH.pm
+
+license=(GPL PerlArtistic)
+source=("http://search.cpan.org/CPAN/authors/id/M/MI/MITHALDU/$_cpan_name.tar.gz")
+md5sums=(5494c91420bf77de4af808fcafb6c3ce)
+
+arch=(any)
+makedepends=(make)
+depends=(perl perl-math-bigint-gmp)
+
+build()
+{
+  cd "$srcdir/$_cpan_name"
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check()
+{
+  cd "$srcdir/$_cpan_name"
+  make test
+}
+
+package()
+{
+  cd "$srcdir/$_cpan_name"
+  make pure_install DESTDIR="$pkgdir"
+
+  cd "$pkgdir"
+  find . -name '.packlist' -delete
+  find . -name '*.pod'     -delete
+}
diff --git a/pcr/perl-math-bigint-gmp/PKGBUILD b/pcr/perl-math-bigint-gmp/PKGBUILD
new file mode 100644
index 000000000..32923d432
--- /dev/null
+++ b/pcr/perl-math-bigint-gmp/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer (AUR): Pedro Alejandro López-Valencia <palopezv@gmail.com>
+
+_author=PJACKLAM
+_perlmod=Math-BigInt-GMP
+pkgname=perl-math-bigint-gmp
+pkgver=1.37
+pkgrel=2
+pkgdesc="Big integer calculations using the GNU Multiple Precision Arithmetic Library."
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/"
+license=('GPL' 'PerlArtistic')
+depends=('perl>=5.16.2' 'gmp')
+options=(!emptydirs)
+source=(http://cpan.perl.org/modules/by-authors/id/P/PJ/$_author/$_perlmod-$pkgver.tar.gz)
+md5sums=('d11bf69c0471e38191f33144079d0373')
+
+build() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  # Install module in vendor directories.
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  make test
+}
+
+package() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  make install DESTDIR="$pkgdir/"
+
+  find ${pkgdir} -name '.packlist' -delete
+  find ${pkgdir} -name '*.pod' -delete
+}
+
+# vim:set ts=2 sw=2 et ft=sh: