Old version cleanout. Version bump converted to linux-mod eclass. Solves bug #67732

21 files changed, 151 insertions, 596 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 9dd14b976d4b..2b8fc06cfbca 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-crypt/bestcrypt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.22 2005/01/01 12:25:49 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.23 2005/01/03 04:23:22 dragonheart Exp $
+
+*bestcrypt-1.5_p9 (03 Jan 2005)
+
+  03 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/bestcrypt-1.5_p2-bdev_file_fix.patch,
+  -files/bestcrypt-1.5_p2-makefile_fix.patch,
+  -files/bestcrypt-1.5_p5-makefile_fix.patch,
+  -files/bestcrypt-1.5_p6-makefile_fix.patch,
+  +files/bestcrypt-1.5_p9-makefile_fix.patch, -bestcrypt-1.2_p6.ebuild,
+  -bestcrypt-1.5_p1.ebuild, -bestcrypt-1.5_p2.ebuild,
+  -bestcrypt-1.5_p5.ebuild, -bestcrypt-1.5_p6.ebuild,
+  +bestcrypt-1.5_p9.ebuild, -bestcrypt-1.4_p2.ebuild:
+  Old version cleanout. Version bump converted to linux-mod eclass. Solves bug
+  #67732 by Jorge Hodge <hodge@bridge.com.br>.
 
   31 Oct 2004; Brandon Low <lostlogic@gentoo.org>
   bestcrypt-1.5_p7-r1.ebuild:
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index 9e0705348b08..51386d7c2b89 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -1,26 +1,13 @@
 MD5 fd8e879b08adeba74119f7ee623fec5f ChangeLog 3528
-MD5 2cc1b023f48b17e05ff9b2bf66484810 bestcrypt-1.2_p6.ebuild 1542
-MD5 1b8f2dcc40d7190e4bb881da850fc6eb bestcrypt-1.4_p2.ebuild 1518
-MD5 3c789b6e117810462d48970ee413ef5d bestcrypt-1.5_p1.ebuild 1667
-MD5 30b7b426d5cbeae5af973eb8aefd02e7 bestcrypt-1.5_p2.ebuild 1652
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
-MD5 1060003f649dd0b1a1462f07e2d3ed70 bestcrypt-1.5_p5.ebuild 1504
-MD5 d322c408ff7c7b9bbae50595c75afb94 bestcrypt-1.5_p6.ebuild 1503
 MD5 8b338478bb062e2860e7a50fb3e1f4b9 bestcrypt-1.5_p7.ebuild 1509
 MD5 3d114602bf62a96e9360d74a3453759c bestcrypt-1.5_p7-r1.ebuild 1774
+MD5 d2f1841bdaff2086276fbe399ce62a2c bestcrypt-1.5_p9.ebuild 2641
 MD5 c5fbab81816aa1d6f319f8434d2db2b2 files/bcrypt 3113
 MD5 5b4b4d2cf3a069dcc49e6803af149665 files/bcrypt2 3097
 MD5 0627a90c642911ade3f933e5b6ecd6c0 files/bcrypt3 3159
-MD5 9e28557b9e0d6e148ba9da712b789909 files/bestcrypt-1.5_p2-bdev_file_fix.patch 365
-MD5 612a37e4db226c3ff5e6f261c20085f1 files/bestcrypt-1.5_p2-makefile_fix.patch 2047
-MD5 b0b2c330ce5e18ccd0ad06aa6aff62a3 files/digest-bestcrypt-1.2_p6 67
-MD5 9c378965942830e2966d15c1c0d0816b files/digest-bestcrypt-1.4_p2 67
-MD5 73a8ba802e25017bcceb177c6b8f4105 files/digest-bestcrypt-1.5_p1 67
-MD5 423393c6218fc246347ba804c6d12093 files/digest-bestcrypt-1.5_p2 67
-MD5 612a37e4db226c3ff5e6f261c20085f1 files/bestcrypt-1.5_p5-makefile_fix.patch 2047
-MD5 4db01d5af606b757325ba05826a8ebfa files/digest-bestcrypt-1.5_p5 67
-MD5 c77a72f4f64ecd2ff3f754543ca23aad files/bestcrypt-1.5_p6-makefile_fix.patch 2286
-MD5 5d4026b2dc6da6c144fdf10f11d9a92c files/digest-bestcrypt-1.5_p6 67
 MD5 ae0a806bcd924019822cdbfdc0dbcfec files/bestcrypt-1.5_p7-makefile_fix.patch 2519
 MD5 362ade933d7aab0a81b18a9e08d1e24f files/digest-bestcrypt-1.5_p7 67
 MD5 4b5ee352a3df35a5803d9013b763afec files/digest-bestcrypt-1.5_p7-r1 136
