Cleanup

Package-Manager: portage-2.1.4.3

3 files changed, 5 insertions, 129 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index c4615ec4197f..1a410bef5861 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.82 2008/01/11 07:10:26 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.83 2008/02/13 10:34:49 alonbl Exp $
+
+  13 Feb 2008; Alon Bar-Lev <alonbl@gentoo.org> -johntheripper-1.7.2.ebuild:
+  Cleanup
 
 *johntheripper-1.7.2-r4 (11 Jan 2008)
 
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 759841a3f6aa..4573cfd6a6f8 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -4,12 +4,10 @@ AUX johntheripper-1.7.2-sha1-memset.patch 388 RMD160 71190df1e84e543eef49e953915
 AUX johntheripper-1.7.2-stackdef-2.S.patch 363 RMD160 dfb0912bcff9ded13a50ccc153448423c0f00831 SHA1 ea3b75eb936adc98ebfe41650f608173b6b272f9 SHA256 9ce4d1e7ee1440208a7b8ed48fd4270c558772df10d3b2bb8ecaffc26152a073
 AUX johntheripper-1.7.2-stackdef.S.patch 1845 RMD160 947aa7be3186c13f87b35e2bbd1bd63f28c5e1a9 SHA1 705a85daf7a65b9b0908b638144c4eaae2ee7316 SHA256 952f076de0eef22db086864ca95e84aab16eb5fcb7035cb3d9c23340b3e2311f
 AUX johntheripper-1.7.2-stripping.patch 840 RMD160 9001329b0fcda4ed244c746cdd6dc2d5bde9ae94 SHA1 e60f41af985f12a431b9c272e3964d166d552782 SHA256 e2b989facd64aa1634de13df5a76c3c5579ad90d75a4af63f68b5ad970eca0b8
-DIST john-1.7-all-4.diff.gz 50311 RMD160 eafed1e75d72beef62664b238adf38ec6e6d4c52 SHA1 6050745204b38a7dd9fc41889de2b87866c8b528 SHA256 cb51be6cb03e952a21ea1a85e60253b932c946959b62f8082665ac2c7a792909
 DIST john-1.7.2-all-7.diff.gz 64450 RMD160 c0adeb226ee75bbc9a875b93a622b99927fb825f SHA1 a0b25e3f9606b5839a4f1a59f896727f0195ba9a SHA256 fb2f42d12ec94be02ad398ac9e823190e518cefcb096a4197c6a37d83d29124c
 DIST john-1.7.2-all-9.diff.gz 70430 RMD160 20fde9586f5d7938fbb9f187ec0689f48a56590d SHA1 1d5202842e1ba7f68306d1524bb029b29a5c3e29 SHA256 44555f9c2b630d9c35597f1a4319379f4e3f452ab2103b21cee8d3ebe6d38bbe
 DIST john-1.7.2.tar.gz 809308 RMD160 8ab90216401cf5cda7ba50a8bb88f53678e35eac SHA1 c3c4720c2f1446a3349b0307a0522af574d013e4 SHA256 9a94d2417b13d49cb11aeb11186933fe0e0491904987ca47c88bf5710935c3cb
 EBUILD johntheripper-1.7.2-r3.ebuild 3256 RMD160 ecf828bec14a2d55a28c73140e569bec61329a2b SHA1 3882167d75c0f4f5b853c2fb90ab0e35ee35410e SHA256 54049154f71ff658f883ee0aab478d12fda50151248ebad2d4d578242878a8dc
 EBUILD johntheripper-1.7.2-r4.ebuild 2964 RMD160 97a42db852ab61ff199637bdc7d8a839eb7b5bf2 SHA1 964fb7fb2629a5ef24c10b740688f64010230507 SHA256 9a62dcb4696cddad8c9ef9c11084ce3c8530f2b2b83edc6231935e2e74452254
