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

["Andrew Savchenko" <bircoph@gentoo.org>]

commit:     18480253df9ef5cddd357863d55a8b75ebcb11a5
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Jul 18 13:49:28 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 13:49:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=18480253

app-doc/root-docs/5.34.32 is moved to the main tree now

 app-doc/root-docs/ChangeLog                        |   4 +
 .../files/root-docs-6.00.01-fillpatterns.patch     |  30 -----
 app-doc/root-docs/root-docs-5.34.32.ebuild         | 137 ---------------------
 3 files changed, 4 insertions(+), 167 deletions(-)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 71e1af1..d5887fa 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/ChangeLog,v 1.42 2014/03/28 18:48:01 bicatali Exp $
 
+  18 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> -root-docs-5.34.32.ebuild,
+  -files/root-docs-6.00.01-fillpatterns.patch:
+  5.34.32 is moved to the main tree now
+
 *root-docs-5.34.32 (17 Jul 2015)
 
   17 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> +root-docs-5.34.32.ebuild,

diff --git a/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch b/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch
deleted file mode 100644
index e48a4f7..0000000
--- a/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/core/base/doc/macros/fillpatterns.C b/core/base/doc/macros/fillpatterns.C
-index b0a5132..fca81c8 100644
---- a/core/base/doc/macros/fillpatterns.C
-+++ b/core/base/doc/macros/fillpatterns.C
-@@ -20,11 +20,11 @@ TCanvas * fillpatterns()
- 
-    // Fixed patterns.
-    for (i=1; i<=5; i++) {
--      box(j++, 0.01, y-bh, 0.19, y);
--      box(j++, 0.21, y-bh, 0.39, y);
--      box(j++, 0.41, y-bh, 0.59, y);
--      box(j++, 0.61, y-bh, 0.79, y);
--      box(j++, 0.81, y-bh, 0.99, y);
-+      box(j, 0.01, y-bh, 0.19, y); j++;
-+      box(j, 0.21, y-bh, 0.39, y); j++;
-+      box(j, 0.41, y-bh, 0.59, y); j++;
-+      box(j, 0.61, y-bh, 0.79, y); j++;
-+      box(j, 0.81, y-bh, 0.99, y); j++;
-       y = y-bh-db;
-    }
- 
-@@ -55,7 +55,7 @@ TCanvas * fillpatterns()
-    return Pat;
- }
- 
--box(Int_t pat, Double_t x1, Double_t y1, Double_t x2, Double_t  y2)
-+void box(Int_t pat, Double_t x1, Double_t y1, Double_t x2, Double_t  y2)
- {
-    // Draw an box using the fill pattern "pat" with the "pat" value
-    // written on top.

diff --git a/app-doc/root-docs/root-docs-5.34.32.ebuild b/app-doc/root-docs/root-docs-5.34.32.ebuild
deleted file mode 100644
index 50bf04b..0000000
--- a/app-doc/root-docs/root-docs-5.34.32.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.28.ebuild,v 1.3 2015/06/14 19:25:46 bircoph Exp $
-
-EAPI=5
-
-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"
-	KEYWORDS=""
-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}"
-fi
-
-inherit eutils 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/all/themes/newsflash/images/blue/root-banner.png
-		${HOMEPAGE}/sites/all/themes/newsflash/images/info.png )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="api +math +metric http"
-
-VIRTUALX_REQUIRED="api"
-
-DEPEND="
-	app-text/pandoc
-	dev-haskell/pandoc-citeproc[bibutils]
-	dev-texlive/texlive-latex
-	virtual/pkgconfig
-	api? (
-		media-fonts/dejavu
-		~sci-physics/root-${PV}[X,graphviz,opengl]
-	)"
-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
-}
-
-src_prepare() {
-	use api && epatch \
-		"${FILESDIR}/${PN}-6.00.01-makehtml.patch" \
-		"${FILESDIR}/${PN}-6.00.01-fillpatterns.patch"
-	# prefixify the configure script
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		configure || die "prefixify configure failed"
-}
-
-src_configure() {
-	# we need only to setup paths here, html docs doesn't depend on USE flags
-	if use api; then
-		./configure \
-			--prefix="${EPREFIX}/usr" \
-			--etcdir="${EPREFIX}/etc/root" \
-			--libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" \
-			--docdir="${EPREFIX}${DOC_DIR}" \
-			--tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials" \
-			--testdir="${EPREFIX}${DOC_DIR}/examples/tests" \
-			--with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \
-			--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps" \
-			--nohowto
-	fi
-}
-
-src_compile() {
-	pdf_target=( primer users-guide )
-	local pdf_size=pdfa4
-	use metric || pdf_size=pdfletter
-	use math && pdf_target+=( minuit2 spectrum )
-	use http && pdf_target+=( HttpServer JSROOT )
-
-	local i
-	for (( i=0; i<${#pdf_target[@]}; i++ )); do
-		emake -C documentation/"${pdf_target[i]}" "${pdf_size}"
-	done
-
-	if use api; then
-		# video drivers may want to access hardware devices
-		cards=$(echo -n /dev/dri/card* /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
-		[[ -n "${cards}" ]] && addpredict "${cards}"
-
-		ROOTSYS="${S}" Xemake html
-		# if root.exe crashes, return code will be 0 due to gdb attach,
-		# so we need to check if last html file was generated;
-		# this check is volatile and can't catch crash on the last file.
-		[[ -f htmldoc/timespec.html ]] || die "html doc generation crashed"
-	fi
-}
-
-src_install() {
-	insinto "${DOC_DIR}"
-
-	local i
-	for (( i=0; i<${#pdf_target[@]}; i++ )); do
-		doins documentation/"${pdf_target[i]}"/*.pdf
-	done
-	unset pdf_target
-
-	use math && doins \
-		"${DISTDIR}/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf" \
-		"${DISTDIR}/roofit_quickstart_${ROOFIT_QS_DOC_PV}.pdf" \
-		"${DISTDIR}/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf"
-
-	if use api; then
-		# Install offline replacements for online messages
-		cp "${DISTDIR}"/{root-banner.png,info.png} htmldoc/ || die "cp failed"
-		# too large data to copy
-		dodir "${DOC_DIR}/html"
-		mv htmldoc/* "${ED}${DOC_DIR}/html/" || die
-		docompress -x ${DOC_DIR}/html
-	fi
-}