Remove old ebuilds and fix bug 250141 (thanks vapier).

(Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r4 i686)

8 files changed, 10 insertions, 304 deletions

diff --git a/app-crypt/ophcrack/ChangeLog b/app-crypt/ophcrack/ChangeLog
index 44250180730e..201230cf4ac3 100644
--- a/app-crypt/ophcrack/ChangeLog
+++ b/app-crypt/ophcrack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/ophcrack
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ChangeLog,v 1.24 2008/11/17 17:06:03 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ChangeLog,v 1.25 2008/12/07 18:22:17 ikelos Exp $
+
+  07 Dec 2008; Mike Auty <ikelos@gentoo.org> -files/samdump2-2.0.patch,
+  -files/ophcrack-3.0-makefile.patch, -ophcrack-2.4.ebuild,
+  ophcrack-2.4.1.ebuild, -ophcrack-3.0.ebuild, -ophcrack-3.0.1.ebuild,
+  -ophcrack-3.0.1-r1.ebuild:
+  Remove old ebuilds and fix bug 250141 (thanks vapier).
 
 *ophcrack-3.0.1-r2 (17 Nov 2008)
 
diff --git a/app-crypt/ophcrack/files/ophcrack-3.0-makefile.patch b/app-crypt/ophcrack/files/ophcrack-3.0-makefile.patch
deleted file mode 100644
index e90726facc04..000000000000
--- a/app-crypt/ophcrack/files/ophcrack-3.0-makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/Makefile.in b/src/Makefile.in
-index fcfcdbb..e5bffc4 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -53,10 +53,10 @@ ophcrack: main.o libophcrack.a samdump2/libsamdump2.a
- # Install target
- install: all
- 	@echo "Creating directories..."
--	$(INSTALL) -d $(bindir)
--#	$(INSTALL) -d $(mandir)
-+	$(INSTALL) -d $(DESTDIR)$(bindir)
-+#	$(INSTALL) -d $(DESTDIR)$(mandir)
- 	@echo "Copying binary..."
--	$(INSTALL) ophcrack $(bindir)
-+	$(INSTALL) ophcrack $(DESTDIR)$(bindir)
- #	@echo "Installing man page..."
- #	$(INSTALL) ophcrack.1 $(DESTDIR)$(MANDIR)
- 	@echo ""
diff --git a/app-crypt/ophcrack/files/samdump2-2.0.patch b/app-crypt/ophcrack/files/samdump2-2.0.patch
deleted file mode 100644
index e1b680e85b2c..000000000000
--- a/app-crypt/ophcrack/files/samdump2-2.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/samdump2-2.0/Makefile b/samdump2-2.0/Makefile
-index f8fa462..ab4490c 100644
---- a/samdump2-2.0/Makefile
-+++ b/samdump2-2.0/Makefile
-@@ -49,7 +49,7 @@ clean:
- 	@echo ""
- 
- # Install target
--install: build infos
-+install: build
- 	@echo "Creating directories..."
- 	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(MANDIR)
-@@ -60,7 +60,7 @@ install: build infos
- 	@echo ""
- 
- # Uninstall target
--uninstall: infos
-+uninstall: 
- 	@echo "Deleting binary and manpages..."
- 	rm -f $(DESTDIR)$(BINDIR)/samdump2
- 	rm -f $(DESTDIR)$(MANDIR)/samdump2.1
diff --git a/app-crypt/ophcrack/ophcrack-2.4.1.ebuild b/app-crypt/ophcrack/ophcrack-2.4.1.ebuild
index 3e2da4c25444..fd86fb716b54 100644
--- a/app-crypt/ophcrack/ophcrack-2.4.1.ebuild
+++ b/app-crypt/ophcrack/ophcrack-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-2.4.1.ebuild,v 1.1 2008/01/10 23:24:34 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-2.4.1.ebuild,v 1.2 2008/12/07 18:22:17 ikelos Exp $
 
 inherit toolchain-funcs eutils
 
