remove old stuff - this fails with newer kernels

(Portage version: 2.1_rc3)
 (Signed Manifest commit)

15 files changed, 11 insertions, 754 deletions

diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index 60a7f13bd12d..af6baa3529cf 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -5,26 +5,6 @@ AUX bcrypt3 3246 RMD160 2049cdd2934451843a2c72d4337e359ef3928f2f SHA1 04433a0504
 MD5 063ae0f67213da39ed4dd75a594b3b07 files/bcrypt3 3246
 RMD160 2049cdd2934451843a2c72d4337e359ef3928f2f files/bcrypt3 3246
 SHA256 83296e7fb84845ee0a177b9bc2d88caddb66440b38c3505fc91061873b2a45b3 files/bcrypt3 3246
-AUX bestcrypt-1.5_p10-makefile_fix.patch 1136 RMD160 6dcd9ebfc3419c44ad0ba4287369b5634f781258 SHA1 2424f4c60d8fb877aa362b03fa2a3743a278421c SHA256 1a81d2d9b4e50a63c19b695563c5247b7f490af345d8b24ab5fd6112103db315
-MD5 e9585e8f08138f46bdda7b88ddd81cd8 files/bestcrypt-1.5_p10-makefile_fix.patch 1136
-RMD160 6dcd9ebfc3419c44ad0ba4287369b5634f781258 files/bestcrypt-1.5_p10-makefile_fix.patch 1136
-SHA256 1a81d2d9b4e50a63c19b695563c5247b7f490af345d8b24ab5fd6112103db315 files/bestcrypt-1.5_p10-makefile_fix.patch 1136
-AUX bestcrypt-1.5_p11-makefile_fix.patch 1148 RMD160 8f2e6a1ac93177caf0c78b0a849c180ddda3649f SHA1 8355b2bc7693b30cf6e105e2e5abc9d61c8b5d2b SHA256 acee714247f59ae52998dd7d9285706c805b278941a646e1bc96d066b9f80303
-MD5 009cee9a408478ebf4f7c1a381c7e8b2 files/bestcrypt-1.5_p11-makefile_fix.patch 1148
-RMD160 8f2e6a1ac93177caf0c78b0a849c180ddda3649f files/bestcrypt-1.5_p11-makefile_fix.patch 1148
-SHA256 acee714247f59ae52998dd7d9285706c805b278941a646e1bc96d066b9f80303 files/bestcrypt-1.5_p11-makefile_fix.patch 1148
-AUX bestcrypt-1.6_p1-kgsha256makefile_fix.patch 313 RMD160 6a52380f3658abf004e70d0df0ba036616492153 SHA1 f00e5ae0db858e552a10153f1cbbe5652acf171f SHA256 386c031dae04c955450eebc25c1816e7490a3b2cc2e8f64eed70222f75599049
-MD5 6827793707b540d0174ef30904e3ded1 files/bestcrypt-1.6_p1-kgsha256makefile_fix.patch 313
-RMD160 6a52380f3658abf004e70d0df0ba036616492153 files/bestcrypt-1.6_p1-kgsha256makefile_fix.patch 313
-SHA256 386c031dae04c955450eebc25c1816e7490a3b2cc2e8f64eed70222f75599049 files/bestcrypt-1.6_p1-kgsha256makefile_fix.patch 313
-AUX bestcrypt-1.6_p1-makefile_fix.patch 1367 RMD160 b5665d0d160c2c889528c76b8fb9becfe8fe2e70 SHA1 6fdf0a5d467481acfa41bc10fadbc001df1a77ef SHA256 42379ddbc13db727f4ea959eb1c9d7d11eeea827f873986d11ae5bdeb106a4c5
-MD5 e4fb0265d55a570daf750fa7c0b8414c files/bestcrypt-1.6_p1-makefile_fix.patch 1367
-RMD160 b5665d0d160c2c889528c76b8fb9becfe8fe2e70 files/bestcrypt-1.6_p1-makefile_fix.patch 1367
-SHA256 42379ddbc13db727f4ea959eb1c9d7d11eeea827f873986d11ae5bdeb106a4c5 files/bestcrypt-1.6_p1-makefile_fix.patch 1367
-AUX bestcrypt-1.6_p2-makefile_fix.patch 1760 RMD160 aee7a1f05d85fe6ba3f5c0cc989bf06cfcec3cac SHA1 a960a8fb73f6b24099adb4b6ab3e534392078e53 SHA256 a028d46b94ccd08f02e64f9091a6cc41123b53ac757a5b3ba6e9e2434c817d17
-MD5 cf95724607cedd581c142b4dc421d6d4 files/bestcrypt-1.6_p2-makefile_fix.patch 1760
-RMD160 aee7a1f05d85fe6ba3f5c0cc989bf06cfcec3cac files/bestcrypt-1.6_p2-makefile_fix.patch 1760
-SHA256 a028d46b94ccd08f02e64f9091a6cc41123b53ac757a5b3ba6e9e2434c817d17 files/bestcrypt-1.6_p2-makefile_fix.patch 1760
 AUX bestcrypt-1.6_p2-path.patch 342 RMD160 370f284b02a4cda0a474fe9be4ae9ae25f71ccff SHA1 1aa92224848e5adee21ff7f9c8558892d1e3aca4 SHA256 25e708b174433ad84f33500404799df2b470384345d6f3c005bd28fd6658d30b
 MD5 eee5b50e92787e0f9266bc2a5f8a3aed files/bestcrypt-1.6_p2-path.patch 342
 RMD160 370f284b02a4cda0a474fe9be4ae9ae25f71ccff files/bestcrypt-1.6_p2-path.patch 342
