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 1S1v1r-0001ZP-2M for garchives@archives.gentoo.org; Mon, 27 Feb 2012 07:29:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C821E0F60; Mon, 27 Feb 2012 07:29:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C9373E0F60 for ; Mon, 27 Feb 2012 07:29:40 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DEBC664401 for ; Mon, 27 Feb 2012 07:29:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D4548E53FE for ; Mon, 27 Feb 2012 07:29:37 +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: <1330327764.a8123cc7b89c5ab45e3b19f82a6f242aaacb2ed0.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/files/, sci-chemistry/coot/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/coot/ChangeLog sci-chemistry/coot/coot-9999.ebuild sci-chemistry/coot/files/9999-include.patch sci-chemistry/coot/files/9999-lidia.patch X-VCS-Directories: sci-chemistry/coot/files/ sci-chemistry/coot/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: a8123cc7b89c5ab45e3b19f82a6f242aaacb2ed0 X-VCS-Branch: master Date: Mon, 27 Feb 2012 07:29:37 +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: c35b5090-162b-49f6-8418-564ebbe18a61 X-Archives-Hash: baa5cfcefac5ef88f7abeae0929547b8 commit: a8123cc7b89c5ab45e3b19f82a6f242aaacb2ed0 Author: Justin Lecher gentoo org> AuthorDate: Mon Feb 27 07:29:24 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Feb 27 07:29:24 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Da8123cc7 Cleaned old patches, added goocanvas config option (Portage version: 2.2.0_alpha89/git/Linux x86_64, unsigned Manifest commi= t) --- sci-chemistry/coot/ChangeLog | 8 ++++++++ sci-chemistry/coot/coot-9999.ebuild | 5 +---- sci-chemistry/coot/files/9999-include.patch | 12 ------------ sci-chemistry/coot/files/9999-lidia.patch | 15 --------------- 4 files changed, 9 insertions(+), 31 deletions(-) diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog index b097d5b..1508087 100644 --- a/sci-chemistry/coot/ChangeLog +++ b/sci-chemistry/coot/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 27 Feb 2012; Justin Lecher -files/9999-include.patch= , + -files/9999-lidia.patch, coot-9999.ebuild: + Cleaned old patches, added goocanvas config option + + 25 Feb 2012; Justin Lecher -files/9999-include.patch= , + -files/9999-lidia.patch, coot-9999.ebuild: + Cleaned old patches, added goocanvas config option + 14 Jan 2012; Justin Lecher -Manifest, -Manifest: Dropped Manifest =20 diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coo= t-9999.ebuild index dd204d0..ec0fe56 100644 --- a/sci-chemistry/coot/coot-9999.ebuild +++ b/sci-chemistry/coot/coot-9999.ebuild @@ -81,9 +81,7 @@ pkg_setup() { =20 PATCHES=3D( "${FILESDIR}"/${PV}-clipper-config.patch - "${FILESDIR}"/${PV}-lidia.patch "${FILESDIR}"/${PV}-goocanvas.patch - "${FILESDIR}"/${PV}-include.patch "${FILESDIR}"/${PV}-gl.patch "${FILESDIR}"/${PV}-mmdb-config.patch "${FILESDIR}"/${PV}-test.patch @@ -113,8 +111,7 @@ src_configure() { # Yes, this is broken behavior. local myeconfargs=3D( --includedir=3D'${prefix}/include/coot' - --with-gtkcanvas-prefix=3D"${EPREFIX}/usr" - --with-gtkgl-prefix=3D"${EPREFIX}/usr" + --with-goocanvas-prefix=3D"${EPREFIX}/usr" --with-guile --with-python=3D"${EPREFIX}/usr" --with-guile-gtk diff --git a/sci-chemistry/coot/files/9999-include.patch b/sci-chemistry/= coot/files/9999-include.patch deleted file mode 100644 index 3076663..0000000 --- a/sci-chemistry/coot/files/9999-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: lbg/Makefile.am -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- lbg/Makefile.am (revision 3219) -+++ lbg/Makefile.am (working copy) -@@ -2,6 +2,7 @@ - lib_LTLIBRARIES=3Dlibcoot-lidia.la -=20 - INCLUDES =3D \ -+ -I$(top_srcdir)/coot-utils \ - -I$(top_srcdir)/lidia-core \ - -I$(top_srcdir)/geometry \ - -I$(top_srcdir)/utils \ diff --git a/sci-chemistry/coot/files/9999-lidia.patch b/sci-chemistry/co= ot/files/9999-lidia.patch deleted file mode 100644 index 2076513..0000000 --- a/sci-chemistry/coot/files/9999-lidia.patch +++ /dev/null @@ -1,15 +0,0 @@ - lidia-core/Makefile.am | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/lidia-core/Makefile.am b/lidia-core/Makefile.am -index 17d468d..78bf054 100644 ---- a/lidia-core/Makefile.am -+++ b/lidia-core/Makefile.am -@@ -34,3 +34,7 @@ libcoot_lidia_core_la_SOURCES =3D lbg-molfile.cc lig-b= uild.cc - # test_molfile_SOURCES: test-molfile.cc -=20 - # test_molfile_LDADD: libcoot-lidia-core.la -+ -+libcoot_lidia_core_la_LIBADD =3D \ -+ $(top_builddir)/geometry/libcoot-geometry.la \ -+ $(MMDB_LIBS) $(CLIPPER_LIBS)