Respect LDFLAGS, fix documentation installation wrt bug #296746

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 141 insertions, 2 deletions

diff --git a/dev-util/radare/ChangeLog b/dev-util/radare/ChangeLog
index 18fdc2fd7b79..a17a1713e494 100644
--- a/dev-util/radare/ChangeLog
+++ b/dev-util/radare/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/radare
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/ChangeLog,v 1.12 2010/03/18 11:29:29 deathwing00 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/ChangeLog,v 1.13 2010/06/24 12:39:39 hwoarang Exp $
+
+*radare-1.5-r1 (24 Jun 2010)
+
+  24 Jun 2010; Markos Chandras <hwoarang@gentoo.org> +radare-1.5-r1.ebuild,
+  +files/radare-1.5-ldflags.patch:
+  Respect LDFLAGS, fix documentation installation wrt bug #296746
 
 *radare-1.5 (14 Dec 2009)
 
diff --git a/dev-util/radare/files/radare-1.5-ldflags.patch b/dev-util/radare/files/radare-1.5-ldflags.patch
new file mode 100644
index 000000000000..138df930776b
--- /dev/null
+++ b/dev-util/radare/files/radare-1.5-ldflags.patch
@@ -0,0 +1,94 @@
+Index: radare-1.5/src/radiff/bdiff/Makefile
+===================================================================
+--- radare-1.5.orig/src/radiff/bdiff/Makefile
++++ radare-1.5/src/radiff/bdiff/Makefile
+@@ -10,5 +10,5 @@ bdiff${BINSFX}:
+ 	@echo "No g++ found by configure"
+ else
+ bdiff${BINSFX}: bdiff.o
+-	-g++ -O2 bdiff.o -o bdiff${BINSFX}
++	-g++ ${CFLAGS} ${LDFLAGS} bdiff.o -o bdiff${BINSFX}
+ endif
+Index: radare-1.5/src/arch/arm/aasm/Makefile
+===================================================================
+--- radare-1.5.orig/src/arch/arm/aasm/Makefile
++++ radare-1.5/src/arch/arm/aasm/Makefile
+@@ -15,7 +15,7 @@ all: armasm
+ armasm: ${AOBJ} 
+ 
+ armasm:
+-	-${CC} ${AOBJ} -o armasm
++	-${CC} ${CFLAGS} ${LDFLAGS} ${AOBJ} -o armasm
+ 
+ clean:
+ 	-rm -f ${AOBJ} armasm
+Index: radare-1.5/src/Makefile.acr
+===================================================================
+--- radare-1.5.orig/src/Makefile.acr
++++ radare-1.5/src/Makefile.acr
+@@ -101,7 +101,7 @@ gui: ${OBJ}
+ 	-${CC} ${LDFLAGS} -o ravalagui${BINSFX} ../vala/*.o ${OBJ} ${OBJ2} ${RADARE_LIBS} ${LIBS}  ${W32LIBS} -lvte
+ 
+ lsbstego${BINSFX}: lsbstego.o
+-	${CC} lsbstego.o -g -o lsbstego${BINSFX}
++	${CC} ${CLFAGS} ${LDFLAGS} lsbstego.o -g -o lsbstego${BINSFX}
+ 
+ _rabin:
+ 	cd rabin && ${MAKE} all
+@@ -125,7 +125,7 @@ _rahash:
+ 	-cd rahash && ${MAKE} all
+ 
+ rax${BINSFX}: rax.o
+-	${CC} ${CFLAGS} rax.o -o rax${BINSFX}
++	${CC} ${CFLAGS} ${LDFLAGS} rax.o -o rax${BINSFX}
+ 
+ xrefs${BINSFX}: xrefs.o
+ 	${CC} ${CFLAGS} ${LDFLAGS} xrefs.o -o xrefs${BINSFX}
+Index: radare-1.5/src/plug/hack/Makefile
+===================================================================
+--- radare-1.5.orig/src/plug/hack/Makefile
++++ radare-1.5/src/plug/hack/Makefile
+@@ -20,7 +20,7 @@ CFLAGS+=-I../.. -g
+ all: hello.${SO} lua.${SO} gtk-hello.${SO} scriptedit.${SO} python.${SO} ruby.${SO} gtk-prefs.${SO} gtk-topbar.${SO} perl.${SO} python26.${SO}
+ 
+ hello.${SO}:
+-	${CC} ${CFLAGS} ${SHARED_CFLAGS} hello.c -o hello.${SO}
++	${CC} ${CFLAGS} ${LDFLAGS} ${SHARED_CFLAGS} hello.c -o hello.${SO}
+ 
+ ifeq ($(HAVE_GUI),0)
+ gtk-hello.${SO}:
+@@ -56,7 +56,7 @@ ifeq ($(HAVE_LIB_PYTHON2_6),1)
+ endif
+ 
+ perl.${SO}:
+-	-${CC} perl.c ${SHARED_CFLAGS} ${CFLAGS} ${PERL_CFLAGS} ${PERL_LIBS} -o perl.${SO}
++	-${CC} perl.c ${SHARED_CFLAGS} ${CFLAGS} ${LDFLAGS} ${PERL_CFLAGS} ${PERL_LIBS} -o perl.${SO}
+ 
+ ruby.${SO}:
+ 	-ruby mkruby.rb
+Index: radare-1.5/src/rabin/Makefile
+===================================================================
+--- radare-1.5.orig/src/rabin/Makefile
++++ radare-1.5/src/rabin/Makefile
+@@ -6,7 +6,7 @@ OBJ=dietelf.o dietelf64.o rabin.o dietpe
+ all: rabin${BINSFX}
+ 
+ rabin${BINSFX}: ${OBJ}
+-	${CC} ${OBJ} ${DL_LIBS} -o rabin${BINSFX}
++	${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${DL_LIBS} -o rabin${BINSFX}
+ 
+ install:
+ 	cd .. && ${MAKE} install
+Index: radare-1.5/src/rasm/Makefile
+===================================================================
+--- radare-1.5.orig/src/rasm/Makefile
++++ radare-1.5/src/rasm/Makefile
+@@ -9,7 +9,7 @@ OBJ+=${OLLYOBJ}
+ all: rasm${BINSFX}
+ 
+ rasm${BINSFX}: ${OBJ}
+-	${CC} ${OBJ} -o rasm${BINSFX} ../utils.c
++	${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} -o rasm${BINSFX} ../utils.c
+ 
+ clean:
+ 	-rm -f ${OBJ} rasm${BINSFX}
diff --git a/dev-util/radare/radare-1.5-r1.ebuild b/dev-util/radare/radare-1.5-r1.ebuild
new file mode 100644
index 000000000000..5e2ebc38c91a
--- /dev/null
+++ b/dev-util/radare/radare-1.5-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.5-r1.ebuild,v 1.1 2010/06/24 12:39:39 hwoarang Exp $
+
+inherit eutils
+
+DESCRIPTION="Advanced command line hexadecimail editor and more"
+HOMEPAGE="http://www.radare.org"
+SRC_URI="http://www.radare.org/get/radare-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="gui lua vala"
+
+DEPEND="sys-libs/readline
+		dev-lang/python
+		lua? ( dev-lang/lua )
+		vala? ( dev-lang/vala )
+		"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	# fix documentation installation
+	sed -i "s:doc/${PN}:doc/${PF}:g" \
+		Makefile.acr global.h.acr src/Makefile.acr wscript dist/maemo/Makefile
+}
+
+src_compile() {
+	econf $(use_with gui) || die "configure failed"
+	emake -j1 || die "compile failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+}