[gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/

[Justin Lecher]

commit:     ead832ffe4f481f8c4ad3a72a7aa2df91f25851b
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 11:03:24 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 11:03:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ead832ff

app-doc/root-docs: Bump to EAPI=6

* Fix patches for current EHAD

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../root-docs/files/root-docs-6.02.05-jsroot.patch | 11 ------
 app-doc/root-docs/root-docs-9999.ebuild            | 42 +++++-----------------
 2 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/app-doc/root-docs/files/root-docs-6.02.05-jsroot.patch b/app-doc/root-docs/files/root-docs-6.02.05-jsroot.patch
deleted file mode 100644
index 1ea170e..0000000
--- a/app-doc/root-docs/files/root-docs-6.02.05-jsroot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- root-6.02.05/documentation/JSROOT/JSROOT.md.orig	2015-02-09 11:59:47.000000000 +0300
-+++ root-6.02.05/documentation/JSROOT/JSROOT.md	2015-04-05 19:13:24.010358387 +0300
-@@ -198,7 +198,7 @@
-        <div id="drawing">loading...</div>
-     </body>
- 
--Internally, the JSROOT.loadScript(urllist, callback, debug) method is used. It can be useful when some other scripts should be loaded as well. __urllist__ is a string with scripts names, separated by ';' symbol. If a script name starts with __$$$__ (triple dollar sign), the script will be loaded from a location relative to the main JSROOT directory. 
-+Internally, the JSROOT.loadScript(urllist, callback, debug) method is used. It can be useful when some other scripts should be loaded as well. __urllist__ is a string with scripts names, separated by ';' symbol. If a script name starts with __\$\$\$__ (triple dollar sign), the script will be loaded from a location relative to the main JSROOT directory. 
- This location is automatically detected when JSRootCore.js script is loaded.
- 
- 

diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
index 7c64864..4ffda31 100644
--- a/app-doc/root-docs/root-docs-9999.ebuild
+++ b/app-doc/root-docs/root-docs-9999.ebuild
@@ -1,36 +1,20 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 ROOT_PN="root"
 ROOFIT_DOC_PV=2.91-33
 ROOFIT_QS_DOC_PV=3.00
 TMVA_DOC_PV=4.2.0
 
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EVCS_OFFLINE=yes # we need exactly the same checkout as root itself
-	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
-else
-	SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${ROOT_PN}-${PV}"
-fi
-
-inherit eutils multilib virtualx
+inherit eutils git-r3 multilib virtualx
 
 DESCRIPTION="Documentation for ROOT Data Analysis Framework"
 HOMEPAGE="http://root.cern.ch/drupal"
-SRC_URI="${SRC_URI}
-	math? (
-		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-		http://root.cern.ch/download/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-		http://root.cern.ch/drupal/sites/default/files/roofit_quickstart_${ROOFIT_QS_DOC_PV}.pdf )
-	api? (
-		${HOMEPAGE}/sites/default/files/images/root6-banner.jpg
-		${HOMEPAGE}/sites/all/themes/newsflash/images/info.png )"
+SRC_URI=""
+EGIT_REPO_URI="http://root.cern.ch/git/root.git"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
@@ -51,20 +35,12 @@ RDEPEND=""
 
 DOC_DIR="/usr/share/doc/${ROOT_PN}-${PV}"
 
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		# we need to force sci-physics/root checkout here
-		git-r3_checkout "${EGIT_REPO_URI}" "${WORKDIR}/${P}" "sci-physics/root/0"
-	else
-		default
-	fi
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.00.01-makehtml.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-6.00.01-makehtml.patch" \
-		"${FILESDIR}/${PN}-6.02.05-jsroot.patch"
-
+	default
 	# prefixify the configure script
 	sed -i \
 		-e "s:/usr:${EPREFIX}/usr:g" \