From 65e298dccdf0624be6215913d1bbaf799c514eaf Mon Sep 17 00:00:00 2001
From: Sebastien Fabbro <bicatali@gentoo.org>
Date: Sun, 22 Jul 2012 20:34:45 +0000
Subject: imported from science overlay

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
---
 app-doc/root-docs/ChangeLog                        |  9 +-
 .../files/root-docs-5.34.01-makehtml.patch         | 51 ++++++++++++
 app-doc/root-docs/root-docs-5.34.00.ebuild         | 96 ----------------------
 app-doc/root-docs/root-docs-5.34.01.ebuild         | 96 ++++++++++++++++++++++
 4 files changed, 155 insertions(+), 97 deletions(-)
 create mode 100644 app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch
 delete mode 100644 app-doc/root-docs/root-docs-5.34.00.ebuild
 create mode 100644 app-doc/root-docs/root-docs-5.34.01.ebuild

(limited to 'app-doc')

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 045765968a36..911cfdbbcaaa 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -1,7 +1,14 @@
 # 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.24 2012/07/15 09:36:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/ChangeLog,v 1.25 2012/07/22 20:34:45 bicatali Exp $
 
+*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.
+	
   15 Jul 2012; Justin Lecher <jlec@gentoo.org> -root-docs-5.26.00.ebuild,
   -root-docs-5.28-r1.ebuild:
   Cleaned old
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 000000000000..b339226c83d1
--- /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.00.ebuild b/app-doc/root-docs/root-docs-5.34.00.ebuild
deleted file mode 100644
index ca27548511ad..000000000000
--- a/app-doc/root-docs/root-docs-5.34.00.ebuild
+++ /dev/null
@@ -1,96 +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.34.00.ebuild,v 1.2 2012/06/27 17:31:12 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 ~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.01.ebuild b/app-doc/root-docs/root-docs-5.34.01.ebuild
new file mode 100644
index 000000000000..f873d30b25a2
--- /dev/null
+++ b/app-doc/root-docs/root-docs-5.34.01.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}
+}
-- 
cgit v1.2.3-65-gdbad