From: Markos Chandras <hwoarang@gentoo.org>
Date: Thu, 24 Jun 2010 12:39:39 +0000 (+0000)
Subject: Respect LDFLAGS, fix documentation installation wrt bug #296746
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=db36b9b1435993fbb585505f0619298c74ea9b41;p=gentoo.git

Respect LDFLAGS, fix documentation installation wrt bug #296746
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

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/Manifest b/dev-util/radare/Manifest
index f5b3eba89058..d6f4160790df 100644
--- a/dev-util/radare/Manifest
+++ b/dev-util/radare/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX radare-1.2.1-as-needed.patch 12748 RMD160 c4fcc56db1586b308213dd3732dd89627abcac86 SHA1 0ac02f07f5439b3e37e01b5e909b15f3748fcd80 SHA256 6b72a2fb75109d6d1ba14cba9ec15c97dec504b3984f98e82ecd465860e85729
+AUX radare-1.5-ldflags.patch 3182 RMD160 bf315743ea4e268a21992f48bd216baee6979419 SHA1 8e86fc685349eb96cbbb340d47f7ff32ffaccf94 SHA256 dbea1b9c24dbd05a7ffb0c7b074dc4f11f2adb9f90ec978a835150d85d6c6833
 DIST radare-0.9.9.tar.gz 1111964 RMD160 024c5905e9a856f126e88b0be501fb8ba0febf36 SHA1 c05e106f6188a385c4bdd813af66154970759846 SHA256 a8856c6622a888beb96cb3f3c758c827a175af2b272e00454d281e64f035cff5
 DIST radare-1.2.1.tar.gz 1595561 RMD160 fbc2d2c130ab5402df9d88f8dcac179b23cb34a2 SHA1 8a685b8e219181aaccc2e0de88eea6de632ec6a5 SHA256 d89c2a7254d8a05341e1b2c4c9a5c5a07e3d150d664833dbcf6cc2b559d82def
 DIST radare-1.2.2.tar.gz 1595419 RMD160 3f3da03aa2aeb39d6fb7008174f3d03d4ec939b2 SHA1 9b806c2536b7b712aa9cff71c75e2675710e0178 SHA256 c43a286023a5d024f0328a721c7f469a5673ee18cb84bc640467057d128b4418
@@ -16,13 +14,7 @@ EBUILD radare-1.2.2.ebuild 690 RMD160 07fde3b4e828870ea46985e12f0aa69d288032e7 S
 EBUILD radare-1.4.1.ebuild 745 RMD160 d9f745e5ca39ac7b2cc09044784c41b2db29dea8 SHA1 c5bd05b8189cb0456376f0cd608ea894b4deb89f SHA256 e8615944889f85da119211b630babf4869e780488265dc9a286fff58cf8255e7
 EBUILD radare-1.4.2.ebuild 749 RMD160 2248c7b4d95fe6f241593d57af1bb1a065efec7b SHA1 234f484ea04f1a94f599fe850c10272e6524319f SHA256 2d8ac92da36c20add2053804fc52a02d7ddb8f02c34161118feb8dda924d4d6f
 EBUILD radare-1.4.ebuild 684 RMD160 145b98dce2b3e5661ab39cf9cfd88deeaec3f0b3 SHA1 c85f669c27362baa6d1bb7b26fb3d62f1ab751cc SHA256 e22caffb0ea01d018be448f741c69da9c1fd300b31e1d380955297437b906bcf
+EBUILD radare-1.5-r1.ebuild 981 RMD160 815a4500f7bd3a9deb597237918d94da90238d20 SHA1 82ac118a230db679e3e0ead7f4cb0aa1883fa3a3 SHA256 66a38103f9b9774f140e63bba3814b361ad302deb8be5662eb517eb79725239d
 EBUILD radare-1.5.ebuild 739 RMD160 02c9476a2c726b79ee5deeb704dbe3d14771d9a7 SHA1 20208a011e16213cdae694e0626312ff14a150e1 SHA256 533871eda4e32c231bd1e0292ec0c2f0357bbec675bf3cd6d1b8a6826562295e
-MISC ChangeLog 1982 RMD160 edcfedc0c191ff1fd79635045e0f703a811c2161 SHA1 70155c2b195a2ee152e892c4ffb26d145e883f36 SHA256 fd04ec94ac6c8e278c7990c1f462ef4e1a736d08521ebe657b7ab5b91141e56c
+MISC ChangeLog 2187 RMD160 09bd802c0ff69746ca1b55c1633b76c536537340 SHA1 5deb65f73b3ded4b766967c69f2670caa5fe5355 SHA256 29ff645ba294b45703ea93875d5ef9684bd315ea91f82af814e538ec9ca82bed
 MISC metadata.xml 449 RMD160 34f3effe46ff24de87df6c13e71a9eccc11d1d3a SHA1 e91b4beb5f4e22a99d95ef8d2806d55ffae819e8 SHA256 f503757570c811846dbf0512348400b49f8f33cf54e25e6df0e83200018346b6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuizZQACgkQ/ejvha5XGaMBlwCfe5aOKqKJ0C3ett95Y57xHDCW
-sigAoKMGOvjdbISClLbXY4y0fL1mDI1t
-=MEWO
------END PGP SIGNATURE-----
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"
+}