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@gentoo.org>

3 files changed, 9 insertions, 49 deletions

diff --git a/app-doc/root-docs/Manifest b/app-doc/root-docs/Manifest
deleted file mode 100644
index 27710df7e..000000000
--- a/app-doc/root-docs/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST RooFit_Users_Manual_2.91-33.pdf 1330062 SHA256 101c4e4c41962238fcabf1caa86cafc51241a1800594491b2e62ef8b565a5646 SHA512 732d7dea3541b51e5f0b9b5b70dae57e1bdbb2504c4222d5e5095ec0f9b67307011c1f31c2c95be419b53dd8426f52f62f6c9370084208176a2ed3d7f25d783b WHIRLPOOL 033897bef4bdb13246a81ea6749f7895e6c4d639752e932130234ad9153bb399a4e5d416237850da27f139d3cccc53d9adb7a077abf20d257ce057157d6c3696
-DIST TMVAUsersGuide-v4.2.0.pdf 4099493 SHA256 b61614d14289a20f5fa429f79e474e596cdabb807632c901347479ad425791b9 SHA512 a52f36bdf9791c2e1c4b17f08dbcb100927d11c0db1d69ec611437017f80d90be557baf530af10aabc4d07dac626f1736352abd71845dba5e2c0899ff5b126d4 WHIRLPOOL 5be3affaf45dc6086329a82d582f95c9a251fedb7943fd84c14310b91504b7318db0d992a7da8e9da8b0b0fbbf4a7c58b7339bc4b529221804afb9988342829c
-DIST info.png 2060 SHA256 51de6661250f3fb71c6c8250cbc4bdc4dc4283cc90240b4dc1ee6168e8d40279 SHA512 81a730eefbe7a7e15d5840491402c7644bf7ed5d5f8f3830ed9457b343cc7882480e993ea84aef93500742cd0fe8469859cd2c925e5582b91ef56406804ae276 WHIRLPOOL 02ea6daf9e3d21947ebf5dd01c455a13f2fcbf9981be34a150056a3510122ca49e3d137d4f242c7218d4d06ace09566d513a04f09071723ac244f5a38e982bac
-DIST roofit_quickstart_3.00.pdf 501576 SHA256 65aaf9e0c88352e265fd55b97a2503a9ee4a51d3219daff69c6f7f6427fe22cf SHA512 e8e1bd3bb3ead0ae3883512d7ff297651b99937fd5df0b61cf559ea5dd6cfbda35dfd8ebc953ed11a12f471849f6e95e05869b58a1e433ea6e5d1d1aa08bbb93 WHIRLPOOL a58b221272e3b2775639bf934f63cd06919105871ad736a84e18e6f3949a579301d1c6d69df39576dcc11867aa27274f5c78f36146a929698437b1a0c310aebe
-DIST root6-banner.jpg 32319 SHA256 9d6d226bbe61db257a1796a3ad04dfe97b3bb500a29349ff76bf6a929ed1e104 SHA512 f01dd253f24d59c374042efd239ce023e5ca82d3d617ca6763daf9720b169c4fb27a0f4573ea95d807f0e12095924606372df4940f65ce7d859164314d22b9af WHIRLPOOL 69976abe240235a4f4eb25d61a0ceb183dc5ad5f9e57e9130ae10615329dd23125848f45608e1ad2d65a286d1f191f95336316f7c8f1cc052d396c31433cbe4c
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 1ea170e84..000000000
--- 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 7c6486497..4ffda31ec 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" \