+MD5 ca9e4e3d8a5d0f6e54e5b83d2fe21c58 files/digest-bestcrypt-1.5_p9 136
+MD5 e9585e8f08138f46bdda7b88ddd81cd8 files/bestcrypt-1.5_p9-makefile_fix.patch 1136
diff --git a/app-crypt/bestcrypt/bestcrypt-1.2_p6.ebuild b/app-crypt/bestcrypt/bestcrypt-1.2_p6.ebuild
deleted file mode 100644
index eeb5f8798006..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.2_p6.ebuild
+++ /dev/null
@@ -1,60 +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.2_p6.ebuild,v 1.10 2005/01/01 12:25:49 eradicator Exp $
-
-inherit flag-o-matic
-
-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"
-
-LICENSE="bestcrypt"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86"
-
-DEPEND="virtual/linux-sources"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
-	filter-flags -fforce-addr
-	unpack ${A}
-	for file in `find . -type f -iname Makefile*`;do
-		sed -i -e "s:-O[0-9]:${CFLAGS}:"	\
-		    -e 's%KVER =.*%KVER = $(shell readlink /usr/src/linux|sed -e "s:linux-\\([0-9]\\+\.[0-9]\\+\\)\..*:\\1:")%' \
-		    -e "s%uname -r%readlink /usr/src/linux|sed -e 's:linux-::'%" \
-			 ${file}
-
-	done
-}
-
-src_compile() {
-	emake -j1 || die
-}
-
-src_install() {
-	#Install docs
-	dohtml ${WORKDIR}/bchelp/*
-	dodir /usr/share/doc/bestcrypt-1.2_p5/html/img
-	insinto /usr/share/doc/bestcrypt-1.2_p5/html/img
-	doins ${WORKDIR}/bchelp/img/*
-
-	exeinto /etc/rc.d/init.d
-	doexe ${FILESDIR}/bcrypt
-	dodir \
-		/usr/bin \
-		/etc/init.d \
-		/etc/rc.d/rc{0,1,2,3,4,5,6}.d \
-		/etc/rc{0,1,2,3,4,5,6}.d \
-		/usr/share/man/man8 \
-		/lib/modules/${KV}/kernel/drivers/block
-	einstall MAN_PATH="/usr/share/man" \
-		 root="${D}" \
-		 MOD_PATH=/lib/modules/${KV}/kernel/drivers/block
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/bcrypt
-	rm -rf ${D}/etc/rc*.d
-	dodoc README LICENSE
-}
diff --git a/app-crypt/bestcrypt/bestcrypt-1.4_p2.ebuild b/app-crypt/bestcrypt/bestcrypt-1.4_p2.ebuild
deleted file mode 100644
index e5c6b98ef67d..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.4_p2.ebuild
+++ /dev/null
@@ -1,60 +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.4_p2.ebuild,v 1.7 2005/01/01 12:25:49 eradicator Exp $
-
-inherit flag-o-matic
-
-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"
-
-LICENSE="bestcrypt"
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86"
-
-DEPEND="virtual/linux-sources"
-
-S=${WORKDIR}/bcrypt
-
-src_unpack() {
-	filter-flags -fforce-addr
-	unpack ${A}
-	for file in `find . -type f -iname Makefile*`;do
-		sed -i -e "s:-O[0-9]:${CFLAGS}:"	\
-		    -e 's%KVER =.*%KVER = $(shell readlink /usr/src/linux|sed -e "s:linux-\\([0-9]\\+\.[0-9]\\+\\)\..*:\\1:")%' \
-		    -e "s%uname -r%readlink /usr/src/linux|sed -e 's:linux-::'%" \
-			 ${file}
-
-	done
-}
-
-src_compile() {
-	emake -j1 || die
-}
-
-src_install() {
-	#Install docs
-	dohtml ${WORKDIR}/bchelp/*
-	dodir /usr/share/doc/${PF}/html/img
-	insinto /usr/share/doc/${PF}/html/img
-	doins ${WORKDIR}/bchelp/img/*
-
-	exeinto /etc/rc.d/init.d
-	doexe ${FILESDIR}/bcrypt
-	dodir \
-		/usr/bin \
-		/etc/init.d \
-		/etc/rc.d/rc{0,1,2,3,4,5,6}.d \
-		/etc/rc{0,1,2,3,4,5,6}.d \
-		/usr/share/man/man8 \
-		/lib/modules/${KV}/kernel/drivers/block
-	einstall MAN_PATH="/usr/share/man" \
-		 root="${D}" \
-		 MOD_PATH=/lib/modules/${KV}/kernel/drivers/block
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/bcrypt
-	rm -rf ${D}/etc/rc*.d
-	dodoc README LICENSE
-}
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p1.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p1.ebuild
deleted file mode 100644
index fca59b03554e..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.5_p1.ebuild
+++ /dev/null
@@ -1,63 +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_p1.ebuild,v 1.5 2005/01/01 12:25:49 eradicator Exp $
-
-inherit flag-o-matic
-
-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"
-
-LICENSE="bestcrypt"
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86"
-
-DEPEND="virtual/linux-sources"
-
-S=${WORKDIR}/bcrypt
-
-pkg_setup() {
-	if [ -e /usr/src/linux/include/linux/modsetver.h ] &&
-	   [ ! -e /usr/src/linux/include/linux/modversions.h ]; then
-		einfo "Setting modsetver->modversions symlink"
-		ln -s /usr/src/linux/include/linux/modsetver.h \
-		      /usr/src/linux/include/linux/modversions.h
-	fi
-}
-
-src_unpack() {
-	filter-flags -fforce-addr
-	unpack ${A}
-	for file in `find . -type f -iname Makefile*`;do
-		sed -i -e "s:-O[0-9]:${CFLAGS}:"	\
-		    -e 's%KVER =.*%KVER = $(shell readlink /usr/src/linux|sed -e "s:linux-\\([0-9]\\+\\.[0-9]\\+\\)\\..*:\\1:")%' \
-		    -e "s%uname -r%readlink /usr/src/linux|sed -e 's:linux-::'%" \
-			 ${file}
-
-	done
-}
-
-src_compile() {
-	emake -j1 || die
-}
-
-src_install() {
-	exeinto /etc/rc.d/init.d
-	doexe ${FILESDIR}/bcrypt
-	dodir \
-		/usr/bin \
-		/etc/init.d \
-		/etc/rc.d/rc{0,1,2,3,4,5,6}.d \
-		/etc/rc{0,1,2,3,4,5,6}.d \
-		/usr/share/man/man8 \
-		/lib/modules/${KV}/kernel/drivers/block
-	einstall MAN_PATH="/usr/share/man" \
-		 root="${D}" \
-		 MOD_PATH=/lib/modules/${KV}/kernel/drivers/block
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bcrypt2 bcrypt
-	rm -rf ${D}/etc/rc*.d
-	dodoc README LICENSE
-}
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p2.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p2.ebuild
deleted file mode 100644
index 959859374fdb..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.5_p2.ebuild
+++ /dev/null
@@ -1,64 +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_p2.ebuild,v 1.4 2005/01/01 12:25:49 eradicator Exp $
-
-inherit flag-o-matic eutils check-kernel
-
-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"
-
-LICENSE="bestcrypt"
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86"
-
-DEPEND="virtual/linux-sources"
-
-S=${WORKDIR}/bcrypt
-
-pkg_setup() {
-	if [ -e /usr/src/linux/include/linux/modsetver.h ] &&
-	   [ ! -e /usr/src/linux/include/linux/modversions.h ]; then
-		einfo "Setting modsetver->modversions symlink"
-		ln -s /usr/src/linux/include/linux/modsetver.h \
-		      /usr/src/linux/include/linux/modversions.h
-	fi
-}
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${P}-makefile_fix.patch
-
-	get_KV_info
-	if [ "${KV_major}" == "2" -a "${KV_minor}" == "6" -a "${KV_micro}" -ge "4" ]; then
-		epatch ${FILESDIR}/${P}-bdev_file_fix.patch
-	fi
-}
-
-src_compile() {
-	filter-flags -fforce-addr
-
-	emake -j1 EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" || die
-}
-
-src_install() {
-	exeinto /etc/rc.d/init.d
-	doexe ${FILESDIR}/bcrypt
-	dodir \
-		/usr/bin \
-		/etc/init.d \
-		/etc/rc.d/rc{0,1,2,3,4,5,6}.d \
-		/etc/rc{0,1,2,3,4,5,6}.d \
-		/usr/share/man/man8 \
-		/lib/modules/${KV}/kernel/drivers/block
-	einstall MAN_PATH="/usr/share/man" \
-		 root="${D}" \
-		 MOD_PATH=/lib/modules/${KV}/kernel/drivers/block
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bcrypt2 bcrypt
-	rm -rf ${D}/etc/rc*.d
-	dodoc README LICENSE
-}
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p5.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p5.ebuild
deleted file mode 100644
index 05407b9e34ef..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.5_p5.ebuild
+++ /dev/null
@@ -1,59 +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_p5.ebuild,v 1.2 2005/01/01 12:25:49 eradicator Exp $
-
-inherit flag-o-matic eutils check-kernel
-
-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"
-
-LICENSE="bestcrypt"
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86"
-
-DEPEND="virtual/linux-sources"
-
-S=${WORKDIR}/bcrypt
-
-pkg_setup() {
-	if [ -e /usr/src/linux/include/linux/modsetver.h ] &&
-	   [ ! -e /usr/src/linux/include/linux/modversions.h ]; then
-		einfo "Setting modsetver->modversions symlink"
-		ln -s /usr/src/linux/include/linux/modsetver.h \
-		      /usr/src/linux/include/linux/modversions.h
-	fi
-}
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${P}-makefile_fix.patch
-}
-
-src_compile() {
-	filter-flags -fforce-addr
-
-	emake -j1 EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" || die
-}
-
-src_install() {
-	exeinto /etc/rc.d/init.d
-	doexe ${FILESDIR}/bcrypt
-	dodir \
-		/usr/bin \
-		/etc/init.d \
-		/etc/rc.d/rc{0,1,2,3,4,5,6}.d \
-		/etc/rc{0,1,2,3,4,5,6}.d \
-		/usr/share/man/man8 \
-		/lib/modules/${KV}/kernel/drivers/block
-	einstall MAN_PATH="/usr/share/man" \
-		 root="${D}" \
-		 MOD_PATH=/lib/modules/${KV}/kernel/drivers/block
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bcrypt2 bcrypt
-	rm -rf ${D}/etc/rc*.d
-	dodoc README LICENSE
-}
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p6.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p6.ebuild
deleted file mode 100644
index ad8ef9224dd2..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.5_p6.ebuild
+++ /dev/null
@@ -1,60 +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_p6.ebuild,v 1.2 2005/01/01 12:25:49 eradicator Exp $
-
-inherit flag-o-matic eutils check-kernel
-
-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"
-
-LICENSE="bestcrypt"
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86"
-
-DEPEND="virtual/linux-sources"
-
-S=${WORKDIR}/bcrypt
-
-pkg_setup() {
-	if [ -e /usr/src/linux/include/linux/modsetver.h ] &&
-	   [ ! -e /usr/src/linux/include/linux/modversions.h ]; then
-		einfo "Setting modsetver->modversions symlink"
-		ln -s /usr/src/linux/include/linux/modsetver.h \
-		      /usr/src/linux/include/linux/modversions.h
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-makefile_fix.patch
-}
-
-src_compile() {
-	filter-flags -fforce-addr
-
-	emake -j1 EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" || die
-}
-
-src_install() {
-	exeinto /etc/rc.d/init.d
-	doexe ${FILESDIR}/bcrypt
-	dodir \
-		/usr/bin \
-		/etc/init.d \
-		/etc/rc.d/rc{0,1,2,3,4,5,6}.d \
-		/etc/rc{0,1,2,3,4,5,6}.d \
-		/usr/share/man/man8 \
-		/lib/modules/${KV}/kernel/drivers/block
-	einstall MAN_PATH="/usr/share/man" \
-		 root="${D}" \
-		 MOD_PATH=/lib/modules/${KV}/kernel/drivers/block
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bcrypt2 bcrypt
-	rm -rf ${D}/etc/rc*.d
-	dodoc README LICENSE
-}
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p9.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p9.ebuild
new file mode 100644
index 000000000000..65f97f949833
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-1.5_p9.ebuild
@@ -0,0 +1,93 @@
+# 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_p9.ebuild,v 1.1 2005/01/03 04:23:22 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="~x86 ~amd64"
+
+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() {
+
+	echo -e "\nmodule: \$(OBJ)" >> mod/Makefile.alg
+
+	filter-flags -fforce-addr
+	#BUILD_PARAMS=-I${S}/include KERNEL_DIR=${KV_DIR} -DKBUILD_MODNAME=bc_$$i" TARGET=bc_
+	#linux-mod_src_compile
+
+	emake -C mod SYMSRC=bc_dev${KV_MAJOR}${KV_MINOR}.c bc_dev.ver
+
+	emake -C mod OBJS=bc_dev${KV_MAJOR}${KV_MINOR}.o \
+		KERNEL_DIR=${KV_DIR} KEXT=${KV_OBJ} CC=$(tc-getCC) LD=$(tc-getLD) \
+		AS=$(tc-getAS) CPP=$(tc-getCXX)
+	einfo "Modules compiled"
+
+
+	emake -C kgsha || die "library compile failed"
+	emake -C src || die "bctool compile failed"
+
+	#emake -j1 KERNEL_TMP= EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" || die
+}
+
+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
+
+	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"
+}
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.5_p2-bdev_file_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p2-bdev_file_fix.patch
deleted file mode 100644
index a4af5a3c83b8..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.5_p2-bdev_file_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mod/bc_dev26.c	2004-03-27 14:46:16.163050206 +0000
-+++ mod/bc_dev26.c	2004-03-27 15:02:29.696906457 +0000
-@@ -634,7 +634,7 @@
- 	}
- 
- 	if (S_ISBLK(bc->bc_dentry->d_inode->i_mode))
--		blkdev_put(bc->bc_dentry->d_inode->i_bdev, BDEV_FILE);
-+		blkdev_put(bc->bc_dentry->d_inode->i_bdev);
- 
- 	if (!bc->bc_flags.readonly)
- 		put_write_access(bc->bc_dentry->d_inode);
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.5_p2-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p2-makefile_fix.patch
deleted file mode 100644
index 9868634c3930..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.5_p2-makefile_fix.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- mod/Makefile	2004-02-10 10:32:19.000000000 +0000
-+++ mod/Makefile	2004-03-27 13:40:22.811483270 +0000
-@@ -42,7 +42,8 @@
- 
- CFLAGS = -c -D__KERNEL__ -DMODULE 
- 
--KVER = $(shell uname -r | sed 's/\(.\..\).*/\1/')
-+KVER = $(shell readlink /usr/src/linux|sed -e "s:.*linux-\([0-9]\+\.[0-9]\+\)\..*:\1:")
-+KNAME = $(shell readlink /usr/src/linux|sed "s:linux-::")
- 
- OBJS = bc_dev22.o
- KEXT = o
-@@ -66,7 +67,7 @@
- #	Linux 2.4.x 
- #######################################################################
- ifeq ($(KVER), 2.4)
--KERNEL_DIR = /lib/modules/$(shell uname -r)/build
-+KERNEL_DIR = /lib/modules/$(KNAME)/build
- OBJS = bc_dev24.o
- SYMSRC = bc_dev24.c
- CFLAGS += $(shell $(CC) -I$(KERNEL_DIR)/include/ -c test_nice.c -o /dev/null 2>/dev/null && echo "-D_NICE_PRESENT_")
-@@ -84,7 +85,7 @@
- #	Linux 2.6.x 
- #######################################################################
- ifeq ($(KVER), 2.6)
--KERNEL_DIR = /lib/modules/$(shell uname -r)/build
-+KERNEL_DIR = /lib/modules/$(KNAME)/build
- OBJS = bc_dev26.o
- CFLAGS += -I$(KERNEL_DIR)/include/asm/mach-default/ -DKBUILD_BASENAME=BestCrypt
- KEXT = ko
-@@ -92,13 +93,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), i386)
--CFLAGS += -O6 -fno-strength-reduce -fno-strict-aliasing 
--# -Wall
--endif
-+CFLAGS += $(EXTRA_CFLAGS)
- 
- LDFLAGS = -d -r
- 
---- src/Makefile	2004-03-27 14:02:53.281310545 +0000
-+++ src/Makefile	2004-03-27 14:03:09.227381640 +0000
-@@ -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	2004-03-27 14:04:43.074259248 +0000
-+++ kgsha/Makefile	2004-03-27 14:05:03.033341700 +0000
-@@ -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_p5-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p5-makefile_fix.patch
deleted file mode 100644
index 9868634c3930..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.5_p5-makefile_fix.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- mod/Makefile	2004-02-10 10:32:19.000000000 +0000
-+++ mod/Makefile	2004-03-27 13:40:22.811483270 +0000
-@@ -42,7 +42,8 @@
- 
- CFLAGS = -c -D__KERNEL__ -DMODULE 
- 
--KVER = $(shell uname -r | sed 's/\(.\..\).*/\1/')
-+KVER = $(shell readlink /usr/src/linux|sed -e "s:.*linux-\([0-9]\+\.[0-9]\+\)\..*:\1:")
-+KNAME = $(shell readlink /usr/src/linux|sed "s:linux-::")
- 
- OBJS = bc_dev22.o
- KEXT = o
-@@ -66,7 +67,7 @@
- #	Linux 2.4.x 
- #######################################################################
- ifeq ($(KVER), 2.4)
--KERNEL_DIR = /lib/modules/$(shell uname -r)/build
-+KERNEL_DIR = /lib/modules/$(KNAME)/build
- OBJS = bc_dev24.o
- SYMSRC = bc_dev24.c
- CFLAGS += $(shell $(CC) -I$(KERNEL_DIR)/include/ -c test_nice.c -o /dev/null 2>/dev/null && echo "-D_NICE_PRESENT_")
-@@ -84,7 +85,7 @@
- #	Linux 2.6.x 
- #######################################################################
- ifeq ($(KVER), 2.6)
--KERNEL_DIR = /lib/modules/$(shell uname -r)/build
-+KERNEL_DIR = /lib/modules/$(KNAME)/build
- OBJS = bc_dev26.o
- CFLAGS += -I$(KERNEL_DIR)/include/asm/mach-default/ -DKBUILD_BASENAME=BestCrypt
- KEXT = ko
-@@ -92,13 +93,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), i386)
--CFLAGS += -O6 -fno-strength-reduce -fno-strict-aliasing 
--# -Wall
--endif
-+CFLAGS += $(EXTRA_CFLAGS)
- 
- LDFLAGS = -d -r
- 
---- src/Makefile	2004-03-27 14:02:53.281310545 +0000
-+++ src/Makefile	2004-03-27 14:03:09.227381640 +0000
-@@ -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	2004-03-27 14:04:43.074259248 +0000
-+++ kgsha/Makefile	2004-03-27 14:05:03.033341700 +0000
-@@ -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_p6-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p6-makefile_fix.patch
deleted file mode 100644
index cc0827afa638..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.5_p6-makefile_fix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- mod/Makefile.org	2004-07-07 20:49:59.000000000 +0200
-+++ mod/Makefile	2004-07-07 20:53:58.000000000 +0200
-@@ -42,7 +42,8 @@
- 
- CFLAGS = -c -D__KERNEL__ -DMODULE 
- 
--KVER = $(shell uname -r | sed 's/\(.\..\).*/\1/')
-+KVER = $(shell readlink /usr/src/linux|sed -e "s:.*linux-\([0-9]\+\.[0-9]\+\)\..*:\1:")
-+KNAME = $(shell readlink /usr/src/linux|sed "s:linux-::")
- 
- OBJS = bc_dev22.o
- KEXT = o
-@@ -66,7 +67,7 @@
- #	Linux 2.4.x 
- #######################################################################
- ifeq ($(KVER), 2.4)
--KERNEL_DIR = /lib/modules/$(shell uname -r)/build
-+KERNEL_DIR = /lib/modules/$(KNAME)/build
- OBJS = bc_dev24.o
- SYMSRC = bc_dev24.c
- CFLAGS += $(shell $(CC) -I$(KERNEL_DIR)/include/ -c test_nice.c -o /dev/null 2>/dev/null && echo "-D_NICE_PRESENT_")
-@@ -84,7 +85,7 @@
- #	Linux 2.6.x 
- #######################################################################
- ifeq ($(KVER), 2.6)
--KERNEL_DIR = /lib/modules/$(shell uname -r)/build
-+KERNEL_DIR = /lib/modules/$(KNAME)/build
- OBJS = bc_dev26.o
- CFLAGS += -I$(KERNEL_DIR)/include/asm/mach-default/ -DKBUILD_BASENAME=BestCrypt
- CFLAGS += $(shell $(CC) -I$(KERNEL_DIR)/include/ -I$(KERNEL_DIR)/include/asm/mach-default/ -c test_blkdev_put.c -o /dev/null 2>/dev/null && echo "-D_BLKDEV_2_")
-@@ -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_p9-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p9-makefile_fix.patch
new file mode 100644
index 000000000000..6f1e4f3ef6bc
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-1.5_p9-makefile_fix.patch
@@ -0,0 +1,38 @@
+--- 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/digest-bestcrypt-1.2_p6 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.2_p6
deleted file mode 100644
index d1fd9d073219..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.2_p6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93d275cf6d351e9e286dc54316e4c1a2 BestCrypt-1.2-6.tar.gz 160552
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.4_p2 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.4_p2
deleted file mode 100644
index a794b3b6ca13..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.4_p2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f333b05b732579ea2ad0740fb35006c9 BestCrypt-1.4-2.tar.gz 161696
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p1 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p1
deleted file mode 100644
index 754ffb599a27..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e53732960b290e2ebdfd705b428d4fb BestCrypt-1.5-1.tar.gz 166553
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p2 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p2
deleted file mode 100644
index cc9a75ca7fa9..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98b5197997e15157fc3e409c53e6a45e BestCrypt-1.5-2.tar.gz 166302
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p5 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p5
deleted file mode 100644
index f277395a3224..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6680a7e9683729dfcf416a2ad832b3fc BestCrypt-1.5-5.tar.gz 167957
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p6 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p6
deleted file mode 100644
index 45562294b188..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5185fd607851e0eacf356381d69ea2d9 BestCrypt-1.5-6.tar.gz 167995
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p9 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p9
new file mode 100644
index 000000000000..86a59f5f9bf3
--- /dev/null
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p9
@@ -0,0 +1,2 @@
+MD5 d963ef2c9d9196ea128cc39180bf1c71 BestCrypt-1.5-9.tar.gz 169750
+MD5 aa6e1f0e9ee797b409267bdba1f6534e bcrypt-rc6-serpent.diff.gz 5718