[gentoo-commits] proj/lua:master commit in: dev-lua/luasocket/, dev-lang/luajit/

[gentoo-commits] proj/lua:master commit in: dev-lua/luasocket/, dev-lang/luajit/

[Vadim A. Misbakh-Soloviov]

commit:     72c7e80bc28c7fd90c1dedc755090ed3a67fa2c3
Author:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Sun Jul 14 01:40:24 2013 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sun Jul 14 01:40:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=72c7e80b

[dev-lua/luasocket] bump

Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>

---
 dev-lang/luajit/luajit-2.0.2.ebuild     |  8 ++++++--
 dev-lang/luajit/luajit-2.0.9999.ebuild  |  8 ++++++--
 dev-lang/luajit/luajit-2.1.9999.ebuild  |  8 ++++++--
 dev-lua/luasocket/luasocket-9999.ebuild | 22 ++++++++++------------
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/dev-lang/luajit/luajit-2.0.2.ebuild b/dev-lang/luajit/luajit-2.0.2.ebuild
index 01f4f12..4662414 100644
--- a/dev-lang/luajit/luajit-2.0.2.ebuild
+++ b/dev-lang/luajit/luajit-2.0.2.ebuild
@@ -66,6 +66,11 @@ src_prepare() {
 		-e "s|/usr/local|/usr|" \
 		-e "s|lib/|$(get_libdir)/|" \
 		-i src/luaconf.h || die "failed to fix prefix in luaconf.h"
+
+        sed \
+                -e "s|/usr/local|/usr|" \
+                -e "s|lib/|$(get_libdir)/|" \
+                -i etc/luajit.pc || die "failed to fix prefix in pkg-config file"
 }
 
 src_compile() {
@@ -86,7 +91,6 @@ src_compile() {
 		# ebuild, I choose method "a"
 		# (since it is more secure on hardened systems, imho) +
 		# + ewarn user, that he really should disable ccache.
-		#	 append-ldflags -nopie
 
 #		append-ldflags -nopie
 		append-cflags -fPIC
@@ -126,5 +130,5 @@ src_install() {
 
 	host-is-pax && pax-mark m "${ED}usr/bin/${PN}-${MY_PV}"
 	dosym "${PN}-${MY_PV}" "/usr/bin/${PN}"
-	newbin "${FILESDIR}/luac.jit" "luac-${MY_PV}"
+	dobin "${FILESDIR}/luac.jit"
 }

diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index 5086ac9..597bf9b 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -53,6 +53,11 @@ src_prepare(){
 		-e "s|/usr/local|/usr|" \
 		-e "s|lib/|$(get_libdir)/|" \
 		-i src/luaconf.h || die "failed to fix prefix in luaconf.h"
+
+        sed \
+                -e "s|/usr/local|/usr|" \
+                -e "s|lib/|$(get_libdir)/|" \
+                -i etc/luajit.pc || die "failed to fix prefix in pkg-config file"
 }
 
 src_compile() {
@@ -73,7 +78,6 @@ src_compile() {
 		# ebuild, I choose method "a"
 		# (since it is more secure on hardened systems, imho) +
 		# + ewarn user, that he really should disable ccache.
-		#	 append-ldflags -nopie
 
 #	       append-ldflags -nopie
 		append-cflags -fPIC
@@ -113,5 +117,5 @@ src_install() {
 
 	host-is-pax && pax-mark m "${ED}usr/bin/${PN}-${MY_PV}"
 	dosym "${PN}-${MY_PV}" "/usr/bin/${PN}"
-	newbin "${FILESDIR}/luac.jit" "luac-${MY_PV}"
+	dobin "${FILESDIR}/luac.jit"
 }
\ No newline at end of file

diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index 0b39743..b8ba01e 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -53,6 +53,11 @@ src_prepare(){
 		-e "s|/usr/local|/usr|" \
 		-e "s|lib/|$(get_libdir)/|" \
 		-i src/luaconf.h || die "failed to fix prefix in luaconf.h"
+
+	sed \
+		-e "s|/usr/local|/usr|" \
+		-e "s|lib/|$(get_libdir)/|" \
+		-i etc/luajit.pc || die "failed to fix prefix in pkg-config file"
 }
 
 src_compile() {
@@ -73,7 +78,6 @@ src_compile() {
 		# ebuild, I choose method "a"
 		# (since it is more secure on hardened systems, imho) +
 		# + ewarn user, that he really should disable ccache.
-		#	 append-ldflags -nopie
 
 #	       append-ldflags -nopie
 		append-cflags -fPIC
@@ -113,5 +117,5 @@ src_install() {
 
 	host-is-pax && pax-mark m "${ED}usr/bin/${PN}-${MY_PV}"
 	dosym "${PN}-${MY_PV}" "/usr/bin/${PN}"
-	newbin "${FILESDIR}/luac.jit" "luac-${MY_PV}"
+	dobin "${FILESDIR}/luac.jit"
 }
\ No newline at end of file

diff --git a/dev-lua/luasocket/luasocket-9999.ebuild b/dev-lua/luasocket/luasocket-9999.ebuild
index bfb6a36..d792435 100644
--- a/dev-lua/luasocket/luasocket-9999.ebuild
+++ b/dev-lua/luasocket/luasocket-9999.ebuild
@@ -4,13 +4,11 @@
 
 EAPI="5"
 
-inherit multilib toolchain-funcs flag-o-matic eutils git-2
+inherit base multilib toolchain-funcs flag-o-matic eutils git-2
 
 DESCRIPTION="Networking support library for the Lua language."
 HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/"
-#EHG_REPO_URI="http://code.matthewwild.co.uk/luasocket2-hg/"
 EGIT_REPO_URI="https://github.com/diegonehab/luasocket git://github.com/diegonehab/luasocket"
-EGIT_BRANCH="unstable"
 
 LICENSE="MIT"
 SLOT="0"
@@ -21,19 +19,20 @@ RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+DOCS=( "NEW" "README" )
+HTML_DOCS=( "doc/" )
 src_compile() {
-	local inc=/usr/include
-	use luajit && inc=/usr/include/luajit-2.0
+	local lua=lua;
+	use luajit && lua=luajit;
 
 	use debug && export DEBUG="DEBUG"
 
 	emake linux \
 		prefix=/usr \
-		LUAINC_linux="${inc}" \
-		LUALIB_linux=/usr/lib \
+		LUAINC_linux="$($(tc-getPKG_CONFIG) --variable includedir ${lua})" \
+		LUALIB_linux="/usr/$(get_libdir)" \
 		CC="$(tc-getCC)" \
-		LD="$(tc-getCC) -shared" \
-		|| die
+		LD="$(tc-getCC) -shared"
 }
 
 src_install() {
@@ -41,8 +40,7 @@ src_install() {
 	use luajit && lua=luajit;
 	emake install \
 		INSTALL_TOP_SHARE="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" \
-		INSTALL_TOP_LIB="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua} | sed -e "s:lib/:$(get_libdir)/:")" || die
+		INSTALL_TOP_LIB="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua})"
 
-	dodoc NEW README || die
-	dohtml doc/* || die
+	base_src_install_docs
 }