Version bump.

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

4 files changed, 91 insertions, 107 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index bf1a3c9ffb1b..2f9e3c89152d 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.41 2009/08/09 12:52:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.42 2009/08/09 20:10:25 arfrever Exp $
+
+*botan-1.8.5 (09 Aug 2009)
+
+  09 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -botan-1.8.0.ebuild, +botan-1.8.5.ebuild:
+  Version bump.
 
   09 Aug 2009; nixnut <nixnut@gentoo.org> botan-1.8.2.ebuild:
   ppc stable #277122
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 30ca18ed0725..0376083de71c 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -4,13 +4,13 @@ AUX botan-1.6.1-gcc-4.3.patch 579 RMD160 61c8b6b46ff19276aec33c4473a1c187aee24ea
 AUX botan-1.8.2-respect_LDFLAGS.patch 728 RMD160 67feefc5a038702636514f731783077309cc2d93 SHA1 2a28ab44d8a265ea5450239e92c23d890f15fc0d SHA256 ed35be362e9a68485df22bf07000ce032077d7f0e1f51fdca644f64ad4c9d3a2
 DIST Botan-1.6.1.tgz 1845323 RMD160 e729d03ac8aba3a8c157cd956f4ddf08d99fe33b SHA1 c0c980539e13ba1332301bdd1dcb7dce6905624e SHA256 4ff3ec8c0c5c21fcb5b56e2c54a4eeddf7101a883e13a816630ccff288c0a9c4
 DIST Botan-1.6.5.tgz 1850265 RMD160 7fd677a4d855257c76ce98ea34550b4022f8cd76 SHA1 20fa08ed2dc7979b87897f514fb1bcd2fc76e8ff SHA256 047924e4f5d080dbda37a9a42fb935340edee7d77a11d81afee2e0c1452f40e2
-DIST Botan-1.8.0.tgz 2541455 RMD160 a3b70d3ff5b45636a5e01e83254c659130b9fc67 SHA1 a65ce62af831c79d1e7f622421d1e6e5271dcab4 SHA256 d695e1d57d532f336efdf3a9be53581a77af19a0ba5b10cdbc7d63d3e61b6b7b
 DIST Botan-1.8.2.tgz 2534539 RMD160 d1cf72091e3b03671f31f603178e809f29022a21 SHA1 6b266f78fb328d8fb1547a91545d2a8e298759fa SHA256 b28730a4c3043868564337b391e9a944eacbf0808d40552e50dddb8f31a8c0a3
 DIST Botan-1.8.4.tgz 3443737 RMD160 5df7d68d5f177001fa879aae5dfb3c9c564b08c7 SHA1 159b6c2942a3cd2a4db25889e79d1c6176f3c171 SHA256 835fd3b204cc6132e21a0af5534857dd96cd4346d1c004091fb303ac6dcb96f0
+DIST Botan-1.8.5.tgz 3444972 RMD160 e641e8c51dbb5ae55014e755496075da489f84bb SHA1 e23b916e24ed7653d409d887b1a958e085f0648f SHA256 6370f819a2d31421a297ab65cd4b65434207b3d34db73fa45a59da790210b9dc
 EBUILD botan-1.6.1-r1.ebuild 2800 RMD160 9b704e2cb8618dc451f1b51d1d61e039c56aca8d SHA1 401b84978bd57d5440732ed60494e384d8f93377 SHA256 b6eb52761da8675e51a90198b430770d9a3f12a65b1512056ca6a39dc99453ab
 EBUILD botan-1.6.5.ebuild 2658 RMD160 7f2d96fdc84a8f2d8b9df0ebda60c840d2b62628 SHA1 961bcf07e05e176c5e58b0889d6eac2b5c111f06 SHA256 cb6ce3ca230d5f4df0d88898af0593bd8ebafc0f8315f7ec7f0b3660ba9a3994
-EBUILD botan-1.8.0.ebuild 3355 RMD160 33d03e54267e06a9bc875bf232b3553bf434a539 SHA1 1edb4f89d05d0919fe985c3749b9bac79baf73fa SHA256 fdf8302ca29de0b505c669f680e90e2929db384ddf99d9351a233d097fceec2c
 EBUILD botan-1.8.2.ebuild 3463 RMD160 ef9e3f12df768ac8f9fc09fc799abf27f2c87fa7 SHA1 e93d93576e1e205345fbbf5be8dd0ab852d23623 SHA256 350b4c42861ec6ea7764033c718e9c9e4286f824a4e7150d59c833b2486dd1e7
 EBUILD botan-1.8.4.ebuild 2137 RMD160 efd3404a8e77689bb7a03e5111ff1519a3e4cf7a SHA1 e105a6ace29acc737c52488490a3833e6c2a694e SHA256 b23213972b0a4de1b9aaf1b2f9372b9b8fbc14e2dfac736a1d17930211eada16
