Version bump.

Package-Manager: portage-14774-svn/cvs/Linux x86_64

4 files changed, 15 insertions, 104 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index f6dc3295681c..5600837d924c 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/botan
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.49 2009/11/03 20:01:27 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.50 2009/11/03 21:39:26 arfrever Exp $
+
+*botan-1.8.8 (03 Nov 2009)
+
+  03 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -botan-1.8.4.ebuild, -botan-1.8.6.ebuild, +botan-1.8.8.ebuild:
+  Version bump.
 
   03 Nov 2009; Christian Faulhammer <fauli@gentoo.org> botan-1.8.7.ebuild:
   stable x86, bug 289437
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 3fd7d8994c08..b3ade73f70f6 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST Botan-1.8.4.tgz 3443737 RMD160 5df7d68d5f177001fa879aae5dfb3c9c564b08c7 SHA1 159b6c2942a3cd2a4db25889e79d1c6176f3c171 SHA256 835fd3b204cc6132e21a0af5534857dd96cd4346d1c004091fb303ac6dcb96f0
-DIST Botan-1.8.6.tgz 3464318 RMD160 57b4a7442a83a7369c4752f71bf74f2e6792a26c SHA1 8a7ad28222c8f2ae1819be312e3f6bac8f2b33c1 SHA256 62e5cb3daa058778b958fb914dc85dabcd3d4298a54cc44dbae071be08e7fedd
 DIST Botan-1.8.7.tgz 3464535 RMD160 73a6417f1445282e4b2fbf45557f2644b2996563 SHA1 69d985f66aa024f0d53c2d5597a4f1a0b9735959 SHA256 a4087fa008aa6b84a6780c9eedbe63319fba2f27bb5f182a1b0f349eba02ea24
-EBUILD botan-1.8.4.ebuild 2132 RMD160 e5d6ec2241ad75a92ed2eb4e526755cab8320992 SHA1 7ec319bed1a10b0f66590d147afbb8bf285fca1f SHA256 ad962aaa68c1aa710fb2088df81a9585e36393b282c7eaf288c6d40a7eb71755
-EBUILD botan-1.8.6.ebuild 2132 RMD160 aa1fd8a3a283a42646bcb6a747d7070db47e7417 SHA1 7f2fd00ea18255e830326f9c266a81a52fdecc0e SHA256 901d236b584acaa30ea5206573d16290ea91c7d86fc019cdc53b83bd0478de2c
+DIST Botan-1.8.8.tgz 2844588 RMD160 f8ac1842ddba312903442038d32da57f25f9bc1b SHA1 699df8f0c5e8d48fa8c65a873bb2e9975d4d66c5 SHA256 60a31bd9ed18ac85293d7f44c7fbb9bd0206eb7df5b42dff8517dd01b446ba84
 EBUILD botan-1.8.7.ebuild 2130 RMD160 5927d516fa550d4739d9eec50b6a20a35307ba46 SHA1 4c5c2330156f49f4436a1151a6a4a8c024a51ef4 SHA256 21f6d6b44dfb46904ea07241fcec8f6c8f9db6b0e60a3a4d012242bccd8fa24b
