[gentoo-commits] gentoo-x86 commit in dev-libs/botan: ChangeLog botan-1.8.8-r1.ebuild

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    10/03/30 18:35:49

  Modified:             ChangeLog botan-1.8.8-r1.ebuild
  Log:
  Set Python 2 as active version of Python.
  (Portage version: 15841-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.57                 dev-libs/botan/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/ChangeLog?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/ChangeLog?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/ChangeLog?r1=1.56&r2=1.57

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ChangeLog	4 Feb 2010 04:20:51 -0000	1.56
+++ ChangeLog	30 Mar 2010 18:35:48 -0000	1.57
@@ -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@g.o>
+  botan-1.8.8-r1.ebuild:
+  Set Python 2 as active version of Python.
 
   04 Feb 2010; Markos Chandras <hwoarang@g.o> botan-1.8.8.ebuild:
   Stable on amd64 wrt bug #295701



1.2                  dev-libs/botan/botan-1.8.8-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/botan-1.8.8-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/botan-1.8.8-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/botan-1.8.8-r1.ebuild?r1=1.1&r2=1.2

Index: botan-1.8.8-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.8-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- botan-1.8.8-r1.ebuild	23 Jan 2010 15:18:58 -0000	1.1
+++ botan-1.8.8-r1.ebuild	30 Mar 2010 18:35:48 -0000	1.2
@@ -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 @@
 	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 @@
 	# 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_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"
 }