@@ -33,64 +13,28 @@ AUX bestcrypt-1.6_p5-makefile_fix.patch 2229 RMD160 f6bbdc9dc392fc2ca784ce3b6faf
 MD5 7363de908c43373f6ccfc37fcc32989a files/bestcrypt-1.6_p5-makefile_fix.patch 2229
 RMD160 f6bbdc9dc392fc2ca784ce3b6fafa05fe94b31d1 files/bestcrypt-1.6_p5-makefile_fix.patch 2229
 SHA256 f73b2e78dea62960aec05c5cd6bfaaf830aaf36f4a21d257fed48d26c7995b7b files/bestcrypt-1.6_p5-makefile_fix.patch 2229
-AUX bestcrypt.devfs 1673 RMD160 b43ab59cf5862a22a90f751ef30d7d1df50847ca SHA1 559e9a77a27e15c9b2856f4143467fb310cc1449 SHA256 fe79414d1cfc3629016ecb730e5550ae421cf6568703a412d9b5172e175d9c32
-MD5 01225cc87eee84cf54232c86b04e8c93 files/bestcrypt.devfs 1673
-RMD160 b43ab59cf5862a22a90f751ef30d7d1df50847ca files/bestcrypt.devfs 1673
-SHA256 fe79414d1cfc3629016ecb730e5550ae421cf6568703a412d9b5172e175d9c32 files/bestcrypt.devfs 1673
-DIST BestCrypt-1.5-10.tar.gz 169899 RMD160 6086e7a930b2f6b1d3e532473eb41212d5512300 SHA256 29dfc468b3ff0facc4c0a9d40afe682d3637b521b85046e3608eb7f8ff043a0e
-DIST BestCrypt-1.5-11.tar.gz 170110 RMD160 39357390dfebdd349da7e8bf14b0429a36b406fe SHA256 9fff1d66cd34bea5815eb2f6bfeb34d94069e21aa2b24dfaccdbd98487cb6621
-DIST BestCrypt-1.6-1.tar.gz 194566 RMD160 3726f8fef55f4fa308ab022cedaf2b901d474215 SHA256 9d1d1b71368e42537f72df501dd61664cc5c2133dd89638f1a7a152ac0b44b26
-DIST BestCrypt-1.6-2.tar.gz 194602 RMD160 2030c2a15d4feda955c374ed2ff7ed7fca211308 SHA256 91d4c5ffdee82d1a3be06912b3c499e7d4640e072f5e9d41c854e981ad190b45
-DIST BestCrypt-1.6-5.tar.gz 194939 RMD160 969f67ac374282ef32d6a37ba1079bef220cc543 SHA256 066b8ba630a234a0bd92987020665bfad07675fa0db563744c02af28c00444bd
-DIST bcrypt-rc6-serpent-c.diff.gz 6034 RMD160 127d0f2d562f1fdbfa6a8db5d83e92703a90ccc4 SHA256 6161a5bb5711307351eab95e53174bb7f181f870a4755e59ea1ad3eff9427bf5
-DIST bcrypt-rc6-serpent.diff.gz 5718 RMD160 f388894ea0f3d1055dffaf118083baefa5822000 SHA256 1407b27e6a8390f62b66985d25f91ca1b68ff89ca5d9c211f0e83868214bdde8
-EBUILD bestcrypt-1.5_p10.ebuild 2974 RMD160 997fdb9048e054f6738ac4669be2e3badb1c9432 SHA1 12503f7bf2007515eb296df72e6a436d3f1e695c SHA256 a8936b7e3440b4393bfc8305c4c9a98f032f4deae70a91af306cffa9ca8db857
-MD5 e30c17c4efee41b1ed3f849680d9cdfa bestcrypt-1.5_p10.ebuild 2974
-RMD160 997fdb9048e054f6738ac4669be2e3badb1c9432 bestcrypt-1.5_p10.ebuild 2974
-SHA256 a8936b7e3440b4393bfc8305c4c9a98f032f4deae70a91af306cffa9ca8db857 bestcrypt-1.5_p10.ebuild 2974
-EBUILD bestcrypt-1.5_p11.ebuild 3130 RMD160 037558440152c3b66da4a0f643bf3f19a88b01a0 SHA1 e45f78e2fb1bb3c7e21c9ce7f25ccf3c365a0889 SHA256 42f6fab76911e6573667126c34a11e0a9618ecef1327ce14912538656cfa6f75
-MD5 01fa3fab9cef0bcfe01671f972ba1052 bestcrypt-1.5_p11.ebuild 3130
-RMD160 037558440152c3b66da4a0f643bf3f19a88b01a0 bestcrypt-1.5_p11.ebuild 3130
-SHA256 42f6fab76911e6573667126c34a11e0a9618ecef1327ce14912538656cfa6f75 bestcrypt-1.5_p11.ebuild 3130
-EBUILD bestcrypt-1.6_p1-r2.ebuild 3368 RMD160 e6f81bb7e8b2ceae66bd8313f95bfc283d1e7df3 SHA1 11c03b7979dcb2d5cd86870b9263eb31086c8d5d SHA256 e2f4022bc479bd2bac0b5a56a9f25db6bf12093983f1f02721f0c80c0c34b8e3
-MD5 dbc881283e69a96c6b64f474e7ad732b bestcrypt-1.6_p1-r2.ebuild 3368
-RMD160 e6f81bb7e8b2ceae66bd8313f95bfc283d1e7df3 bestcrypt-1.6_p1-r2.ebuild 3368
-SHA256 e2f4022bc479bd2bac0b5a56a9f25db6bf12093983f1f02721f0c80c0c34b8e3 bestcrypt-1.6_p1-r2.ebuild 3368
-EBUILD bestcrypt-1.6_p2-r1.ebuild 3215 RMD160 86f4adc0b53d56bcc2d5a525e277cb0c3906f465 SHA1 26c67c46c7d022e285b900b424fe756c26d28b92 SHA256 fcb34a37ebd3b6aedeaa8d2645fd88f1ce2b5937fded06cb9eb2bc283137cc1b
-MD5 e37e1e4c10f5515dfede974dc9697827 bestcrypt-1.6_p2-r1.ebuild 3215
-RMD160 86f4adc0b53d56bcc2d5a525e277cb0c3906f465 bestcrypt-1.6_p2-r1.ebuild 3215
-SHA256 fcb34a37ebd3b6aedeaa8d2645fd88f1ce2b5937fded06cb9eb2bc283137cc1b bestcrypt-1.6_p2-r1.ebuild 3215
+DIST BestCrypt-1.6-5.tar.gz 194939 RMD160 969f67ac374282ef32d6a37ba1079bef220cc543 SHA1 527cc86e82b65326f6b9fa37ce44ced970b19ae8 SHA256 066b8ba630a234a0bd92987020665bfad07675fa0db563744c02af28c00444bd
+DIST bcrypt-rc6-serpent-c.diff.gz 6034 RMD160 127d0f2d562f1fdbfa6a8db5d83e92703a90ccc4 SHA1 ed23242a81d7681b887951be67019a24780c978a SHA256 6161a5bb5711307351eab95e53174bb7f181f870a4755e59ea1ad3eff9427bf5
+DIST bcrypt-rc6-serpent.diff.gz 5718 RMD160 f388894ea0f3d1055dffaf118083baefa5822000 SHA1 f82278c22678e7dedb74bf6bbc202702fbe3f988 SHA256 1407b27e6a8390f62b66985d25f91ca1b68ff89ca5d9c211f0e83868214bdde8
 EBUILD bestcrypt-1.6_p5.ebuild 3215 RMD160 c8e4670b2d38f374e4a0b2da7b566187705b09c9 SHA1 507098335e9ae4b10965abc6989f532be63e052c SHA256 214411959146a7ad053592c895c0ae249fe27c61886dc277fe0555a7ad54b7a6
 MD5 479c212327cd8851936019586e414cd3 bestcrypt-1.6_p5.ebuild 3215
 RMD160 c8e4670b2d38f374e4a0b2da7b566187705b09c9 bestcrypt-1.6_p5.ebuild 3215
 SHA256 214411959146a7ad053592c895c0ae249fe27c61886dc277fe0555a7ad54b7a6 bestcrypt-1.6_p5.ebuild 3215