-MISC ChangeLog 7693 RMD160 9bf47dbaa309dd5a420b1e9bb1cae133f6ae123c SHA1 12c952af9dee4c5dafe7f9ffaeefaf6e62fec997 SHA256 bb7779f8b24598b765dd60577c4ef54845ccdc8b0359d435f8608a4de4c09eca
+EBUILD botan-1.8.8.ebuild 2125 RMD160 2e06936aed0b99f6b47533463600557e3019d44f SHA1 b7e5bb35411383645abbb9d988ff08d0b3befc0a SHA256 e48d5bb9d2a2368cb3c06e0a2b938a8ff3d21ffc236fdac89c0b9f5ab7648924
+MISC ChangeLog 7879 RMD160 4e0f2d0296474ea78372e7497fa3c26d3ae3bc60 SHA1 631755f0c7b2bfc2bc5932e997cde29217c6d338 SHA256 1fb0321f37708dce2641fb34a24cea13ac132189faa9f6a0dfd88244660a96c8
 MISC metadata.xml 319 RMD160 084032a656409b8d666fa6e9c0b0f89e3ef955e7 SHA1 77d4f800c80c56a3191d488ef2d6444ab165cee3 SHA256 c0597f70f00af70ca6f77bf906babe3059717b8c1e91a74c61904008e0c14054
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrwjCYACgkQNQqtfCuFneNTuQCdE2D+FQAos7sqIXiZ4CMHgTgR
-So8AoJqdyn5g1NsGpNQgYSTk9jDPW5lC
-=X1Se
------END PGP SIGNATURE-----
diff --git a/dev-libs/botan/botan-1.8.4.ebuild b/dev-libs/botan/botan-1.8.4.ebuild
deleted file mode 100644
index 42bbf884fd0a..000000000000
--- a/dev-libs/botan/botan-1.8.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.4.ebuild,v 1.3 2009/09/12 10:26:58 fauli Exp $
-
-EAPI="2"
-
-inherit multilib toolchain-funcs
-
-MY_PN="Botan"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="http://botan.randombit.net/"
-SRC_URI="http://files.randombit.net/botan/${MY_P}.tgz"
-
-KEYWORDS="~amd64 ~ia64 ppc ~sparc x86"
-SLOT="0"
-LICENSE="BSD"
-IUSE="bzip2 gmp ssl threads zlib"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
-	zlib? ( >=sys-libs/zlib-1.2.3 )
-	gmp? ( >=dev-libs/gmp-4.2.2 )
-	ssl? ( >=dev-libs/openssl-0.9.8g )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/python-2.5.0"
-
-src_configure() {
-	local disable_modules="proc_walk,unix_procs,cpu_counter"
-
-	if ! useq threads; then
-		disable_modules="${disable_modules},pthreads"
-	fi
-
-	# Enable v9 instructions for sparc64
-	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
-		CHOSTARCH="sparc32-v9"
-	else
-		CHOSTARCH="${CHOST%%-*}"
-	fi
-
-	cd "${S}"
-	elog "Disabling modules: ${disable_modules}"
-
-	# FIXME: We might actually be on *BSD or OS X...
-	./configure.py \
-		--prefix="${D}/usr" \
-		--libdir=/$(get_libdir) \
-		--docdir=/share/doc/ \
-		--cc=gcc \
-		--os=linux \
-		--cpu=${CHOSTARCH} \
-		--with-endian="$(tc-endian)" \
-		--with-tr1=system \
-		$(use_with bzip2) \
-		$(use_with gmp gnump) \
-		$(use_with ssl openssl) \
-		$(use_with zlib) \
-		--disable-modules=${disable_modules} \
-		|| die "configure.py failed"
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT="" || die "emake failed"
-}
-
-src_test() {
-	chmod -R ugo+rX "${S}"
-	emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check || die "emake check failed"
-	LD_LIBRARY_PATH="${S}" ./check --validate || die "validation tests failed"
-}
-
-src_install() {
-	emake install || die "emake install failed"
-	sed -i -e "s:${D}::g" \
-		"${D}/usr/bin/botan-config" \
-		"${D}/usr/$(get_libdir)/pkgconfig/botan-1.8.pc" || die "sed failed"
-	mv "${D}/usr/share/doc/Botan-${PV}" "${D}/usr/share/doc/${PF}" || die "could not rename directory"
-}
diff --git a/dev-libs/botan/botan-1.8.6.ebuild b/dev-libs/botan/botan-1.8.8.ebuild
index f6da906dfd4a..712f5b505d53 100644
--- a/dev-libs/botan/botan-1.8.6.ebuild
+++ b/dev-libs/botan/botan-1.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.6.ebuild,v 1.2 2009/09/27 19:21:03 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.8.ebuild,v 1.1 2009/11/03 21:39:26 arfrever Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="http://botan.randombit.net/"
 SRC_URI="http://files.randombit.net/botan/${MY_P}.tgz"
 
-KEYWORDS="~amd64 ~ia64 ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="BSD"
 IUSE="bzip2 gmp ssl threads zlib"
@@ -69,13 +69,11 @@ src_compile() {
 src_test() {
 	chmod -R ugo+rX "${S}"
 	emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check || die "emake check failed"
-	LD_LIBRARY_PATH="${S}" ./check --validate || die "validation tests failed"
+	LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed"
 }
 
 src_install() {
 	emake install || die "emake install failed"
-	sed -i -e "s:${D}::g" \
-		"${D}/usr/bin/botan-config" \
-		"${D}/usr/$(get_libdir)/pkgconfig/botan-1.8.pc" || die "sed failed"
-	mv "${D}/usr/share/doc/Botan-${PV}" "${D}/usr/share/doc/${PF}" || die "could not rename directory"
+	sed -i -e "s:${D}::g" "${D}usr/bin/botan-config" "${D}usr/$(get_libdir)/pkgconfig/botan-1.8.pc" || die "sed failed"
+	mv "${D}usr/share/doc/Botan-${PV}" "${D}usr/share/doc/${PF}" || die "Renaming of directory failed"
 }