Fix lib location, bug#195982, thanks to Jean Krohn

(Portage version: 2.1.3.13)

17 files changed, 19 insertions, 462 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index b60e31d37112..4ffe0871ebc5 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-libs/botan
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.25 2007/08/13 20:19:35 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.26 2007/10/15 21:23:47 alonbl Exp $
+
+  15 Oct 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/botan-1.4.4-gcc34.patch, -files/botan-1.4.9-gcc-4.patch,
+  -files/botan-1.5.11-asm.patch, -botan-1.4.4.ebuild, -botan-1.4.9.ebuild,
+  -botan-1.4.11.ebuild, -botan-1.4.12.ebuild, -botan-1.5.5.ebuild,
+  -botan-1.5.11.ebuild, +botan-1.6.1-r1.ebuild:
+  Cleanup
+
+*botan-1.6.1-r1 (15 Oct 2007)
+
+  15 Oct 2007; Alon Bar-Lev <alonbl@gentoo.org> +botan-1.6.1-r1.ebuild:
+  Fix lib location, bug#195982, thanks to Jean Krohn
 
   13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> botan-1.6.1.ebuild:
   ppc. stable
diff --git a/dev-libs/botan/botan-1.4.11.ebuild b/dev-libs/botan/botan-1.4.11.ebuild
deleted file mode 100644
index 7532ee6db78b..000000000000
--- a/dev-libs/botan/botan-1.4.11.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.11.ebuild,v 1.2 2007/03/03 22:32:36 genone Exp $
-
-# Comments/fixes to lloyd@randombit.net (author)
-
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="http://botan.randombit.net/"
-SRC_URI="http://botan.randombit.net/files/Botan-${PV}.tgz"
-
-KEYWORDS="~ppc ~sparc ~x86"
-SLOT="0"
-LICENSE="BSD"
-IUSE="bzip2 gmp ssl zlib"
-
-S="${WORKDIR}/Botan-${PV}"
-
-RDEPEND="virtual/libc
-	bzip2? ( >=app-arch/bzip2-1.0.1 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-
-# configure.pl requires DirHandle, Getopt::Long, File::Spec, and File::Copy;
-# all seem included in dev-lang/perl ATM.
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_compile() {
-	# Modules that should work under any semi-recent Unix
-	local modules="alloc_mmap,es_egd,es_ftw,es_unix,fd_unix,ml_unix,tm_unix,tm_posix,mux_pthr"
-
-	if useq bzip2; then modules="$modules,comp_bzip2"; fi
-	if useq zlib; then modules="$modules,comp_zlib"; fi
-	if useq gmp; then modules="$modules,eng_gmp"; fi
-	if useq ssl; then modules="$modules,eng_ossl"; fi
-	# removed?
-	#if useq qt; then modules="$modules,mux_qt"; fi
-
-	# This is also supported on i586+ - hope this is correct.
-	# documention says sparc though not enables because of
-	# http://bugs.gentoo.org/show_bug.cgi?id=71760#c11
-	if [ ${ARCH} = 'alpha' -o ${ARCH} = 'amd64' ] || \
-		[ ${ARCH} = 'x86' -a ${CHOST:0:4} != "i386" -a ${CHOST:0:4} != "i486" ]; then
-		modules="$modules,tm_hard"
-	fi
-
-	# should be enabled on mips64
-	if [ "${ARCH}" = 'alpha' -o "${ARCH}" = 'amd64' -o \
-		"${ARCH}" = 'ia64' -o "${ARCH}" = 'ppc64' -o "${PROFILE_ARCH}" = 'mips64'  ]; then
-		modules="$modules,mp_asm64"
-	fi
-
-	# Enable v9 instructions for sparc64
-	if [ "${PROFILE_ARCH}" = "sparc64" ]; then
-		CHOSTARCH='sparc32-v9'
-	else
-		CHOSTARCH=$(echo ${CHOST} | cut -d - -f 1)
-	fi
-
-	cd ${S}
-	elog "Enabling modules: " ${modules}
-
-	# FIXME: We might actually be on *BSD or OS X...
-	./configure.pl --noauto gcc-linux-${CHOSTARCH} --modules=$modules ||
-		die "configure.pl failed"
-	emake "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed"
-}
-
-src_test() {
-	chmod -R ugo+rX ${S}
-	emake check || die "emake check failed"
-	env LD_LIBRARY_PATH=${S} ./check --validate || die "validation tests failed"
-}
-
-src_install() {
-	make INSTALLROOT="${D}/usr" install || die "make install failed"
-}
diff --git a/dev-libs/botan/botan-1.4.12.ebuild b/dev-libs/botan/botan-1.4.12.ebuild
deleted file mode 100644
index fda3182bc2f4..000000000000
--- a/dev-libs/botan/botan-1.4.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.12.ebuild,v 1.2 2007/03/03 22:32:36 genone Exp $
-
-# Comments/fixes to lloyd@randombit.net (author)
-
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="http://botan.randombit.net/"
-SRC_URI="http://botan.randombit.net/files/Botan-${PV}.tgz"
-
-KEYWORDS="~ppc ~sparc ~x86"
-SLOT="0"
-LICENSE="BSD"
-IUSE="bzip2 gmp ssl zlib"
-
-S="${WORKDIR}/Botan-${PV}"
-
-RDEPEND="virtual/libc
-	bzip2? ( >=app-arch/bzip2-1.0.1 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-
-# configure.pl requires DirHandle, Getopt::Long, File::Spec, and File::Copy;
-# all seem included in dev-lang/perl ATM.
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_compile() {
-	# Modules that should work under any semi-recent Unix
-	local modules="alloc_mmap,es_egd,es_ftw,es_unix,fd_unix,ml_unix,tm_unix,tm_posix,mux_pthr"
-
-	if useq bzip2; then modules="$modules,comp_bzip2"; fi
-	if useq zlib; then modules="$modules,comp_zlib"; fi
-	if useq gmp; then modules="$modules,eng_gmp"; fi
-	if useq ssl; then modules="$modules,eng_ossl"; fi
-	# removed?
-	#if useq qt; then modules="$modules,mux_qt"; fi
-
-	# This is also supported on i586+ - hope this is correct.
-	# documention says sparc though not enables because of
-	# http://bugs.gentoo.org/show_bug.cgi?id=71760#c11
-	if [ ${ARCH} = 'alpha' -o ${ARCH} = 'amd64' ] || \
-		[ ${ARCH} = 'x86' -a ${CHOST:0:4} != "i386" -a ${CHOST:0:4} != "i486" ]; then
-		modules="$modules,tm_hard"
-	fi
-
-	# should be enabled on mips64
-	if [ "${ARCH}" = 'alpha' -o "${ARCH}" = 'amd64' -o \
-		"${ARCH}" = 'ia64' -o "${ARCH}" = 'ppc64' -o "${PROFILE_ARCH}" = 'mips64'  ]; then
-		modules="$modules,mp_asm64"
-	fi
-
-	# Enable v9 instructions for sparc64
-	if [ "${PROFILE_ARCH}" = "sparc64" ]; then
-		CHOSTARCH='sparc32-v9'
-	else
-		CHOSTARCH=$(echo ${CHOST} | cut -d - -f 1)
-	fi
-
-	cd ${S}
-	elog "Enabling modules: " ${modules}
-
-	# FIXME: We might actually be on *BSD or OS X...
-	./configure.pl --noauto gcc-linux-${CHOSTARCH} --modules=$modules ||
-		die "configure.pl failed"
-	emake "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed"
-}
-
-src_test() {
-	chmod -R ugo+rX ${S}
-	emake check || die "emake check failed"
-	env LD_LIBRARY_PATH=${S} ./check --validate || die "validation tests failed"
-}
-
-src_install() {
-	make INSTALLROOT="${D}/usr" install || die "make install failed"
-}
diff --git a/dev-libs/botan/botan-1.4.4.ebuild b/dev-libs/botan/botan-1.4.4.ebuild
deleted file mode 100644
index fdcd5186e289..000000000000
--- a/dev-libs/botan/botan-1.4.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.4.ebuild,v 1.9 2007/07/12 02:25:35 mr_bones_ Exp $
-
-# Comments/fixes to lloyd@randombit.net (author)
-
-inherit eutils
-
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="http://botan.randombit.net/"
-SRC_URI="http://botan.randombit.net/files/Botan-${PV}.tgz"
-
-KEYWORDS="ppc sparc x86"
-SLOT="0"
-LICENSE="BSD"
-IUSE="bzip2 gmp ssl zlib"
-
-S="${WORKDIR}/Botan-${PV}"
-
-# FIXME: libstdc++ here?
-RDEPEND="virtual/libc
-	bzip2? ( >=app-arch/bzip2-1.0.1 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-
-# configure.pl requires DirHandle, Getopt::Long, File::Spec, and File::Copy;
-# all seem included in dev-lang/perl ATM.
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gcc34.patch
-}
-
-src_compile() {
-	# Modules that should work under any semi-recent Unix
-	local modules="alloc_mmap,es_egd,es_ftw,es_unix,fd_unix,ml_unix,tm_unix,mux_pthr"
-
-	if useq bzip2; then modules="$modules,comp_bzip2"; fi
-	if useq zlib; then modules="$modules,comp_zlib"; fi
-	if useq gmp; then modules="$modules,eng_gmp"; fi
-	if useq ssl; then modules="$modules,eng_ossl"; fi
-
-	# This is also supported on i586+ - hope this is correct.
-	if [ ${ARCH} = 'alpha' -o ${ARCH} = 'amd64' ] || \
-		[ ${ARCH} = 'x86' -a ${CHOST:0:4} != "i386" -a ${CHOST:0:4} != "i486" ]; then
-		modules="$modules,tm_hard"
-	fi
-
-	# Also works on mips64
-	if [ "${ARCH}" = 'alpha' -o "${ARCH}" = 'amd64' -o \
-		"${ARCH}" = 'ia64' -o "${ARCH}" = 'ppc64' -o "${PROFILE_ARCH}" = 'mips64'  ]; then
-		modules="$modules,mp_asm64"
-	fi
-
-	# Enable v9 instructions for sparc64
-	if [ ${PROFILE_ARCH} = 'sparc64' ]; then
-		CHOSTARCH='sparc32-v9'
-	else
-		CHOSTARCH=$(echo ${CHOST} | cut -d - -f 1)
-	fi
-
-	cd ${S}
-	elog "Enabling modules: " ${modules}
-
-	# FIXME: We might actually be on *BSD or OS X...
-	./configure.pl --noauto gcc-linux-$CHOSTARCH --modules=$modules ||
-		die "configure.pl failed"
-	emake "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed"
-}
-
-src_test() {
-	chmod -R ugo+rX ${S}
-	emake check || die "emake check failed"
-	env LD_LIBRARY_PATH=${S} ./check --validate || die "validation tests failed"
-}
-
-src_install() {
-	make INSTALLROOT="${D}/usr" install || die "make install failed"
-}
diff --git a/dev-libs/botan/botan-1.4.9.ebuild b/dev-libs/botan/botan-1.4.9.ebuild
deleted file mode 100644
index bd87586fc68f..000000000000
--- a/dev-libs/botan/botan-1.4.9.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.9.ebuild,v 1.7 2007/07/12 02:25:35 mr_bones_ Exp $
-
-inherit eutils
-# Comments/fixes to lloyd@randombit.net (author)
-
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="http://botan.randombit.net/"
-SRC_URI="http://botan.randombit.net/files/Botan-${PV}.tgz"
-
-KEYWORDS="ppc sparc x86"
-SLOT="0"
-LICENSE="BSD"
-IUSE="bzip2 gmp ssl zlib"
-
-S="${WORKDIR}/Botan-${PV}"
-
-RDEPEND="virtual/libc
-	bzip2? ( >=app-arch/bzip2-1.0.1 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-
-# configure.pl requires DirHandle, Getopt::Long, File::Spec, and File::Copy;
-# all seem included in dev-lang/perl ATM.
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gcc-4.patch
-}
-
-src_compile() {
-	# Modules that should work under any semi-recent Unix
-	local modules="alloc_mmap,es_egd,es_ftw,es_unix,fd_unix,ml_unix,tm_unix,tm_posix,mux_pthr"
-
-	if useq bzip2; then modules="$modules,comp_bzip2"; fi
-	if useq zlib; then modules="$modules,comp_zlib"; fi
-	if useq gmp; then modules="$modules,eng_gmp"; fi
-	if useq ssl; then modules="$modules,eng_ossl"; fi
-	# removed?
-	#if useq qt; then modules="$modules,mux_qt"; fi
-
-	# This is also supported on i586+ - hope this is correct.
-	# documention says sparc though not enables because of
-	# http://bugs.gentoo.org/show_bug.cgi?id=71760#c11
-	if [ ${ARCH} = 'alpha' -o ${ARCH} = 'amd64' ] || \
-		[ ${ARCH} = 'x86' -a ${CHOST:0:4} != "i386" -a ${CHOST:0:4} != "i486" ]; then
-		modules="$modules,tm_hard"
-	fi
-
-	# should be enabled on mips64
-	if [ "${ARCH}" = 'alpha' -o "${ARCH}" = 'amd64' -o \
-		"${ARCH}" = 'ia64' -o "${ARCH}" = 'ppc64' -o "${PROFILE_ARCH}" = 'mips64'  ]; then
-		modules="$modules,mp_asm64"
-	fi
-
-	# Enable v9 instructions for sparc64
-	if [ "${PROFILE_ARCH}" = "sparc64" ]; then
-		CHOSTARCH='sparc32-v9'
-	else
-		CHOSTARCH=$(echo ${CHOST} | cut -d - -f 1)
-	fi
-
-	cd ${S}
-	elog "Enabling modules: " ${modules}
-
-	# FIXME: We might actually be on *BSD or OS X...
-	./configure.pl --noauto gcc-linux-${CHOSTARCH} --modules=$modules ||
-		die "configure.pl failed"
-	emake "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed"
-}
-
-src_test() {
-	chmod -R ugo+rX ${S}
-	emake check || die "emake check failed"
-	env LD_LIBRARY_PATH=${S} ./check --validate || die "validation tests failed"
-}
-
-src_install() {
-	make INSTALLROOT="${D}/usr" install || die "make install failed"
-}
diff --git a/dev-libs/botan/botan-1.5.5.ebuild b/dev-libs/botan/botan-1.5.5.ebuild
deleted file mode 100644
index 9a6688368377..000000000000
--- a/dev-libs/botan/botan-1.5.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.5.5.ebuild,v 1.4 2007/03/03 22:32:36 genone Exp $
-
-# Comments/fixes to lloyd@randombit.net (author)
-
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="http://botan.randombit.net/"
-SRC_URI="http://botan.randombit.net/files/Botan-${PV}.tgz"
-
-KEYWORDS="~ppc ~sparc ~x86"
-SLOT="0"
-LICENSE="BSD"
-IUSE="bzip2 gmp ssl zlib"
-
-S="${WORKDIR}/Botan-${PV}"
-
-RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.1 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-
-# configure.pl requires DirHandle, Getopt::Long, File::Spec, and File::Copy;
-# all seem included in dev-lang/perl ATM.
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_compile() {
-	# Modules that should work under any semi-recent Unix
-	local modules="alloc_mmap,es_egd,es_ftw,es_unix,fd_unix,ml_unix,tm_unix,tm_posix,mux_pthr"
-
-	if useq bzip2; then modules="$modules,comp_bzip2"; fi
-	if useq zlib; then modules="$modules,comp_zlib"; fi
-	if useq gmp; then modules="$modules,eng_gmp"; fi
-	if useq ssl; then modules="$modules,eng_ossl"; fi
-
-	# This is also supported on i586+ - hope this is correct.
-	# documention says sparc though not enables because of
-	# http://bugs.gentoo.org/show_bug.cgi?id=71760#c11
-	if [ ${ARCH} = 'alpha' -o ${ARCH} = 'amd64' ] || \
-			[ ${ARCH} = 'x86' -a ${CHOST:0:4} != "i386" -a ${CHOST:0:4} != "i486" ]; then
-			modules="$modules,tm_hard"
-	fi
-
-	# If we have assembly code for this machine, use it
-	if [ "${ARCH}" = 'x86' ]; then
-		modules="$modules,mp_ia32"
-	elif [ "${ARCH}" = 'amd64' ]; then
-		modules="$modules,mp_amd64"
-	elif [ "${ARCH}" = 'alpha' -o "${ARCH}" = 'ia64' -o "${ARCH}" = 'ppc64'
-			-o "${PROFILE_ARCH}" = 'mips64'  ]; then
-			modules="$modules,mp_asm64"
-	fi
-
-	# Enable v9 instructions for sparc64
-	if [ "${PROFILE_ARCH}" = "sparc64" ]; then
-			CHOSTARCH='sparc32-v9'
-	else
-			CHOSTARCH=$(echo ${CHOST} | cut -d - -f 1)
-	fi
-
-	cd "${S}"
-	elog "Enabling modules: " ${modules}
-
-	# FIXME: We might actually be on *BSD or OS X...
-	./configure.pl --noauto gcc-linux-${CHOSTARCH} --modules=$modules ||
-			die "configure.pl failed"
-	emake "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed"
-}
-
-src_test() {
-	chmod -R ugo+rX "${S}"
-	emake check || die "emake check failed"
-	env LD_LIBRARY_PATH="${S}" ./check --validate || die "validation tests failed"
-}
-
-src_install() {
-	make INSTALLROOT="${D}/usr" install || die "make install failed"
-}
diff --git a/dev-libs/botan/botan-1.5.11.ebuild b/dev-libs/botan/botan-1.6.1-r1.ebuild
index bf62d62fd6e4..9208d75be87f 100644
--- a/dev-libs/botan/botan-1.5.11.ebuild
+++ b/dev-libs/botan/botan-1.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.5.11.ebuild,v 1.4 2007/03/03 22:32:36 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.6.1-r1.ebuild,v 1.1 2007/10/15 21:23:47 alonbl Exp $
 
 inherit eutils multilib
 
@@ -55,7 +55,7 @@ src_compile() {
 	if [ "${ARCH}" = "x86" ]; then
 		modules="$modules,mp_ia32,alg_ia32"
 	elif [ "${ARCH}" = "amd64" ]; then
-		modules="$modules,mp_amd64"
+		modules="$modules,mp_amd64,alg_amd64"
 	elif [ "${ARCH}" = "alpha" -o "${ARCH}" = "ia64" -o \
 		"${ARCH}" = "ppc64" -o "${PROFILE_ARCH}" = "mips64"  ]; then
 		modules="$modules,mp_asm64"
@@ -74,7 +74,7 @@ src_compile() {
 	# FIXME: We might actually be on *BSD or OS X...
 	./configure.pl \
 		--noauto gcc-linux-${CHOSTARCH} \
-		--libdir=/usr/$(get_libdir) \
+		--libdir=/$(get_libdir) \
 		--modules=$modules ||
 			die "configure.pl failed"
 	emake "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed"
diff --git a/dev-libs/botan/files/botan-1.4.4-gcc34.patch b/dev-libs/botan/files/botan-1.4.4-gcc34.patch
deleted file mode 100644
index d0e8d0245b3f..000000000000
--- a/dev-libs/botan/files/botan-1.4.4-gcc34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Botan-1.4.4/configure.pl	2004-12-02 23:38:44.000000000 -0500
-+++ Botan/configure.pl	2004-12-04 12:45:22.189044368 -0500
-@@ -832,7 +832,7 @@
-     # didn't get output, assume it's a buggy GCC. There is no reduction in code
-     # quality, etc, so even if we're wrong it's no big deal.
- 
--    if(($gcc_version =~ /gcc version 3\.[34]/) ||
-+    if(($gcc_version =~ /3\.[34]/) ||
-        ($gcc_version =~ /2\.95\.[0-4]/) ||
-        ($gcc_version eq '' && $^O eq 'cygwin'))
-     {
diff --git a/dev-libs/botan/files/botan-1.4.9-gcc-4.patch b/dev-libs/botan/files/botan-1.4.9-gcc-4.patch
deleted file mode 100644
index 9cf16ace4ae9..000000000000
--- a/dev-libs/botan/files/botan-1.4.9-gcc-4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.pl.orig	2006-01-03 07:40:04.015099823 -0500
-+++ configure.pl	2006-01-03 07:40:47.828059635 -0500
-@@ -874,7 +874,8 @@
-     # didn't get output, assume it's a buggy GCC. There is no reduction in code
-     # quality, etc, so even if we're wrong it's no big deal.
- 
--    if(($gcc_version =~ /3\.[34]/) ||
-+    if(($gcc_version =~ /4\.[01]/) ||
-+       ($gcc_version =~ /3\.[34]/) ||
-        ($gcc_version =~ /2\.95\.[0-4]/) ||
-        ($gcc_version eq '' && $^O eq 'cygwin'))
-     {
diff --git a/dev-libs/botan/files/botan-1.5.11-asm.patch b/dev-libs/botan/files/botan-1.5.11-asm.patch
deleted file mode 100644
index 0a48eb0f3368..000000000000
--- a/dev-libs/botan/files/botan-1.5.11-asm.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urNp Botan-1.5.11.org/modules/alg_ia32/asm_macr.h Botan-1.5.11/modules/alg_ia32/asm_macr.h
---- Botan-1.5.11.org/modules/alg_ia32/asm_macr.h	2006-09-10 08:59:20.000000000 +0300
-+++ Botan-1.5.11/modules/alg_ia32/asm_macr.h	2006-10-24 21:14:15.000000000 +0200
-@@ -6,6 +6,10 @@
- #ifndef BOTAN_EXT_ASM_MACROS_H__
- #define BOTAN_EXT_ASM_MACROS_H__
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
- /*************************************************
- * General/Global Macros                          *
- *************************************************/
diff --git a/dev-libs/botan/files/digest-botan-1.4.11 b/dev-libs/botan/files/digest-botan-1.4.11
deleted file mode 100644
index 1e965df1188f..000000000000
--- a/dev-libs/botan/files/digest-botan-1.4.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 987ad49322cc41496fc2eae38ddd93c1 Botan-1.4.11.tgz 1802089
-RMD160 c8aa827cf10151266b88e17c172999a6ccaab816 Botan-1.4.11.tgz 1802089
-SHA256 02d0482a0f06114e2d7848e4cf393e095c8857501177a5a2d2c03cecd199f1ed Botan-1.4.11.tgz 1802089
diff --git a/dev-libs/botan/files/digest-botan-1.4.12 b/dev-libs/botan/files/digest-botan-1.4.12
deleted file mode 100644
index 375b39dafcc3..000000000000
--- a/dev-libs/botan/files/digest-botan-1.4.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0bb60ed7c9f454fab6df9a06916fbec6 Botan-1.4.12.tgz 1801371
-RMD160 c7b78863eaa10668dc8ceaef70245a1a52938c2e Botan-1.4.12.tgz 1801371
-SHA256 b894065634c0822eda943d35169f1444348644269a4d1e53d6a0bd14cb3cc94f Botan-1.4.12.tgz 1801371
diff --git a/dev-libs/botan/files/digest-botan-1.4.4 b/dev-libs/botan/files/digest-botan-1.4.4
deleted file mode 100644
index dc73a17f01a8..000000000000
--- a/dev-libs/botan/files/digest-botan-1.4.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9c71f4ce74fc02484e4499d923961815 Botan-1.4.4.tgz 1436270
-RMD160 836b7e9407636c5ec76b0a1c11d461967fa2f8b1 Botan-1.4.4.tgz 1436270
-SHA256 1ab6ab9e62f199d9f16cdc28653784aee94e6f526f7e4083a45069666fa5009e Botan-1.4.4.tgz 1436270
diff --git a/dev-libs/botan/files/digest-botan-1.4.9 b/dev-libs/botan/files/digest-botan-1.4.9
deleted file mode 100644
index b6ae5151e73d..000000000000
--- a/dev-libs/botan/files/digest-botan-1.4.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 42acef0f6a0d70d4fb3871f15b49f32f Botan-1.4.9.tgz 1812447
-RMD160 cf4ffbf4aebc08de6e3720a13c9557bae0dd493e Botan-1.4.9.tgz 1812447
-SHA256 234c399adc5694440cc4bc57170c74c3abc6157bad037d4a6d01435e5b330a0d Botan-1.4.9.tgz 1812447
diff --git a/dev-libs/botan/files/digest-botan-1.5.11 b/dev-libs/botan/files/digest-botan-1.5.11
deleted file mode 100644
index 41a922e3ffb9..000000000000
--- a/dev-libs/botan/files/digest-botan-1.5.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6fc71b20d30dedd93b0c19a74b2ae0c2 Botan-1.5.11.tgz 1373484
-RMD160 6a080d69eb53d8a7c0c3c70848401e397e0ce8b3 Botan-1.5.11.tgz 1373484
-SHA256 efff1ad12e22bdbf69f007a58b49a273a548c4bf0b83cac0a92f6d332c8f43e5 Botan-1.5.11.tgz 1373484
diff --git a/dev-libs/botan/files/digest-botan-1.5.5 b/dev-libs/botan/files/digest-botan-1.5.5
deleted file mode 100644
index 4b587098d5bd..000000000000
--- a/dev-libs/botan/files/digest-botan-1.5.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 72130aa4f033b53f92afca605eb2b2d4 Botan-1.5.5.tgz 1240713
-RMD160 660651795018b2071b815137ce6925524b32bf7e Botan-1.5.5.tgz 1240713
-SHA256 f8989356a1d40fcff7a867db9168ad6ecb9abca22b64bc0c0b9db653bb814907 Botan-1.5.5.tgz 1240713
diff --git a/dev-libs/botan/files/digest-botan-1.6.1-r1 b/dev-libs/botan/files/digest-botan-1.6.1-r1
new file mode 100644
index 000000000000..b092471132dc
--- /dev/null
+++ b/dev-libs/botan/files/digest-botan-1.6.1-r1
@@ -0,0 +1,3 @@
+MD5 c7330b4db6408d47db34af7887b8bfca Botan-1.6.1.tgz 1845323
+RMD160 e729d03ac8aba3a8c157cd956f4ddf08d99fe33b Botan-1.6.1.tgz 1845323
+SHA256 4ff3ec8c0c5c21fcb5b56e2c54a4eeddf7101a883e13a816630ccff288c0a9c4 Botan-1.6.1.tgz 1845323