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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/
@ 2012-06-19 20:20 Andrew Savchenko
  0 siblings, 0 replies; 12+ messages in thread
From: Andrew Savchenko @ 2012-06-19 20:20 UTC (permalink / raw
  To: gentoo-commits

commit:     f19e5c8fab523ace9a4b548048c01ec35375933c
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Jun 19 20:19:17 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue Jun 19 20:19:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f19e5c8f

app-doc/root-docs: separate htmldoc from root package

---
 app-doc/root-docs/ChangeLog                        |   12 ++-
 .../root-docs/files/root-docs-5.34-makehtml.patch  |   52 +++++++++++
 app-doc/root-docs/root-docs-9999.ebuild            |   97 ++++++++++++++++++++
 3 files changed, 160 insertions(+), 1 deletions(-)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index a2798b5..0858080 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -1,7 +1,17 @@
 # ChangeLog for app-doc/root-docs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-docs-9999 (19 Jun 2012)
+
+  19 Jun 2012; Andrew Savchenko <bircoph@gmail.com>
+  +files/root-docs-5.34-makehtml.patch, +root-docs-9999.ebuild:
+  htmldoc generation for root must be separated, because it is
+  supposed to be run only root was installed to the live
+  filesystem. It can't be faked easily in the sandbox environment,
+  because ROOTSYS is not respected when --prefix or --*dir are
+  used for configure script.
+
 *root-docs-5.32 (03 Dec 2011)
 
   03 Dec 2011; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.30.ebuild,

diff --git a/app-doc/root-docs/files/root-docs-5.34-makehtml.patch b/app-doc/root-docs/files/root-docs-5.34-makehtml.patch
new file mode 100644
index 0000000..57fb69b
--- /dev/null
+++ b/app-doc/root-docs/files/root-docs-5.34-makehtml.patch
@@ -0,0 +1,52 @@
+--- root/Makefile.orig	2012-05-30 00:50:46.000000000 +0400
++++ root/Makefile	2012-05-30 00:51:05.839679686 +0400
+@@ -1088,16 +1088,7 @@
+ releasenotes:
+ 	@$(MAKERELNOTES)
+ 
+-html: $(ROOTEXE) changelog releasenotes
+-ifneq ($(USECONFIG),FALSE)
+-	@if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \
+-	  || [ "`which root.exe`" -ot "bin/root.exe" ]; then \
+-	  echo 'ERROR: root.exe has not been installed by this build.'; \
+-	  echo '       Run "make install" before running "make html".'; \
+-	  exit 1; \
+-	fi
+-endif
+-	@$(MAKELOGHTML)
++html: compiledata releasenotes
+ 	@$(MAKEHTML)
+ 
+ # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
+--- root/build/unix/makehtml.sh.orig	2012-06-18 06:44:59.000000000 +0400
++++ root/build/unix/makehtml.sh	2012-06-18 19:39:41.262064654 +0400
+@@ -1,17 +1,17 @@
+ #! /bin/sh
+ 
+-ROOT=bin/root.exe
++ROOT=root.exe
+ 
+ dir=`pwd`
+ cd tutorials
+ # we need tutorials/hsimple.root
+ if [ ! -f hsimple.root ]; then
+-   $ROOT -l -b -q hsimple.C
++   $ROOT -l -b -q hsimple.C && exit 1
+ fi
+ cd tree
+ # we need tutorials/tree/cernstaff.root
+ if [ ! -f cernstaff.root ]; then
+-   $ROOT -l -b -q cernbuild.C
++   $ROOT -l -b -q cernbuild.C || exit 1
+ fi
+ cd $dir
+ 
+@@ -19,7 +19,7 @@
+ echo "Generating doc in directory htmldoc/..."
+ echo ""
+ 
+-$ROOT -l <<makedoc
++$ROOT -l <<makedoc || exit 1
+     THtml h;
+     h.LoadAllLibs();
+     h.MakeAll();

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..a4c77b1
--- /dev/null
+++ b/app-doc/root-docs/root-docs-9999.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2012 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.28-r1.ebuild,v 1.1 2011/05/17 17:51:07 bicatali Exp $
+
+EAPI=4
+
+ROOT_PN="root"
+PATCH_PV="5.34"
+
+if [[ ${PV} == "9999" ]] ; then
+	_SVN_DEP="dev-vcs/subversion"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit eutils multilib toolchain-funcs virtualx
+
+DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
+HOMEPAGE="http://root.cern.ch/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${ROOT_PN}"
+VIRTUALX_REQUIRED="always"
+
+DEPEND="
+	~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
+	virtual/pkgconfig
+	${_SVN_DEP}"
+RDEPEND=""
+
+pkg_setup() {
+	# sandboxed user can't access video hardware, so xorg-x11 implementation
+	# should be used
+	GL_IMPLEM=$(eselect opengl show)
+	eselect opengl set xorg-x11
+}
+
+src_unpack() {
+	# can't use subversion eclass functions,
+	# we need to svn export the same root tree:
+	# 1) svn revisions for root and root-docs must be the same;
+	# 2) no need to abuse server twice.
+	if [[ ${PV} == "9999" ]] ; then
+		addpredict "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk/.svn"
+		svn export "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk" \
+			"${S}" || die "svn export failed"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
+}
+
+src_configure() {
+	# we need only to setup paths here, html docs doesn't depend on USE flags
+	./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-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
+		--with-afs-shared=yes \
+		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps
+}
+
+src_compile() {
+	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 "looks like html doc generation crashed"
+}
+
+src_install() {
+	mkdir -p "${ED}usr/share/doc/${PF}/"
+	# too large data to copy
+	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
+}
+
+pkg_postinst() {
+	eselect opengl set ${GL_IMPLEM}
+}



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/
@ 2012-06-20  9:18 Andrew Savchenko
  0 siblings, 0 replies; 12+ messages in thread
From: Andrew Savchenko @ 2012-06-20  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     ee25d872f9e2ae3536f41227353bb3235a1d3647
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Jun 20 09:18:18 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Jun 20 09:18:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ee25d872

app-doc/root-docs: backport htmldoc generation fixes

---
 app-doc/root-docs/ChangeLog                        |    6 +
 .../root-docs/files/root-docs-5.32-makehtml.patch  |   44 +++++++++
 app-doc/root-docs/root-docs-5.32.03.ebuild         |   98 ++++++++++++++++++++
 app-doc/root-docs/root-docs-5.32.ebuild            |   25 -----
 4 files changed, 148 insertions(+), 25 deletions(-)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 482b978..aec7424 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-docs-5.32.03 (20 Jun 2012)
+
+  20 Jun 2012; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.32.ebuild,
+  +root-docs-5.32.03.ebuild, +files/root-docs-5.32-makehtml.patch:
+  Backport htmldoc generation fixes for 5.32 branch.
+
 *root-docs-5.34.00 (19 Jun 2012)
 
   19 Jun 2012; Andrew Savchenko <bircoph@gmail.com> +root-docs-5.34.00.ebuild:

diff --git a/app-doc/root-docs/files/root-docs-5.32-makehtml.patch b/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
new file mode 100644
index 0000000..5cad010
--- /dev/null
+++ b/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
@@ -0,0 +1,44 @@
+--- root/Makefile.orig	2012-05-23 21:07:07.000000000 +0400
++++ root/Makefile	2012-05-23 22:47:48.935680301 +0400
+@@ -1039,8 +1039,7 @@
+ releasenotes:
+ 	@$(MAKERELNOTES)
+ 
+-html: $(ROOTEXE) changelog releasenotes
+-	@$(MAKELOGHTML)
++html: compiledata releasenotes
+ 	@$(MAKEHTML)
+ 
+ # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
+--- root/build/unix/makehtml.sh.orig	2012-06-18 06:44:59.000000000 +0400
++++ root/build/unix/makehtml.sh	2012-06-18 19:39:41.262064654 +0400
+@@ -1,17 +1,17 @@
+ #! /bin/sh
+ 
+-ROOT=bin/root.exe
++ROOT=root.exe
+ 
+ dir=`pwd`
+ cd tutorials
+ # we need tutorials/hsimple.root
+ if [ ! -f hsimple.root ]; then
+-   $ROOT -l -b -q hsimple.C
++   $ROOT -l -b -q hsimple.C && exit 1
+ fi
+ cd tree
+ # we need tutorials/tree/cernstaff.root
+ if [ ! -f cernstaff.root ]; then
+-   $ROOT -l -b -q cernbuild.C
++   $ROOT -l -b -q cernbuild.C || exit 1
+ fi
+ cd $dir
+ 
+@@ -19,7 +19,7 @@
+ echo "Generating doc in directory htmldoc/..."
+ echo ""
+ 
+-$ROOT -l <<makedoc
++$ROOT -l <<makedoc || exit 1
+     THtml h;
+     h.LoadAllLibs();
+     h.MakeAll();

diff --git a/app-doc/root-docs/root-docs-5.32.03.ebuild b/app-doc/root-docs/root-docs-5.32.03.ebuild
new file mode 100644
index 0000000..567cbb1
--- /dev/null
+++ b/app-doc/root-docs/root-docs-5.32.03.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 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.28-r1.ebuild,v 1.1 2011/05/17 17:51:07 bicatali Exp $
+
+EAPI=4
+
+ROOT_PN="root"
+PATCH_PV="5.32"
+
+if [[ ${PV} == "9999" ]] ; then
+	_SVN_DEP="dev-vcs/subversion"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit eutils multilib toolchain-funcs virtualx
+
+DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
+HOMEPAGE="http://root.cern.ch/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${ROOT_PN}"
+VIRTUALX_REQUIRED="always"
+
+DEPEND="
+	~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
+	>=sci-physics/root-5.32.03-r3[X,doc,graphviz,htmldoc,opengl]
+	virtual/pkgconfig
+	${_SVN_DEP}"
+RDEPEND=""
+
+pkg_setup() {
+	# sandboxed user can't access video hardware, so xorg-x11 implementation
+	# should be used
+	GL_IMPLEM=$(eselect opengl show)
+	eselect opengl set xorg-x11
+}
+
+src_unpack() {
+	# can't use subversion eclass functions,
+	# we need to svn export the same root tree:
+	# 1) svn revisions for root and root-docs must be the same;
+	# 2) no need to abuse server twice.
+	if [[ ${PV} == "9999" ]] ; then
+		addpredict "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk/.svn"
+		svn export "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk" \
+			"${S}" || die "svn export failed"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
+}
+
+src_configure() {
+	# we need only to setup paths here, html docs doesn't depend on USE flags
+	./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-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
+		--with-afs-shared=yes \
+		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps
+}
+
+src_compile() {
+	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 "looks like html doc generation crashed"
+}
+
+src_install() {
+	mkdir -p "${ED}usr/share/doc/${PF}/"
+	# too large data to copy
+	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
+}
+
+pkg_postinst() {
+	eselect opengl set ${GL_IMPLEM}
+}

diff --git a/app-doc/root-docs/root-docs-5.32.ebuild b/app-doc/root-docs/root-docs-5.32.ebuild
deleted file mode 100644
index 5b9d543..0000000
--- a/app-doc/root-docs/root-docs-5.32.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 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.28-r1.ebuild,v 1.1 2011/05/17 17:51:07 bicatali Exp $
-
-EAPI=3
-inherit versionator
-
-DESCRIPTION="An Object-Oriented Data Analysis Framework"
-MYP=html$(replace_version_separator 1 '')
-
-SRC_URI="ftp://root.cern.ch/root/${MYP}.tar.gz"
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="as-is"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/htmldoc
-
-src_install() {
-	insinto /usr/share/doc/${PF}/html
-	# use mv, there is too much to copy
-	mv ${MYP}/* "${ED}"/usr/share/doc/${PF}/
-}



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/
@ 2012-07-21 22:43 Andrew Savchenko
  0 siblings, 0 replies; 12+ messages in thread
From: Andrew Savchenko @ 2012-07-21 22:43 UTC (permalink / raw
  To: gentoo-commits

commit:     e3882560b983ba280fb3a43a7ece6e67ff97150a
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Jul 21 22:42:33 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sat Jul 21 22:42:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e3882560

app-doc/root-docs: update live ebuild

---
 app-doc/root-docs/ChangeLog                        |    5 ++
 .../root-docs/files/root-docs-5.32-makehtml.patch  |   44 --------------------
 ...akehtml.patch => root-docs-9999-makehtml.patch} |   33 +++++++--------
 app-doc/root-docs/root-docs-9999.ebuild            |    2 +-
 4 files changed, 22 insertions(+), 62 deletions(-)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 36085b8..2f4b658 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jul 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-docs-5.32-makehtml.patch, -files/root-docs-5.34-makehtml.patch,
+  root-docs-9999.ebuild, +files/root-docs-9999-makehtml.patch:
+  Update patching for live ebuild. Remove old.
+
   06 Jul 2012; Justin Lecher <jlec@gentoo.org> -root-docs-5.32.03.ebuild,
   metadata.xml:
   Dropped in tree version

diff --git a/app-doc/root-docs/files/root-docs-5.32-makehtml.patch b/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
deleted file mode 100644
index 5cad010..0000000
--- a/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- root/Makefile.orig	2012-05-23 21:07:07.000000000 +0400
-+++ root/Makefile	2012-05-23 22:47:48.935680301 +0400
-@@ -1039,8 +1039,7 @@
- releasenotes:
- 	@$(MAKERELNOTES)
- 
--html: $(ROOTEXE) changelog releasenotes
--	@$(MAKELOGHTML)
-+html: compiledata releasenotes
- 	@$(MAKEHTML)
- 
- # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
---- root/build/unix/makehtml.sh.orig	2012-06-18 06:44:59.000000000 +0400
-+++ root/build/unix/makehtml.sh	2012-06-18 19:39:41.262064654 +0400
-@@ -1,17 +1,17 @@
- #! /bin/sh
- 
--ROOT=bin/root.exe
-+ROOT=root.exe
- 
- dir=`pwd`
- cd tutorials
- # we need tutorials/hsimple.root
- if [ ! -f hsimple.root ]; then
--   $ROOT -l -b -q hsimple.C
-+   $ROOT -l -b -q hsimple.C && exit 1
- fi
- cd tree
- # we need tutorials/tree/cernstaff.root
- if [ ! -f cernstaff.root ]; then
--   $ROOT -l -b -q cernbuild.C
-+   $ROOT -l -b -q cernbuild.C || exit 1
- fi
- cd $dir
- 
-@@ -19,7 +19,7 @@
- echo "Generating doc in directory htmldoc/..."
- echo ""
- 
--$ROOT -l <<makedoc
-+$ROOT -l <<makedoc || exit 1
-     THtml h;
-     h.LoadAllLibs();
-     h.MakeAll();

diff --git a/app-doc/root-docs/files/root-docs-5.34-makehtml.patch b/app-doc/root-docs/files/root-docs-9999-makehtml.patch
similarity index 60%
rename from app-doc/root-docs/files/root-docs-5.34-makehtml.patch
rename to app-doc/root-docs/files/root-docs-9999-makehtml.patch
index 57fb69b..b339226 100644
--- a/app-doc/root-docs/files/root-docs-5.34-makehtml.patch
+++ b/app-doc/root-docs/files/root-docs-9999-makehtml.patch
@@ -1,10 +1,10 @@
---- root/Makefile.orig	2012-05-30 00:50:46.000000000 +0400
-+++ root/Makefile	2012-05-30 00:51:05.839679686 +0400
-@@ -1088,16 +1088,7 @@
- releasenotes:
- 	@$(MAKERELNOTES)
+--- root/Makefile.orig	2012-07-13 13:42:46.000000000 +0400
++++ root/Makefile	2012-07-22 00:15:03.282994389 +0400
+@@ -1087,16 +1087,7 @@
  
--html: $(ROOTEXE) changelog releasenotes
+ ifeq ($(BUILDX11),yes)
+ ifeq ($(BUILDASIMAGE),yes)
+-html: rootexecs postbin changelog releasenotes
 -ifneq ($(USECONFIG),FALSE)
 -	@if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \
 -	  || [ "`which root.exe`" -ot "bin/root.exe" ]; then \
@@ -16,17 +16,16 @@
 -	@$(MAKELOGHTML)
 +html: compiledata releasenotes
  	@$(MAKEHTML)
- 
- # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
---- root/build/unix/makehtml.sh.orig	2012-06-18 06:44:59.000000000 +0400
-+++ root/build/unix/makehtml.sh	2012-06-18 19:39:41.262064654 +0400
-@@ -1,17 +1,17 @@
+ else
+ html:
+--- root/build/unix/makehtml.sh.orig	2012-06-28 11:33:36.000000000 +0400
++++ root/build/unix/makehtml.sh	2012-07-22 00:18:58.705804436 +0400
+@@ -1,16 +1,16 @@
  #! /bin/sh
  
--ROOT=bin/root.exe
-+ROOT=root.exe
- 
  dir=`pwd`
+-ROOT=$dir/bin/root
++ROOT=root
  cd tutorials
  # we need tutorials/hsimple.root
  if [ ! -f hsimple.root ]; then
@@ -41,10 +40,10 @@
  fi
  cd $dir
  
-@@ -19,7 +19,7 @@
- echo "Generating doc in directory htmldoc/..."
- echo ""
+@@ -20,7 +20,7 @@
  
+ # To generate the full documentation, we do need to
+ # use the graphics engine, so do not use '-b'.
 -$ROOT -l <<makedoc
 +$ROOT -l <<makedoc || exit 1
      THtml h;

diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
index ca27548..463a23b 100644
--- a/app-doc/root-docs/root-docs-9999.ebuild
+++ b/app-doc/root-docs/root-docs-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 ROOT_PN="root"
-PATCH_PV="5.34"
+PATCH_PV="9999"
 
 if [[ ${PV} == "9999" ]] ; then
 	_SVN_DEP="dev-vcs/subversion"


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/
@ 2012-07-22 12:45 Andrew Savchenko
  0 siblings, 0 replies; 12+ messages in thread
From: Andrew Savchenko @ 2012-07-22 12:45 UTC (permalink / raw
  To: gentoo-commits

commit:     8a0106a2475a0283e28c0425d79acaf332afc807
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Jul 22 12:44:34 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Jul 22 12:44:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8a0106a2

sci-physics/root-docs: version bump

---
 app-doc/root-docs/ChangeLog                        |    7 +++++++
 ...html.patch => root-docs-5.34.01-makehtml.patch} |    0
 ...t-docs-9999.ebuild => root-docs-5.34.01.ebuild} |    2 +-
 app-doc/root-docs/root-docs-9999.ebuild            |    2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 2f4b658..50977dd 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-docs-5.34.01 (22 Jul 2012)
+
+  22 Jul 2012; Andrew Savchenko <bircoph@gmail.com> +root-docs-5.34.01.ebuild,
+  +files/root-docs-5.34.01-makehtml.patch, root-docs-9999.ebuild,
+  -files/root-docs-9999-makehtml.patch:
+  Version bump.
+
   21 Jul 2012; Andrew Savchenko <bircoph@gmail.com>
   -files/root-docs-5.32-makehtml.patch, -files/root-docs-5.34-makehtml.patch,
   root-docs-9999.ebuild, +files/root-docs-9999-makehtml.patch:

diff --git a/app-doc/root-docs/files/root-docs-9999-makehtml.patch b/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch
similarity index 100%
rename from app-doc/root-docs/files/root-docs-9999-makehtml.patch
rename to app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch

diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-5.34.01.ebuild
similarity index 99%
copy from app-doc/root-docs/root-docs-9999.ebuild
copy to app-doc/root-docs/root-docs-5.34.01.ebuild
index 463a23b..27260c2 100644
--- a/app-doc/root-docs/root-docs-9999.ebuild
+++ b/app-doc/root-docs/root-docs-5.34.01.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 ROOT_PN="root"
-PATCH_PV="9999"
+PATCH_PV="5.34.01"
 
 if [[ ${PV} == "9999" ]] ; then
 	_SVN_DEP="dev-vcs/subversion"

diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
index 463a23b..27260c2 100644
--- a/app-doc/root-docs/root-docs-9999.ebuild
+++ b/app-doc/root-docs/root-docs-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 ROOT_PN="root"
-PATCH_PV="9999"
+PATCH_PV="5.34.01"
 
 if [[ ${PV} == "9999" ]] ; then
 	_SVN_DEP="dev-vcs/subversion"


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/
@ 2012-10-19 21:32 Andrew Savchenko
  0 siblings, 0 replies; 12+ messages in thread
From: Andrew Savchenko @ 2012-10-19 21:32 UTC (permalink / raw
  To: gentoo-commits

commit:     8916f014f94b74d4f0edfe14fcae12ced549bd9a
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Oct 19 21:32:19 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Oct 19 21:32:19 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8916f014

app-doc/root-docs: version bump

Version bump in 5.32 and 5.34 branches.

---
 app-doc/root-docs/ChangeLog                        |    7 ++
 .../root-docs/files/root-docs-5.32-makehtml.patch  |   44 +++++++++
 app-doc/root-docs/root-docs-5.32.04.ebuild         |   96 ++++++++++++++++++++
 app-doc/root-docs/root-docs-5.34.02.ebuild         |   96 ++++++++++++++++++++
 4 files changed, 243 insertions(+), 0 deletions(-)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 50977dd..e0d6641 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-docs-5.34.02 (19 Oct 2012)
+*root-docs-5.32.04 (19 Oct 2012)
+
+  19 Oct 2012; Andrew Savchenko <bircoph@gmail.com> +root-docs-5.32.04.ebuild,
+  +files/root-docs-5.32-makehtml.patch, +root-docs-5.34.02.ebuild:
+  Version bump for patch releases in 5.32 and 5.34 branches.
+
 *root-docs-5.34.01 (22 Jul 2012)
 
   22 Jul 2012; Andrew Savchenko <bircoph@gmail.com> +root-docs-5.34.01.ebuild,

diff --git a/app-doc/root-docs/files/root-docs-5.32-makehtml.patch b/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
new file mode 100644
index 0000000..5cad010
--- /dev/null
+++ b/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
@@ -0,0 +1,44 @@
+--- root/Makefile.orig	2012-05-23 21:07:07.000000000 +0400
++++ root/Makefile	2012-05-23 22:47:48.935680301 +0400
+@@ -1039,8 +1039,7 @@
+ releasenotes:
+ 	@$(MAKERELNOTES)
+ 
+-html: $(ROOTEXE) changelog releasenotes
+-	@$(MAKELOGHTML)
++html: compiledata releasenotes
+ 	@$(MAKEHTML)
+ 
+ # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
+--- root/build/unix/makehtml.sh.orig	2012-06-18 06:44:59.000000000 +0400
++++ root/build/unix/makehtml.sh	2012-06-18 19:39:41.262064654 +0400
+@@ -1,17 +1,17 @@
+ #! /bin/sh
+ 
+-ROOT=bin/root.exe
++ROOT=root.exe
+ 
+ dir=`pwd`
+ cd tutorials
+ # we need tutorials/hsimple.root
+ if [ ! -f hsimple.root ]; then
+-   $ROOT -l -b -q hsimple.C
++   $ROOT -l -b -q hsimple.C && exit 1
+ fi
+ cd tree
+ # we need tutorials/tree/cernstaff.root
+ if [ ! -f cernstaff.root ]; then
+-   $ROOT -l -b -q cernbuild.C
++   $ROOT -l -b -q cernbuild.C || exit 1
+ fi
+ cd $dir
+ 
+@@ -19,7 +19,7 @@
+ echo "Generating doc in directory htmldoc/..."
+ echo ""
+ 
+-$ROOT -l <<makedoc
++$ROOT -l <<makedoc || exit 1
+     THtml h;
+     h.LoadAllLibs();
+     h.MakeAll();

diff --git a/app-doc/root-docs/root-docs-5.32.04.ebuild b/app-doc/root-docs/root-docs-5.32.04.ebuild
new file mode 100644
index 0000000..65095a2
--- /dev/null
+++ b/app-doc/root-docs/root-docs-5.32.04.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 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.32.03.ebuild,v 1.4 2012/07/14 18:45:53 jdhore Exp $
+
+EAPI=4
+
+ROOT_PN="root"
+PATCH_PV="5.32"
+
+if [[ ${PV} == "9999" ]] ; then
+	_SVN_DEP="dev-vcs/subversion"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit eutils multilib toolchain-funcs virtualx
+
+DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
+HOMEPAGE="http://root.cern.ch/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE=""
+
+S="${WORKDIR}/${ROOT_PN}"
+VIRTUALX_REQUIRED="always"
+
+DEPEND="
+	~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
+	virtual/pkgconfig
+	${_SVN_DEP}"
+RDEPEND=""
+
+pkg_setup() {
+	# sandboxed user can't access video hardware, so xorg-x11 implementation
+	# should be used
+	GL_IMPLEM=$(eselect opengl show)
+	eselect opengl set xorg-x11
+}
+
+src_unpack() {
+	# can't use subversion eclass functions,
+	# we need to svn export the same root tree:
+	# 1) svn revisions for root and root-docs must be the same;
+	# 2) no need to abuse server twice.
+	if [[ ${PV} == "9999" ]] ; then
+		addpredict "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk/.svn"
+		svn export "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk" \
+			"${S}" || die "svn export failed"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
+}
+
+src_configure() {
+	# we need only to setup paths here, html docs doesn't depend on USE flags
+	./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-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
+		--with-afs-shared=yes \
+		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps
+}
+
+src_compile() {
+	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 "looks like html doc generation crashed"
+}
+
+src_install() {
+	dodir /usr/share/doc/${PF}
+	# too large data to copy
+	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
+}
+
+pkg_postinst() {
+	eselect opengl set ${GL_IMPLEM}
+}

diff --git a/app-doc/root-docs/root-docs-5.34.02.ebuild b/app-doc/root-docs/root-docs-5.34.02.ebuild
new file mode 100644
index 0000000..f873d30
--- /dev/null
+++ b/app-doc/root-docs/root-docs-5.34.02.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 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.01.ebuild,v 1.1 2012/07/22 20:34:45 bicatali Exp $
+
+EAPI=4
+
+ROOT_PN="root"
+PATCH_PV="5.34.01"
+
+if [[ ${PV} == "9999" ]] ; then
+	_SVN_DEP="dev-vcs/subversion"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit eutils multilib toolchain-funcs virtualx
+
+DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
+HOMEPAGE="http://root.cern.ch/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE=""
+
+S="${WORKDIR}/${ROOT_PN}"
+VIRTUALX_REQUIRED="always"
+
+DEPEND="
+	~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
+	virtual/pkgconfig
+	${_SVN_DEP}"
+RDEPEND=""
+
+pkg_setup() {
+	# sandboxed user can't access video hardware, so xorg-x11 implementation
+	# should be used
+	GL_IMPLEM=$(eselect opengl show)
+	eselect opengl set xorg-x11
+}
+
+src_unpack() {
+	# can't use subversion eclass functions,
+	# we need to svn export the same root tree:
+	# 1) svn revisions for root and root-docs must be the same;
+	# 2) no need to abuse server twice.
+	if [[ ${PV} == "9999" ]] ; then
+		addpredict "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk/.svn"
+		svn export "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk" \
+			"${S}" || die "svn export failed"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
+}
+
+src_configure() {
+	# we need only to setup paths here, html docs doesn't depend on USE flags
+	./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-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
+		--with-afs-shared=yes \
+		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps
+}
+
+src_compile() {
+	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 "looks like html doc generation crashed"
+}
+
+src_install() {
+	dodir /usr/share/doc/${PF}
+	# too large data to copy
+	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
+}
+
+pkg_postinst() {
+	eselect opengl set ${GL_IMPLEM}
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/
@ 2013-05-28 21:26 Andrew Savchenko
  0 siblings, 0 replies; 12+ messages in thread
From: Andrew Savchenko @ 2013-05-28 21:26 UTC (permalink / raw
  To: gentoo-commits

commit:     023bddbe83308ebcb8f0ba55cf9e18715bf466da
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue May 28 21:24:58 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue May 28 21:24:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=023bddbe

root-docs: fix sandbox access violation

See bug 471236. Addpredict is now used to catch possible HW device
access.

---
 app-doc/root-docs/ChangeLog                        |  7 ++++
 .../root-docs/files/root-docs-5.32-makehtml.patch  | 44 ----------------------
 ...ocs-5.34.05.ebuild => root-docs-5.34.07.ebuild} | 39 +++++--------------
 3 files changed, 16 insertions(+), 74 deletions(-)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 3ddaf4a..4d94231 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-docs-5.34.07 (28 May 2013)
+
+  28 May 2013; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.34.05.ebuild,
+  +root-docs-5.34.07.ebuild, -files/root-docs-5.32-makehtml.patch:
+  Fix sandbox violation on DRI systems: use addpredict instead of
+  switching to Xong GL interface. Remove old.
+
 *root-docs-5.34.05 (23 Feb 2013)
 
   23 Feb 2013; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.32.04.ebuild,

diff --git a/app-doc/root-docs/files/root-docs-5.32-makehtml.patch b/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
deleted file mode 100644
index 5cad010..0000000
--- a/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- root/Makefile.orig	2012-05-23 21:07:07.000000000 +0400
-+++ root/Makefile	2012-05-23 22:47:48.935680301 +0400
-@@ -1039,8 +1039,7 @@
- releasenotes:
- 	@$(MAKERELNOTES)
- 
--html: $(ROOTEXE) changelog releasenotes
--	@$(MAKELOGHTML)
-+html: compiledata releasenotes
- 	@$(MAKEHTML)
- 
- # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
---- root/build/unix/makehtml.sh.orig	2012-06-18 06:44:59.000000000 +0400
-+++ root/build/unix/makehtml.sh	2012-06-18 19:39:41.262064654 +0400
-@@ -1,17 +1,17 @@
- #! /bin/sh
- 
--ROOT=bin/root.exe
-+ROOT=root.exe
- 
- dir=`pwd`
- cd tutorials
- # we need tutorials/hsimple.root
- if [ ! -f hsimple.root ]; then
--   $ROOT -l -b -q hsimple.C
-+   $ROOT -l -b -q hsimple.C && exit 1
- fi
- cd tree
- # we need tutorials/tree/cernstaff.root
- if [ ! -f cernstaff.root ]; then
--   $ROOT -l -b -q cernbuild.C
-+   $ROOT -l -b -q cernbuild.C || exit 1
- fi
- cd $dir
- 
-@@ -19,7 +19,7 @@
- echo "Generating doc in directory htmldoc/..."
- echo ""
- 
--$ROOT -l <<makedoc
-+$ROOT -l <<makedoc || exit 1
-     THtml h;
-     h.LoadAllLibs();
-     h.MakeAll();

diff --git a/app-doc/root-docs/root-docs-5.34.05.ebuild b/app-doc/root-docs/root-docs-5.34.07.ebuild
similarity index 69%
rename from app-doc/root-docs/root-docs-5.34.05.ebuild
rename to app-doc/root-docs/root-docs-5.34.07.ebuild
index 3bab6fa..acf75e7 100644
--- a/app-doc/root-docs/root-docs-5.34.05.ebuild
+++ b/app-doc/root-docs/root-docs-5.34.07.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2013 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.03.ebuild,v 1.1 2012/10/26 15:39:53 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.07.ebuild,v 1.1 2013/05/23 23:50:00 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
 ROOT_PN="root"
 PATCH_PV="5.34.01"
 
 if [[ ${PV} == "9999" ]] ; then
-	_SVN_DEP="dev-vcs/subversion"
+	_GIT=git-2
 	SRC_URI=""
 	KEYWORDS=""
 else
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit eutils multilib toolchain-funcs virtualx
+inherit eutils multilib toolchain-funcs virtualx ${_GIT}
 
 DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
 HOMEPAGE="http://root.cern.ch/"
@@ -31,30 +31,9 @@ VIRTUALX_REQUIRED="always"
 DEPEND="
 	~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
 	virtual/pkgconfig
-	${_SVN_DEP}"
+	${_GIT_DEP}"
 RDEPEND=""
 
-pkg_setup() {
-	# sandboxed user can't access video hardware, so xorg-x11 implementation
-	# should be used
-	GL_IMPLEM=$(eselect opengl show)
-	eselect opengl set xorg-x11
-}
-
-src_unpack() {
-	# can't use subversion eclass functions,
-	# we need to svn export the same root tree:
-	# 1) svn revisions for root and root-docs must be the same;
-	# 2) no need to abuse server twice.
-	if [[ ${PV} == "9999" ]] ; then
-		addpredict "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk/.svn"
-		svn export "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk" \
-			"${S}" || die "svn export failed"
-	else
-		default
-	fi
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
 }
@@ -78,6 +57,10 @@ src_configure() {
 }
 
 src_compile() {
+	# 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;
@@ -91,7 +74,3 @@ src_install() {
 	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
 	docompress -x "${EPREFIX}/usr/share/doc/${PF}/"
 }
-
-pkg_postinst() {
-	eselect opengl set ${GL_IMPLEM}
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/
@ 2013-12-29  0:31 Justin Lecher
  0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2013-12-29  0:31 UTC (permalink / raw
  To: gentoo-commits

commit:     48e23a3ceee1b66aa123de66347e618de0585707
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 23:55:47 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 23:55:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=48e23a3c

More up to date verison in tree

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

---
 app-doc/root-docs/ChangeLog                        | 108 ---------------------
 .../files/root-docs-5.34.01-makehtml.patch         |  51 ----------
 app-doc/root-docs/metadata.xml                     |  14 ---
 app-doc/root-docs/root-docs-5.34.10.ebuild         |  77 ---------------
 app-doc/root-docs/root-docs-5.34.13.ebuild         |  77 ---------------
 app-doc/root-docs/root-docs-9999.ebuild            |  97 ------------------
 6 files changed, 424 deletions(-)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
deleted file mode 100644
index e7a3993..0000000
--- a/app-doc/root-docs/ChangeLog
+++ /dev/null
@@ -1,108 +0,0 @@
-# ChangeLog for app-doc/root-docs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*root-docs-5.34.13 (05 Dec 2013)
-
-  05 Dec 2013; Andrew Savchenko <bircoph@gmail.com> +root-docs-5.34.13.ebuild:
-  Version bump.
-
-  07 Oct 2013; Andrew Savchenko <bircoph@gmail.com> root-docs-5.34.10.ebuild:
-  Omit unneeded howto messages.
-
-*root-docs-5.34.10 (04 Oct 2013)
-
-  04 Oct 2013; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.34.09.ebuild,
-  +root-docs-5.34.10.ebuild:
-  Version bump per bug 486620. Remove old.
-
-*root-docs-5.34.09 (29 Jun 2013)
-
-  29 Jun 2013; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.34.08.ebuild,
-  +root-docs-5.34.09.ebuild:
-  Version bump.
-
-*root-docs-5.34.08 (08 Jun 2013)
-
-  08 Jun 2013; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.34.07.ebuild,
-  +root-docs-5.34.08.ebuild:
-  Version bump.
-
-*root-docs-5.34.07 (28 May 2013)
-
-  28 May 2013; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.34.05.ebuild,
-  +root-docs-5.34.07.ebuild, -files/root-docs-5.32-makehtml.patch:
-  Fix sandbox violation on DRI systems: use addpredict instead of
-  switching to Xong GL interface. Remove old.
-
-*root-docs-5.34.05 (23 Feb 2013)
-
-  23 Feb 2013; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.32.04.ebuild,
-  -root-docs-5.34.03.ebuild, +root-docs-5.34.05.ebuild, root-docs-9999.ebuild:
-  Version bump. Remove old. Do not compress files (mostly headers) as
-  this renders them unusable from html pages.
-
-*root-docs-5.34.03 (25 Oct 2012)
-
-  25 Oct 2012; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.34.02.ebuild,
-  +root-docs-5.34.03.ebuild:
-  Version bump.
-
-*root-docs-5.34.02 (19 Oct 2012)
-*root-docs-5.32.04 (19 Oct 2012)
-
-  19 Oct 2012; Andrew Savchenko <bircoph@gmail.com> +root-docs-5.32.04.ebuild,
-  +files/root-docs-5.32-makehtml.patch, +root-docs-5.34.02.ebuild:
-  Version bump for patch releases in 5.32 and 5.34 branches.
-
-*root-docs-5.34.01 (22 Jul 2012)
-
-  22 Jul 2012; Andrew Savchenko <bircoph@gmail.com> +root-docs-5.34.01.ebuild,
-  +files/root-docs-5.34.01-makehtml.patch, root-docs-9999.ebuild,
-  -files/root-docs-9999-makehtml.patch:
-  Version bump.
-
-  21 Jul 2012; Andrew Savchenko <bircoph@gmail.com>
-  -files/root-docs-5.32-makehtml.patch, -files/root-docs-5.34-makehtml.patch,
-  root-docs-9999.ebuild, +files/root-docs-9999-makehtml.patch:
-  Update patching for live ebuild. Remove old.
-
-  06 Jul 2012; Justin Lecher <jlec@gentoo.org> -root-docs-5.32.03.ebuild,
-  metadata.xml:
-  Dropped in tree version
-
-*root-docs-5.32.03 (20 Jun 2012)
-
-  20 Jun 2012; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.32.ebuild,
-  +root-docs-5.32.03.ebuild, +files/root-docs-5.32-makehtml.patch:
-  Backport htmldoc generation fixes for 5.32 branch.
-
-*root-docs-5.34.00 (19 Jun 2012)
-
-  19 Jun 2012; Andrew Savchenko <bircoph@gmail.com> +root-docs-5.34.00.ebuild:
-  Version bump based on live ebuild.
-
-*root-docs-9999 (19 Jun 2012)
-
-  19 Jun 2012; Andrew Savchenko <bircoph@gmail.com>
-  +files/root-docs-5.34-makehtml.patch, +root-docs-9999.ebuild:
-  htmldoc generation for root must be separated, because it is
-  supposed to be run only root was installed to the live
-  filesystem. It can't be faked easily in the sandbox environment,
-  because ROOTSYS is not respected when --prefix or --*dir are
-  used for configure script.
-
-*root-docs-5.32 (03 Dec 2011)
-
-  03 Dec 2011; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.30.ebuild,
-  +root-docs-5.32.ebuild:
-  Version bump.
-  Remove useless html/html32/ patch chunk, thus html files will be
-  installed directly into /usr/share/doc/${PF}/.
-
-*root-docs-5.30 (02 Aug 2011)
-
-  02 Aug 2011; Andrew Savchenko <bircoph@gmail.com> +root-docs-5.30.ebuild,
-  +metadata.xml:
-  Version bump.
-

diff --git a/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch b/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch
deleted file mode 100644
index b339226..0000000
--- a/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- root/Makefile.orig	2012-07-13 13:42:46.000000000 +0400
-+++ root/Makefile	2012-07-22 00:15:03.282994389 +0400
-@@ -1087,16 +1087,7 @@
- 
- ifeq ($(BUILDX11),yes)
- ifeq ($(BUILDASIMAGE),yes)
--html: rootexecs postbin changelog releasenotes
--ifneq ($(USECONFIG),FALSE)
--	@if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \
--	  || [ "`which root.exe`" -ot "bin/root.exe" ]; then \
--	  echo 'ERROR: root.exe has not been installed by this build.'; \
--	  echo '       Run "make install" before running "make html".'; \
--	  exit 1; \
--	fi
--endif
--	@$(MAKELOGHTML)
-+html: compiledata releasenotes
- 	@$(MAKEHTML)
- else
- html:
---- root/build/unix/makehtml.sh.orig	2012-06-28 11:33:36.000000000 +0400
-+++ root/build/unix/makehtml.sh	2012-07-22 00:18:58.705804436 +0400
-@@ -1,16 +1,16 @@
- #! /bin/sh
- 
- dir=`pwd`
--ROOT=$dir/bin/root
-+ROOT=root
- cd tutorials
- # we need tutorials/hsimple.root
- if [ ! -f hsimple.root ]; then
--   $ROOT -l -b -q hsimple.C
-+   $ROOT -l -b -q hsimple.C && exit 1
- fi
- cd tree
- # we need tutorials/tree/cernstaff.root
- if [ ! -f cernstaff.root ]; then
--   $ROOT -l -b -q cernbuild.C
-+   $ROOT -l -b -q cernbuild.C || exit 1
- fi
- cd $dir
- 
-@@ -20,7 +20,7 @@
- 
- # To generate the full documentation, we do need to
- # use the graphics engine, so do not use '-b'.
--$ROOT -l <<makedoc
-+$ROOT -l <<makedoc || exit 1
-     THtml h;
-     h.LoadAllLibs();
-     h.MakeAll();

diff --git a/app-doc/root-docs/metadata.xml b/app-doc/root-docs/metadata.xml
deleted file mode 100644
index 8d64e52..0000000
--- a/app-doc/root-docs/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-  <email>bircoph@gmail.com</email>
-  <name>Andrew Savchenko</name>
-  <description>Maintainer. Assign bugs to him</description>
-</maintainer>
-<herd>sci-physics</herd>
-<longdescription lang="en">
-  This package contains the automatically generated ROOT class
-  documentation.
-</longdescription>
-</pkgmetadata>

diff --git a/app-doc/root-docs/root-docs-5.34.10.ebuild b/app-doc/root-docs/root-docs-5.34.10.ebuild
deleted file mode 100644
index 3a039f1..0000000
--- a/app-doc/root-docs/root-docs-5.34.10.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 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.07.ebuild,v 1.1 2013/05/23 23:50:00 bicatali Exp $
-
-EAPI=5
-
-ROOT_PN="root"
-PATCH_PV="5.34.01"
-
-if [[ ${PV} == "9999" ]] ; then
-	_GIT=git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit eutils multilib toolchain-funcs virtualx ${_GIT}
-
-DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-S="${WORKDIR}/${ROOT_PN}"
-VIRTUALX_REQUIRED="always"
-
-DEPEND="
-	~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
-	virtual/pkgconfig
-	${_GIT_DEP}"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
-}
-
-src_configure() {
-	# we need only to setup paths here, html docs doesn't depend on USE flags
-	./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-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--with-afs-shared=yes \
-		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--nohowto
-}
-
-src_compile() {
-	# 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 "looks like html doc generation crashed"
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}
-	# too large data to copy
-	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
-	docompress -x "${EPREFIX}/usr/share/doc/${PF}/"
-}

diff --git a/app-doc/root-docs/root-docs-5.34.13.ebuild b/app-doc/root-docs/root-docs-5.34.13.ebuild
deleted file mode 100644
index 3a039f1..0000000
--- a/app-doc/root-docs/root-docs-5.34.13.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 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.07.ebuild,v 1.1 2013/05/23 23:50:00 bicatali Exp $
-
-EAPI=5
-
-ROOT_PN="root"
-PATCH_PV="5.34.01"
-
-if [[ ${PV} == "9999" ]] ; then
-	_GIT=git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit eutils multilib toolchain-funcs virtualx ${_GIT}
-
-DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-S="${WORKDIR}/${ROOT_PN}"
-VIRTUALX_REQUIRED="always"
-
-DEPEND="
-	~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
-	virtual/pkgconfig
-	${_GIT_DEP}"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
-}
-
-src_configure() {
-	# we need only to setup paths here, html docs doesn't depend on USE flags
-	./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-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--with-afs-shared=yes \
-		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--nohowto
-}
-
-src_compile() {
-	# 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 "looks like html doc generation crashed"
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}
-	# too large data to copy
-	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
-	docompress -x "${EPREFIX}/usr/share/doc/${PF}/"
-}

diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
deleted file mode 100644
index 8b170c6..0000000
--- a/app-doc/root-docs/root-docs-9999.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2013 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.00.ebuild,v 1.2 2012/06/27 17:31:12 bicatali Exp $
-
-EAPI=5
-
-ROOT_PN="root"
-PATCH_PV="5.34.01"
-
-if [[ ${PV} == "9999" ]] ; then
-	_SVN_DEP="dev-vcs/subversion"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit eutils multilib toolchain-funcs virtualx
-
-DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-S="${WORKDIR}/${ROOT_PN}"
-VIRTUALX_REQUIRED="always"
-
-DEPEND="
-	~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
-	virtual/pkgconfig
-	${_SVN_DEP}"
-RDEPEND=""
-
-pkg_setup() {
-	# sandboxed user can't access video hardware, so xorg-x11 implementation
-	# should be used
-	GL_IMPLEM=$(eselect opengl show)
-	eselect opengl set xorg-x11
-}
-
-src_unpack() {
-	# can't use subversion eclass functions,
-	# we need to svn export the same root tree:
-	# 1) svn revisions for root and root-docs must be the same;
-	# 2) no need to abuse server twice.
-	if [[ ${PV} == "9999" ]] ; then
-		addpredict "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk/.svn"
-		svn export "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk" \
-			"${S}" || die "svn export failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
-}
-
-src_configure() {
-	# we need only to setup paths here, html docs doesn't depend on USE flags
-	./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-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--with-afs-shared=yes \
-		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps
-}
-
-src_compile() {
-	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 "looks like html doc generation crashed"
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}
-	# too large data to copy
-	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
-	docompress -x "${EPREFIX}/usr/share/doc/${PF}/"
-}
-
-pkg_postinst() {
-	eselect opengl set ${GL_IMPLEM}
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/
@ 2014-07-02 13:35 Andrew Savchenko
  0 siblings, 0 replies; 12+ messages in thread
From: Andrew Savchenko @ 2014-07-02 13:35 UTC (permalink / raw
  To: gentoo-commits

commit:     e116f147917ffb7abb208aa05681f2d7f5a88620
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Jul  2 13:35:16 2014 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Jul  2 13:35:16 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e116f147

app-doc/root-docs: properly generate gif images

---
 app-doc/root-docs/ChangeLog                              | 12 ++++++++++++
 .../root-docs/files/root-docs-6.00.01-cernbuild.patch    | 16 ----------------
 app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch |  4 +---
 ...t-docs-6.00.01.ebuild => root-docs-6.00.01-r1.ebuild} |  3 +--
 app-doc/root-docs/root-docs-9999.ebuild                  |  2 +-
 5 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 0589d99..2ccae6d 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,18 @@
 # Copyright 1999-2014 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 $
 
+*root-docs-6.00.01-r1 (02 Jul 2014)
+
+  02 Jul 2014; Andrew Savchenko <bircoph@gmail.com> -root-docs-6.00.01.ebuild,
+  +root-docs-6.00.01-r1.ebuild, root-docs-9999.ebuild,
+  -files/root-docs-6.00.01-cernbuild.patch,
+  files/root-docs-6.00.01-makehtml.patch:
+  Remove unneeded cernbuild patch since
+  https://sft.its.cern.ch/jira/browse/ROOT-6421
+  is fixed in sci-physics/root now.
+  Also remove unneeded #include for library load from makehtml.sh
+  patch. Now docs seems to be equivalent to those on root.cern.ch
+
 *root-docs-6.00.01 (29 Jun 2014)
 
   29 Jun 2014; Andrew Savchenko <bircoph@gmail.com> +root-docs-6.00.01.ebuild,

diff --git a/app-doc/root-docs/files/root-docs-6.00.01-cernbuild.patch b/app-doc/root-docs/files/root-docs-6.00.01-cernbuild.patch
deleted file mode 100644
index b155795..0000000
--- a/app-doc/root-docs/files/root-docs-6.00.01-cernbuild.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tutorials/tree/cernbuild.C b/tutorials/tree/cernbuild.C
-index ba516b6..793ecb5 100644
---- a/tutorials/tree/cernbuild.C
-+++ b/tutorials/tree/cernbuild.C
-@@ -2,6 +2,11 @@
- // see also a variant in staff.C
- // Author: Rene Brun
-    
-+#include "TFile.h"
-+#include "TSystem.h"
-+#include "TString.h"
-+#include "TTree.h"
-+
- TFile *cernbuild(Int_t get=0, Int_t print=1) {
- 
-    Int_t           Category;

diff --git a/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch b/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch
index 8ad9b88..6134686 100644
--- a/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch
+++ b/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch
@@ -44,14 +44,12 @@ index a94e790..8b4589d 100755
  fi
  cd $dir
  
-@@ -20,7 +20,9 @@ echo ""
+@@ -20,7 +20,7 @@ echo ""
  
  # To generate the full documentation, we do need to
  # use the graphics engine, so do not use '-b'.
 -$ROOT -n -l <<makedoc
 +$ROOT -n -l <<makedoc || exit 1
-+    #include "THtml.h"
-+    gSystem->Load("libHtml");
      THtml h;
      h.LoadAllLibs();
      h.MakeAll();

diff --git a/app-doc/root-docs/root-docs-6.00.01.ebuild b/app-doc/root-docs/root-docs-6.00.01-r1.ebuild
similarity index 97%
rename from app-doc/root-docs/root-docs-6.00.01.ebuild
rename to app-doc/root-docs/root-docs-6.00.01-r1.ebuild
index bb17e86..a0cb7b2 100644
--- a/app-doc/root-docs/root-docs-6.00.01.ebuild
+++ b/app-doc/root-docs/root-docs-6.00.01-r1.ebuild
@@ -61,8 +61,7 @@ src_unpack() {
 
 src_prepare() {
 	use api && epatch \
-		"${FILESDIR}/${PN}-6.00.01-makehtml.patch" \
-		"${FILESDIR}/${PN}-6.00.01-cernbuild.patch"
+		"${FILESDIR}/${PN}-6.00.01-makehtml.patch"
 	# prefixify the configure script
 	sed -i \
 		-e "s:/usr:${EPREFIX}/usr:g" \

diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
index 32ba358..0ee27bf 120000
--- a/app-doc/root-docs/root-docs-9999.ebuild
+++ b/app-doc/root-docs/root-docs-9999.ebuild
@@ -1 +1 @@
-root-docs-6.00.01.ebuild
\ No newline at end of file
+root-docs-6.00.01-r1.ebuild
\ No newline at end of file


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/
@ 2014-07-06 12:53 Andrew Savchenko
  0 siblings, 0 replies; 12+ messages in thread
From: Andrew Savchenko @ 2014-07-06 12:53 UTC (permalink / raw
  To: gentoo-commits

commit:     c5804b106c05ee0cd43f3665261c630b17f4ac5a
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Jul  6 12:51:41 2014 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Jul  6 12:51:41 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c5804b10

app-doc/root-docs: backport fixes from ROOT-6 branch

---
 app-doc/root-docs/ChangeLog                        |   6 +
 .../files/root-docs-5.34.01-makehtml.patch         |  51 ++++++++
 app-doc/root-docs/root-docs-5.34.18-r2.ebuild      | 132 +++++++++++++++++++++
 3 files changed, 189 insertions(+)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 56ea0fc..ca2ea86 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 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 $
 
+*root-docs-5.34.18-r2 (06 Jul 2014)
+
+  06 Jul 2014; Andrew Savchenko <bircoph@gmail.com>
+  +root-docs-5.34.18-r2.ebuild, +files/root-docs-5.34.01-makehtml.patch:
+  Backport PDFs generation and html fixes from ROOT-6 branch.
+
 *root-docs-6.00.02 (05 Jul 2014)
 
   05 Jul 2014; Andrew Savchenko <bircoph@gmail.com>

diff --git a/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch b/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch
new file mode 100644
index 0000000..b339226
--- /dev/null
+++ b/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch
@@ -0,0 +1,51 @@
+--- root/Makefile.orig	2012-07-13 13:42:46.000000000 +0400
++++ root/Makefile	2012-07-22 00:15:03.282994389 +0400
+@@ -1087,16 +1087,7 @@
+ 
+ ifeq ($(BUILDX11),yes)
+ ifeq ($(BUILDASIMAGE),yes)
+-html: rootexecs postbin changelog releasenotes
+-ifneq ($(USECONFIG),FALSE)
+-	@if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \
+-	  || [ "`which root.exe`" -ot "bin/root.exe" ]; then \
+-	  echo 'ERROR: root.exe has not been installed by this build.'; \
+-	  echo '       Run "make install" before running "make html".'; \
+-	  exit 1; \
+-	fi
+-endif
+-	@$(MAKELOGHTML)
++html: compiledata releasenotes
+ 	@$(MAKEHTML)
+ else
+ html:
+--- root/build/unix/makehtml.sh.orig	2012-06-28 11:33:36.000000000 +0400
++++ root/build/unix/makehtml.sh	2012-07-22 00:18:58.705804436 +0400
+@@ -1,16 +1,16 @@
+ #! /bin/sh
+ 
+ dir=`pwd`
+-ROOT=$dir/bin/root
++ROOT=root
+ cd tutorials
+ # we need tutorials/hsimple.root
+ if [ ! -f hsimple.root ]; then
+-   $ROOT -l -b -q hsimple.C
++   $ROOT -l -b -q hsimple.C && exit 1
+ fi
+ cd tree
+ # we need tutorials/tree/cernstaff.root
+ if [ ! -f cernstaff.root ]; then
+-   $ROOT -l -b -q cernbuild.C
++   $ROOT -l -b -q cernbuild.C || exit 1
+ fi
+ cd $dir
+ 
+@@ -20,7 +20,7 @@
+ 
+ # To generate the full documentation, we do need to
+ # use the graphics engine, so do not use '-b'.
+-$ROOT -l <<makedoc
++$ROOT -l <<makedoc || exit 1
+     THtml h;
+     h.LoadAllLibs();
+     h.MakeAll();

diff --git a/app-doc/root-docs/root-docs-5.34.18-r2.ebuild b/app-doc/root-docs/root-docs-5.34.18-r2.ebuild
new file mode 100644
index 0000000..ac00ef2
--- /dev/null
+++ b/app-doc/root-docs/root-docs-5.34.18-r2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2014 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.18-r1.ebuild,v 1.2 2014/03/28 18:48:01 bicatali 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/default/files/images/root6-banner.jpg
+		${HOMEPAGE}/sites/all/themes/newsflash/images/info.png )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="api +math +metric"
+
+VIRTUALX_REQUIRED="api"
+
+DEPEND="
+	~sci-physics/root-${PV}[X,graphviz,opengl]
+	app-text/pandoc
+	app-text/texlive
+	dev-haskell/pandoc-citeproc[bibutils]
+	media-fonts/dejavu
+	virtual/pkgconfig"
+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}-5.34.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}/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 )
+
+	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/tableDescriptor_st.html ]] || die "html doc generation crashed"
+	fi
+}
+
+src_install() {
+	insinto "${DOC_DIR}"
+
+	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
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/
@ 2015-02-23 17:55 Andrew Savchenko
  0 siblings, 0 replies; 12+ messages in thread
From: Andrew Savchenko @ 2015-02-23 17:55 UTC (permalink / raw
  To: gentoo-commits

commit:     47eb57b44f9222eb4b7e4c45a4418038014bb731
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Mon Feb 23 17:55:21 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Mon Feb 23 17:55:21 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=47eb57b4

app-doc/root-docs: remove old

---
 app-doc/root-docs/ChangeLog                        |   5 +
 .../files/root-docs-5.34.01-makehtml.patch         |  51 --------
 app-doc/root-docs/root-docs-5.34.18-r2.ebuild      | 132 --------------------
 app-doc/root-docs/root-docs-6.00.01-r1.ebuild      | 133 --------------------
 app-doc/root-docs/root-docs-6.00.02.ebuild         | 134 ++++++++++++++++++++-
 app-doc/root-docs/root-docs-9999.ebuild            |   2 +-
 6 files changed, 139 insertions(+), 318 deletions(-)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 9c3acec..75e0c62 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,11 @@
 # 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 $
 
+  23 Feb 2015; Andrew Savchenko <bircoph@gentoo.org>
+  -root-docs-5.34.18-r2.ebuild, -root-docs-6.00.01-r1.ebuild,
+  root-docs-9999.ebuild, -files/root-docs-5.34.01-makehtml.patch:
+  Remove old versions.
+
 *root-docs-5.34.26 (23 Feb 2015)
 
   23 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> +root-docs-5.34.26.ebuild:

diff --git a/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch b/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch
deleted file mode 100644
index b339226..0000000
--- a/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- root/Makefile.orig	2012-07-13 13:42:46.000000000 +0400
-+++ root/Makefile	2012-07-22 00:15:03.282994389 +0400
-@@ -1087,16 +1087,7 @@
- 
- ifeq ($(BUILDX11),yes)
- ifeq ($(BUILDASIMAGE),yes)
--html: rootexecs postbin changelog releasenotes
--ifneq ($(USECONFIG),FALSE)
--	@if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \
--	  || [ "`which root.exe`" -ot "bin/root.exe" ]; then \
--	  echo 'ERROR: root.exe has not been installed by this build.'; \
--	  echo '       Run "make install" before running "make html".'; \
--	  exit 1; \
--	fi
--endif
--	@$(MAKELOGHTML)
-+html: compiledata releasenotes
- 	@$(MAKEHTML)
- else
- html:
---- root/build/unix/makehtml.sh.orig	2012-06-28 11:33:36.000000000 +0400
-+++ root/build/unix/makehtml.sh	2012-07-22 00:18:58.705804436 +0400
-@@ -1,16 +1,16 @@
- #! /bin/sh
- 
- dir=`pwd`
--ROOT=$dir/bin/root
-+ROOT=root
- cd tutorials
- # we need tutorials/hsimple.root
- if [ ! -f hsimple.root ]; then
--   $ROOT -l -b -q hsimple.C
-+   $ROOT -l -b -q hsimple.C && exit 1
- fi
- cd tree
- # we need tutorials/tree/cernstaff.root
- if [ ! -f cernstaff.root ]; then
--   $ROOT -l -b -q cernbuild.C
-+   $ROOT -l -b -q cernbuild.C || exit 1
- fi
- cd $dir
- 
-@@ -20,7 +20,7 @@
- 
- # To generate the full documentation, we do need to
- # use the graphics engine, so do not use '-b'.
--$ROOT -l <<makedoc
-+$ROOT -l <<makedoc || exit 1
-     THtml h;
-     h.LoadAllLibs();
-     h.MakeAll();

diff --git a/app-doc/root-docs/root-docs-5.34.18-r2.ebuild b/app-doc/root-docs/root-docs-5.34.18-r2.ebuild
deleted file mode 100644
index ac00ef2..0000000
--- a/app-doc/root-docs/root-docs-5.34.18-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2014 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.18-r1.ebuild,v 1.2 2014/03/28 18:48:01 bicatali 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/default/files/images/root6-banner.jpg
-		${HOMEPAGE}/sites/all/themes/newsflash/images/info.png )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="api +math +metric"
-
-VIRTUALX_REQUIRED="api"
-
-DEPEND="
-	~sci-physics/root-${PV}[X,graphviz,opengl]
-	app-text/pandoc
-	app-text/texlive
-	dev-haskell/pandoc-citeproc[bibutils]
-	media-fonts/dejavu
-	virtual/pkgconfig"
-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}-5.34.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}/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 )
-
-	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/tableDescriptor_st.html ]] || die "html doc generation crashed"
-	fi
-}
-
-src_install() {
-	insinto "${DOC_DIR}"
-
-	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-6.00.01-r1.ebuild b/app-doc/root-docs/root-docs-6.00.01-r1.ebuild
deleted file mode 100644
index 096e0fe..0000000
--- a/app-doc/root-docs/root-docs-6.00.01-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2014 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.18-r1.ebuild,v 1.2 2014/03/28 18:48:01 bicatali 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/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="
-	~sci-physics/root-${PV}[X,graphviz,opengl]
-	app-text/pandoc
-	app-text/texlive
-	dev-haskell/pandoc-citeproc[bibutils]
-	media-fonts/dejavu
-	virtual/pkgconfig"
-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}/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 )
-
-	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/tableDescriptor_st.html ]] || die "html doc generation crashed"
-	fi
-}
-
-src_install() {
-	insinto "${DOC_DIR}"
-
-	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-6.00.02.ebuild b/app-doc/root-docs/root-docs-6.00.02.ebuild
deleted file mode 120000
index 0ee27bf..0000000
--- a/app-doc/root-docs/root-docs-6.00.02.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-root-docs-6.00.01-r1.ebuild
\ No newline at end of file

diff --git a/app-doc/root-docs/root-docs-6.00.02.ebuild b/app-doc/root-docs/root-docs-6.00.02.ebuild
new file mode 100644
index 0000000..096e0fe
--- /dev/null
+++ b/app-doc/root-docs/root-docs-6.00.02.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2014 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.18-r1.ebuild,v 1.2 2014/03/28 18:48:01 bicatali 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/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="
+	~sci-physics/root-${PV}[X,graphviz,opengl]
+	app-text/pandoc
+	app-text/texlive
+	dev-haskell/pandoc-citeproc[bibutils]
+	media-fonts/dejavu
+	virtual/pkgconfig"
+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}/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 )
+
+	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/tableDescriptor_st.html ]] || die "html doc generation crashed"
+	fi
+}
+
+src_install() {
+	insinto "${DOC_DIR}"
+
+	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
index 0ee27bf..3c99658 120000
--- a/app-doc/root-docs/root-docs-9999.ebuild
+++ b/app-doc/root-docs/root-docs-9999.ebuild
@@ -1 +1 @@
-root-docs-6.00.01-r1.ebuild
\ No newline at end of file
+root-docs-6.00.02.ebuild
\ No newline at end of file


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/
@ 2015-07-17  9:43 Andrew Savchenko
  0 siblings, 0 replies; 12+ messages in thread
From: Andrew Savchenko @ 2015-07-17  9:43 UTC (permalink / raw
  To: gentoo-commits

commit:     a32a491976fa16aaadc263e8925c92e3c767618f
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Jul 17 09:42:45 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Fri Jul 17 09:42:45 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a32a4919

app-doc/root-docs: version bump

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

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 9a184fc..71e1af1 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,12 @@
 # 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 $
 
+*root-docs-5.34.32 (17 Jul 2015)
+
+  17 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> +root-docs-5.34.32.ebuild,
+  +files/root-docs-6.00.01-fillpatterns.patch:
+  Version bump. Added for testing.
+
   12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -root-docs-6.02.05.ebuild:
   6.02.05 is in the portage tree now
 

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
new file mode 100644
index 0000000..e48a4f7
--- /dev/null
+++ b/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 0000000..50bf04b
--- /dev/null
+++ b/app-doc/root-docs/root-docs-5.34.32.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.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
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/
@ 2016-02-22 13:25 Justin Lecher
  0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2016-02-22 13:25 UTC (permalink / raw
  To: gentoo-commits

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" \


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2016-02-22 13:26 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-02 13:35 [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/ Andrew Savchenko
  -- strict thread matches above, loose matches on Subject: below --
2016-02-22 13:25 Justin Lecher
2015-07-17  9:43 Andrew Savchenko
2015-02-23 17:55 Andrew Savchenko
2014-07-06 12:53 Andrew Savchenko
2013-12-29  0:31 Justin Lecher
2013-05-28 21:26 Andrew Savchenko
2012-10-19 21:32 Andrew Savchenko
2012-07-22 12:45 Andrew Savchenko
2012-07-21 22:43 Andrew Savchenko
2012-06-20  9:18 Andrew Savchenko
2012-06-19 20:20 Andrew Savchenko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox