public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/
Date: Mon, 13 Apr 2015 06:25:20 +0000 (UTC)	[thread overview]
Message-ID: <1428906281.a41dfa7276c9bcaf9cc19a33292d51bc563b6aae.jlec@gentoo> (raw)

commit:     a41dfa7276c9bcaf9cc19a33292d51bc563b6aae
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Apr 12 19:21:01 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 06:24:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a41dfa72

app-doc/root-docs: 6.02.05 moved to the tree

 app-doc/root-docs/ChangeLog                |   3 +
 app-doc/root-docs/root-docs-6.02.05.ebuild | 137 ----------------------------
 app-doc/root-docs/root-docs-9999.ebuild    | 138 ++++++++++++++++++++++++++++-
 3 files changed, 140 insertions(+), 138 deletions(-)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 06865b3..9a184fc 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,9 @@
 # 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 $
 
+  12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -root-docs-6.02.05.ebuild:
+  6.02.05 is in the portage tree now
+
   11 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> root-docs-6.02.05.ebuild:
   Update deps: root and fonts are needed only for api docs.
 

diff --git a/app-doc/root-docs/root-docs-6.02.05.ebuild b/app-doc/root-docs/root-docs-6.02.05.ebuild
deleted file mode 100644
index ee79039..0000000
--- a/app-doc/root-docs/root-docs-6.02.05.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.1 2015/03/25 21:39:33 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"
-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
-
-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 )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="api +math +metric http"
-
-VIRTUALX_REQUIRED="api"
-
-DEPEND="
-	app-text/pandoc
-	app-text/texlive
-	dev-haskell/pandoc-citeproc[bibutils]
-	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() {
-	epatch \
-		"${FILESDIR}/${PN}-6.00.01-makehtml.patch" \
-		"${FILESDIR}/${PN}-6.02.05-jsroot.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}/usr/share/doc/${PF}" \
-			--tutdir="${EPREFIX}/usr/share/doc/${PF}/examples/tutorials" \
-			--testdir="${EPREFIX}/usr/share/doc/${PF}/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/WindowAttributes_t.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}"/{root6-banner.jpg,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
-}

diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
deleted file mode 120000
index d603111..0000000
--- a/app-doc/root-docs/root-docs-9999.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-root-docs-6.02.05.ebuild
\ No newline at end of file

diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
new file mode 100644
index 0000000..ee79039
--- /dev/null
+++ b/app-doc/root-docs/root-docs-9999.ebuild
@@ -0,0 +1,137 @@
+# 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.1 2015/03/25 21:39:33 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"
+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
+
+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 )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="api +math +metric http"
+
+VIRTUALX_REQUIRED="api"
+
+DEPEND="
+	app-text/pandoc
+	app-text/texlive
+	dev-haskell/pandoc-citeproc[bibutils]
+	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() {
+	epatch \
+		"${FILESDIR}/${PN}-6.00.01-makehtml.patch" \
+		"${FILESDIR}/${PN}-6.02.05-jsroot.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}/usr/share/doc/${PF}" \
+			--tutdir="${EPREFIX}/usr/share/doc/${PF}/examples/tutorials" \
+			--testdir="${EPREFIX}/usr/share/doc/${PF}/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/WindowAttributes_t.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}"/{root6-banner.jpg,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
+}


             reply	other threads:[~2015-04-13  6:25 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-13  6:25 Justin Lecher [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-04-12 19:22 [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/ Andrew Savchenko
2015-04-11 11:58 Andrew Savchenko
2015-03-03  4:31 git@oystercatcher mirror+tproxy
2015-03-03  4:31 Andrew Savchenko
2015-03-02  8:05 Andrew Savchenko
2015-02-24 23:53 Andrew Savchenko
2015-02-23 17:44 Andrew Savchenko
2014-06-30  3:00 Andrew Savchenko
2013-12-05 17:08 Andrew Savchenko
2013-10-07  3:00 Andrew Savchenko
2013-10-04 23:39 Andrew Savchenko
2013-06-29  6:14 Andrew Savchenko
2013-06-08 15:00 Andrew Savchenko
2013-02-23 12:45 Andrew Savchenko
2012-10-25 16:38 Andrew Savchenko
2012-07-06 12:58 Justin Lecher
2012-07-05 15:45 Andrew Savchenko
2012-07-01  6:34 Andrew Savchenko
2012-06-19 23:18 Andrew Savchenko
2011-12-04  0:29 Andrew Savchenko
2011-08-02 22:04 Andrew Savchenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1428906281.a41dfa7276c9bcaf9cc19a33292d51bc563b6aae.jlec@gentoo \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox