Python support per bug#382889, some sync with Arfrever Frehtes Taifersar Arahesis work, cleanups

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64

3 files changed, 161 insertions, 2 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index b40add0b3b45..81bd9f793c42 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/botan
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.74 2013/01/12 19:02:41 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.75 2013/01/13 00:09:55 alonbl Exp $
+
+*botan-1.10.3-r1 (13 Jan 2013)
+
+  13 Jan 2013; Alon Bar-Lev <alonbl@gentoo.org> +botan-1.10.3-r1.ebuild:
+  Python support per bug#382889, some sync with Arfrever Frehtes Taifersar
+  Arahesis work, cleanups
 
   12 Jan 2013; Alon Bar-Lev <alonbl@gentoo.org> botan-1.10.3.ebuild:
   Add bindist USE to disable ecdsa, bug#446226, thanks to Peter Stuge
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index c6d00afc9ae5..a69de9c80ae5 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,7 +2,8 @@ DIST Botan-1.10.1.tbz 2195784 SHA256 205a3c011391d01ca3e4f127a2ffbf993a4f59788ff
 DIST Botan-1.10.3.tbz 2215991 SHA256 e1db6af2deb230699b076cde893ad949f0580d4fd7b030fcd791ae982d184734 SHA512 e14a961dca2ece04b20a574ad1eb4467f1d94ac1c1fb3b66db704d750aa9953dd78e5700065b896eea63effeffdeb6c529cc8de6eea30c3acef851cd7ddb872b WHIRLPOOL 2b400ec5f6bbaf235a88a057a5dbde05987894a6f8cbf3a8fc0447192d42ce13d4fe9a06060ef09d5eaafe5357ee726345b1e753654136f1612a7c7912688fd5
 DIST Botan-1.8.11.tbz 2808114 SHA256 c3b60a2c3dfcbe7b21626e8459e5134d3cbabe45b6d94f454860b99798739ba4 SHA512 03577a01e464841e7c985ce6323c4eeaf8d5fc968786d058139e8f965d81900ceb17c7e3f54c948b9dbb602717fec0eff153e1f140c4016aef97c7adb317e5d1 WHIRLPOOL a7f1283ca50d52ccff025a74c10cd7b973a196f873b8386e0efc73af84d0e765a127448f999be9e76e90e772dc20950bf0ae9972fad99840b0045caea41ee811
 EBUILD botan-1.10.1.ebuild 2464 SHA256 f349b245dd1646a1d5bb16746a038fb2a95ea1cad33dc8eba9dbf217fbd3050b SHA512 89c65fca3de7ef3e3588e1aa99a3e489b58e3656aed6a99469216e42b8df6066c439ad36fad26949fbb31442661f60f4c821c698a91bdda1da66f266702661a7 WHIRLPOOL 6a4d01719b85b9cb6e97873ce2bbb224764febf25515e86f58f68b0c8f7523ba305fa985788f3705c7343ac37ca2a7fdf597bae722f738cca8c4bb897c740dfa
+EBUILD botan-1.10.3-r1.ebuild 4120 SHA256 c5ac0e7576f242b946807f076acbe93cf5f1174b2f23e01b8d0056914c00a400 SHA512 46f9dba7a7d1c496ec8c9afb0fbf3b6042cad8ac203dd1c757462151bdddeeecb53de6cff948fc5e564d6740c2c884fd4e645261cafb96a7a879ca2146a691fa WHIRLPOOL 6cddeac5ec4e15ec01eeac079e0c0a1ac2804494a2e3773eef15dfc8a8ac8320d5af924e350225352f15d196baad104611c842c0d198e0b0fce3e3098c168ecd
 EBUILD botan-1.10.3.ebuild 2551 SHA256 c1e8c854a007d93240308b148e74ee6a6a3edfe222597a15661b788d2d1e83d4 SHA512 38e2e616c31cc0ae21bde436d4b453ca68dc96f0c69b160a6975cd3e1531a3d727c1b96e5d1e91add272489bab41c6c34d3d8eb0d77fd841b2714b8bde449c8b WHIRLPOOL 2677402e6fe19076220b8edc41c85b93ce5d5145e91fbf6ec727d2d6d7109b4b37f1ad76fd84741a82998bdb6cb4852c3fa596f6ee8b52496746253b5c870bb6
 EBUILD botan-1.8.11.ebuild 2461 SHA256 a1e4111c47aa003a7688116652ec43d6a66e863c346b6bd0f744a3f8fd514188 SHA512 7d3dc940f2d0602da995849a7a82d81dead91c7967b089df03ba76092e5f0422af41ff84d48c77da81c57f1b289b8c6c7a9670f7037ecdb4dcfeab504e132549 WHIRLPOOL 440c7e4a9f74cbf5f60a9e1704398feab0423e0f4afa6d23bbcdfe3b0888638ca17331607e8b6e61bce6d94a6c25d8f995a39301c73c36f7948cfe76043c8c62
