main/lua-uuid: merge changes from testing package

2 files changed, 26 insertions, 73 deletions

diff --git a/main/lua-uuid/APKBUILD b/main/lua-uuid/APKBUILD
index 7aff17bfd3..2c13324422 100644
--- a/main/lua-uuid/APKBUILD
+++ b/main/lua-uuid/APKBUILD
@@ -1,39 +1,35 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-uuid
-pkgver=2012.05
+_realname=uuid
+pkgver=0.2.0
 pkgrel=1
-pkgdesc="Lua library generating universally unique identifiers based on libuuid"
-url="http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"
-arch="all"
-license="Public-Domain"
-depends=
-makedepends="lua-dev util-linux-dev"
-install=
-subpackages=
+pkgdesc="A pure Lua uuid generator (modified from a Rackspace module)"
+url="https://tieske.github.io/uuid/"
+arch="noarch"
+license="Apache-2.0"
+options="!check"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Tieske/uuid/archive/version_$pkgver.tar.gz"
+builddir="$srcdir/uuid-version_$pkgver"
+
+_luaversions="5.1 5.2 5.3"
+for _v in $_luaversions; do
+	makedepends="$makedepends lua$_v-dev"
+	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
+done
 
-# seems like they just update the upstream source package. Version is found in
-# luuid.c
-# For date and checksum see:
-# http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/release.txt
-
-source="https://dev.alpinelinux.org/archive/lua-uuid/luuid-$pkgver.tar.gz"
-#source="http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/luuid.tar.gz"
-
-
-_builddir="$srcdir"/uuid
-
-prepare() {
-	cd "$_builddir"
+package() {
+	mkdir -p "$pkgdir"
 }
 
-build() {
-	cd "$_builddir"
-	make so || return 1
-}
+_subpackage() {
+	local lver="${subpkgname:3:3}"
+	pkgdesc="$pkgdesc (for Lua $lver)"
+	depends="lua$lver"
+	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
 
-package() {
-	cd "$_builddir"
-	install -Dm755 uuid.so "$pkgdir"/usr/lib/lua/5.1/uuid.so
+	install -Dm644 "$builddir"/src/uuid.lua \
+		"$subpkgdir"/usr/share/lua/$lver/uuid.lua
 }
 
-sha512sums="0530a291a1e249d55faba285d98ffdf163b5aedffdaf403477dd39440e1b95a598c4fc41adcff1f5f83f60cba3493b77cb73b7678db8213d68dfd2c894ed9733  luuid-2012.05.tar.gz"
+sha512sums="1117c76dbbabee6de01d1657339236810822040e20afd974dec302b9d2035ca087d33ef47029c6184203c3e694cc9282a303ce19eadffc71b0f48c6a4a5ef5b0  lua-uuid-0.2.0.tar.gz"
diff --git a/testing/lua-uuid/APKBUILD b/testing/lua-uuid/APKBUILD
deleted file mode 100644
index 1d237eee37..0000000000
--- a/testing/lua-uuid/APKBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=lua-uuid
-_realname=uuid
-pkgver=0.2.0
-pkgrel=1
-pkgdesc="A pure Lua uuid generator (modified from a Rackspace module)"
-url="https://tieske.github.io/uuid/"
-arch="noarch"
-license="Apache-2.0"
-depends=""
-makedepends=""
-install=""
-options="!check"
-subpackages=""
-source="$pkgname-$pkgver.tar.gz::https://github.com/Tieske/uuid/archive/version_$pkgver.tar.gz"
-builddir="$srcdir/uuid-version_$pkgver"
-
-_luaversions="5.1 5.2 5.3"
-for _v in $_luaversions; do
-	makedepends="$makedepends lua$_v-dev"
-	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
-done
-
-build() {
-	return 0
-}
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
-_subpackage() {
-	local lver="${subpkgname:3:3}"
-	pkgdesc="$pkgdesc (for Lua $lver)"
-	depends="lua$lver"
-	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
-	
-	install -Dm644 "$builddir"/src/uuid.lua \
-		"$subpkgdir"/usr/share/lua/$lver/uuid.lua
-}
-
-sha512sums="1117c76dbbabee6de01d1657339236810822040e20afd974dec302b9d2035ca087d33ef47029c6184203c3e694cc9282a303ce19eadffc71b0f48c6a4a5ef5b0  lua-uuid-0.2.0.tar.gz"