version bump thanks to meatoo. old version removed

(Portage version: 2.0.51.22-r1)

6 files changed, 32 insertions, 19 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index a7dad1584983..819ec0daef3a 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/botan
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.5 2005/06/01 00:53:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.6 2005/06/25 09:20:53 dragonheart Exp $
+
+*botan-1.4.6 (25 Jun 2005)
+
+  25 Jun 2005; Daniel Black <dragonheart@gentoo.org> -botan-1.4.3.ebuild,
+  botan-1.4.4.ebuild, +botan-1.4.6.ebuild:
+  version bump thanks to meatoo. old version removed
 
   01 Jun 2005; Mike Frysinger <vapier@gentoo.org> botan-1.4.3.ebuild,
   botan-1.4.4.ebuild:
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 32070c9733f9..c6499ff49fb5 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,7 +1,9 @@
-MD5 51a2ce695a86d1c47151753d61d8ba1b ChangeLog 1276
 MD5 64c36f71d888b4d8ebb9c8a98e3d1013 botan-1.4.3.ebuild 2216
 MD5 d769a7ef93cd04ed5de9f468af0979cd metadata.xml 463
+MD5 51a2ce695a86d1c47151753d61d8ba1b ChangeLog 1276
 MD5 900732622b9efbe290d7ec59c338acde botan-1.4.4.ebuild 2415
+MD5 38cd9b4ddfcc848b3d37f38974a36f5e botan-1.4.6.ebuild 2420
 MD5 c9748b2c6a670b1f0b8cbcb3ca74b8bb files/digest-botan-1.4.3 61
 MD5 010820c4ff5b87a3b62ea84bee465eed files/digest-botan-1.4.4 61
 MD5 2214700974b810ad0c871ae2110ff054 files/botan-1.4.4-gcc34.patch 479
+MD5 cdec8ad496751d2c376b3ccca0d8045d files/digest-botan-1.4.6 61
diff --git a/dev-libs/botan/botan-1.4.4.ebuild b/dev-libs/botan/botan-1.4.4.ebuild
index fc6a34f8c6e4..0eb029547685 100644
--- a/dev-libs/botan/botan-1.4.4.ebuild
+++ b/dev-libs/botan/botan-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.4 2005/06/01 00:53:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.4.ebuild,v 1.5 2005/06/25 09:20:53 dragonheart Exp $
 
 # Comments/fixes to lloyd@randombit.net (author)
 
@@ -10,7 +10,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="http://botan.randombit.net/"
 SRC_URI="http://botan.randombit.net/files/Botan-${PV}.tgz"
 
-KEYWORDS="x86 ppc sparc"
+KEYWORDS="ppc sparc x86"
 SLOT="0"
 LICENSE="BSD"
 IUSE="bzip2 zlib gmp ssl debug"
diff --git a/dev-libs/botan/botan-1.4.3.ebuild b/dev-libs/botan/botan-1.4.6.ebuild
index c45ee0cbe791..a6d61c109274 100644
--- a/dev-libs/botan/botan-1.4.3.ebuild
+++ b/dev-libs/botan/botan-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.3.ebuild,v 1.3 2005/06/01 00:53:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.6.ebuild,v 1.1 2005/06/25 09:20:53 dragonheart Exp $
 
 # Comments/fixes to lloyd@randombit.net (author)
 
@@ -8,7 +8,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="http://botan.randombit.net/"
 SRC_URI="http://botan.randombit.net/files/Botan-${PV}.tgz"
 
-KEYWORDS="x86"
+KEYWORDS="~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="BSD"
 IUSE="bzip2 zlib gmp ssl debug"
@@ -29,39 +29,44 @@ DEPEND="${RDEPEND}
 
 src_compile() {
 	# Modules that should work under any semi-recent Unix
-	modules="alloc_mmap,es_egd,es_ftw,es_unix,fd_unix,ml_unix,tm_unix,mux_pthr"
+	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 use zlib; then modules="$modules,comp_zlib"; fi
-	if use gmp; then modules="$modules,eng_gmp"; fi
-	if use ssl; then modules="$modules,eng_ossl"; 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+ and sparcv9 - how to test for them? CCHOST?
+	# 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 and sparc64
-	if [ ${ARCH} = 'alpha' -o ${ARCH} = 'amd64' -o \
-		${ARCH} = 'ia64' -o ${ARCH} = 'ppc64' ]; then
+	# 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
 
-	# Are there any CHOSTs in use which break this?
-	CHOSTARCH=$(echo ${CHOST} | cut -d - -f 1)
+	# Enable v9 instructions for sparc64
+	if [ ${PROFILE_ARCH} = 'sparc64' ]; then
+		CHOSTARCH='sparc32-v9'
+	else
+		CHOSTARCH=$(echo ${CHOST} | cut -d - -f 1)
+	fi
 
 	cd ${S}
-	einfo "Enabling modules: " $(echo $modules | sed 's/,/ /g')
+	einfo "Enabling modules: " ${modules}
 
 	# FIXME: We might actually be on *BSD or OS X...
-	./configure.pl --noauto gcc-linux-$CHOSTARCH --modules=$modules --dumb-gcc ||
+	./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"
 }
diff --git a/dev-libs/botan/files/digest-botan-1.4.3 b/dev-libs/botan/files/digest-botan-1.4.3
deleted file mode 100644
index abc3ca1773ff..000000000000
--- a/dev-libs/botan/files/digest-botan-1.4.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a17826468e55156c8a32adeba23d7fa Botan-1.4.3.tgz 1435821
diff --git a/dev-libs/botan/files/digest-botan-1.4.6 b/dev-libs/botan/files/digest-botan-1.4.6
new file mode 100644
index 000000000000..ef81286d487f
--- /dev/null
+++ b/dev-libs/botan/files/digest-botan-1.4.6
@@ -0,0 +1 @@
+MD5 ad94e7bdc64ab34c92b3f0061c86f2ea Botan-1.4.6.tgz 1433246