main/haserl: upgrade to 0.9.35 (from testing)

2 files changed, 6 insertions, 86 deletions

diff --git a/main/haserl/APKBUILD b/main/haserl/APKBUILD
index 6c8e8f04a6..8a4f8f9f36 100644
--- a/main/haserl/APKBUILD
+++ b/main/haserl/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2"
-_defaultlua="5.2"
+_luaversions="5.3 5.2 5.1"
+_defaultlua="5.3"
 pkgname=haserl
-pkgver=0.9.33
+pkgver=0.9.35
 pkgrel=1
 pkgdesc="Html And Shell Embedded Report Language"
 url="http://haserl.sourceforge.net/"
@@ -75,6 +75,6 @@ for _i in $_luaversions; do
 	eval "split_${_i/./_}() { _split $_i; }"
 done
 
-md5sums="a9decddb508944d56f71dd2f821e2ec5  haserl-0.9.33.tar.gz"
-sha256sums="9a65b14dc721643fc5b85c79117cb6d824bd3683b246744137bb5d978df7621b  haserl-0.9.33.tar.gz"
-sha512sums="8a285f43daee95a9dc8bbda1166323ab65ccad16ec13e61efaea0fbf88b1920d1af3e7efe7aade0025c8fd1368dcb5262b63f4848ab2fb7b0976ba8751d03886  haserl-0.9.33.tar.gz"
+md5sums="918f0b4f6cec0b438c8b5c78f2989010  haserl-0.9.35.tar.gz"
+sha256sums="a1b633e80f3e2638e7f8f850786e95072cfd9877f88780092996fd6aaf7ae2da  haserl-0.9.35.tar.gz"
+sha512sums="f0f2fc46540223b4b5369fe13b3020bed5e0578b7ca1ed1688f01678ba5302c876540c0d58dde427f9180915fa38cfffd01f1a4cbbc0fce851789056b3665ab0  haserl-0.9.35.tar.gz"
diff --git a/testing/haserl/APKBUILD b/testing/haserl/APKBUILD
deleted file mode 100644
index 8a4f8f9f36..0000000000
--- a/testing/haserl/APKBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.3 5.2 5.1"
-_defaultlua="5.3"
-pkgname=haserl
-pkgver=0.9.35
-pkgrel=1
-pkgdesc="Html And Shell Embedded Report Language"
-url="http://haserl.sourceforge.net/"
-arch="all"
-license="GPL2"
-depends=""
-makedepends="automake autoconf"
-subpackages="$pkgname-doc"
-for _i in $_luaversions; do
-	depends="$depends haserl-lua$_i"
-	makedepends="$makedepends lua$_i-dev"
-	subpackages="$subpackages haserl-lua$_i:split_${_i/./_}"
-done
-options="suid"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-
-_sdir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_sdir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	sed -i -e 's/^        /\t/' src/Makefile.am || return 1
-	rm -f src/haserl_lualib.inc
-
-	aclocal && autoconf && autoheader && automake --add-missing || return 1
-
-	for _i in $_luaversions; do
-		cp -r "$_sdir" "$srcdir"/build-$_i
-	done
-}
-
-build() {
-	for _i in $_luaversions; do
-		cd "$srcdir"/build-$_i
-		./configure \
-			--build=$CBUILD \
-			--host=$CHOST \
-			--prefix=/usr \
-			--with-lua=lua$_i \
-			|| return 1
-		make || return 1
-	done
-}
-
-package() {
-	for _i in $_luaversions; do
-		cd "$srcdir"/build-$_i
-		make DESTDIR="$pkgdir/" install || return 1
-		chmod 4111 "$pkgdir"/usr/bin/haserl
-		mv "$pkgdir"/usr/bin/haserl "$pkgdir"/usr/bin/haserl-lua$_i
-	done
-	ln -s haserl-lua$_defaultlua "$pkgdir"/usr/bin/haserl
-}
-
-_split() {
-	local d= _ver=$1
-	pkgdesc="Html And Shell Embedded Report Language with Lua $_ver support"
-	replaces="$pkgname"
-	depends=
-	if [ -f "$pkgdir"/usr/bin/haserl-lua$_ver ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/haserl-lua$_ver "$subpkgdir"/usr/bin/ || return 1
-	fi
-}
-
-for _i in $_luaversions; do
-	eval "split_${_i/./_}() { _split $_i; }"
-done
-
-md5sums="918f0b4f6cec0b438c8b5c78f2989010  haserl-0.9.35.tar.gz"
-sha256sums="a1b633e80f3e2638e7f8f850786e95072cfd9877f88780092996fd6aaf7ae2da  haserl-0.9.35.tar.gz"
-sha512sums="f0f2fc46540223b4b5369fe13b3020bed5e0578b7ca1ed1688f01678ba5302c876540c0d58dde427f9180915fa38cfffd01f1a4cbbc0fce851789056b3665ab0  haserl-0.9.35.tar.gz"