From ba7bed75477c53136cb7fbf68a58dff23f64f8ae Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 18 Oct 2012 17:15:26 -0400
Subject: fix up the [java] packages that were in [libre]

---
 java/java-asm3/PKGBUILD | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)
 mode change 100755 => 100644 java/java-asm3/PKGBUILD

(limited to 'java/java-asm3')

diff --git a/java/java-asm3/PKGBUILD b/java/java-asm3/PKGBUILD
old mode 100755
new mode 100644
index 7e66a5b5a..3af6902f4
--- a/java/java-asm3/PKGBUILD
+++ b/java/java-asm3/PKGBUILD
@@ -13,12 +13,13 @@ depends=('java-runtime')
 makedepends=(
   apache-ant
   java-ow-util-ant-tasks
+  jh
 )
 source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
 
-_M2_LOCALREPO='/usr/share/maven/repository'
+_distdir="$_pkgname-$pkgver/output/dist"
 _ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
-_m2_packages=(
+_m2_artifacts=(
   asm
   asm-analysis
   asm-commons
@@ -29,50 +30,50 @@ _m2_packages=(
   asm-all
   asm-debug-all)
 
-build() {
+mksource()
   cd "$srcdir/$_pkgname-$pkgver"
-
   rm cobertura.ser # We regenerate this
   rm examples/jasmin/test/jasmin.jar
+}
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  eval `jh mksource`
 
   echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
   ant dist
 
   # This will make package() easier:
-  cd output/dist/lib
+  cd "$srcdir/$_distdir/lib"
   ln -s all/* .
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
   # Install license file
+  cd "$srcdir/$_pkgname-$pkgver"
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   # Install documentation
-  cd output/dist
+  cd "$srcdir/$_distdir"
   install -d "$pkgdir/usr/share/doc/$pkgname"
   cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc"
   cp -r examples         "$pkgdir/usr/share/doc/$pkgname/examples"
   
-  # Install Apache Maven modules
-  cd lib
-  install -d "$pkgdir"/usr/share/java/asm
-  for pkg in "${_m2_packages[@]}"; do
-    dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver
-    # Create the Maven directory
-    install -d "$pkgdir$dir"
-    # Install the files
-    cp $pkg-$pkgver.* "$pkgdir$dir"
+  # Install the README about the -all files
+  cd "$srcdir/$_distdir/lib"
+  install -Dm644 README.txt \
+      "$pkgdir"/usr/share/java/$_pkgname/README-$pkgver.txt
+
+  # Install Maven artifacts
+  export DESTDIR=$pkgdir
+  for artifact in "${_m2_artifacts[@]}"; do
+    jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.{jar,pom}
     # Symlink them to /usr/share/java
-    ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/
-    ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar
+    ln -s "$(jh mvn-basename asm $artifact $pkgver).jar" \
+	"$pkgdir"/usr/share/java/$_pkgname/
+    ln -s $_pkgname/$artifact-$pkgver.jar \
+	"$pkgdir"/usr/share/java/$artifact-${pkgver%%.*}.jar
   done
-  
-  # Install a README file about the -all files
-  cd "$srcdir/$_pkgname-$pkgver"
-  install -m644 output/dist/lib/all/README.txt \
-    "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
 }
 
 md5sums=('433024df8176f09922646316e415631c')
-- 
cgit v1.2.3