Version bump. Respect LDFLAGS. Fix building with --as-needed (bug #272242).

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

4 files changed, 142 insertions, 2 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index 8bf9c538d329..b1927baefa5d 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,13 @@
 # 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.37 2009/04/29 11:30:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.38 2009/06/06 20:04:07 arfrever Exp $
+
+*botan-1.8.2 (06 Jun 2009)
+
+  06 Jun 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +botan-1.8.2.ebuild, +files/botan-1.8.2-respect_LDFLAGS.patch:
+  Version bump. Respect LDFLAGS. Fix building with --as-needed (bug
+  #272242).
 
   29 Apr 2009; Raúl Porcel <armin76@gentoo.org> botan-1.8.0.ebuild:
   Add ~ia64 wrt #267773
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index daacbcba04ce..040737533581 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,11 +1,14 @@
 AUX botan-1.6.1-asm.patch 1383 RMD160 61187729bb9a05fbdd0423265257e0f53c621035 SHA1 70d9b565d58e2e34e7242bd5479e8a0e06e5566c SHA256 59c952e65b30e8761d327ac5bebd9202cb5e385a4cb61e2f0eedb31110913a3c
 AUX botan-1.6.1-gcc-4.2.patch 818 RMD160 2847fa3327542ae411d32820adb5933acbcce986 SHA1 66dcc3aad9982b42cf4c7eb07f1d948c4387c9a5 SHA256 26ee15113053f29f281a0a059670543d04ba54321ec2e526931a2d2590d83e1a
 AUX botan-1.6.1-gcc-4.3.patch 579 RMD160 61c8b6b46ff19276aec33c4473a1c187aee24ea7 SHA1 2dc1a2fa8eb5130367fff79fe159eb2f8ca7aff6 SHA256 c854a5736fb876dee5a13f06a33bd3ab1446f9ecd6ea4135ccff19d6d8d74e6c
+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
 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
-MISC ChangeLog 6101 RMD160 00866631594fa51e1fcab72a51934b18df61a876 SHA1 0a4fa8e08a7caa3a31beecf9e7dcaece6c84edb0 SHA256 f3e9340c35ba46734e5c36758bd0cb059549f0c261b1329cf24b9022f7e2fa2c
+EBUILD botan-1.8.2.ebuild 3467 RMD160 662258f3b91d5d47fc587e0f1f9766022545219e SHA1 1474ca06d7f0278b6e57f48a38d4f15a7b3f92b5 SHA256 a957a718aca27a264d112a122818d431d70222e8d7945a275635a3daabc8b7ad
+MISC ChangeLog 6349 RMD160 63b087b5e81701f85620e191c84a32eda2452eea SHA1 990c9a3523bce31ec937790192d9488a180a11be SHA256 6d28a96d557dc93844e72339937a040ff248ab3f01ff1a332179555e09d9cce0
 MISC metadata.xml 319 RMD160 084032a656409b8d666fa6e9c0b0f89e3ef955e7 SHA1 77d4f800c80c56a3191d488ef2d6444ab165cee3 SHA256 c0597f70f00af70ca6f77bf906babe3059717b8c1e91a74c61904008e0c14054
diff --git a/dev-libs/botan/botan-1.8.2.ebuild b/dev-libs/botan/botan-1.8.2.ebuild
new file mode 100644
index 000000000000..1e7307c551fc
--- /dev/null
+++ b/dev-libs/botan/botan-1.8.2.ebuild
@@ -0,0 +1,110 @@
+# 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.2.ebuild,v 1.1 2009/06/06 20:04:07 arfrever Exp $
+
+EAPI="2"
+
+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_prepare() {
+	epatch "${FILESDIR}/${P}-respect_LDFLAGS.patch"
+}
+
+src_configure() {
+	# 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"
+}
+
+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() {
+	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/files/botan-1.8.2-respect_LDFLAGS.patch b/dev-libs/botan/files/botan-1.8.2-respect_LDFLAGS.patch
new file mode 100644
index 000000000000..bf354a5307e0
--- /dev/null
+++ b/dev-libs/botan/files/botan-1.8.2-respect_LDFLAGS.patch
@@ -0,0 +1,20 @@
+--- src/build-data/makefile/unix_shr.in
++++ src/build-data/makefile/unix_shr.in
+@@ -88,7 +88,7 @@
+ # Link Commands                                  #
+ ##################################################
+ $(CHECK): $(LIBRARIES) $(CHECKOBJS)
+-	$(CXX) $(CHECKOBJS) -L. -lbotan-@{var:version} $(LINK_TO) -o $(CHECK)
++	$(CXX) $(LDFLAGS) $(CHECKOBJS) -o $(CHECK) -L. -lbotan-@{var:version} $(LINK_TO)
+ 
+ $(STATIC_LIB): $(LIBOBJS)
+ 	$(RM) $(STATIC_LIB)
+@@ -96,7 +96,7 @@
+ 	$(RANLIB) $(STATIC_LIB)
+ 
+ $(SHARED_LIB): $(LIBOBJS)
+-	$(SO_LINK_CMD) $(LINK_TO) $(LIBOBJS) -o $(SHARED_LIB)
++	$(SO_LINK_CMD) $(LDFLAGS) $(LIBOBJS) -o $(SHARED_LIB) $(LINK_TO)
+ 	$(LN) $(SHARED_LIB) $(SYMLINK)
+ 
+ ##################################################