Use lua eclass.

12 files changed, 39 insertions, 36 deletions

diff --git a/dev-lua/lrexlib/ChangeLog b/dev-lua/lrexlib/ChangeLog
index 67bff85..ec75431 100644
--- a/dev-lua/lrexlib/ChangeLog
+++ b/dev-lua/lrexlib/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Aug 2008; Ali Polatel <hawking@gentoo.org> lrexlib-2.4.0.ebuild:
+  Use lua.eclass
+
 *lrexlib-2.4.0 (21 Aug 2008)
 
   21 Aug 2008; Ali Polatel <hawking@gentoo.org> +lrexlib-2.4.0.ebuild:
diff --git a/dev-lua/lrexlib/Manifest b/dev-lua/lrexlib/Manifest
index e595d3d..f1a407a 100644
--- a/dev-lua/lrexlib/Manifest
+++ b/dev-lua/lrexlib/Manifest
@@ -1,3 +1,3 @@
 DIST lrexlib-2.4.0.zip 62655 RMD160 6494022558dde0657dc3eb4aa819f9f0aec1f307 SHA1 efcf3de1cfba875e3f6d384d616f1591b1dc1519 SHA256 d8c1b0f4e1ff48c94dd6086bf58702731421d7ab5fac406e30623ace82f91082
-EBUILD lrexlib-2.4.0.ebuild 1410 RMD160 5d06f537932be5862f6151e95a076f996606c49c SHA1 26399fbfcf54cfad099fcc24620ff45109eb0293 SHA256 4e716f56546c2298b0fb96f3c5f82db90fa603ec35bfdf84f6c08e762afcc861
-MISC ChangeLog 235 RMD160 dfef3e9b646543b9e76e74f531ecdaaab689c302 SHA1 bf32f3c5c9de05b726f8f2e4f020ea11201c1b47 SHA256 b75cf7fca47365885f0345c2bcebacb5439b94cf20f15c7f631bc7e0351b6421
+EBUILD lrexlib-2.4.0.ebuild 1528 RMD160 d9b30fdcfd434b924a8a560e503bf6084ef310ef SHA1 fef2ea3621fb4413c0c07beb9cbfdcd2e1008619 SHA256 9dea68a040c1f800eb0bfbe69f9662f16bef31b004ae86a51728592855174b11
+MISC ChangeLog 323 RMD160 fbdf17d8bd9ab7c25ef2ad86bf564d9735c1ff25 SHA1 bcc1cb2c264511daf738c39c6759f57a808ff03d SHA256 a44707db0c871e3c45b0dc01194d2b0a33bc0e580ce2f46f597b8214e05df718
diff --git a/dev-lua/lrexlib/lrexlib-2.4.0.ebuild b/dev-lua/lrexlib/lrexlib-2.4.0.ebuild
index 2f886af..d861fcc 100644
--- a/dev-lua/lrexlib/lrexlib-2.4.0.ebuild
+++ b/dev-lua/lrexlib/lrexlib-2.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit multilib
+inherit lua
 
 DESCRIPTION="Binding of three regular expression libraries (POSIX, PCRE and Oniguruma) to Lua"
 HOMEPAGE="http://luaforge.net/projects/lrexlib/"
