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

[Andrew Savchenko]

commit:     e7052ace633654653bad2b85c3830e452e30c37a
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Dec  5 17:08:07 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Dec  5 17:08:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e7052ace

app-doc/root-docs: version bump

---
 app-doc/root-docs/ChangeLog                        |  5 +++
 ...t-docs-9999.ebuild => root-docs-5.34.13.ebuild} | 42 ++++++----------------
 app-doc/root-docs/root-docs-9999.ebuild            |  2 +-
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 3dbc631..e7a3993 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,11 @@
 # 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@×××××.com> +root-docs-5.34.13.ebuild:
+  Version bump.
+
   07 Oct 2013; Andrew Savchenko <bircoph@×××××.com> root-docs-5.34.10.ebuild:
   Omit unneeded howto messages.
 

diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-5.34.13.ebuild
similarity index 67%
copy from app-doc/root-docs/root-docs-9999.ebuild
copy to app-doc/root-docs/root-docs-5.34.13.ebuild
index 4763153..3a039f1 100644
--- a/app-doc/root-docs/root-docs-9999.ebuild
+++ b/app-doc/root-docs/root-docs-5.34.13.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.00.ebuild,v 1.2 2012/06/27 17:31:12 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
 }
@@ -74,10 +53,15 @@ src_configure() {
 		--with-ld=$(tc-getCXX) \
 		--with-afs-shared=yes \
 		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps
+		--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;
@@ -91,7 +75,3 @@ src_install() {
 	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
 	docompress -x "${EPREFIX}/usr/share/doc/${PF}/"
 }
-
-pkg_postinst() {
-	eselect opengl set ${GL_IMPLEM}
-}

diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
index 4763153..8b170c6 100644
--- a/app-doc/root-docs/root-docs-9999.ebuild
+++ b/app-doc/root-docs/root-docs-9999.ebuild
@@ -2,7 +2,7 @@
 # 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
+EAPI=5
 
 ROOT_PN="root"
 PATCH_PV="5.34.01"