@@ -33,12 +33,12 @@ src_compile() {
 	# Make samdump2
 	einfo "Compiling samdump2"
 	cd "${WORKDIR}/samdump2-${SAMDUMP_VER}"
-	MAKEOPTS="-j1" emake || die "Failed to make samdump"
+	emake -j1 || die "Failed to make samdump"
 
 	# Make bkhive2
 	einfo "Compiling bkhive"
 	cd "${WORKDIR}/bkhive-${BKHIVE_VER}"
-	MAKEOPTS="-j1" emake || die "Failed to make bkhive2"
+	emake -j1 || die "Failed to make bkhive2"
 
 	# Make the program
 	einfo "Compiling ophcrack"
diff --git a/app-crypt/ophcrack/ophcrack-2.4.ebuild b/app-crypt/ophcrack/ophcrack-2.4.ebuild
deleted file mode 100644
index 96c3857d6920..000000000000
--- a/app-crypt/ophcrack/ophcrack-2.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-2.4.ebuild,v 1.5 2008/01/11 00:02:43 ikelos Exp $
-
-inherit toolchain-funcs eutils
-
-BKHIVE_VER="1.1.0"
-SAMDUMP_VER="1.1.0"
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/bkhive-${BKHIVE_VER}.tar.gz
-	mirror://sourceforge/${PN}/samdump2-${SAMDUMP_VER}.tar.gz
-	!ophsmall? ( http://lasecwww.epfl.ch/SSTIC04-5k.zip )
-	ophsmall? ( http://lasecwww.epfl.ch/SSTIC04-10k.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ophsmall"
-
-DEPEND="app-arch/unzip
-		>=dev-util/pkgconfig-0.22
-		dev-libs/openssl
-		net-libs/netwib
-		>=x11-libs/gtk+-2"
-RDEPEND="dev-libs/openssl
-		 net-libs/netwib
-		 >=x11-libs/gtk+-2"
-
-src_compile() {
-	# Make samdump2
-	einfo "Compiling samdump2"
-	cd "${WORKDIR}/samdump2-${SAMDUMP_VER}"
-	MAKEOPTS="-j1" emake || die "Failed to make samdump"
-
-	# Make bkhive2
-	einfo "Compiling bkhive"
-	cd "${WORKDIR}/bkhive-${BKHIVE_VER}"
-	MAKEOPTS="-j1" emake || die "Failed to make bkhive2"
-
-	# Make the program
-	einfo "Compiling ophcrack"
-	cd "${S}"
-	econf
-	emake || die "Failed to make ophcrack"
-
-	# Don't try to install the prebuilt binaries,
-	# they'll cause an access violation
-	rm -fr "${S}/linux_tools"
-}
-
-src_install() {
-	make install DESTDIR="${D}"
-
-	cd "${WORKDIR}/bkhive-${BKHIVE_VER}"
-	make install DESTDIR="${D}" PREFIX=/usr/
-
-	cd "${WORKDIR}/samdump2-${SAMDUMP_VER}"
-	make install DESTDIR="${D}" PREFIX=/usr/
-
-	TABLENAME="5000"
-	use ophsmall && TABLENAME="10000"
-
-	dodir "/usr/share/${PN}/${TABLENAME}"
-	mv "${WORKDIR}/table"* "${D}/usr/share/${PN}/${TABLENAME}"
-}
diff --git a/app-crypt/ophcrack/ophcrack-3.0.1-r1.ebuild b/app-crypt/ophcrack/ophcrack-3.0.1-r1.ebuild
deleted file mode 100644
index c074ec9573c4..000000000000
--- a/app-crypt/ophcrack/ophcrack-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-3.0.1-r1.ebuild,v 1.1 2008/08/28 20:06:34 ikelos Exp $
-
-inherit toolchain-funcs autotools eutils
-
-SAMDUMP_VER="2.0"
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://sourceforge/${PN}/samdump2-${SAMDUMP_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-		>=dev-util/pkgconfig-0.22
-		dev-libs/openssl
-		net-libs/netwib
-		>=x11-libs/qt-4"
-RDEPEND="dev-libs/openssl
-		 net-libs/netwib
-		 >=x11-libs/qt-4
-		 app-crypt/ophcrack-tables"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/samdump2-${SAMDUMP_VER}.patch"
-}
-
-src_compile() {
-	# Make samdump2
-	einfo "Compiling samdump2"
-	cd "${WORKDIR}/samdump2-${SAMDUMP_VER}"
-	MAKEOPTS="-j1" emake || die "Failed to make samdump"
-
-	# Make the program
-	einfo "Compiling ophcrack"
-	cd "${S}"
-	econf
-	emake || die "Failed to make ophcrack"
-
-	# Don't try to install the prebuilt binaries,
-	# they'll cause an access violation
-	rm -fr "${S}/linux_tools"
-}
-
-src_install() {
-	make install DESTDIR="${D}"
-
-	cd "${WORKDIR}/samdump2-${SAMDUMP_VER}"
-	make install DESTDIR="${D}" PREFIX=/usr/
-
-	cd "${S}"
-	newicon src/gui/pixmaps/os.xpm ophcrack.xpm
-	make_desktop_entry "${PN}" OphCrack ophcrack
-}
diff --git a/app-crypt/ophcrack/ophcrack-3.0.1.ebuild b/app-crypt/ophcrack/ophcrack-3.0.1.ebuild
deleted file mode 100644
index 17e5b687d0b7..000000000000
--- a/app-crypt/ophcrack/ophcrack-3.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-3.0.1.ebuild,v 1.1 2008/07/21 19:51:00 ikelos Exp $
-
-inherit toolchain-funcs autotools eutils
-
-SAMDUMP_VER="2.0"
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://sourceforge/${PN}/samdump2-${SAMDUMP_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-		>=dev-util/pkgconfig-0.22
-		dev-libs/openssl
-		net-libs/netwib
-		>=x11-libs/qt-4"
-RDEPEND="dev-libs/openssl
-		 net-libs/netwib
-		 >=x11-libs/qt-4
-		 app-crypt/ophcrack-tables"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/samdump2-${SAMDUMP_VER}.patch"
-}
-
-src_compile() {
-	# Make samdump2
-	einfo "Compiling samdump2"
-	cd "${WORKDIR}/samdump2-${SAMDUMP_VER}"
-	MAKEOPTS="-j1" emake || die "Failed to make samdump"
-
-	# Make the program
-	einfo "Compiling ophcrack"
-	cd "${S}"
-	econf
-	emake || die "Failed to make ophcrack"
-
-	# Don't try to install the prebuilt binaries,
-	# they'll cause an access violation
-	rm -fr "${S}/linux_tools"
-}
-
-src_install() {
-	make install DESTDIR="${D}"
-
-	cd "${WORKDIR}/samdump2-${SAMDUMP_VER}"
-	make install DESTDIR="${D}" PREFIX=/usr/
-}
diff --git a/app-crypt/ophcrack/ophcrack-3.0.ebuild b/app-crypt/ophcrack/ophcrack-3.0.ebuild
deleted file mode 100644
index 4bee578453ea..000000000000
--- a/app-crypt/ophcrack/ophcrack-3.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-3.0.ebuild,v 1.1 2008/07/21 19:16:12 ikelos Exp $
-
-inherit toolchain-funcs autotools eutils
-
-BKHIVE_VER="1.1.1"
-SAMDUMP_VER="1.1.1"
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://sourceforge/${PN}/bkhive-${BKHIVE_VER}.tar.gz
-	mirror://sourceforge/${PN}/samdump2-${SAMDUMP_VER}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-		>=dev-util/pkgconfig-0.22
-		dev-libs/openssl
-		net-libs/netwib
-		>=x11-libs/qt-4"
-RDEPEND="dev-libs/openssl
-		 net-libs/netwib
-		 >=x11-libs/qt-4
-		 app-crypt/ophcrack-tables"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
-
-src_compile() {
-	# Make samdump2
-	einfo "Compiling samdump2"
-	cd "${WORKDIR}/samdump2-${SAMDUMP_VER}"
-	MAKEOPTS="-j1" emake || die "Failed to make samdump"
-
-	# Make bkhive2
-	einfo "Compiling bkhive"
-	cd "${WORKDIR}/bkhive-${BKHIVE_VER}"
-	MAKEOPTS="-j1" emake || die "Failed to make bkhive2"
-
-	# Make the program
-	einfo "Compiling ophcrack"
-	cd "${S}"
-	econf
-	emake || die "Failed to make ophcrack"
-
-	# Don't try to install the prebuilt binaries,
-	# they'll cause an access violation
-	rm -fr "${S}/linux_tools"
-}
-
-src_install() {
-	make install DESTDIR="${D}"
-
-	cd "${WORKDIR}/bkhive-${BKHIVE_VER}"
-	make install DESTDIR="${D}" PREFIX=/usr/
-
-	cd "${WORKDIR}/samdump2-${SAMDUMP_VER}"
-	make install DESTDIR="${D}" PREFIX=/usr/
-}