[gentoo-commits] proj/sci:master commit in: sci-physics/root/, sci-physics/root/files/

[Justin Lecher]

commit:     6f07c2d62ee51108028aef334392b84ac39a9c81
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Sep 27 18:27:34 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 18:29:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=6f07c2d6

sci-physics/root: Drop desktop-patch (upstreamed), add http-useflag enabling 
THttpServer.

Package-Manager: portage-2.2.22

 sci-physics/root/ChangeLog                        |  4 ++++
 sci-physics/root/files/root-5.34.13-desktop.patch | 12 ------------
 sci-physics/root/root-9999.ebuild                 |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 566f40c..77f4c1f 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  27 Sep 2015; Oliver Freyermuth <o.freyerm...@googlemail.com> 
root-9999.ebuild:
+  sci-physics/root: Drop desktop-patch (upstreamed), 
+  add http-useflag enabling THttpServer.
+
   18 Jul 2015; Andrew Savchenko <birc...@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 7d47bcf..0000000
--- 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/root-9999.ebuild 
b/sci-physics/root/root-9999.ebuild
index 91415ff..3ff5618 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -195,7 +195,6 @@ 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 \
@@ -309,6 +308,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)