Fix building with Python 2.6 (bug #272612). Respect CC, CFLAGS and LDFLAGS.

(Portage version: 13733-svn/cvs/Linux x86_64)

4 files changed, 79 insertions, 21 deletions

diff --git a/dev-libs/distorm64/ChangeLog b/dev-libs/distorm64/ChangeLog
index 9cd334840736..284a04ed8432 100644
--- a/dev-libs/distorm64/ChangeLog
+++ b/dev-libs/distorm64/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/distorm64
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/distorm64/ChangeLog,v 1.2 2009/02/04 15:23:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/distorm64/ChangeLog,v 1.3 2009/06/29 12:29:20 arfrever Exp $
+
+  29 Jun 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  distorm64-1.7.30-r1.ebuild, +files/distorm64-1.7.30-python.patch,
+  +files/distorm64-1.7.30-respect_flags.patch:
+  Fix building with Python 2.6 (bug #272612). Respect CC, CFLAGS and
+  LDFLAGS.
 
 *distorm64-1.7.30-r1 (04 Feb 2009)
 
diff --git a/dev-libs/distorm64/distorm64-1.7.30-r1.ebuild b/dev-libs/distorm64/distorm64-1.7.30-r1.ebuild
index bb34cda3c350..f98fad38e73f 100644
--- a/dev-libs/distorm64/distorm64-1.7.30-r1.ebuild
+++ b/dev-libs/distorm64/distorm64-1.7.30-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/distorm64/distorm64-1.7.30-r1.ebuild,v 1.1 2009/02/04 15:23:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/distorm64/distorm64-1.7.30-r1.ebuild,v 1.2 2009/06/29 12:29:20 arfrever Exp $
 
-EAPI="1"
+EAPI="2"
 
-inherit eutils
+inherit eutils flag-o-matic python toolchain-funcs
 
 DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)"
 HOMEPAGE="http://www.ragestorm.net/distorm/"
@@ -12,26 +12,31 @@ SRC_URI="http://ragestorm.net/distorm/${PN}-pkg${PV}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="+python"
 
 DEPEND="python? ( >=dev-lang/python-2.4 )"
-RDEPEND="$DEPEND"
+RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-python.patch"
+	epatch "${FILESDIR}/${P}-respect_flags.patch"
 }
 
 src_compile() {
 	cd "${WORKDIR}/${PN}/build/linux"
-	emake clib || die "make clib failed!"
+	emake clib CC="$(tc-getCC)" || die "make clib failed!"
 
 	if use python; then
-		emake py || die "make py failed!"
+		python_version
+		append-flags "-I/usr/include/python${PYVER}"
+		emake py CC="$(tc-getCC)" || die "make py failed!"
 	fi
 
 	cd "${WORKDIR}/${PN}/linuxproj"
-	emake disasm || die "make disasm failed!"
+	emake disasm CC="$(tc-getCC)" || die "make disasm failed!"
 
 }
 
@@ -41,21 +46,15 @@ src_install() {
 	dolib.so libdistorm64.so
 
 	if use python; then
-		if has_version ">=dev-lang/python-2.5"; then
-			mkdir -p "${D}usr/lib/python2.5/site-packages/"
-			install libdistorm64.so "${D}usr/lib/python2.5/site-packages/distorm.so"
-		else
-			mkdir -p "${D}usr/lib/python2.4/site-packages/"
-			install libdistorm64.so "${D}usr/lib/python2.4/site-packages/distorm.o"
-		fi
+		dodir "$(python_get_sitedir)"
+		install libdistorm64.so "${D}$(python_get_sitedir)/distorm.so"
 	fi
 
 	cd "${WORKDIR}/${PN}/"
-	mv distorm64.a libdistorm64.a
-	dolib.a libdistorm64.a
+	newlib.a distorm64.a libdistorm64.a
 
 	dobin linuxproj/disasm
 
-	mkdir -p "${D}usr/include"
+	dodir "/usr/include"
 	install distorm.h "${D}usr/include/" || die "Unable to install distorm.h"
 }
diff --git a/dev-libs/distorm64/files/distorm64-1.7.30-python.patch b/dev-libs/distorm64/files/distorm64-1.7.30-python.patch
new file mode 100644
index 000000000000..15d82f2215d7
--- /dev/null
+++ b/dev-libs/distorm64/files/distorm64-1.7.30-python.patch
@@ -0,0 +1,11 @@
+--- src/pydistorm.h
++++ src/pydistorm.h
+@@ -22,7 +22,7 @@
+ #include "decoder.h"

+ 

+ #ifdef __GNUC__

+- #include <python2.5/Python.h>

++ #include <Python.h>

+ #elif _MSC_VER

+  #include <python.h>

+ #endif

diff --git a/dev-libs/distorm64/files/distorm64-1.7.30-respect_flags.patch b/dev-libs/distorm64/files/distorm64-1.7.30-respect_flags.patch
new file mode 100644
index 000000000000..0af2da2f7a9b
--- /dev/null
+++ b/dev-libs/distorm64/files/distorm64-1.7.30-respect_flags.patch
@@ -0,0 +1,42 @@
+--- build/linux/Makefile
++++ build/linux/Makefile
+@@ -6,7 +6,7 @@
+ COBJS	= ../../src/x86defs.o ../../src/wstring.o ../../src/textdefs.o ../../src/prefix.o ../../src/operands.o ../../src/insts.o ../../src/instructions.o ../../src/distorm.o ../../src/decoder.o
+ PYOBJS	= ../../src/x86defs.o ../../src/wstring.o ../../src/textdefs.o ../../src/pydistorm.o ../../src/prefix.o ../../src/operands.o ../../src/insts.o ../../src/instructions.o ../../src/decoder.o
+ CC	= gcc
+-CFLAGS	= -O2 -Wall -fPIC -DSUPPORT_64BIT_OFFSET -D_DLL
++CFLAGS	+= -Wall -fPIC -DSUPPORT_64BIT_OFFSET -D_DLL
+ 
+ all: clib py
+ 
+@@ -14,11 +14,11 @@
+ 	/bin/rm -rf ../../src/*.o ${TARGET} ../../distorm64.a
+ 
+ clib: ${COBJS}
+-	${CC} ${CFLAGS} ${VERSION} ${COBJS} -fPIC -shared -o ${TARGET}
++	${CC} ${LDFLAGS} ${VERSION} ${COBJS} -fPIC -shared -o ${TARGET}
+ 	ar rs ../../distorm64.a ${COBJS}
+ 
+ py: ${PYOBJS}
+-	${CC} ${CFLAGS} ${VERSION} ${PYOBJS} -fPIC -shared -o ${TARGET}
++	${CC} ${LDFLAGS} ${VERSION} ${PYOBJS} -fPIC -shared -o ${TARGET}
+ 
+ install: libdistorm64.so
+ 	install -s ${TARGET} /usr/local/lib
+--- linuxproj/Makefile
++++ linuxproj/Makefile
+@@ -4,12 +4,12 @@
+ 
+ TARGET	= disasm
+ CC	= gcc
+-CFLAGS	= -Wall -O2 -I. -o
++CFLAGS	+= -Wall -I.
+ 
+ all:	disasm
+ 
+ disasm:
+-	${CC} ${CFLAGS} ${TARGET} main.c ../distorm64.a
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${TARGET} main.c ../distorm64.a
+ 
+ clean:
+ 	/bin/rm -rf *.o ${TARGET}