import to the main tree. keyword ~amd64-linux and ~x86-linux. cleaning

(Portage version: 2.2.01.20430-prefix/cvs/Linux x86_64)

7 files changed, 341 insertions, 27 deletions

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 852777306a81..952b9ff27eb4 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -1,11 +1,52 @@
 # ChangeLog for app-doc/root-docs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/ChangeLog,v 1.18 2012/03/13 17:15:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/ChangeLog,v 1.19 2012/06/27 17:30:22 bicatali Exp $
+
+  27 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org> -root-docs-5.32.ebuild,
+  +root-docs-5.32.03.ebuild, +files/root-docs-5.32-makehtml.patch,
+  +root-docs-5.34.00.ebuild, +files/root-docs-5.34-makehtml.patch,
+  metadata.xml:
+  import to the main tree. keyword ~amd64-linux and ~x86-linux. cleaning
+
+*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 (13 Mar 2012)
 
   13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> +root-docs-5.32.ebuild:
-  Version bump
+  Import to the main tree.
+
+*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.
 
 *root-docs-5.28-r1 (17 May 2011)
 
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 000000000000..5cad0102a4fa
--- /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/files/root-docs-5.34-makehtml.patch b/app-doc/root-docs/files/root-docs-5.34-makehtml.patch
new file mode 100644
index 000000000000..57fb69b37b4a
--- /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/metadata.xml b/app-doc/root-docs/metadata.xml
index 131ee598cb70..8d64e524d20f 100644
--- a/app-doc/root-docs/metadata.xml
+++ b/app-doc/root-docs/metadata.xml
@@ -1,5 +1,14 @@
 <?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.32.03.ebuild b/app-doc/root-docs/root-docs-5.32.03.ebuild
new file mode 100644
index 000000000000..c63aef3ba5aa
--- /dev/null
+++ b/app-doc/root-docs/root-docs-5.32.03.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.32.03.ebuild,v 1.1 2012/06/27 17:30:22 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 ~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]
+	>=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() {
+	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.32.ebuild b/app-doc/root-docs/root-docs-5.32.ebuild
deleted file mode 100644
index 9be24d0fd0b8..000000000000
--- a/app-doc/root-docs/root-docs-5.32.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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.ebuild,v 1.1 2012/03/13 17:15:19 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}/
-}
diff --git a/app-doc/root-docs/root-docs-5.34.00.ebuild b/app-doc/root-docs/root-docs-5.34.00.ebuild
new file mode 100644
index 000000000000..ec6d87aeff92
--- /dev/null
+++ b/app-doc/root-docs/root-docs-5.34.00.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.00.ebuild,v 1.1 2012/06/27 17:30:22 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=""
+
+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}
+}