ver bump #64451

8 files changed, 71 insertions, 81 deletions

diff --git a/net-analyzer/hydra/ChangeLog b/net-analyzer/hydra/ChangeLog
index eadd04245bc1..e65f232ff1c7 100644
--- a/net-analyzer/hydra/ChangeLog
+++ b/net-analyzer/hydra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/hydra
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/ChangeLog,v 1.8 2004/08/18 04:04:17 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/ChangeLog,v 1.9 2004/09/25 04:22:03 vapier Exp $
+
+*hydra-4.3 (25 Sep 2004)
+
+  25 Sep 2004; Mike Frysinger <vapier@gentoo.org> +hydra-4.3.ebuild:
+  Version bump #64451 by Daniel Webert.
 
 *hydra-4.2 (17 Aug 2004)
 
diff --git a/net-analyzer/hydra/files/digest-hydra-4.1 b/net-analyzer/hydra/files/digest-hydra-4.1
deleted file mode 100644
index 88b792ec6a2b..000000000000
--- a/net-analyzer/hydra/files/digest-hydra-4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63f1bea8ff62d296099f777d25ee842e hydra-4.1-src.tar.gz 172264
diff --git a/net-analyzer/hydra/files/digest-hydra-4.2 b/net-analyzer/hydra/files/digest-hydra-4.2
deleted file mode 100644
index 2d71965420ef..000000000000
--- a/net-analyzer/hydra/files/digest-hydra-4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 99e22711fa15fc6a1c891296ee76f3f5 hydra-4.2-src.tar.gz 171955
diff --git a/net-analyzer/hydra/files/digest-hydra-4.3 b/net-analyzer/hydra/files/digest-hydra-4.3
new file mode 100644
index 000000000000..c2bc59d0bb28
--- /dev/null
+++ b/net-analyzer/hydra/files/digest-hydra-4.3
@@ -0,0 +1 @@
+MD5 e135798de515bb2f7a231625046210a9 hydra-4.3-src.tar.gz 172215
diff --git a/net-analyzer/hydra/files/make_xhydra.sh b/net-analyzer/hydra/files/make_xhydra.sh
deleted file mode 100644
index 4f19968e5678..000000000000
--- a/net-analyzer/hydra/files/make_xhydra.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-echo "Trying to compile xhydra now (hydra gtk gui) - dont worry if this fails, this is really optional ..."
-echo "You must add the gtk flag to your USE variable to install xhydra."
-echo "Don't worry, ./hydra is the way to go!"
diff --git a/net-analyzer/hydra/hydra-4.1.ebuild b/net-analyzer/hydra/hydra-4.1.ebuild
deleted file mode 100644
index e8952f31e61c..000000000000
--- a/net-analyzer/hydra/hydra-4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-4.1.ebuild,v 1.4 2004/08/16 10:29:27 eldad Exp $
-
-DESCRIPTION="Advanced parallized login hacker"
-HOMEPAGE="http://www.thc.org/"
-SRC_URI="http://www.thc.org/releases/${P}-src.tar.gz"
-
-LICENSE="HYDRA GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	net-libs/libssh"
-
-S=${WORKDIR}/${P}-src
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s:-O2:${CFLAGS}:" Makefile.am
-}
-
-src_compile() {
-	# has it's own stupid custom configure script
-	./configure --prefix=/usr || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	dobin hydra pw-inspector || die "dobin failed"
-	dodoc CHANGES README TODO
-}
diff --git a/net-analyzer/hydra/hydra-4.2.ebuild b/net-analyzer/hydra/hydra-4.2.ebuild
deleted file mode 100644
index 4604f393efff..000000000000
--- a/net-analyzer/hydra/hydra-4.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-4.2.ebuild,v 1.1 2004/08/18 04:04:17 squinky86 Exp $
-
-DESCRIPTION="Advanced parallized login hacker"
-HOMEPAGE="http://www.thc.org/"
-SRC_URI="http://www.thc.org/releases/${P}-src.tar.gz"
-
-LICENSE="HYDRA GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="gtk"
-
-DEPEND="dev-libs/openssl
-	net-libs/libssh
-	gtk? ( >=x11-libs/gtk+-1.2 )"
-
-S=${WORKDIR}/${P}-src
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s:-O2:${CFLAGS}:" Makefile.am
-	if ! use gtk; then
-		cp ${FILESDIR}/make_xhydra.sh ./hydra-gtk/make_xhydra.sh
-		chmod +x ./hydra-gtk/make_xhydra.sh
-	fi
-}
-
-src_compile() {
-	# has it's own stupid custom configure script
-	./configure --prefix=/usr || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	dobin hydra pw-inspector || die "dobin failed"
-	use gtk && dobin xhydra
-	dodoc CHANGES README TODO
-}
diff --git a/net-analyzer/hydra/hydra-4.3.ebuild b/net-analyzer/hydra/hydra-4.3.ebuild
new file mode 100644
index 000000000000..14c98689ca56
--- /dev/null
+++ b/net-analyzer/hydra/hydra-4.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-4.3.ebuild,v 1.1 2004/09/25 04:22:03 vapier Exp $
+
+DESCRIPTION="Advanced parallized login hacker"
+HOMEPAGE="http://www.thc.org/"
+SRC_URI="http://www.thc.org/releases/${P}-src.tar.gz"
+
+LICENSE="HYDRA GPL-2"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE="gtk ssl"
+
+DEPEND="gtk? ( >=x11-libs/gtk+-1.2 )
+	ssl? (
+		dev-libs/openssl
+		net-libs/libssh
+	)"
+
+S=${WORKDIR}/${P}-src
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i "s:-O2:${CFLAGS}:" Makefile.am
+
+	cd hydra-gtk
+	rm make_xhydra.sh || die
+	if use gtk ; then
+		make distclean || die
+	fi
+}
+
+src_compile() {
+	# has it's own stupid custom configure script
+	./configure --prefix=/usr || die "configure failed"
+	sed -i \
+		-e '/^XDEFINES=/s:=.*:=:' \
+		-e '/^XLIBS=/s:=.*:=:' \
+		-e '/^XLIBPATHS/s:=.*:=:' \
+		-e '/^XIPATHS=/s:=.*:=:' \
+		Makefile || die "pruning vars"
+	if use ssl ; then
+		sed -i \
+			-e '/^XDEFINES=/s:=:=-DLIBOPENSSL -DLIBSSH:' \
+			-e '/^XLIBS=/s:=:=-lcrypto -lssl -lssh:' \
+			Makefile || die "adding ssl"
+	fi
+	emake || die "make failed"
+
+	if use gtk ; then
+		cd hydra-gtk
+		econf || die
+		emake || die
+	fi
+}
+
+src_install() {
+	dobin hydra pw-inspector || die "dobin failed"
+	if use gtk ; then
+		dobin hydra-gtk/src/xhydra || die "gtk"
+	fi
+	dodoc CHANGES README TODO
+}