Set Python 2 as active version of Python.

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

3 files changed, 21 insertions, 15 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index a1e14f6e66b7..1db408973760 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/botan
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.56 2010/02/04 04:20:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.57 2010/03/30 18:35:48 arfrever Exp $
+
+  30 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  botan-1.8.8-r1.ebuild:
+  Set Python 2 as active version of Python.
 
   04 Feb 2010; Markos Chandras <hwoarang@gentoo.org> botan-1.8.8.ebuild:
   Stable on amd64 wrt bug #295701
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index ad1665ae5ba9..a8f1c8b6285d 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,9 +1,7 @@
 AUX botan-1.8.8-darwin-install_name-fix.patch 511 RMD160 40f5e7361f991de21ca0599b2e51954b6b10f573 SHA1 ad7afc7d13cdd90d72437e160a94568f8cedf48b SHA256 fca8d469d78ae2ec7e26dbef9732e4a73223173565135e48678d0d3f81785e17
 AUX botan-1.8.8-use_negative_lea_displacement.patch 884 RMD160 c259f4d51f3c25df93d2cf99f9f29d6f2f92ea5d SHA1 d5b3deec6fadaea2b2fc41e3b62ca38c8c007f16 SHA256 b88d8a5af5a849e7a0ecbce70d63f5348cb15fd156440080e6f8e6d569084784
-DIST Botan-1.8.7.tgz 3464535 RMD160 73a6417f1445282e4b2fbf45557f2644b2996563 SHA1 69d985f66aa024f0d53c2d5597a4f1a0b9735959 SHA256 a4087fa008aa6b84a6780c9eedbe63319fba2f27bb5f182a1b0f349eba02ea24
 DIST Botan-1.8.8.tgz 2844588 RMD160 f8ac1842ddba312903442038d32da57f25f9bc1b SHA1 699df8f0c5e8d48fa8c65a873bb2e9975d4d66c5 SHA256 60a31bd9ed18ac85293d7f44c7fbb9bd0206eb7df5b42dff8517dd01b446ba84
-EBUILD botan-1.8.7.ebuild 2130 RMD160 d0bae6da21cd7f1bbc3a46007ffcc992318b1665 SHA1 4372bfe08a12cafc35f037b8edbb2815fafef0a9 SHA256 e7e25b0e0f5ea5e1a6bdc5a819587d472b825bb58f2d4989c95c795ad61dcfc9
-EBUILD botan-1.8.8-r1.ebuild 2542 RMD160 0b15a592d92fe4e0eb27233568798a39ad48d0bd SHA1 e96dd709912ea3a2aad3f8c7e163c1f1d536754c SHA256 8abd89f673cd41212e97d133dea86f7bfdb3aef79e94d40806caaea3039442fa
+EBUILD botan-1.8.8-r1.ebuild 2550 RMD160 d6ef3fd6a8a77eaabf5e731be0bb55420dd11ac3 SHA1 e5e07659c4f4da05e066b3891d5c18b8eccee623 SHA256 071f7d9f4f40514ed34d96bab423c9aa5846d3393710fbcea6d44a7de6da2280
 EBUILD botan-1.8.8.ebuild 2211 RMD160 67cd9ac6e2c3fdfa0498ad944e2944459dae5104 SHA1 62036e8eebcfff6a0c3e91f3b477f3687e678682 SHA256 da9a455d28890b88eb0fd79bcd15eca48cd2598f92a2e3a44ed2ac12de1f4d34
-MISC ChangeLog 8932 RMD160 5e114433f62be1a254a8988f3bac68feca4202b4 SHA1 023be7e86e87c61863c3d5e93d2d8042edc1ff93 SHA256 4c44e58691bde8fcce2fe702f96164538bde196c70d4dd2e68b4c4b1cb642b96
+MISC ChangeLog 9075 RMD160 919256e0bcc0f1a5c194899513587e33f1482e11 SHA1 2284e81c5b9936159c46fa5396edfe04efe545e1 SHA256 0de4960b0d35bb6cfb12ad847e32caffb6fa6eae910a8bbd94566ef8802cb48a
 MISC metadata.xml 319 RMD160 084032a656409b8d666fa6e9c0b0f89e3ef955e7 SHA1 77d4f800c80c56a3191d488ef2d6444ab165cee3 SHA256 c0597f70f00af70ca6f77bf906babe3059717b8c1e91a74c61904008e0c14054
diff --git a/dev-libs/botan/botan-1.8.8-r1.ebuild b/dev-libs/botan/botan-1.8.8-r1.ebuild
index dd8c9b2f43aa..28fa22f8cf61 100644
--- a/dev-libs/botan/botan-1.8.8-r1.ebuild
+++ b/dev-libs/botan/botan-1.8.8-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.8-r1.ebuild,v 1.1 2010/01/23 15:18:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.8-r1.ebuild,v 1.2 2010/03/30 18:35:48 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 
-inherit eutils multilib toolchain-funcs
+inherit eutils multilib python toolchain-funcs
 
 MY_PN="Botan"
 MY_P="${MY_PN}-${PV}"
@@ -25,11 +25,18 @@ RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
 	ssl? ( >=dev-libs/openssl-0.9.8g )"
 
 DEPEND="${RDEPEND}
-	>=dev-lang/python-2.4"
+	=dev-lang/python-2*"
+
+pkg_setup() {
+	python_set_active_version 2
+}
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-use_negative_lea_displacement.patch"
-	epatch "${FILESDIR}"/${P}-darwin-install_name-fix.patch
+	epatch "${FILESDIR}/${P}-darwin-install_name-fix.patch"
+
+	# Install documentation in /usr/share/doc/${PF}.
+	sed -e "/^DOCDIR *=/s/Botan-\$(VERSION)/${PF}/" -i src/build-data/makefile/unix_shr.in || die "sed failed"
 }
 
 src_configure() {
@@ -59,7 +66,7 @@ src_configure() {
 	# 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 \
+		--prefix="${EPREFIX}/usr" \
 		--libdir=$(get_libdir) \
 		--docdir=share/doc \
 		--cc=gcc \
@@ -86,8 +93,5 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D%/}${EPREFIX}/usr" install || die "emake install failed"
-	# do the move as a two-stage operation for case-INsensitive filesystems
-	mv "${D%/}${EPREFIX}"/usr/share/doc/{Botan-${PV},tbm} || die
-	mv "${D%/}${EPREFIX}"/usr/share/doc/{tbm,${PF}} || die
+	emake DESTDIR="${ED}usr" install || die "emake install failed"
 }