aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gmail.com>2012-06-20 13:18:18 +0400
committerAndrew Savchenko <bircoph@gmail.com>2012-06-20 13:18:18 +0400
commitee25d872f9e2ae3536f41227353bb3235a1d3647 (patch)
tree7feeab2d578aa97e3875fb7cd65c6f179cfd8dfd /app-doc
parentsci-physics/root: backport htmldoc fixes to 5.32 branch (diff)
downloadsci-ee25d872f9e2ae3536f41227353bb3235a1d3647.tar.gz
sci-ee25d872f9e2ae3536f41227353bb3235a1d3647.tar.bz2
sci-ee25d872f9e2ae3536f41227353bb3235a1d3647.zip
app-doc/root-docs: backport htmldoc generation fixes
Diffstat (limited to 'app-doc')
-rw-r--r--app-doc/root-docs/ChangeLog6
-rw-r--r--app-doc/root-docs/Manifest7
-rw-r--r--app-doc/root-docs/files/root-docs-5.32-makehtml.patch44
-rw-r--r--app-doc/root-docs/root-docs-5.32.03.ebuild98
-rw-r--r--app-doc/root-docs/root-docs-5.32.ebuild25
5 files changed, 152 insertions, 28 deletions
diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 482b97812..aec7424f8 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/Manifest b/app-doc/root-docs/Manifest
index e61632012..fe27625f3 100644
--- a/app-doc/root-docs/Manifest
+++ b/app-doc/root-docs/Manifest
@@ -1,8 +1,9 @@
+AUX root-docs-5.32-makehtml.patch 1074 RMD160 66a5184f36aec74b3f04f93ec3d7790eb221f25a SHA1 c4c760be51f90995b5a859b582fd62ab5fa7cee3 SHA256 cc5fc9fb780357c50137bbf1adb1630688abd288f3d337c06b154709e581a8de
AUX root-docs-5.34-makehtml.patch 1389 RMD160 ab7affbe7b525bdfa7822784e6aa8619604417c8 SHA1 3cd6f5fd9495c75e0b24dc008d94072943f68e2c SHA256 dc0395adc808432506d4c18fdd56bf20e2e51a414c6cf4345d45e657889763e1
-DIST html532.tar.gz 868144440 RMD160 6de2c739cc7c56923338d34547d19258ccae13db SHA1 d2ca8298ca85067bac28609432c020e53168478b SHA256 9797ffc762acbe121a1be903a03de08b9e2254f7cae673cd9bf59664c6135108
+DIST root_v5.32.03.source.tar.gz 55529362 RMD160 90ee828638f322c169875135b51231810dada383 SHA1 cc1125660073918d0f47e209a069be2b9e849dc3 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6
DIST root_v5.34.00.source.tar.gz 56214534 RMD160 6089493c70f94a1c4edd87ebe79adb9f3570f903 SHA1 e7c8352d92be8510b36001efb020f3eb0bf22ed1 SHA256 808e04876dbc9cfbfea54ee11ba35e90382e8ff4219dbdbe2d2236a9dadf7df1
-EBUILD root-docs-5.32.ebuild 647 RMD160 13ec32169f61265338ec6bd3cd9565c2d2120091 SHA1 550dcc4862605d04abc14cf90ecb1009f63b3a60 SHA256 2cb28751e7f28be261f635b9805996c56ef7f3faf0d65571497ab5239404689f
+EBUILD root-docs-5.32.03.ebuild 2751 RMD160 853b557e921d364f57fd0d7f6f11e323482413df SHA1 73caca1f03bf5be034d15a4e8d7b578afda262c1 SHA256 b508d9fb60407b0df12fc7d3fc9be933fb895a79d3e59cf6a46132351157b010
EBUILD root-docs-5.34.00.ebuild 2689 RMD160 a34459ccd2002b0a7ede2c07e01205bb842d255a SHA1 9123d6916390beda5207eb582d994c4c72646d6c SHA256 8db4b13106fc81e618776d19b8f7bce306ade63ac86881b994f67984c0a26b62
EBUILD root-docs-9999.ebuild 2689 RMD160 a34459ccd2002b0a7ede2c07e01205bb842d255a SHA1 9123d6916390beda5207eb582d994c4c72646d6c SHA256 8db4b13106fc81e618776d19b8f7bce306ade63ac86881b994f67984c0a26b62
-MISC ChangeLog 1103 RMD160 182066e02451a7f2dee8ca72792088ae6737b79f SHA1 89019e2172e4c23b7082d6128fd020878a2e3bf2 SHA256 d236901f3bfdf389d0d9cff740ff90f42e66b5ded895217e45bf609e856a5bae
+MISC ChangeLog 1334 RMD160 82a11846c16c1e6d796b9edbc1d8668a1a9f0927 SHA1 982e2da4714fe70292f6c14a29c7af4e284a44e9 SHA256 04935384ea3738bc649adc33b1472bf18c2da5000f886846c0fc05c8bb6d25af
MISC metadata.xml 164 RMD160 6e4c63a6f70f174f40277eed39ac05fba4a49566 SHA1 e1af6f2028e69dee3c76e7e85353a144c83d3383 SHA256 9eddaccbdd2f6b3f93213d72782f07518dff1625fd8d63faf61dc97bd328b5e7
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 000000000..5cad0102a
--- /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 000000000..567cbb1cd
--- /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 5b9d543a4..000000000
--- 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}/
-}