Drop gl and test patch -> included upstream

(Portage version: 2.2.0_alpha90/git/Linux x86_64, unsigned Manifest commit)

4 files changed, 11 insertions, 30 deletions

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 15080873d..d281af243 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Mar 2012; Justin Lecher <jlec@gentoo.org> -files/9999-gl.patch,
+  -files/9999-test.patch, coot-9999.ebuild:
+  Drop gl and test patch -> included upstream
+
   27 Feb 2012; Justin Lecher <jlec@gentoo.org> -files/9999-include.patch,
   -files/9999-lidia.patch, coot-9999.ebuild:
   Cleaned old patches, added goocanvas config option
diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
index ec0fe5616..f5bd08672 100644
--- a/sci-chemistry/coot/coot-9999.ebuild
+++ b/sci-chemistry/coot/coot-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=4
 
 PYTHON_DEPEND="2"
+
 AUTOTOOLS_AUTORECONF="true"
 
 inherit autotools-utils python subversion toolchain-funcs versionator
@@ -25,6 +26,8 @@ LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+openmp static-libs test"
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
 SCIDEPS="
 	>=sci-libs/ccp4-libs-6.1
 	>=sci-libs/clipper-20090520
@@ -69,8 +72,6 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
 pkg_setup() {
 	if use openmp; then
 		tc-has-openmp || die "Please use an OPENMP capable compiler"
@@ -82,9 +83,7 @@ pkg_setup() {
 PATCHES=(
 	"${FILESDIR}"/${PV}-clipper-config.patch
 	"${FILESDIR}"/${PV}-goocanvas.patch
-	"${FILESDIR}"/${PV}-gl.patch
 	"${FILESDIR}"/${PV}-mmdb-config.patch
-	"${FILESDIR}"/${PV}-test.patch
 	"${FILESDIR}"/${PV}-ssm.patch
 	"${FILESDIR}"/${PV}-libpng-1.5.patch
 	)
@@ -95,6 +94,10 @@ src_unpack() {
 }
 
 src_prepare() {
+	sed \
+		-e "s:AM_COOT_SYS_BUILD_TYPE:COOT_SYS_BUILD_TYPE=Gentoo-Linux-$(PYTHON)-gtk2 ; AC_MSG_RESULT([\$COOT_SYS_BUILD_TYPE]); AC_SUBST(COOT_SYS_BUILD_TYPE):g" \
+		-i configure.in || die
+
 	autotools-utils_src_prepare
 
 	cat >> src/svn-revision.cc <<- EOF
diff --git a/sci-chemistry/coot/files/9999-gl.patch b/sci-chemistry/coot/files/9999-gl.patch
deleted file mode 100644
index bbd858c64..000000000
--- a/sci-chemistry/coot/files/9999-gl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: coot-surface/Makefile.am
-===================================================================
---- coot-surface/Makefile.am	(revision 3478)
-+++ coot-surface/Makefile.am	(working copy)
-@@ -29,4 +29,4 @@
- 
- libcoot_surface_la_LIBADD = \
- 	$(top_builddir)/surface/libccp4mg-surface.la \
--	$(GLUT_LIBS) $(CLIPPER_LIBS) $(MMDB_LIBS) 
-+	$(GLUT_LIBS) $(CLIPPER_LIBS) $(MMDB_LIBS) -lGL
diff --git a/sci-chemistry/coot/files/9999-test.patch b/sci-chemistry/coot/files/9999-test.patch
deleted file mode 100644
index 8cb79e65d..000000000
--- a/sci-chemistry/coot/files/9999-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/testing.cc |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/src/testing.cc b/src/testing.cc
-index f767bf6..097b9b9 100644
---- a/src/testing.cc
-+++ b/src/testing.cc
-@@ -86,6 +86,8 @@ std::string greg_test(const std::string &file_name) {
-    const char *c = getenv("COOT_TEST_DATA_DIR");
-    if (c) {
-       dd = c;
-+      dd += "/";
-+      dd += file_name;
-    } else { 
-       const char *d = getenv("HOME");
-       if (d) {