valabind: fix upstream issue https://github.com/radare/radare2-bindings/issues/154

dev-util/valabind/Manifest

@@ -1,2 +1 @@
-DIST valabind-0.10.0.tar.gz 51782 SHA256 dbc792b7f7c93cbc1c0187c456f793437ccce980b24484ade95b507e2ca30f25 SHA512 8a1cb5d9c0960df0832d7c72a5204a24ec56f7ced9defe80636670502d6807db63af31fb3d0b0970bb35e27c907455270aa1b898ab1a8818373a271849fb388d WHIRLPOOL c65d978cbb5e2d976aecc486cbb741cdf22348a0e18864542e5ca2ec9a29791f5fcccfbc9f98f663edc4a8cb94fae91da0c5f9797d3559b38f3b11d5ba7930a4
 DIST valabind-1.3.0.tar.gz 52267 SHA256 8dd2bc96cfd27103da89b3a2ba2f75746b7fa128404da9a57362179129e649f1 SHA512 54a5c3a90eb95c48179a26b846495efc8e274c868bdb02c28054bc775e9eb788883e720e059efcbadd4e183272a27aadb6cf47aba085a96262dfb38979b3b415 WHIRLPOOL 78e459b0f4b327b0d5a38e12e690e931df70e38c1d4e915cb1b7db2ebb405b55eb2b05b2fef0713e04a33f408fcf96b7c3f328a5cd7b40a90d98fef260e24a32

dev-util/valabind/files/d47196747795d25c02099ffda0a44c737692d232.patch

@@ -0,0 +1,59 @@
+From d47196747795d25c02099ffda0a44c737692d232 Mon Sep 17 00:00:00 2001
+From: pancake <pancake@nopcode.org>
+Date: Thu, 10 Aug 2017 18:45:59 +0200
+Subject: [PATCH] Honor some more C*FLAGS in valabind-cc
+
+---
+ valabind-cc | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/valabind-cc b/valabind-cc
+index e4132d9..24915d7 100755
+--- a/valabind-cc
++++ b/valabind-cc
+@@ -156,7 +156,6 @@ perl)
+   LC_ALL=C # fix anoying perl warning
+   export LC_ALL
+   CFLAGS="${CFLAGS} `perl -MExtUtils::Embed -e ccopts 2>/dev/null | sed -e 's,-arch [^ ]*,,g'`"
+-
+   LDFLAGS="${LDFLAGS} `perl -MExtUtils::Embed -e ldopts 2>/dev/null | sed -e 's,-arch [^ ]*,,g'`"
+   ;;
+ java)
+@@ -168,7 +167,7 @@ java)
+   fi
+   ;;
+ php5)
+-  CFLAGS="`php-config --includes 2>/dev/null` `pkg-config --libs libpng 2>/dev/null`"
++  CFLAGS="${CFLAGS} `php-config --includes 2>/dev/null` `pkg-config --libs libpng 2>/dev/null`"
+   LDFLAGS="${LDFLAGS} `php-config --libs 2>/dev/null`"
+   ;;
+ lua)
+@@ -256,7 +255,7 @@ if [ "$CXXOUT" = 1 ]; then
+ elif [ "$TEST" = 1 ]; then
+   case "${LANG}" in
+   ctypes)
+-    python2 --version >/dev/null 2>&1 || \
++    python2 --version > /dev/null 2>&1 || \
+     python --version > /dev/null 2>&1 || \
+     exit 1
+     ;;
+@@ -280,6 +279,9 @@ elif [ "$TEST" = 1 ]; then
+     eval echo ${SWIG} -O -o ${MOD}_wrap.${EXT} ${SWIGCPP} ${SWIGFLAGS} -${LANG} ${MOD}.i ${NULLPIPE}
+     eval ${SWIG} -O -o ${MOD}_wrap.${EXT} ${SWIGCPP} ${SWIGFLAGS} -${LANG} ${MOD}.i ${NULLPIPE}
+     if [ ! $? = 0 ]; then rm -rf ${DIR} ; exit 1 ; fi
++    if [ "${EXT}" = cxx ]; then
++      CFLAGS="${CFLAGS} ${CXXFLAGS}"
++    fi
+     eval echo ${CC} $@ -fPIC -shared ${MOD}_wrap.${EXT} ${CFLAGS} -o ${OMOD}.${SOEXT} ${LDFLAGS} ${NULLPIPE}
+     eval ${CC} $@ -fPIC -shared ${MOD}_wrap.${EXT} ${CFLAGS} -o ${OMOD}.${SOEXT} ${LDFLAGS} ${NULLPIPE}
+     if [ ! $? = 0 ]; then rm -rf ${DIR} ; exit 1 ; fi
+@@ -311,6 +313,9 @@ else
+       CFLAGS="`echo ${CFLAGS} | sed -e 's,-mno[^\ ]*,,g' -e 's,-f[^\ ]*,,g'`"
+       LDFLAGS="`echo ${LDFLAGS} | sed -e 's,-pagezero_size [^\ ]*,,g'`"
+       LDFLAGS="`echo ${LDFLAGS} | sed -e 's,-image_base [^\ ]*,,g'`"
++      if [ "${EXT}" = cxx ]; then
++        CFLAGS="${CFLAGS} ${CXXFLAGS}"
++      fi
+       echo ${CC} $@ -fPIC -shared ${MOD}_wrap.${EXT} ${SWIGCPP} ${CFLAGS} -o ${OMOD}.${SOEXT} ${LDFLAGS}
+       ${CC} $@ -fPIC -shared ${MOD}_wrap.${EXT} ${SWIGCPP} ${CFLAGS} -o ${OMOD}.${SOEXT} ${LDFLAGS} || exit 1
+     fi

dev-util/valabind/valabind-1.3.0-r1.ebuild

@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	#fixing issue: https://github.com/radare/radare2-bindings/issues/154
+	epatch ${FILESDIR}/d47196747795d25c02099ffda0a44c737692d232.patch
 	#upstream smoked something here
 	sed -i -e "s:^GIT_TIP:#GIT_TIP:" Makefile || die
 	#they don't detect version properly either

dev-util/valabind/valabind-1.3.0.ebuild

@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION=0.32
-VALA_USE_DEPEND=vapigen
-inherit vala
-
-DESCRIPTION="Valabind is a tool to parse vala or vapi files to transform them into swig files"
-HOMEPAGE="https://github.com/radare/valabind"
-SRC_URI="https://github.com/radare/valabind/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND="$(vala_depend)"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig"
-
-src_prepare() {
-	#upstream smoked something here
-	sed -i -e "s:^GIT_TIP:#GIT_TIP:" Makefile || die
-	#they don't detect version properly either
-	sed -i -e "s:=valac:=valac-$(vala_best_api_version):" Makefile || die
-	sed -i -e "s:\$(shell ./getvv):libvala-$(vala_best_api_version):" Makefile || die
-	eapply_user
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-}