-MISC ChangeLog 6687 RMD160 dc3016b567545c13524b64ca28ec062d855395ff SHA1 bb2cda3e96b7074134ecb9983fa57287581b8d9a SHA256 1a63e96791456ca952f8eeb260e8a1c5dccd624ca23c60b7e910fedbcba5d223
+EBUILD botan-1.8.5.ebuild 2135 RMD160 e5bb13764fe713ef3bd4476eaf7504aef5305ef9 SHA1 d7e02a1f37da88f036f999c7857873eff2342cd0 SHA256 91bd2c91554b347e3cdb0289d4618b3f3f633deb40561168cc7eba5b89514788
+MISC ChangeLog 6851 RMD160 19fc7fd8dfba24a04807e6618071ee11c010ebbf SHA1 2052d37d06595cb249225d236f9cc9b5fca9a62e SHA256 8722fe94d9064c0df7f98926e7bb6ce4eea3f378babc1fe1182e87783c680a0c
 MISC metadata.xml 319 RMD160 084032a656409b8d666fa6e9c0b0f89e3ef955e7 SHA1 77d4f800c80c56a3191d488ef2d6444ab165cee3 SHA256 c0597f70f00af70ca6f77bf906babe3059717b8c1e91a74c61904008e0c14054
diff --git a/dev-libs/botan/botan-1.8.0.ebuild b/dev-libs/botan/botan-1.8.0.ebuild
deleted file mode 100644
index 8e7d5d16a4cc..000000000000
--- a/dev-libs/botan/botan-1.8.0.ebuild
+++ /dev/null
@@ -1,103 +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.0.ebuild,v 1.7 2009/04/29 11:30:57 armin76 Exp $
-
-inherit eutils 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 )"
-
-# configure.pl requires 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,egd,fd_unix,posix_rt"
-	local disable_modules="proc_walk,unix_procs,cpu_counter"
-
-	if useq bzip2; then modules="${modules},bzip2"; fi
-	if useq zlib; then modules="${modules},zlib"; fi
-	if useq gmp; then modules="${modules},gnump"; fi
-	if useq ssl; then modules="${modules},openssl"; fi
-	if useq threads; then modules="${modules},pthreads"; else
-		disable_modules="${disable_modules},pthreads"
-	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 we have assembly code for this machine, use it
-	if [ "${ARCH}" = "x86" ]; then
-		modules="${modules},mp_ia32"
-		#below is untested.
-		#modules="${modules},mp_ia32,mulop_ia32,serpent_ia32,ia32_eng,md4_ia32,md5_ia32,sha1_ia32,asm_ia32"
-	elif [ "${ARCH}" = "amd64" ]; then
-		modules="${modules},mp_amd64"
-		# monty_amd64 and mulop_amd64 had compile failures 20090103 Botan-1.8
-		#disable_modules="${disable_modules},monty_generic,mulop_generic"
-		#modules="${modules},monty_amd64,mp_amd64,mulop_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}
-	elog "Disabling modules: " ${disable_modules}
-
-	# FIXME: We might actually be on *BSD or OS X...
-	./configure.pl \
-		--prefix="${D}"/usr \
-		--libdir=/$(get_libdir) \
-		--docdir=/share/doc/ \
-		--cc=gcc \
-		--os=linux \
-		--cpu=${CHOSTARCH} \
-		--with-endian="$(tc-endian)" \
-		--with-tr1=system \
-		--enable-modules=${modules} \
-		--disable-modules=${disable_modules} \
-		|| die "configure.pl failed"
-	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 || die "emake check failed"
-	env LD_LIBRARY_PATH="${S}" ./check --validate || die "validation tests failed"
-}
-
-src_install() {
-	make install || die "make install failed"
-	sed -i -e "s:${D}::g" \
-		"${D}"/usr/bin/botan-config \
-		"${D}"/usr/$(get_libdir)/pkgconfig/botan-1.8.pc || die 'bad sed'
-	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.5.ebuild b/dev-libs/botan/botan-1.8.5.ebuild
new file mode 100644
index 000000000000..7e20c86c9124
--- /dev/null
+++ b/dev-libs/botan/botan-1.8.5.ebuild
@@ -0,0 +1,81 @@
+# 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.5.ebuild,v 1.1 2009/08/09 20:10:25 arfrever 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.4"
+
+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"
+}