[patch] Patch to hydra-5.4-r3.ebuild to fix numerous QA issues

hydra-5.4-r3.ebuild.patch (text/plain), 1.85 KB, created by Kevin Pyle on 2010-08-21 18:48:23 UTC

diff -ru a/hydra-5.4-r3.ebuild b/hydra-5.4-r3.ebuild
--- a/hydra-5.4-r3.ebuild	2010-05-21 16:06:40.000000000 +0000
+++ b/hydra-5.4-r3.ebuild	2010-08-21 18:32:02.738992004 +0000
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-5.4-r3.ebuild,v 1.4 2010/05/21 15:53:49 pva Exp $
 
 EAPI="2"
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Advanced parallized login hacker"
 HOMEPAGE="http://www.thc.org/thc-hydra/"
@@ -15,21 +15,30 @@
 IUSE="gtk ssl"
 
 DEPEND="gtk? ( >=x11-libs/gtk+-1.2 )
+	dev-libs/openssl
 	ssl? (
-		dev-libs/openssl
 		>=net-libs/libssh-0.4.0
 	)"
 
 S=${WORKDIR}/${P}-src
 
 src_prepare() {
-	sed -i "s:-O2:${CFLAGS}:" Makefile.am || die "sed failed"
+	sed -i \
+		-e "s:-O2:${CPPFLAGS} ${CFLAGS}:" \
+		-e 's:|| echo.*$::' \
+		-e '/\t-$(CC)/s/-//' \
+		-e "/ -o /s:\$(OPTS):& ${LDFLAGS}:" \
+		Makefile.am || die "sed failed"
 	epatch "${FILESDIR}/${P}-_FORTIFY_SOURCE.patch"
 	epatch "${FILESDIR}/${P}-free-without-malloc.patch"
 	epatch "${FILESDIR}/${P}-libssh-0.4.0.patch"
+	# None of the settings in Makefile.unix are useful to us
+	: > Makefile.unix
 }
 
 src_configure() {
+	# Note: despite the naming convention, the top level script is not an
+	# autoconf-based script.
 	./configure \
 		--prefix=/usr \
 		$(use gtk && echo --disable-xhydra) \
@@ -37,7 +46,7 @@
 
 	sed -i \
 		-e '/^XDEFINES=/s:=.*:=:' \
-		-e '/^XLIBS=/s:=.*:=:' \
+		-e '/^XLIBS=/s:=.*:=-lcrypto:' \
 		-e '/^XLIBPATHS/s:=.*:=:' \
 		-e '/^XIPATHS=/s:=.*:=:' \
 		Makefile || die "pruning vars"
@@ -45,7 +54,7 @@
 	if use ssl ; then
 		sed -i \
 			-e '/^XDEFINES=/s:=:=-DLIBOPENSSL -DLIBSSH:' \
-			-e '/^XLIBS=/s:=:=-lcrypto -lssl -lssh:' \
+			-e '/^XLIBS=/s:$: -lssl -lssh:' \
 			Makefile || die "adding ssl"
 	fi
 
@@ -56,6 +65,7 @@
 }
 
 src_compile() {
+	tc-export CC
 	emake || die "make failed"
 	if use gtk ; then
 		cd hydra-gtk && \