-EBUILD johntheripper-1.7.2.ebuild 3235 RMD160 9de4c6a5b0ee1677668596a90f4b030a014b1544 SHA1 f0ed3a26b008c7cbad5395702b22a36954f513cd SHA256 d52ee9fefd3be639e038384b3c36c602b0a510a6cd93f5571fc496e41e61903d
-MISC ChangeLog 13877 RMD160 22dc42f84c0cd260a71aa69871e7cfdb7400deab SHA1 980286a180992b424bfc6a4d895d3d13ec3ae735 SHA256 28ba469a2ffdbb3649f24c92511bc009a43c3e338fa4c7e6a5f4e5cb33fc2088
+MISC ChangeLog 13965 RMD160 b27a7044380c6d57d45f66a34f5d62b784684dbd SHA1 61a9ed62bb7683a0eb5420994a6e35b6fad2e569 SHA256 59987097c5230e3c5d2375527a086e9f6bcf4ce8936a641d334c5393498b1635
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
diff --git a/app-crypt/johntheripper/johntheripper-1.7.2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2.ebuild
deleted file mode 100644
index 21035d1df596..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2.ebuild,v 1.16 2008/02/04 18:47:56 grobian Exp $
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-MY_PBASE=${P/theripper/}
-MY_PNBASE=${PN/theripper/}
-S=${WORKDIR}/${MY_PBASE}
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-SRC_URI="http://www.openwall.com/john/f/${MY_PBASE}.tar.gz
-		http://www.openwall.com/john/contrib/${MY_PNBASE}-1.7-all-4.diff.gz"
-
-# banquise-to-bigpatch-17.patch.bz2"
-# based off /var/tmp/portage/johntheripper-1.6.40
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
-IUSE="mmx altivec"
-
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.7"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${MY_PNBASE}-1.7-all-4.diff
-
-	for p in params.h sha1-memset stackdef.S stripping; do
-		epatch "${FILESDIR}/${P}-${p}.patch"
-	done
-
-	ebegin "Applying ${P}-Makefile.patch"
-	sed -i -e "s|^CFLAGS.*|CFLAGS= -c -Wall ${CFLAGS}|" \
-		-e 's|^LDFLAGS.*|LDFLAGS= -lm|' "${S}"/src/Makefile
-	eend $?
-
-	ebegin "Applying ${P}-john.conf.patch"
-	sed -i -e 's:$JOHN:/usr/share/john:g' "${S}"/run/john.conf
-	eend $?
-}
-
-src_compile() {
-	cd "${S}"/src
-	# Note this program uses AS and LD incorrectly
-	OPTIONS="CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC) \
-		OPT_NORMAL= OPT_INLINE= JOHN_SYSTEMWIDE=1
-		CFG_FULL_NAME=/etc/john/john.conf
-		CFG_ALT_NAME=/etc/john/john.ini"
-
-	if use x86 ; then
-		if use mmx ; then
-			emake ${OPTIONS} linux-x86-mmx || die "Make failed"
-		else
-			emake ${OPTIONS} linux-x86-any || die "Make failed"
-		fi
-	elif use amd64 ; then
-		emake ${OPTIONS} generic || die "Make failed"
-	elif use alpha ; then
-		emake ${OPTIONS} linux-alpha || die "Make failed"
-	elif use sparc; then
-		emake ${OPTIONS} linux-sparc  || die "Make failed"
-	elif use amd64; then
-		emake ${OPTIONS} linux-x86-64  || die "Make failed"
-	elif use ppc64; then
-		if use altivec; then
-			emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
-		else
-			emake ${OPTIONS} linux-ppc64  || die "Make failed"
-		fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use ppc; then
-		if use altivec; then
-			emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
-		else
-			emake ${OPTIONS} linux-ppc32 || die "Make failed"
-		fi
-	else
-		emake ${OPTIONS} generic || die "Make failed"
-	fi
-
-	# currently broken
-	#emake bench || die "make failed"
-}
-
-src_test() {
-	cd run
-	if  [[ -f /etc/john/john.conf || -f /etc/john/john.ini  ]]
-	then
-		./john --test || die 'self test failed'
-	else
-		ewarn "selftest requires /etc/john/john.conf or /etc/john/john.ini"
-	fi
-}
-
-src_install() {
-	# config files
-	insinto /etc/john
-	doins run/john.conf
-
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -m "${D}"/usr/sbin/john
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# for EGG only
-	dosym john /usr/sbin/undrop
-
-	#newsbin src/bench john-bench
-
-	# share
-	insinto /usr/share/john/
-	doins run/*.chr run/password.lst
-
-	# documentation
-	dodoc doc/*
-}