-MISC ChangeLog 11086 SHA256 ba734038115e0d9096b5d80e75d2bdb77c0175f47b3239592459b4a63b282e49 SHA512 4c4a24052ad4c39ef9ffe0708539c52a910eebf730904baa4417766949885555650d6830e9af1cf7c2669bbd7fdffb0aec8c48ca1f4bf3953d6c861d742f20f9 WHIRLPOOL 5b3d7ec4a3af226417cad245f5fd084074b6ddfa5a8cb974d6e39c8554ecf6647fecf22bce26428ddf8bff3f307f0ca4ad601994c99742aec066326d57b26f4b
+MISC ChangeLog 11293 SHA256 0f2f01fdaa2a20254b721fa27b1b02c42359cdf5825990b5352ea59d41653cd5 SHA512 185651e14854488c4801f8f2cfdc4ae0273a9e315082cf536a01c13d8c3436f8487f7805fcc8014bb66df80df48355d4475683fbcfa02a704ede294d7672a80d WHIRLPOOL 624f75a9c1689e50ac6334078eb05c90eb7f10c0a6af5fc49034e32529f2a216f80e85e3e32d5eb3c12df0632facacfc0aa8703c6a8a5ad4e8de8973d49b5571
 MISC metadata.xml 319 SHA256 c0597f70f00af70ca6f77bf906babe3059717b8c1e91a74c61904008e0c14054 SHA512 1601e3dc9d051c441d1ee786c05cc2d9d39991e57e8f2ab47949b055ee784dd78d78cd601a37d1aa0c40c990c3623dd1e5fa643532225dbdb33e98f6ae9ce6ca WHIRLPOOL 1fe2fdfb936337bab626316df3a834d911f622f891840ecc4d35b016d5201e3b0c2c245e9fd243664eb214b0047b12f14808ba7a790c36bb12bc0674eecaa45e
diff --git a/dev-libs/botan/botan-1.10.3-r1.ebuild b/dev-libs/botan/botan-1.10.3-r1.ebuild
new file mode 100644
index 000000000000..3f5fb61028bb
--- /dev/null
+++ b/dev-libs/botan/botan-1.10.3-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.10.3-r1.ebuild,v 1.1 2013/01/13 00:09:55 alonbl Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+inherit eutils multilib python-r1 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}.tbz"
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~ppc-macos"
+SLOT="0"
+LICENSE="BSD"
+IUSE="bindist doc python bzip2 gmp ssl threads zlib"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
+	zlib? ( >=sys-libs/zlib-1.2.3 )
+	python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-4.2.2 )
+	ssl? ( >=dev-libs/openssl-0.9.8g[bindist=] )"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )"
+
+src_prepare() {
+	sed -e "s/-Wl,-soname,\$@ //" -i src/build-data/makefile/python.in || die "sed failed"
+	sed \
+		-e "/DOCDIR/d" \
+		-e "/^install:/s/ docs//" \
+		-i src/build-data/makefile/unix_shr.in || die "sed failed"
+
+	# Fix ImportError with Python 3.
+	sed -e "s/_botan/.&/" -i src/wrap/python/__init__.py || die "sed failed"
+
+	use python && python_copy_sources
+}
+
+src_configure() {
+	local disable_modules="proc_walk,unix_procs,cpu_counter"
+	use threads || disable_modules+=",pthreads"
+	use bindist && disable_modules+=",ecdsa"
+	elog "Disabling modules: ${disable_modules}"
+
+	# Enable v9 instructions for sparc64
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+		CHOSTARCH="sparc32-v9"
+	else
+		CHOSTARCH="${CHOST%%-*}"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*)   myos=darwin ;;
+		*)           myos=linux  ;;
+	esac
+
+	# foobared buildsystem, --prefix translates into DESTDIR, see also make
+	# install in src_install, we need the correct live-system prefix here on
+	# Darwin for a shared lib with correct install_name
+	./configure.py \
+		--prefix="${EPREFIX}/usr" \
+		--libdir=$(get_libdir) \
+		--docdir=share/doc \
+		--cc=gcc \
+		--os=${myos} \
+		--cpu=${CHOSTARCH} \
+		--with-endian="$(tc-endian)" \
+		--without-sphinx \
+		--with-tr1=system \
+		$(use_with bzip2) \
+		$(use_with gmp gnump) \
+		$(use_with python boost-python) \
+		$(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=""
+
+	if use python; then
+		building() {
+			rm -fr build/python
+			ln -s "${BUILD_DIR}" build/python
+			cp Makefile.python build/python
+			sed -i \
+				-e "s/-lboost_python/-lboost_python-$(echo ${EPYTHON} | sed 's/python//')/" \
+				build/python/Makefile.python
+			emake -f build/python/Makefile.python \
+				CXX="$(tc-getCXX)" \
+				CFLAGS="${CXXFLAGS}" \
+				LDFLAGS="${LDFLAGS}" \
+				PYTHON_ROOT="/usr/$(get_libdir)" \
+				PYTHON_INC="-I$(python_get_includedir)"
+		}
+		python_foreach_impl building
+	fi
+
+	if use doc; then
+		einfo "Generation of documentation"
+		sphinx-build doc doc_output
+	fi
+}
+
+src_test() {
+	chmod -R ugo+rX "${S}"
+	emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check
+	LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}usr" install
+
+	# Add compatibility symlinks.
+	[[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed"
+	[[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed"
+	dosym botan-config-1.10 /usr/bin/botan-config
+	dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc
+
+	if use python; then
+		installation() {
+			rm -fr build/python
+			ln -s "${BUILD_DIR}" build/python
+			emake -f Makefile.python \
+				PYTHON_SITE_PACKAGE_DIR="${ED}$(python_get_sitedir)" \
+				install
+		}
+		python_foreach_impl installation
+	fi
+
+	if use doc; then
+		pushd doc_output > /dev/null
+		insinto /usr/share/doc/${PF}/html
+		doins -r [a-z]* _static
+		popd > /dev/null
+	fi
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize botan
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup botan
+}