version bump as promised in bug #117548. Fixes compile problem with gcc-4 as well. Thanks Lloyd and Dirk

(Portage version: 2.1_pre3)

11 files changed, 43 insertions, 179 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index 8c478babc689..0289d40dc48b 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,14 @@
 # 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.10 2005/11/08 10:22:50 dragonheart Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.11 2006/01/06 08:12:24 dragonheart Exp $
+
+*botan-1.4.11 (06 Jan 2006)
+
+  06 Jan 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/botan-1.4.9-gcc-4.patch, -botan-1.4.6.ebuild, -botan-1.4.7.ebuild,
+  -botan-1.4.8.ebuild, botan-1.4.9.ebuild, +botan-1.4.11.ebuild:
+  version bump as promised in bug #117548. Fixes compile problem with gcc-4 as
+  well. Thanks Lloyd and Dirk
 
 *botan-1.4.9 (08 Nov 2005)
 
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index e0d2eddba165..a01b72f2e429 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,23 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 bb1288383aafe31c46f96d95b656f925 ChangeLog 1943
+MD5 323b8490bb24a12f0ccaf576a043bcfe botan-1.4.11.ebuild 2465
 MD5 043543f19cd858215284f52640cd15ce botan-1.4.4.ebuild 2392
 MD5 9084ddfdf04eb085ef50f6834f3cc744 botan-1.4.6.ebuild 2299
 MD5 efd83cbf39ec97d23f820218adc29730 botan-1.4.7.ebuild 2468
 MD5 ab92d300b5f64552f0c4666eb8954ad2 botan-1.4.8.ebuild 2447
-MD5 323b8490bb24a12f0ccaf576a043bcfe botan-1.4.9.ebuild 2465
+MD5 a688fc8bf548c6d78ef39d6c8e692e73 botan-1.4.9.ebuild 2558
 MD5 2214700974b810ad0c871ae2110ff054 files/botan-1.4.4-gcc34.patch 479
+MD5 f997b850a6fbcfc3be36b7d4133b029a files/botan-1.4.9-gcc-4.patch 493
+MD5 9105f271f3d69095584cafe41c3131ef files/digest-botan-1.4.11 62
 MD5 010820c4ff5b87a3b62ea84bee465eed files/digest-botan-1.4.4 61
 MD5 cdec8ad496751d2c376b3ccca0d8045d files/digest-botan-1.4.6 61
 MD5 d834de2da4a478c4f9d25bff3f10b19b files/digest-botan-1.4.7 61
 MD5 9e9606ac1332a12cce6e94364637ff19 files/digest-botan-1.4.8 61
 MD5 f35ec7d42986b3a8a270b4aaa7483817 files/digest-botan-1.4.9 61
 MD5 d769a7ef93cd04ed5de9f468af0979cd metadata.xml 463
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDcHyImdTrptrqvGERAoWkAKCdT47NrtI2ibrEolSk+m+ShXi74ACffV2T
-Z4g//bNQZsgba8m4Lr5a7Vo=
-=5d2n
------END PGP SIGNATURE-----
diff --git a/dev-libs/botan/botan-1.4.8.ebuild b/dev-libs/botan/botan-1.4.11.ebuild
index ecfaae2a9da1..b7c3c9153f95 100644
--- a/dev-libs/botan/botan-1.4.8.ebuild
+++ b/dev-libs/botan/botan-1.4.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.8.ebuild,v 1.1 2005/10/18 20:27:10 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.11.ebuild,v 1.1 2006/01/06 08:12:24 dragonheart Exp $
 
 # Comments/fixes to lloyd@randombit.net (author)
 
@@ -11,7 +11,7 @@ SRC_URI="http://botan.randombit.net/files/Botan-${PV}.tgz"
 KEYWORDS="~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="BSD"
-IUSE="bzip2 gmp ssl zlib qt"
+IUSE="bzip2 gmp ssl zlib"
 
 S="${WORKDIR}/Botan-${PV}"
 
@@ -28,14 +28,14 @@ DEPEND="${RDEPEND}
 
 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"
+	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
-	if useq qt; then modules="$modules,mux_qt"; 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
diff --git a/dev-libs/botan/botan-1.4.6.ebuild b/dev-libs/botan/botan-1.4.6.ebuild
deleted file mode 100644
index d0fe4ce47c21..000000000000
--- a/dev-libs/botan/botan-1.4.6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.6.ebuild,v 1.2 2005/07/14 21:39:46 agriffis 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}"
-
-# 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_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}
-	einfo "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.7.ebuild b/dev-libs/botan/botan-1.4.7.ebuild
deleted file mode 100644
index 6c4bee439e60..000000000000
--- a/dev-libs/botan/botan-1.4.7.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.7.ebuild,v 1.1 2005/09/28 07:26:50 dragonheart 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 qt"
-
-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_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
-	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}
-	einfo "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
index d823d670f182..5cc57c1cff42 100644
--- a/dev-libs/botan/botan-1.4.9.ebuild
+++ b/dev-libs/botan/botan-1.4.9.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.1 2005/11/08 10:22:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.9.ebuild,v 1.2 2006/01/06 08:12:24 dragonheart Exp $
 
+inherit eutils
 # Comments/fixes to lloyd@randombit.net (author)
 
 DESCRIPTION="A C++ crypto library"
@@ -26,6 +27,13 @@ RDEPEND="virtual/libc
 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"
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
new file mode 100644
index 000000000000..9cf16ace4ae9
--- /dev/null
+++ b/dev-libs/botan/files/botan-1.4.9-gcc-4.patch
@@ -0,0 +1,12 @@
+--- 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/digest-botan-1.4.11 b/dev-libs/botan/files/digest-botan-1.4.11
new file mode 100644
index 000000000000..5df0c9d0cecb
--- /dev/null
+++ b/dev-libs/botan/files/digest-botan-1.4.11
@@ -0,0 +1 @@
+MD5 987ad49322cc41496fc2eae38ddd93c1 Botan-1.4.11.tgz 1802089
diff --git a/dev-libs/botan/files/digest-botan-1.4.6 b/dev-libs/botan/files/digest-botan-1.4.6
deleted file mode 100644
index ef81286d487f..000000000000
--- a/dev-libs/botan/files/digest-botan-1.4.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad94e7bdc64ab34c92b3f0061c86f2ea Botan-1.4.6.tgz 1433246
diff --git a/dev-libs/botan/files/digest-botan-1.4.7 b/dev-libs/botan/files/digest-botan-1.4.7
deleted file mode 100644
index 06a4e703cf79..000000000000
--- a/dev-libs/botan/files/digest-botan-1.4.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 353008e4568f3d181e15eb0d555d5480 Botan-1.4.7.tgz 1429539
diff --git a/dev-libs/botan/files/digest-botan-1.4.8 b/dev-libs/botan/files/digest-botan-1.4.8
deleted file mode 100644
index d4d2c9827abd..000000000000
--- a/dev-libs/botan/files/digest-botan-1.4.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 87003d56a3ef1eed5dcf49675300bec3 Botan-1.4.8.tgz 1428842