Respect LDFLAGS (bug #332831). Do not hardwire CC in Makefile.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

3 files changed, 82 insertions, 3 deletions

diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index ab3d3a5ec93a..68de89391b6d 100644
--- a/net-analyzer/amap/ChangeLog
+++ b/net-analyzer/amap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/amap
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.44 2009/08/25 23:59:07 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.45 2010/08/15 23:44:20 jer Exp $
+
+*amap-5.2-r2 (15 Aug 2010)
+
+  15 Aug 2010; Jeroen Roovers <jer@gentoo.org> +amap-5.2-r2.ebuild:
+  Respect LDFLAGS (bug #332831). Do not hardwire CC in Makefile.
 
   25 Aug 2009; Jeroen Roovers <jer@gentoo.org> -amap-4.8-r1.ebuild,
   -files/amap-4.8-fix-icky-lvalue-casts.diff, -files/amap-4.8-gcc4.patch,
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index ac41da432823..1a1b9e4845db 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,5 +1,6 @@
 AUX 4.8-system-pcre.patch 1232 RMD160 8bf8ea0a6327d7e58022d1b20b4f3ddc0adb2c2f SHA1 21b2d46a40f4972588cf107330c87cfc7b19bbe3 SHA256 608adf3637c8670ad5cfe4a2f69cdab5640b427f94bfed3e00df5c68dbeeca66
 DIST amap-5.2.tar.gz 262875 RMD160 4ea604ecb086f8e3cac84b45caac93b4a04eba26 SHA1 0474391a4c78040a7504bcce3b45bd926a682c41 SHA256 0ca1d5e9feab7d44af39dc058a688a0636f8e798315ee742847c4057e4467fb6
 EBUILD amap-5.2-r1.ebuild 1849 RMD160 2a1a5ca6bf25c7b57fbcc155576efe15d4bfbc33 SHA1 77196b2837ea115f83b504e86df5ab80b96dcb99 SHA256 eaa56dc72405247d5124f91eacac464e9aa2fcc3f8fff2a483a2baa3c8930a6f
-MISC ChangeLog 5908 RMD160 137bf2a444ee84ab7bda98c255b7f70da31e4542 SHA1 5d7d4d92f1f5f437081936d27dae3217287f6fda SHA256 23530f56799139a9e4eede13ff79375874761f340f057b30c3cf7a129e6519bc
+EBUILD amap-5.2-r2.ebuild 1964 RMD160 c70fe618034c8a15941f8a1a57ddda9dcba13b03 SHA1 cabefec2087f5e11664a274ce0329bb6d6f29803 SHA256 8ad3da62aae6835cd6f87e306698dee315080caa4d2ae0ba315e0a223a172bc0
+MISC ChangeLog 6070 RMD160 97302584c8d0c3bbba089e1d292f1f45055372c9 SHA1 11253b1ab0f85c5d8058e6ac04f932c29a29628d SHA256 ff0580f5f23d6e2f3f4a46150edf30e87cdb034736a49e1c8139c9649485c446
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
diff --git a/net-analyzer/amap/amap-5.2-r2.ebuild b/net-analyzer/amap/amap-5.2-r2.ebuild
new file mode 100644
index 000000000000..a3eef76b6667
--- /dev/null
+++ b/net-analyzer/amap/amap-5.2-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.2-r2.ebuild,v 1.1 2010/08/15 23:44:20 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A network scanning tool for pentesters"
+HOMEPAGE="http://www.thc.org/thc-amap/"
+SRC_URI="http://www.thc.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl"
+
+DEPEND="
+	dev-libs/libpcre
+	ssl? ( >=dev-libs/openssl-0.9.6j )
+"
+RDEPEND="
+	${DEPEND}
+	!sci-biology/amap
+"
+
+src_prepare() {
+	rm -rf pcre-3.9
+	sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die "sed amap-lib.c failed"
+	# Above change requires below change. See sources...
+	sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die "sed amap-lib.c failed"
+	sed -i 's:/usr/local:/usr:' amap.h || die "sed amap.h failed"
+	# Files to be updated are at different location, bug 207839.
+	sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die "sed amap.h failed"
+
+	sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die "sed Makefile.am failed"
+
+	epatch "${FILESDIR}"/4.8-system-pcre.patch
+}
+
+src_configure() {
+	# has it's own stupid custom configure script
+	./configure || die "configure failed"
+	sed -i \
+		-e '/^XDEFINES=/s:=.*:=:' \
+		-e '/^XLIBS=/s:=.*:=:' \
+		-e '/^XLIBPATHS/s:=.*:=:' \
+		-e '/^XIPATHS=/s:=.*:=:' \
+		-e "/^CC=/d" \
+		Makefile || die "pruning vars"
+	if use ssl ; then
+		sed -i \
+			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
+			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
+			Makefile || die "adding ssl"
+	fi
+	sed -i Makefile \
+		-e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \
+		|| die "respecting LDFLAGS failed"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) OPT="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin amap amapcrap || die "dobin failed"
+	insinto /usr/share/amap
+	doins appdefs.* || die "doins failed"
+
+	doman ${PN}.1
+	dodoc README TODO CHANGES
+}