[gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/

["Justin Lecher" <jlec@gentoo.org>]

commit:     49a8a1493f90b312c1fd9089dae9bea879836f71
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 09:04:38 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 09:04:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=49a8a149

Moved to autotools-utils.eclass in order to have correct .a/la file handling, #385865; added png15 patch

(Portage version: 2.2.0_alpha62/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-chemistry/coot/ChangeLog        |    4 ++++
 sci-chemistry/coot/coot-9999.ebuild |   33 ++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 164b64e..e7576f5 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Oct 2011; Justin Lecher <jlec@gentoo.org> coot-9999.ebuild:
+  Moved to autotools-utils.eclass in order to have correct .a/la file handling,
+  #385865; added png15 patch
+
   06 Oct 2011; Justin Lecher <jlec@gentoo.org> +files/9999-libpng-1.5.patch,
   coot-9999.ebuild:
   Add png15 support and don't build static libs

diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
index c3f3455..aff58ef 100644
--- a/sci-chemistry/coot/coot-9999.ebuild
+++ b/sci-chemistry/coot/coot-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=3
 
 PYTHON_DEPEND="2"
 
-inherit autotools base python subversion toolchain-funcs versionator
+inherit autotools-utils python subversion toolchain-funcs versionator
 
 MY_S2_PV=$(replace_version_separator 2 - ${PV})
 MY_S2_P=${PN}-${MY_S2_PV/pre1/pre-1}
@@ -23,7 +23,9 @@ SRC_URI="test? ( http://www.biop.ox.ac.uk/coot/devel/greg-data.tar.gz )"
 SLOT="0"
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+openmp test"
+IUSE="+openmp static-libs test"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
 
 SCIDEPS="
 	>=sci-libs/ccp4-libs-6.1
@@ -93,7 +95,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	base_src_prepare
+	autotools-utils_src_prepare
 
 	cat >> src/svn-revision.cc <<- EOF
 	extern "C" {
@@ -109,22 +111,23 @@ src_prepare() {
 src_configure() {
 	# All the --with's are used to activate various parts.
 	# Yes, this is broken behavior.
-	econf \
-		--disable-static \
-		--includedir='${prefix}/include/coot' \
-		--with-gtkcanvas-prefix="${EPREFIX}/usr" \
-		--with-gtkgl-prefix="${EPREFIX}/usr" \
-		--with-guile \
-		--with-python="${EPREFIX}/usr" \
-		--with-guile-gtk \
-		--with-gtk2 \
-		--with-pygtk \
+	local myeconfargs=(
+		--includedir='${prefix}/include/coot'
+		--with-gtkcanvas-prefix="${EPREFIX}/usr"
+		--with-gtkgl-prefix="${EPREFIX}/usr"
+		--with-guile
+		--with-python="${EPREFIX}/usr"
+		--with-guile-gtk
+		--with-gtk2
+		--with-pygtk
 		$(use_enable openmp)
+		)
+	autotools-utils_src_configure
 }
 
 src_compile() {
-	emake || die "emake failed"
-	python_convert_shebangs $(python_get_version) src/coot_gtk2.py
+	autotools-utils_src_compile
+	python_convert_shebangs $(python_get_version) "${S}"/src/coot_gtk2.py
 	cp "${S}"/src/coot_gtk2.py python/coot.py || die
 }