11 files changed, 7 insertions, 476 deletions
diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 972b78c8998d..e8ccebbec88d 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/bestcrypt
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.54 2007/01/23 15:52:35 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.55 2007/01/23 19:38:17 alonbl Exp $
+
+  23 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/bestcrypt-1.6_p2-path.patch, -files/bestcrypt-1.6_p5-gcc41.patch,
+  -files/bestcrypt-1.6_p5-kernel-quotes.patch,
+  -files/bestcrypt-1.6_p5-makefile_fix.patch:
+  Cleanup
 
   23 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
   bestcrypt-1.6_p10-r1.ebuild:
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p10.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p10.ebuild
deleted file mode 100644
index c886507cd332..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p10.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p10.ebuild,v 1.1 2006/12/06 21:24:07 alonbl Exp $
-
-inherit flag-o-matic eutils linux-mod toolchain-funcs multilib
-
-MY_PN="bcrypt"
-MY_PV="${PV/_p/-}"
-DESCRIPTION="commercially licensed transparent filesystem encryption"
-HOMEPAGE="http://www.jetico.com/"
-SRC_URI="http://www.jetico.com/linux/BestCrypt-${MY_PV}.tar.gz
-	!x86? ( mirror://gentoo/bcrypt-rc6-serpent-c.diff.gz )
-	x86? ( http://www.carceri.dk/files/bcrypt-rc6-serpent.diff.gz )"
-
-LICENSE="bestcrypt"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="virtual/linux-sources"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-#get-version
-MODULE_NAMES="bc(block:"${S}"/mod)
-		bc_des(block:"${S}"/mod/des)
-		bc_3des(block:"${S}"/mod/3des)
-		bc_bf128(block:"${S}"/mod/bf128)
-		bc_bf448(block:"${S}"/mod/bf448)
-		bc_blowfish(block:"${S}"/mod/blowfish)
-		bc_cast(block:"${S}"/mod/cast)
-		bc_gost(block:"${S}"/mod/gost)
-		bc_idea(block:"${S}"/mod/idea)
-		bc_rijn(block:"${S}"/mod/rijn)
-		bc_twofish(block:"${S}"/mod/twofish)
-		bc_serpent(block:"${S}"/mod/serpent)
-		bc_rc6(block:"${S}"/mod/rc6)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use x86;
-	then
-		epatch "${WORKDIR}/bcrypt-rc6-serpent.diff"
-	else
-		epatch "${WORKDIR}/bcrypt-rc6-serpent-c.diff"
-	fi
-}
-
-src_compile() {
-	filter-flags -fforce-addr
-
-	emake -C kgsha CPP="$(tc-getCXX)" EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
-	emake -C kgsha256 CPP="$(tc-getCXX)"  EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
-	emake -C src CC="$(tc-getCC)"  EXTRA_CFLAGS="${CFLAGS} -I../kgsha256" || die "bctool compile failed"
-
-	# Don't put stack protection in the kernel - it just is bad
-	_filter-hardened -fstack-protector-all -fstack-protector
-
-	emake  -C mod SYMSRC=bc_dev${KV_MAJOR}${KV_MINOR}.c bc_dev.ver EXTRA_CFLAGS="${CFLAGS}" \
-		|| die "compile failed"
-
-	emake  -C mod OBJS="bc_dev${KV_MAJOR}${KV_MINOR}.o bc_mgr.o" \
-		KERNEL_DIR=${KV_DIR} KEXT=${KV_OBJ} CC=$(tc-getCC) LD=$(tc-getLD) \
-		AS=$(tc-getAS) CPP=$(tc-getCXX) EXTRA_CFLAGS="${CFLAGS}" || die "compile failed"
-
-	einfo "Modules compiled"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"
-	dodir /etc
-	cp etc/bc.conf "${D}"/etc/bc.conf
-
-	dobin bin/bctool
-	insinto /usr/bin
-	for link in bcumount bcformat bcfsck bcnew bcpasswd bcinfo \
-		bclink bcunlink bcmake_hidden bcreencrypt;
-	do
-		dosym bctool /usr/bin/${link}
-	done
-
-	# bug 107392
-	insinto /usr/$(get_libdir)
-	doins lib/libkgsha{,256}.so
-
-	doman man/bctool.8
-	newinitd "${FILESDIR}"/bcrypt3 bcrypt
-	dodoc README HIDDEN_PART
-}
-
-
-pkg_postinst() {
-
-	einfo "If you are using the serpent or rc6 encryption modules and have any problems,"
-	einfo "please submit bugs to http://bugs.gentoo.org because these modules are not part"
-	einfo "of the standard distribution of BestCrypt for Linux released by Jetico."
-	einfo "For more information on these additional modules:"
-	einfo "visit http://www.carceri.dk/index.php?redirect=other_bestcrypt"
-
-	einfo
-	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
-	ewarn "http://www.jetico.com/"
-
-	einfo
-	linux-mod_pkg_postinst
-}
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild
deleted file mode 100644
index ccdb99014363..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild,v 1.7 2006/10/19 00:16:48 jokey Exp $
-
-inherit flag-o-matic eutils linux-mod toolchain-funcs multilib
-
-MY_PN="bcrypt"
-DESCRIPTION="commercially licensed transparent filesystem encryption"
-HOMEPAGE="http://www.jetico.com/"
-SRC_URI="http://www.jetico.com/linux/BestCrypt-${PV/_p/-}.tar.gz
-	!x86? ( mirror://gentoo/bcrypt-rc6-serpent-c.diff.gz )
-	x86? ( http://www.carceri.dk/files/bcrypt-rc6-serpent.diff.gz )"
-
-LICENSE="bestcrypt"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 x86"
-
-DEPEND="virtual/linux-sources"
-
-S="${WORKDIR}/bcrypt"
-
-#get-version
-MODULE_NAMES="bc(block:"${S}"/mod)
-		bc_des(block:"${S}"/mod/des)
-		bc_3des(block:"${S}"/mod/3des)
-		bc_bf128(block:"${S}"/mod/bf128)
-		bc_bf448(block:"${S}"/mod/bf448)
-		bc_blowfish(block:"${S}"/mod/blowfish)
-		bc_cast(block:"${S}"/mod/cast)
-		bc_gost(block:"${S}"/mod/gost)
-		bc_idea(block:"${S}"/mod/idea)
-		bc_rijn(block:"${S}"/mod/rijn)
-		bc_twofish(block:"${S}"/mod/twofish)
-		bc_serpent(block:"${S}"/mod/serpent)
-		bc_rc6(block:"${S}"/mod/rc6)"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-kernel-quotes.patch
-	epatch "${FILESDIR}"/${P}-makefile_fix.patch
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-	epatch "${FILESDIR}"/${PN}-1.6_p2-path.patch
-
-	if use x86;
-	then
-		epatch bcrypt-rc6-serpent.diff
-	else
-		epatch bcrypt-rc6-serpent-c.diff
-	fi
-}
-
-src_compile() {
-	filter-flags -fforce-addr
-
-	emake -C kgsha CPP="$(tc-getCXX)" EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
-	emake -C kgsha256 CPP="$(tc-getCXX)"  EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
-	emake -C src CC="$(tc-getCC)"  EXTRA_CFLAGS="${CFLAGS} -I../kgsha256" || die "bctool compile failed"
-
-	# Don't put stack protection in the kernel - it just is bad
-	_filter-hardened -fstack-protector-all -fstack-protector
-
-	emake  -C mod SYMSRC=bc_dev${KV_MAJOR}${KV_MINOR}.c bc_dev.ver EXTRA_CFLAGS="${CFLAGS}" \
-		|| die "compile failed"
-
-	emake  -C mod OBJS="bc_dev${KV_MAJOR}${KV_MINOR}.o bc_mgr.o" \
-		KERNEL_DIR=${KV_DIR} KEXT=${KV_OBJ} CC=$(tc-getCC) LD=$(tc-getLD) \
-		AS=$(tc-getAS) CPP=$(tc-getCXX) EXTRA_CFLAGS="${CFLAGS}" || die "compile failed"
-
-	einfo "Modules compiled"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"
-	dodir /etc
-	cp etc/bc.conf "${D}"/etc/bc.conf
-
-	dobin bin/bctool
-	insinto /usr/bin
-	for link in bcumount bcformat bcfsck bcnew bcpasswd bcinfo \
-		bclink bcunlink bcmake_hidden bcreencrypt;
-	do
-		dosym bctool /usr/bin/${link}
-	done
-
-	# bug 107392
-	insinto /usr/$(get_libdir)
-	doins lib/libkgsha{,256}.so
-
-	doman man/bctool.8
-	newinitd "${FILESDIR}"/bcrypt3 bcrypt
-	dodoc README HIDDEN_PART
-}
-
-
-pkg_postinst() {
-
-	einfo "If you are using the serpent or rc6 encryption modules and have any problems,"
-	einfo "please submit bugs to http://bugs.gentoo.org because these modules are not part"
-	einfo "of the standard distribution of BestCrypt for Linux released by Jetico."
-	einfo "For more information on these additional modules:"
-	einfo "visit http://www.carceri.dk/index.php?redirect=other_bestcrypt"
-
-	einfo
-	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
-	ewarn "http://www.jetico.com/"
-
-	einfo
-	linux-mod_pkg_postinst
-}
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p8.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p8.ebuild
deleted file mode 100644
index 9dd7823064e0..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p8.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p8.ebuild,v 1.2 2006/10/26 03:41:38 tsunam Exp $
-
-inherit flag-o-matic eutils linux-mod toolchain-funcs multilib
-
-MY_PN="bcrypt"
-MY_PV="${PV/_p/-}"
-DESCRIPTION="commercially licensed transparent filesystem encryption"
-HOMEPAGE="http://www.jetico.com/"
-SRC_URI="http://www.jetico.com/linux/BestCrypt-${MY_PV}.tar.gz
-	!x86? ( mirror://gentoo/bcrypt-rc6-serpent-c.diff.gz )
-	x86? ( http://www.carceri.dk/files/bcrypt-rc6-serpent.diff.gz )"
-
-LICENSE="bestcrypt"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 x86"
-
-DEPEND="virtual/linux-sources"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-#get-version
-MODULE_NAMES="bc(block:"${S}"/mod)
-		bc_des(block:"${S}"/mod/des)
-		bc_3des(block:"${S}"/mod/3des)
-		bc_bf128(block:"${S}"/mod/bf128)
-		bc_bf448(block:"${S}"/mod/bf448)
-		bc_blowfish(block:"${S}"/mod/blowfish)
-		bc_cast(block:"${S}"/mod/cast)
-		bc_gost(block:"${S}"/mod/gost)
-		bc_idea(block:"${S}"/mod/idea)
-		bc_rijn(block:"${S}"/mod/rijn)
-		bc_twofish(block:"${S}"/mod/twofish)
-		bc_serpent(block:"${S}"/mod/serpent)
-		bc_rc6(block:"${S}"/mod/rc6)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use x86;
-	then
-		epatch "${WORKDIR}/bcrypt-rc6-serpent.diff"
-	else
-		epatch "${WORKDIR}/bcrypt-rc6-serpent-c.diff"
-	fi
-}
-
-src_compile() {
-	filter-flags -fforce-addr
-
-	emake -C kgsha CPP="$(tc-getCXX)" EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
-	emake -C kgsha256 CPP="$(tc-getCXX)"  EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
-	emake -C src CC="$(tc-getCC)"  EXTRA_CFLAGS="${CFLAGS} -I../kgsha256" || die "bctool compile failed"
-
-	# Don't put stack protection in the kernel - it just is bad
-	_filter-hardened -fstack-protector-all -fstack-protector
-
-	emake  -C mod SYMSRC=bc_dev${KV_MAJOR}${KV_MINOR}.c bc_dev.ver EXTRA_CFLAGS="${CFLAGS}" \
-		|| die "compile failed"
-
-	emake  -C mod OBJS="bc_dev${KV_MAJOR}${KV_MINOR}.o bc_mgr.o" \
-		KERNEL_DIR=${KV_DIR} KEXT=${KV_OBJ} CC=$(tc-getCC) LD=$(tc-getLD) \
-		AS=$(tc-getAS) CPP=$(tc-getCXX) EXTRA_CFLAGS="${CFLAGS}" || die "compile failed"
-
-	einfo "Modules compiled"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"
-	dodir /etc
-	cp etc/bc.conf "${D}"/etc/bc.conf
-
-	dobin bin/bctool
-	insinto /usr/bin
-	for link in bcumount bcformat bcfsck bcnew bcpasswd bcinfo \
-		bclink bcunlink bcmake_hidden bcreencrypt;
-	do
-		dosym bctool /usr/bin/${link}
-	done
-
-	# bug 107392
-	insinto /usr/$(get_libdir)
-	doins lib/libkgsha{,256}.so
-
-	doman man/bctool.8
-	newinitd "${FILESDIR}"/bcrypt3 bcrypt
-	dodoc README HIDDEN_PART
-}
-
-
-pkg_postinst() {
-
-	einfo "If you are using the serpent or rc6 encryption modules and have any problems,"
-	einfo "please submit bugs to http://bugs.gentoo.org because these modules are not part"
-	einfo "of the standard distribution of BestCrypt for Linux released by Jetico."
-	einfo "For more information on these additional modules:"
-	einfo "visit http://www.carceri.dk/index.php?redirect=other_bestcrypt"
-
-	einfo
-	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
-	ewarn "http://www.jetico.com/"
-
-	einfo
-	linux-mod_pkg_postinst
-}
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.6_p2-path.patch b/app-crypt/bestcrypt/files/bestcrypt-1.6_p2-path.patch
deleted file mode 100644
index 88bbb4af766b..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.6_p2-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bcrypt/src/misc.c.orig	2005-11-12 09:21:28.000000000 +1100
-+++ bcrypt/src/misc.c	2005-11-12 09:21:49.000000000 +1100
-@@ -223,7 +223,7 @@
- int run_process(char *args[])
- {
-     int pid;
--    char *env[] = { "PATH=/sbin", NULL};
-+    char *env[] = { "PATH=/sbin:/usr/sbin", NULL};
- 
-     assert(args != NULL);
-     assert(args[0] != NULL);
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-gcc41.patch b/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-gcc41.patch
deleted file mode 100644
index 7ea35e0aa205..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-gcc41.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- bcrypt/kgsha/Makefile	2006-06-29 22:51:13.000000000 +1000
-+++ /tmp/bcrypt-nowarnerror/kgsha/Makefile	2006-06-29 22:40:16.000000000 +1000
-@@ -19,7 +19,7 @@
- LD = ld -d -shared
- 
- CPP=g++
--CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include -g
-+CPPFLAGS = -fPIC -Wall -fno-strength-reduce -I../include -g
- CPPFLAGS += $(EXTRA_CXXFLAGS)
- 
- TARGET = libkgsha.so
---- bcrypt/kgsha256/Makefile	2006-06-29 22:51:13.000000000 +1000
-+++ /tmp/bcrypt-nowarnerror/kgsha256/Makefile	2006-06-29 22:40:30.000000000 +1000
-@@ -19,7 +19,7 @@
- LD = ld -d -shared
- 
- CPP=g++
--CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include -g
-+CPPFLAGS = -fPIC -Wall -fno-strength-reduce -I../include -g
- CPPFLAGS += $(EXTRA_CXXFLAGS)
- 
- TARGET = libkgsha256.so
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-kernel-quotes.patch b/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-kernel-quotes.patch
deleted file mode 100644
index 1dbf7509468f..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-kernel-quotes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp bcrypt.org/mod/Makefile.alg bcrypt/mod/Makefile.alg
---- bcrypt.org/mod/Makefile.alg	2006-04-12 08:32:39.000000000 +0300
-+++ bcrypt/mod/Makefile.alg	2006-10-09 09:12:34.000000000 +0200
-@@ -24,7 +24,7 @@ LD = ld
- LN_S = ln -s
- LDFLAGS = -d -r
- ifeq ($(K2616), yes)
--KBDEF += -DKBUILD_MODNAME=\"$(MODNAME)\" -DKBUILD_BASENAME=\"BestCrypt\"
-+KBDEF += -DKBUILD_MODNAME=\"$(MODNAME)\" -DKBUILD_BASENAME=\"BestCrypt\" -D_KBUILD_QUOTES
- else
- KBDEF += -DKBUILD_MODNAME=$(MODNAME) -DKBUILD_BASENAME=BestCrypt
- endif
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-makefile_fix.patch
deleted file mode 100644
index b29f78996cb5..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-makefile_fix.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -ruN bcrypt.orig/kgsha/Makefile bcrypt/kgsha/Makefile
---- bcrypt.orig/kgsha/Makefile	2006-03-07 16:52:28.000000000 +1100
-+++ bcrypt/kgsha/Makefile	2006-04-23 17:23:31.000000000 +1000
-@@ -20,6 +20,7 @@
- 
- CPP=g++
- CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include -g
-+CPPFLAGS += $(EXTRA_CXXFLAGS)
- 
- TARGET = libkgsha.so
- HEADERS = kg_defs.h kgsha.h kblock.h sha1.h random.h
-@@ -32,7 +33,7 @@
- 	$(CPP) $(CPPFLAGS) -c -o $@ $<
- 
- $(TARGET):	$(OBJ)
--		$(LD) $(OBJ)  -o $(TARGET)
-+		$(LD) $(OBJ) --soname $(TARGET) --as-needed  -o $(TARGET) -lc
- 		cp -f $(TARGET) ../lib
- #		cp -f $(HEADERS) ../include
- clean:
-diff -ruN bcrypt.orig/kgsha256/Makefile bcrypt/kgsha256/Makefile
---- bcrypt.orig/kgsha256/Makefile	2006-03-07 16:52:28.000000000 +1100
-+++ bcrypt/kgsha256/Makefile	2006-04-23 17:23:18.000000000 +1000
-@@ -20,6 +20,7 @@
- 
- CPP=g++
- CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include -g
-+CPPFLAGS += $(EXTRA_CXXFLAGS)
- 
- TARGET = libkgsha256.so
- HEADERS = kg_defs.h kblock.h
-@@ -32,7 +33,7 @@
- 	$(CPP) $(CPPFLAGS) -c -o $@ $<
- 
- $(TARGET):	$(OBJ)
--		$(LD) $(OBJ)  -o $(TARGET)
-+		$(LD) $(OBJ) --soname $(TARGET) --as-needed  -o $(TARGET) -lc
- 		cp -f $(TARGET) ../lib
- 		cp -f $(HEADERS) ../include
- clean:
-diff -ruN bcrypt.orig/mod/Makefile bcrypt/mod/Makefile
---- bcrypt.orig/mod/Makefile	2006-04-12 15:32:39.000000000 +1000
-+++ bcrypt/mod/Makefile	2006-04-23 17:22:42.000000000 +1000
-@@ -110,15 +110,7 @@
- 
- CFLAGS += -I$(CUR_DIR)/../include/ -I$(KERNEL_DIR)/include/
- 
--ifeq ($(ARCH), alpha)
--CFLAGS += -O2 -pipe -fno-strict-aliasing -fno-common -mno-fp-regs -ffixed-8 -mcpu=ev5
--else
--ifeq ($(ARCH), x86_64)
--CFLAGS += -O2 -fno-strength-reduce -fno-strict-aliasing -mcmodel=kernel
--else
--CFLAGS += -O6 -fno-strength-reduce -fno-strict-aliasing 
--endif
--endif
-+CFLAGS += $(EXTRA_CFLAGS)
- 
- LDFLAGS = -d -r
- 
-diff -ruN bcrypt.orig/src/Makefile bcrypt/src/Makefile
---- bcrypt.orig/src/Makefile	2005-05-14 16:53:06.000000000 +1000
-+++ bcrypt/src/Makefile	2006-04-23 17:22:42.000000000 +1000
-@@ -24,6 +24,7 @@
- CFLAGS += -L../lib -I../include/ 
- CFLAGS += -Wall -fno-strict-aliasing -g # -O2
- #CFLAGS += -g -static -O6
-+CFLAGS += $(EXTRA_CFLAGS)
- LDFLAGS = -ldl -lstdc++
- 
- TARGET = bctool
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p10 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p10
deleted file mode 100644
index 2ead11ca6c60..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p10
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 e520c4183e2d83f882b5359004fd9734 BestCrypt-1.6-10.tar.gz 195976
-RMD160 41544c0284f4c8505a9b0d5007be5e1791552fe9 BestCrypt-1.6-10.tar.gz 195976
-SHA256 fe5bbf3437512434b01bd5db8c11907c26176876cb1893ae7da7b9fe96c0cdce BestCrypt-1.6-10.tar.gz 195976
-MD5 d68956f4c2ed795c68a451a451de27bb bcrypt-rc6-serpent-c.diff.gz 6034
-RMD160 127d0f2d562f1fdbfa6a8db5d83e92703a90ccc4 bcrypt-rc6-serpent-c.diff.gz 6034
-SHA256 6161a5bb5711307351eab95e53174bb7f181f870a4755e59ea1ad3eff9427bf5 bcrypt-rc6-serpent-c.diff.gz 6034
-MD5 aa6e1f0e9ee797b409267bdba1f6534e bcrypt-rc6-serpent.diff.gz 5718
-RMD160 f388894ea0f3d1055dffaf118083baefa5822000 bcrypt-rc6-serpent.diff.gz 5718
-SHA256 1407b27e6a8390f62b66985d25f91ca1b68ff89ca5d9c211f0e83868214bdde8 bcrypt-rc6-serpent.diff.gz 5718
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p5 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p5
deleted file mode 100644
index de5094e97110..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p5
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 e0a390cb24bd08f22290bb7c7f635981 BestCrypt-1.6-5.tar.gz 194939
-RMD160 969f67ac374282ef32d6a37ba1079bef220cc543 BestCrypt-1.6-5.tar.gz 194939
-SHA256 066b8ba630a234a0bd92987020665bfad07675fa0db563744c02af28c00444bd BestCrypt-1.6-5.tar.gz 194939
-MD5 d68956f4c2ed795c68a451a451de27bb bcrypt-rc6-serpent-c.diff.gz 6034
-RMD160 127d0f2d562f1fdbfa6a8db5d83e92703a90ccc4 bcrypt-rc6-serpent-c.diff.gz 6034
-SHA256 6161a5bb5711307351eab95e53174bb7f181f870a4755e59ea1ad3eff9427bf5 bcrypt-rc6-serpent-c.diff.gz 6034
-MD5 aa6e1f0e9ee797b409267bdba1f6534e bcrypt-rc6-serpent.diff.gz 5718
-RMD160 f388894ea0f3d1055dffaf118083baefa5822000 bcrypt-rc6-serpent.diff.gz 5718
-SHA256 1407b27e6a8390f62b66985d25f91ca1b68ff89ca5d9c211f0e83868214bdde8 bcrypt-rc6-serpent.diff.gz 5718
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p8 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p8
deleted file mode 100644
index da7c9e243b17..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p8
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 774cf029d8f02085f0fcda0ab4ab5627 BestCrypt-1.6-8.tar.gz 195314
-RMD160 f5451d7ba238199a3602136383e04654acda9c1f BestCrypt-1.6-8.tar.gz 195314
-SHA256 2229a0caf1a806052b505edd0a33882119e9981e07468c3b71a743db9c453073 BestCrypt-1.6-8.tar.gz 195314
-MD5 d68956f4c2ed795c68a451a451de27bb bcrypt-rc6-serpent-c.diff.gz 6034
-RMD160 127d0f2d562f1fdbfa6a8db5d83e92703a90ccc4 bcrypt-rc6-serpent-c.diff.gz 6034
-SHA256 6161a5bb5711307351eab95e53174bb7f181f870a4755e59ea1ad3eff9427bf5 bcrypt-rc6-serpent-c.diff.gz 6034
-MD5 aa6e1f0e9ee797b409267bdba1f6534e bcrypt-rc6-serpent.diff.gz 5718
-RMD160 f388894ea0f3d1055dffaf118083baefa5822000 bcrypt-rc6-serpent.diff.gz 5718
-SHA256 1407b27e6a8390f62b66985d25f91ca1b68ff89ca5d9c211f0e83868214bdde8 bcrypt-rc6-serpent.diff.gz 5718