-MISC ChangeLog 8459 RMD160 e0fdf9f834b77f2357c7d09f453a2e685a8642f8 SHA1 9a513755a3ef5bc5e97c027991401d23bf11a63f SHA256 7bc2d91e0adae0f2abf6d4209f72befcc58f5e0d0b744881c89489b047317a1b
-MD5 d17f0153813bafca73e55fc87c0cf480 ChangeLog 8459
-RMD160 e0fdf9f834b77f2357c7d09f453a2e685a8642f8 ChangeLog 8459
-SHA256 7bc2d91e0adae0f2abf6d4209f72befcc58f5e0d0b744881c89489b047317a1b ChangeLog 8459
+MISC ChangeLog 8948 RMD160 5316bb6dcac069a3ac451a7bac49ef8295932c47 SHA1 bfd0ee67993770e260482a6fd938c21804b77614 SHA256 aee5d90d3c1e2044da3d7322c5ab971a39e377b882550d5141cbf3bdd3208146
+MD5 f0625490d4e997469b24d9e18de7c24f ChangeLog 8948
+RMD160 5316bb6dcac069a3ac451a7bac49ef8295932c47 ChangeLog 8948
+SHA256 aee5d90d3c1e2044da3d7322c5ab971a39e377b882550d5141cbf3bdd3208146 ChangeLog 8948
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 metadata.xml 224
 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86 metadata.xml 224
