Merge remote-tracking branch 'github/master'

* github/master:
  dev-python/matplotlib2tikz: Drop python3 (only supported in 9999)
  added correspondng patch for =sci-biology/pysurfer-0.6
  sci-biology/pysurfer: version bump
  new manifest and archive name for sci-biology/pysurfer
  new manifests sci-biology/spm:
  added name
  sci-physics/root: Remove geocad-patch, is now upstream.
  sci-physics/root: Drop desktop-patch (upstreamed), add http-useflag enabling THttpServer.
  updated manifest
  saving archive as ${P}
  added patch number
  sci-libs/arrayfire: Version bump
  sci-visualization/forge: Set version of glm required
  sci-visualization/forge: Version bump
  added manifest
  dev-python/ipyparallel: Re-Fix Issue #473; Fixes Bug #561324
  using upstream pckage version
  new patched version from upstream

4 files changed, 10 insertions, 30 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 566f40ce5..accb1de2e 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  27 Sep 2015; Oliver Freyermuth <o.freyermuth@googlemail.com>
+  -files/root-6.00.01-geocad.patch, root-9999.ebuild:
+  sci-physics/root:  Remove geocad-patch, is now upstream.
+
+  27 Sep 2015; Oliver Freyermuth <o.freyermuth@googlemail.com> root-9999.ebuild:
+  sci-physics/root: Drop desktop-patch (upstreamed), 
+  add http-useflag enabling THttpServer.
+
   18 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> -root-5.34.32.ebuild,
   -files/root-5.32.00-dotfont.patch, -files/root-5.34.05-nobyte-compile.patch,
   -files/root-5.34.26-ldflags.patch, metadata.xml:
diff --git a/sci-physics/root/files/root-5.34.13-desktop.patch b/sci-physics/root/files/root-5.34.13-desktop.patch
deleted file mode 100644
index 7d47bcf7c..000000000
--- a/sci-physics/root/files/root-5.34.13-desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/etc/root.desktop b/etc/root.desktop
-index ca38211..688ecfa 100644
---- a/etc/root.desktop
-+++ b/etc/root.desktop
-@@ -8,5 +8,5 @@ Name[de]=ROOT
- Comment=An object-oriented data analysis framework
- Comment[de]=Ein objektorientiertes Framework zur Datenanalyse
- StartupNotify=true
--MimeType=application/x-root;text/x-c++src
--Categories=Science;Development;Application;
-+MimeType=application/x-root;text/x-c++src;
-+Categories=Science;Development;
diff --git a/sci-physics/root/files/root-6.00.01-geocad.patch b/sci-physics/root/files/root-6.00.01-geocad.patch
deleted file mode 100644
index 2742a74bd..000000000
--- a/sci-physics/root/files/root-6.00.01-geocad.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/geom/geocad/inc/TGeoToOCC.h b/geom/geocad/inc/TGeoToOCC.h
-index 892f225..86eb9e1 100644
---- a/geom/geocad/inc/TGeoToOCC.h
-+++ b/geom/geocad/inc/TGeoToOCC.h
-@@ -13,8 +13,10 @@
- #define ROOT_TGeoToOCC
- 
- //Cascade
-+#define Printf Printf_opencascade
- #include <TopoDS_Shape.hxx>
- #include <TopoDS_Wire.hxx>
-+#undef Printf
- 
- //Root
- #ifndef ROOT_TGeoXtru
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 91415ffd3..1b3ed7294 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -195,11 +195,9 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
 		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
 		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
-		"${FILESDIR}"/${PN}-5.34.13-desktop.patch \
 		"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
 		"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-6.00.01-llvm.patch \
-		"${FILESDIR}"/${PN}-6.00.01-geocad.patch
+		"${FILESDIR}"/${PN}-6.00.01-llvm.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -309,6 +307,7 @@ src_configure() {
 			$(use_enable fftw fftw3)
 			$(use_enable geocad)
 			$(use_enable graphviz gviz)
+			$(use_enable http)
 			$(use_enable kerberos krb5)
 			$(use_enable ldap)
 			$(use_enable math genvector)