[gentoo-commits] proj/lua:master commit in: dev-lua/lua-gd/files/, dev-lua/lua-gd/

[Vadim A. Misbakh-Soloviov]

commit:     b138b139502c8f32855134442237707d2888e0a6
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Fri Apr  3 23:27:19 2015 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Fri Apr  3 23:27:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/lua.git/commit/?id=b138b139

[dev-lua/lua-gd] Fix

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

 dev-lua/lua-gd/files/lua-gd-2.0.33.2-makefile.patch | 10 +++++-----
 dev-lua/lua-gd/lua-gd-2.0.33.2.ebuild               | 21 ++++++++++++++++-----
 dev-lua/lua-gd/lua-gd-9999.ebuild                   | 17 +++++++++++++----
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/dev-lua/lua-gd/files/lua-gd-2.0.33.2-makefile.patch 
b/dev-lua/lua-gd/files/lua-gd-2.0.33.2-makefile.patch
index 73cbe27..d334e28 100644
--- a/dev-lua/lua-gd/files/lua-gd-2.0.33.2-makefile.patch
+++ b/dev-lua/lua-gd/files/lua-gd-2.0.33.2-makefile.patch
@@ -5,14 +5,14 @@
  LUAPKG=lua5.1
  OUTFILE=gd.so
 -CFLAGS=`gdlib-config --cflags` `pkg-config $(LUAPKG) --cflags` -O3 -Wall
-+CFLAGS+=`gdlib-config --cflags` `pkg-config $(LUAPKG) --cflags` -fPIC
++CFLAGS+=`gdlib-config --cflags` `pkg-config --cflags $(LUAPKG)` -fPIC
  GDFEATURES=`gdlib-config --features |sed -e "s/GD_/-DGD_/g"`
 -LFLAGS=-shared `gdlib-config --ldflags` `gdlib-config --libs` \
 -    `pkg-config $(LUAPKG) --libs` -lgd
 -INSTALL_PATH=`pkg-config $(LUAPKG) --variable=INSTALL_CMOD`
-+LIBS=`gdlib-config --libs` `pkg-config $(LUAPKG) --libs` -lgd
++LIBS=`gdlib-config --libs` `pkg-config --libs $(LUAPKG)` -lgd
 +LDFLAGS+=`gdlib-config --ldflags` -shared
-+INSTALL_PATH=$(DESTDIR)`pkg-config $(LUAPKG) --variable=INSTALL_CMOD`
++INSTALL_PATH=`pkg-config --variable INSTALL_CMOD $(LUAPKG)`
  
  
  # ---------------------------------------------------------------------------
@@ -26,8 +26,8 @@
  
  install: $(OUTFILE)
 -      install -s $(OUTFILE) $(INSTALL_PATH)
-+      mkdir -p $(INSTALL_PATH)
-+      install $(OUTFILE) $(INSTALL_PATH)
++      mkdir -p $(DESTDIR)/$(INSTALL_PATH)
++      install $(OUTFILE) $(DESTDIR)/$(INSTALL_PATH)
  
  clean:
        rm -f $(OUTFILE) *.o

diff --git a/dev-lua/lua-gd/lua-gd-2.0.33.2.ebuild 
b/dev-lua/lua-gd/lua-gd-2.0.33.2.ebuild
index 82e5aaf..781b213 100644
--- a/dev-lua/lua-gd/lua-gd-2.0.33.2.ebuild
+++ b/dev-lua/lua-gd/lua-gd-2.0.33.2.ebuild
@@ -16,10 +16,13 @@ 
SRC_URI="http://luaforge.net/frs/download.php/1592/${MY_P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
+IUSE="doc examples luajit"
 
-RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
-       media-libs/gd[png]"
+RDEPEND="
+       luajit? ( dev-lang/luajit:2 )
+       !luajit? ( >=dev-lang/lua-5.1 )
+       media-libs/gd[png]
+"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
@@ -30,11 +33,19 @@ src_prepare() {
 }
 
 src_compile() {
-       emake LUAPKG=lua CC="$(tc-getCC)"
+       local lua=lua;
+       use luajit && lua=luajit;
+       emake LUAPKG="${lua}" LUABIN="${lua}" CC="$(tc-getCC)"
 }
 
 src_install() {
-       emake install LUAPKG=lua DESTDIR="${D}"
+       local lua=lua;
+       use luajit && lua=luajit;
+       emake \
+               LUAPKG="${lua}"\
+               DESTDIR="${D}"\
+               INSTALL_PATH="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD 
${lua})"\
+               install
        dodoc README
 
        if use doc; then

diff --git a/dev-lua/lua-gd/lua-gd-9999.ebuild 
b/dev-lua/lua-gd/lua-gd-9999.ebuild
index a0fecef..582745c 100644
--- a/dev-lua/lua-gd/lua-gd-9999.ebuild
+++ b/dev-lua/lua-gd/lua-gd-9999.ebuild
@@ -4,12 +4,12 @@
 
 EAPI="5"
 
-inherit eutils toolchain-funcs git-r3
+inherit eutils toolchain-funcs git-r3 multilib
 
 DESCRIPTION="Lua bindings to Thomas Boutell's gd library"
 HOMEPAGE="http://lua-gd.luaforge.net/";
 SRC_URI=""
-EGIT_REPO_URI="git://github.com/ittner/lua-gd.git"
+EGIT_REPO_URI="https://github.com/ittner/lua-gd.git";
 
 LICENSE="MIT"
 SLOT="0"
@@ -17,12 +17,16 @@ KEYWORDS=""
 IUSE="doc examples luajit"
 
 RDEPEND="
-       !luahit? ( >=dev-lang/lua-5.1 )
+       !luajit? ( >=dev-lang/lua-5.1 )
        luajit? ( dev-lang/luajit:2 )
        media-libs/gd[png]"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
+QA_PREBUILT="usr/$(get_libdir)/*"
+# ^ sorry for that, but upstream prestrips module, and it is impossible to ask
+# pkgconfig here, since lua implementation is unknown atm
+
 src_prepare() {
        sed -r \
                -e "s/^(CFLAGS=)-O3 -Wall /\1/" \
@@ -38,7 +42,12 @@ src_compile() {
 src_install() {
        local lua=lua;
        use luajit && lua=luajit;
-       emake install LUAPKG="${lua}" DESTDIR="${D}"
+       emake \
+               LUAPKG="${lua}"\
+               DESTDIR="${D}"\
+               INSTALL_PATH="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD 
${lua})"\
+               install
+
        dodoc README
 
        if use doc; then