-MD5 af5d0ce0f3b4d98761d7474e3d046a24 files/digest-bestcrypt-1.5_p10 503
-RMD160 b47d065814af879a94fb75705e84290a2fccab1a files/digest-bestcrypt-1.5_p10 503
-SHA256 aeb9aa9d4df266872805bbeab16be750b799989c70e95c4df4ab502ab826e8da files/digest-bestcrypt-1.5_p10 503
-MD5 9377aa99135743be9a5a769ade11cb7d files/digest-bestcrypt-1.5_p11 762
-RMD160 e6579c06f97d3dd4b8ad6708383504f1b003e29e files/digest-bestcrypt-1.5_p11 762
-SHA256 662db30fa6c6d008dfdbc4f96b64b70cba6f20b39e79750923e6b70f3aed983e files/digest-bestcrypt-1.5_p11 762
-MD5 6eed659e694f1417bbe2070cd2c85bfa files/digest-bestcrypt-1.6_p1-r2 759
-RMD160 a3793a9fa187585be935b2496355222c70bfd92d files/digest-bestcrypt-1.6_p1-r2 759
-SHA256 f7b52d9f1d4ef11fedc4b5f0f3c97e8489cd67fd6362a9454efa4c3bc6411900 files/digest-bestcrypt-1.6_p1-r2 759
-MD5 b83893c233733f48700570a61640fb54 files/digest-bestcrypt-1.6_p2-r1 759
-RMD160 635216dfbdeae346ce0a3b977ba84b47c8063a3f files/digest-bestcrypt-1.6_p2-r1 759
-SHA256 7d37ebe32ecb09137c4cf03ff1873bbeb7388bf89570057ed539c8e7d5ed153c files/digest-bestcrypt-1.6_p2-r1 759
 MD5 dd170d28f62e65e70cd3cf160e0d9861 files/digest-bestcrypt-1.6_p5 759
 RMD160 acebddcb31cb47ea345067db1e487d10f5068496 files/digest-bestcrypt-1.6_p5 759
 SHA256 a3d6af6139630204aa7a115bdb7e889a0d75751948b27461b66f610b6db7d60d files/digest-bestcrypt-1.6_p5 759
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEekCjCRZPokWLroQRAtrtAJ4hQBmKSlBZ50mXFDgHcT4mIuApoQCg5UEQ
-G7r2wvi6tMohJ5gupmmvzNk=
-=52Jo
+iD8DBQFEerrLmdTrptrqvGERAlf8AJ9RNJ8l+iRsHQproifXkutuRSSkhgCcDkzK
+Zg74tgXUF6BXFnsMgLL91LA=
+=tYpc
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild
deleted file mode 100644
index d7a6edb97957..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild,v 1.6 2005/08/07 11:27:44 dragonheart Exp $
-
-inherit flag-o-matic eutils linux-mod toolchain-funcs
-
-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
-	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_serpent(block:${S}/mod/serpent)
-		bc_rc6(block:${S}/mod/rc6)
-		bc_twofish(block:${S}/mod/twofish)"
-
-src_unpack() {
-	unpack BestCrypt-${PV/_p/-}.tar.gz
-	cd ${S}
-
-	epatch ${DISTDIR}/bcrypt-rc6-serpent.diff.gz
-	epatch ${FILESDIR}/${P}-makefile_fix.patch
-}
-
-src_compile() {
-
-	filter-flags -fforce-addr
-
-	emake -C kgsha EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
-	emake -C src EXTRA_CFLAGS="${CFLAGS}" || die "bctool compile failed"
-
-	# Don't put stack protection in the kernel - it just is bad
-	append-flags -fno-stack-protector-all -fno-stack-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
-
-
-	doman man/bctool.8
-	newinitd ${FILESDIR}/bcrypt3 bcrypt
-	dodoc README LICENSE HIDDEN_PART
-
-	insinto /etc/devfs.d
-	doins ${FILESDIR}/bestcrypt.devfs
-}
-
-
-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/"
-
-	if [ -e "${ROOT}/dev/.devfsd" ]; then
-		killall -HUP devfsd
-	fi
-
-	einfo
-	linux-mod_pkg_postinst
-}
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p11.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p11.ebuild
deleted file mode 100644
index a7364e7bf972..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.5_p11.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.5_p11.ebuild,v 1.1 2005/08/07 11:27:44 dragonheart Exp $
-
-inherit flag-o-matic eutils linux-mod toolchain-funcs
-
-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_serpent(block:${S}/mod/serpent)
-		bc_rc6(block:${S}/mod/rc6)
-		bc_twofish(block:${S}/mod/twofish)"
-
-src_unpack() {
-	unpack "BestCrypt-${PV/_p/-}.tar.gz"
-	cd "${S}"
-
-	if use x86;
-	then
-		epatch "${DISTDIR}"/bcrypt-rc6-serpent.diff.gz
-	else
-		epatch "${DISTDIR}"/bcrypt-rc6-serpent-c.diff.gz
-	fi
-
-	epatch "${FILESDIR}/${P}"-makefile_fix.patch
-}
-
-src_compile() {
-
-	filter-flags -fforce-addr
-
-	emake -C kgsha EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
-	emake -C src EXTRA_CFLAGS="${CFLAGS}" || die "bctool compile failed"
-
-	# Don't put stack protection in the kernel - it just is bad
-	append-flags -fno-stack-protector-all -fno-stack-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
-
-
-	doman man/bctool.8
-	newinitd ${FILESDIR}/bcrypt3 bcrypt
-	dodoc README LICENSE HIDDEN_PART
-
-	insinto /etc/devfs.d
-	doins ${FILESDIR}/bestcrypt.devfs
-}
-
-
-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/"
-
-	if [ -e "${ROOT}/dev/.devfsd" ]; then
-		killall -HUP devfsd
-	fi
-
-	einfo
-	linux-mod_pkg_postinst
-}
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p1-r2.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p1-r2.ebuild
deleted file mode 100644
index 389ad709e217..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p1-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p1-r2.ebuild,v 1.2 2005/11/10 18:56:09 dragonheart Exp $
-
-inherit flag-o-matic eutils linux-mod toolchain-funcs
-
-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}-makefile_fix.patch
-	epatch "${FILESDIR}"/${P}-kgsha256makefile_fix.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} -fPIC" || die "library compile failed"
-	emake -C kgsha256 CPP="$(tc-getCXX)" EXTRA_CXXFLAGS="${CXXFLAGS} -fPIC" || 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
-	append-flags -fno-stack-protector-all -fno-stack-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/lib
-	doins lib/libkgsha{,256}.so
-
-	doman man/bctool.8
-	newinitd "${FILESDIR}"/bcrypt3 bcrypt
-	dodoc README HIDDEN_PART
-
-	insinto /etc/devfs.d
-	doins "${FILESDIR}"/bestcrypt.devfs
-}
-
-
-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/"
-
-	if [ -e "${ROOT}/dev/.devfsd" ]; then
-		killall -HUP devfsd
-	fi
-
-	einfo
-	linux-mod_pkg_postinst
-}
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p2-r1.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p2-r1.ebuild
deleted file mode 100644
index e10077bb182c..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p2-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p2-r1.ebuild,v 1.1 2005/11/12 10:02:43 dragonheart Exp $
-
-inherit flag-o-matic eutils linux-mod toolchain-funcs
-
-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}-makefile_fix.patch
-	epatch "${FILESDIR}"/${P}-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
-	append-flags -fno-stack-protector-all -fno-stack-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/lib
-	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.5_p10-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p10-makefile_fix.patch
deleted file mode 100644
index 6f1e4f3ef6bc..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.5_p10-makefile_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- mod/Makefile.org	2004-07-07 20:49:59.000000000 +0200
-+++ mod/Makefile	2004-07-07 20:53:58.000000000 +0200
-@@ -95,14 +96,6 @@
- 
- 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
---- src/Makefile.org	2004-07-07 20:54:07.000000000 +0200
-+++ src/Makefile	2004-07-07 20:54:24.000000000 +0200
-@@ -24,6 +24,7 @@
- CFLAGS += -L../lib -I../include/ 
- CFLAGS += -Wall -O2 -fno-strict-aliasing
- #CFLAGS += -g -static -O6
-+CFLAGS += $(EXTRA_CFLAGS)
- LDFLAGS =
- 
- TARGETS = bctool
---- kgsha/Makefile.org	2004-07-07 20:54:34.000000000 +0200
-+++ kgsha/Makefile	2004-07-07 20:54:50.000000000 +0200
-@@ -20,6 +20,7 @@
- 
- CPP=g++
- CPPFLAGS = -Wall -Werror -fno-strength-reduce -I../include -g 
-+CPPFLAGS += $(EXTRA_CXXFLAGS)
- 
- TARGET = libkgsha.a
- HEADERS = kg_defs.h kgsha.h kblock.h sha1.h random.h
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.5_p11-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p11-makefile_fix.patch
deleted file mode 100644
index aeb451add3f6..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.5_p11-makefile_fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- mod/Makefile.orig	2005-01-06 20:15:48.000000000 +1100
-+++ mod/Makefile	2005-08-07 21:14:23.000000000 +1000
-@@ -101,15 +101,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
- 
---- src/Makefile.orig	2004-12-16 19:42:35.000000000 +1100
-+++ src/Makefile	2005-08-07 21:14:23.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 =
- 
- TARGETS = bctool
---- kgsha/Makefile.orig	2002-10-29 18:11:45.000000000 +1100
-+++ kgsha/Makefile	2005-08-07 21:14:23.000000000 +1000
-@@ -20,6 +20,7 @@
- 
- CPP=g++
- CPPFLAGS = -Wall -Werror -fno-strength-reduce -I../include -g 
-+CPPFLAGS += $(EXTRA_CXXFLAGS)
- 
- TARGET = libkgsha.a
- HEADERS = kg_defs.h kgsha.h kblock.h sha1.h random.h
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.6_p1-kgsha256makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.6_p1-kgsha256makefile_fix.patch
deleted file mode 100644
index 88503277ae1f..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.6_p1-kgsha256makefile_fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- bcrypt/kgsha256/Makefile.orig	2005-11-11 05:44:50.000000000 +1100
-+++ bcrypt/kgsha256/Makefile	2005-11-11 05:45:20.000000000 +1100
-@@ -20,6 +20,7 @@
- 
- CPP=g++
- CPPFLAGS = -Wall -Werror -fno-strength-reduce -I../include 
-+CPPFLAGS += $(EXTRA_CXXFLAGS)
- 
- TARGET = libkgsha256.so
- HEADERS = kg_defs.h kblock.h
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.6_p1-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.6_p1-makefile_fix.patch
deleted file mode 100644
index bdbdbbf887e3..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.6_p1-makefile_fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ru /tmp/bcrypt/kgsha/Makefile bcrypt/kgsha/Makefile
---- /tmp/bcrypt/kgsha/Makefile	2005-05-14 16:50:36.000000000 +1000
-+++ bcrypt/kgsha/Makefile	2005-05-23 22:30:00.000000000 +1000
-@@ -20,6 +20,7 @@
- 
- CPP=g++
- CPPFLAGS = -Wall -Werror -fno-strength-reduce -I../include 
-+CPPFLAGS += $(EXTRA_CXXFLAGS)
- 
- TARGET = libkgsha.so
- HEADERS = kg_defs.h kgsha.h kblock.h sha1.h random.h
-diff -ru /tmp/bcrypt/mod/Makefile bcrypt/mod/Makefile
---- /tmp/bcrypt/mod/Makefile	2005-05-23 22:26:09.000000000 +1000
-+++ bcrypt/mod/Makefile	2005-05-23 22:28:52.000000000 +1000
-@@ -101,15 +101,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 -ru /tmp/bcrypt/src/Makefile bcrypt/src/Makefile
---- /tmp/bcrypt/src/Makefile	2005-05-14 16:53:06.000000000 +1000
-+++ bcrypt/src/Makefile	2005-05-23 22:29:31.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/bestcrypt-1.6_p2-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.6_p2-makefile_fix.patch
deleted file mode 100644
index d9871d449754..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.6_p2-makefile_fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -ruN bcrypt.orig/kgsha/Makefile bcrypt/kgsha/Makefile
---- bcrypt.orig/kgsha/Makefile	2005-08-11 16:08:32.000000000 +1000
-+++ bcrypt/kgsha/Makefile	2005-11-11 05:59:59.000000000 +1100
-@@ -20,6 +20,7 @@
- 
- CPP=g++
- CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include 
-+CPPFLAGS += $(EXTRA_CXXFLAGS)
- 
- TARGET = libkgsha.so
- HEADERS = kg_defs.h kgsha.h kblock.h sha1.h random.h
-diff -ruN bcrypt.orig/kgsha256/Makefile bcrypt/kgsha256/Makefile
---- bcrypt.orig/kgsha256/Makefile	2005-08-11 16:08:32.000000000 +1000
-+++ bcrypt/kgsha256/Makefile	2005-11-11 05:59:42.000000000 +1100
-@@ -20,6 +20,7 @@
- 
- CPP=g++
- CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include 
-+CPPFLAGS += $(EXTRA_CXXFLAGS)
- 
- TARGET = libkgsha256.so
- HEADERS = kg_defs.h kblock.h
-diff -ruN bcrypt.orig/mod/Makefile bcrypt/mod/Makefile
---- bcrypt.orig/mod/Makefile	2005-01-06 20:15:48.000000000 +1100
-+++ bcrypt/mod/Makefile	2005-11-11 05:58:27.000000000 +1100
-@@ -101,15 +101,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	2005-11-11 05:58:27.000000000 +1100
-@@ -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/bestcrypt.devfs b/app-crypt/bestcrypt/files/bestcrypt.devfs
deleted file mode 100644
index af4f6d75c823..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt.devfs
+++ /dev/null
@@ -1,24 +0,0 @@
-# Under development. bctool needs /dev/bcrypt[0-9] and /dev/bcrypt/disc0/disc entries (same)
-# look at man devfsd devfsd.conf, and /usr/share/doc/devfsd*/devfsd.conf and submit an
-# answer to bugs.gentoo.org
-#
-# Of course the simplier solution is to migrate to udev.
-# http://www.gentoo.org/doc/en/udev-guide.xml
-#
-#LOOKUP ^bcrypt0$ CFUNCTION GLOBAL mksymlink ${mntpnt}/bcrypt/disc0/disc $devpath
-LOOKUP   ^bcrypt/disc0/disc  EXECUTE /bin/mknod /dev/bcrypt/disc0/disc b 188 0
-LOOKUP   ^bcrypt/disc1/disc  EXECUTE /bin/mknod /dev/bcrypt/disc1/disc b 188 0
-LOOKUP   ^bcrypt/disc2/disc  EXECUTE /bin/mknod /dev/bcrypt/disc2/disc b 188 0
-LOOKUP   ^bcrypt/disc3/disc  EXECUTE /bin/mknod /dev/bcrypt/disc3/disc b 188 0
-LOOKUP   ^bcrypt/disc4/disc  EXECUTE /bin/mknod /dev/bcrypt/disc4/disc b 188 0
-LOOKUP   ^bcrypt/disc5/disc  EXECUTE /bin/mknod /dev/bcrypt/disc5/disc b 188 0
-LOOKUP   ^bcrypt/disc6/disc  EXECUTE /bin/mknod /dev/bcrypt/disc6/disc b 188 0
-LOOKUP   ^bcrypt/disc7/disc  EXECUTE /bin/mknod /dev/bcrypt/disc7/disc b 188 0
-LOOKUP   ^bcrypt/disc8/disc  EXECUTE /bin/mknod /dev/bcrypt/disc8/disc b 188 0
-LOOKUP   ^bcrypt/disc9/disc  EXECUTE /bin/mknod /dev/bcrypt/disc9/disc b 188 0
-LOOKUP   ^bcrypt/disc10/disc  EXECUTE /bin/mknod /dev/bcrypt/disc10/disc b 188 0
-LOOKUP   ^bcrypt/disc11/disc  EXECUTE /bin/mknod /dev/bcrypt/disc11/disc b 188 0
-LOOKUP   ^bcrypt/disc12/disc  EXECUTE /bin/mknod /dev/bcrypt/disc12/disc b 188 0
-LOOKUP   ^bcrypt/disc13/disc  EXECUTE /bin/mknod /dev/bcrypt/disc13/disc b 188 0
-LOOKUP   ^bcrypt/disc14/disc  EXECUTE /bin/mknod /dev/bcrypt/disc14/disc b 188 0
-LOOKUP   ^bcrypt/disc15/disc  EXECUTE /bin/mknod /dev/bcrypt/disc15/disc b 188 0
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p10 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p10
deleted file mode 100644
index a7f268236118..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p10
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 77ddc2bb846edded4921fa4adbf8320f BestCrypt-1.5-10.tar.gz 169899
-RMD160 6086e7a930b2f6b1d3e532473eb41212d5512300 BestCrypt-1.5-10.tar.gz 169899
-SHA256 29dfc468b3ff0facc4c0a9d40afe682d3637b521b85046e3608eb7f8ff043a0e BestCrypt-1.5-10.tar.gz 169899
-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.5_p11 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p11
deleted file mode 100644
index dcdc00b91dd6..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p11
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 30ebb215a29951d9db1e96b97ab2d9df BestCrypt-1.5-11.tar.gz 170110
-RMD160 39357390dfebdd349da7e8bf14b0429a36b406fe BestCrypt-1.5-11.tar.gz 170110
-SHA256 9fff1d66cd34bea5815eb2f6bfeb34d94069e21aa2b24dfaccdbd98487cb6621 BestCrypt-1.5-11.tar.gz 170110
-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_p1-r2 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p1-r2
deleted file mode 100644
index 1634e39cbb84..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p1-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 966088b98018c477438d908ad763056c BestCrypt-1.6-1.tar.gz 194566
-RMD160 3726f8fef55f4fa308ab022cedaf2b901d474215 BestCrypt-1.6-1.tar.gz 194566
-SHA256 9d1d1b71368e42537f72df501dd61664cc5c2133dd89638f1a7a152ac0b44b26 BestCrypt-1.6-1.tar.gz 194566
-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_p2-r1 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p2-r1
deleted file mode 100644
index b0ad25cb4185..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p2-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 4d35a7bab0c2ba2049bf9774b9ded3d9 BestCrypt-1.6-2.tar.gz 194602
-RMD160 2030c2a15d4feda955c374ed2ff7ed7fca211308 BestCrypt-1.6-2.tar.gz 194602
-SHA256 91d4c5ffdee82d1a3be06912b3c499e7d4640e072f5e9d41c854e981ad190b45 BestCrypt-1.6-2.tar.gz 194602
-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