@@ -51,17 +51,15 @@ src_install() {
 		dohtml -r doc/* || die "dodoc failed"
 	fi
 
-	local luaver=
-	luaver="$(lua -v 2>&1| cut -d' ' -f2)"
-	luaver="${luaver%.*}"
-
-	insinto /usr/$(get_libdir)/lua/${luaver}
-	doins src/posix/rex_posix.so* || die "doins failed"
+	lua_install_cmodule src/posix/rex_posix.so.${PV%.*}
+	dosym rex_posix.so.${PV%.*} $(lua_get_libdir)/rex_posix.so || die "dosym failed"
 	if use pcre; then
-		doins src/pcre/rex_pcre.so* || die "doins failed"
+		lua_install_cmodule src/pcre/rex_pcre.so.${PV%.*}
+		dosym rex_pcre.so.${PV%.*} $(lua_get_libdir)/rex_pcre.so || die "dosym failed"
 	fi
 	if use oniguruma; then
-		doins src/oniguruma/rex_onig.so* || die "doins failed"
+		lua_install_cmodule src/oniguruma/rex_onig.so.${PV%.*}
+		dosym rex_onig.so.${PV%.*} $(lua_get_libdir)/rex_onig.so || die "dosym failed"
 	fi
 }
 
diff --git a/dev-lua/luabit/ChangeLog b/dev-lua/luabit/ChangeLog
index 67a0251..a8973e4 100644
--- a/dev-lua/luabit/ChangeLog
+++ b/dev-lua/luabit/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Aug 2008; Ali Polatel <hawking@gentoo.org> luabit-0.4.ebuild:
+  Use lua eclass.
+
   21 Aug 2008; Ali Polatel <hawking@gentoo.org> luabit-0.4.ebuild:
   Add LICENSE
 
diff --git a/dev-lua/luabit/Manifest b/dev-lua/luabit/Manifest
index a487606..b8340f0 100644
--- a/dev-lua/luabit/Manifest
+++ b/dev-lua/luabit/Manifest
@@ -1,3 +1,3 @@
 DIST luabit-0.4.zip 8694 RMD160 9cb4f9fbb99c6391256ac34554725553cd551d40 SHA1 163663430e661ce0662d6a569990ddca8e34f8ba SHA256 5a6e7ed1d930951e98a5d70310db52b5868ccc4586f88c78f276ee38bdcd55c3
-EBUILD luabit-0.4.ebuild 589 RMD160 c2d3618be72dc5336a04bce44f61a502f72d52fd SHA1 6d0a2d7a837eeab28af5909929938960b57751bc SHA256 681562c52c26602afd9603a77b24264b82882e4b643015ca9068b052fe84c5d1
-MISC ChangeLog 310 RMD160 b22a6b5abf32b8511230e09f7e12a5d80966adfa SHA1 c8186c6ab06ab083d2ec09f6b2caa7689eeb286f SHA256 f02a3df99232bb4c8cab5ebb2e37dce9e1eefc6830a92ac36950c2d314d442a3
+EBUILD luabit-0.4.ebuild 480 RMD160 e9ff32d6a8e4bddb8c5046ec8ea9b7ac482f63c1 SHA1 ff8667a1d109b6420efca5370f41a4096b2c1dda SHA256 c51e43e9b711d0988ab6e0f06be06ceae60224944b2cdea5d955649e7ea58d3a
+MISC ChangeLog 396 RMD160 0c3f81da1e8b1dc7dcd6f96d1626f4f846b633ed SHA1 f7980426e3449eeafbdb15b2d80440a1805d52bc SHA256 337980f4fe3067e03d7465c7f5115ccf5fe4762b13a24a7d6c4bf162960480ae
diff --git a/dev-lua/luabit/luabit-0.4.ebuild b/dev-lua/luabit/luabit-0.4.ebuild
index f791476..d84a376 100644
--- a/dev-lua/luabit/luabit-0.4.ebuild
+++ b/dev-lua/luabit/luabit-0.4.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit lua
+
 DESCRIPTION="A bitwise operation lib totally written in Lua."
 HOMEPAGE="http://luaforge.net/projects/bit/"
 SRC_URI="http://luaforge.net/frs/download.php/2185/${P}.zip"
@@ -20,11 +22,6 @@ src_compile() {
 }
 
 src_install() {
-	local luaver=
-	luaver="$(lua -v 2>&1| cut -d' ' -f2)"
-	luaver="${luaver%.*}"
-
-	insinto /usr/share/lua/${luaver}
-	doins *.lua || die "doins failed"
+	lua_install_module *.lua
 }
 
diff --git a/dev-lua/luaexpat/ChangeLog b/dev-lua/luaexpat/ChangeLog
index 138fcfd..7e372b8 100644
--- a/dev-lua/luaexpat/ChangeLog
+++ b/dev-lua/luaexpat/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Aug 2008; Ali Polatel <hawking@gentoo.org> luaexpat-1.1.0.ebuild:
+  Use lua eclass.
+
   21 Aug 2008; Ali Polatel <hawking@gentoo.org> luaexpat-1.1.0.ebuild:
   Add LICENSE, correct HOMEPAGE
 
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index 9f7b6f9..0783da6 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,3 +1,3 @@
 DIST luaexpat-1.1.0.tar.gz 27907 RMD160 f661c0e7f22363f51862187e96306498addea9d9 SHA1 ea359bdbd346ee378c47179a17ac3ee410be5c9d SHA256 9d709ddc606630f9b9dc3f3aafcb2a7c1fcb2675000c09978d8a37974e74effd
-EBUILD luaexpat-1.1.0.ebuild 973 RMD160 13c671fd1736d779421b96d64853fc6591abd943 SHA1 7edab75932dfb518010c2421e624291d4eaa95a2 SHA256 15765184097439618fa1ff3abcf07569777019f49ba5b2f1d78d71fe56ef0258
-MISC ChangeLog 342 RMD160 2653222e201cdd72c274e603ad29003db3e50eeb SHA1 86cf0a5cbf1311735f025c8fae341c3e187b43ac SHA256 d56c3d85d5c55c3cd9b8f3554c644b365f98a774cfcf2d67127bcd7fc865775b
+EBUILD luaexpat-1.1.0.ebuild 912 RMD160 4ea12e0ecf713b24f6783ab95a93cede3c68984a SHA1 93e29f9cea7d757fe889b260f0cc5962f05c4b8c SHA256 dfb543c40d451155f47f2b63464756037957e1138c533b42f604fbb27f6d22ed
+MISC ChangeLog 432 RMD160 b17498705081fe8abab0838f22853f8824917013 SHA1 630ebcffddd78207f80246e28d6a9659cff950c8 SHA256 91da95ea3bdb2045309f9421c69275973243c00fe767e3e3b8e16b6e4345b4b2
diff --git a/dev-lua/luaexpat/luaexpat-1.1.0.ebuild b/dev-lua/luaexpat/luaexpat-1.1.0.ebuild
index 81bd17d..d47329d 100644
--- a/dev-lua/luaexpat/luaexpat-1.1.0.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit multilib
+inherit multilib lua
 
 DESCRIPTION="A SAX XML parser based on the Expat library."
 HOMEPAGE="http://www.keplerproject.org/luaexpat/"
@@ -23,16 +23,14 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	local luaver=
-	luaver="$(lua -v 2>&1| cut -d' ' -f2)"
-	luaver="${luaver%.*}"
+	lua_version
 
 	sed -i \
 		-e "s:/usr/local/lib:\"${D}\"/usr/$(get_libdir):" \
 		-e "s:/usr/local/share:\"${D}\"/usr/share:" \
 		-e "s:usr/local:usr:" \
-		-e "s:\(LUA_VERSION_NUM=\).*:\1 ${luaver}0:" \
-		-e "s:5.0:${luaver}:" \
+		-e "s:\(LUA_VERSION_NUM=\).*:\1 ${LUAVER}0:" \
+		-e "s:5.0:${LUAVER}:" \
 		-e "s:-O2:-fPIC ${CFLAGS}:" \
 		config || die "sed in config failed"
 }
diff --git a/dev-lua/stdlib/ChangeLog b/dev-lua/stdlib/ChangeLog
index 510def6..fd94ac8 100644
--- a/dev-lua/stdlib/ChangeLog
+++ b/dev-lua/stdlib/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Aug 2008; Ali Polatel <hawking@gentoo.org> stdlib-6.ebuild:
+  Use lua eclass, add a blocker for dev-lua/getopt
+
   21 Aug 2008; Ali Polatel <hawking@gentoo.org> stdlib-6.ebuild:
   Install lua modules to /usr/share
 
diff --git a/dev-lua/stdlib/Manifest b/dev-lua/stdlib/Manifest
index cbb5c4e..b02ab9a 100644
--- a/dev-lua/stdlib/Manifest
+++ b/dev-lua/stdlib/Manifest
@@ -1,3 +1,3 @@
 DIST stdlib-6.tar.gz 31021 RMD160 cc398bde081581ece8a618d82a7fee72abc62eeb SHA1 5da20c626fc2e78a49991a952229a150de9fbaaa SHA256 f3e228e94be2950fd4ce48e6ae5d9bbd55abd5f5bac2f451177a8d41af89585c
-EBUILD stdlib-6.ebuild 708 RMD160 dd6024aae61741e7e4b1434245e26ef6e596f073 SHA1 16c866359113783df960eea7362bb9233b219ff8 SHA256 5c4dd02f81054ea6e2e4dcb43a027a03bd0a01f52735611d30ab94b7803b9333
-MISC ChangeLog 326 RMD160 58af7257212bd0b7aee3861b1fef9d6db42583ef SHA1 3d4d21d649ca634de33e316360aab837c3bc7350 SHA256 6392b8d8ae8da77890537ced94cfb086c47b6bfd1d7164461064b49f90023653
+EBUILD stdlib-6.ebuild 616 RMD160 303fbc10a79a74cb3f1538c78ecba426ad094a9d SHA1 3ee76d4a5a86f4cb69da9ff23a0e6d5dee36ec2b SHA256 8d579e41f95404bf5d767389c5e963e57ce686c5693f0b80c2d35dbd84bf5376
+MISC ChangeLog 443 RMD160 5df95f00449682470ce207c0859222efd9b4677b SHA1 a55aeef8eeb1770e9436432af50be128fc9c57ff SHA256 ccae2571c6e6edc40a45b49fffd8a67345688b080122564c06ae2feae7119274
diff --git a/dev-lua/stdlib/stdlib-6.ebuild b/dev-lua/stdlib/stdlib-6.ebuild
index 5517775..e856d71 100644
--- a/dev-lua/stdlib/stdlib-6.ebuild
+++ b/dev-lua/stdlib/stdlib-6.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit lua
+
 DESCRIPTION="Lua library of modules for common programming tasks"
 HOMEPAGE="http://luaforge.net/projects/stdlib/"
 SRC_URI="http://luaforge.net/frs/download.php/3584/${P}.tar.gz"
@@ -11,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc"
 
-DEPEND="dev-lang/lua"
+DEPEND="dev-lang/lua
+	!dev-lua/getopt"
 RDEPEND="${DEPEND}
 	>=dev-lua/lrexlib-2.2.0"
 
@@ -22,12 +25,7 @@ src_compile() {
 }
 
 src_install() {
-	local luaver=
-	luaver="$(lua -v 2>&1| cut -d' ' -f2)"
-	luaver="${luaver%.*}"
-
-	insinto /usr/share/lua/${luaver}
-	doins modules/*.lua || die "doins failed"
+	lua_install_module modules/*.lua
 
 	if use doc; then
 		dohtml -r modules/* || die "dohtml failed"