From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RDjHg-000715-CZ for garchives@archives.gentoo.org; Tue, 11 Oct 2011 20:50:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20D6321C08F; Tue, 11 Oct 2011 20:50:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D40CC21C08F for ; Tue, 11 Oct 2011 20:50:26 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50BE71B403D for ; Tue, 11 Oct 2011 20:50:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 769548004F for ; Tue, 11 Oct 2011 20:50:25 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <49a8a1493f90b312c1fd9089dae9bea879836f71.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/coot/ChangeLog sci-chemistry/coot/coot-9999.ebuild X-VCS-Directories: sci-chemistry/coot/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 49a8a1493f90b312c1fd9089dae9bea879836f71 Date: Tue, 11 Oct 2011 20:50:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2cd8e49cba936dadbe9746d3d543127d commit: 49a8a1493f90b312c1fd9089dae9bea879836f71 Author: Justin Lecher gentoo org> AuthorDate: Fri Oct 7 09:04:38 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Fri Oct 7 09:04:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D49a8a149 Moved to autotools-utils.eclass in order to have correct .a/la file handl= ing, #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: $ =20 + 07 Oct 2011; Justin Lecher coot-9999.ebuild: + Moved to autotools-utils.eclass in order to have correct .a/la file ha= ndling, + #385865; added png15 patch + 06 Oct 2011; Justin Lecher +files/9999-libpng-1.5.pa= tch, 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/coo= t-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=3D3 =20 PYTHON_DEPEND=3D"2" =20 -inherit autotools base python subversion toolchain-funcs versionator +inherit autotools-utils python subversion toolchain-funcs versionator =20 MY_S2_PV=3D$(replace_version_separator 2 - ${PV}) MY_S2_P=3D${PN}-${MY_S2_PV/pre1/pre-1} @@ -23,7 +23,9 @@ SRC_URI=3D"test? ( http://www.biop.ox.ac.uk/coot/devel/= greg-data.tar.gz )" SLOT=3D"0" LICENSE=3D"GPL-3" KEYWORDS=3D"~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE=3D"+openmp test" +IUSE=3D"+openmp static-libs test" + +AUTOTOOLS_IN_SOURCE_BUILD=3D1 =20 SCIDEPS=3D" >=3Dsci-libs/ccp4-libs-6.1 @@ -93,7 +95,7 @@ src_unpack() { } =20 src_prepare() { - base_src_prepare + autotools-utils_src_prepare =20 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=3D'${prefix}/include/coot' \ - --with-gtkcanvas-prefix=3D"${EPREFIX}/usr" \ - --with-gtkgl-prefix=3D"${EPREFIX}/usr" \ - --with-guile \ - --with-python=3D"${EPREFIX}/usr" \ - --with-guile-gtk \ - --with-gtk2 \ - --with-pygtk \ + local myeconfargs=3D( + --includedir=3D'${prefix}/include/coot' + --with-gtkcanvas-prefix=3D"${EPREFIX}/usr" + --with-gtkgl-prefix=3D"${EPREFIX}/usr" + --with-guile + --with-python=3D"${EPREFIX}/usr" + --with-guile-gtk + --with-gtk2 + --with-pygtk $(use_enable openmp) + ) + autotools-utils_src_configure } =20 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 } =20