[gentoo-commits] proj/sci:master commit in: sci-physics/root/, sci-physics/root/files/

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

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2014-09-29 13:13 Justin Lecher
  0 siblings, 0 replies; 10+ messages in thread
From: Justin Lecher @ 2014-09-29 13:13 UTC (permalink / raw
  To: gentoo-commits

commit:     df5e38cf351735f4822dd8706a8739368269bf6b
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 29 13:12:24 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 29 13:12:24 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=df5e38cf

sci-physics/root: Backport fix for build failure

Package-Manager: portage-2.2.14_rc1

---
 sci-physics/root/ChangeLog                        |  4 +++
 sci-physics/root/files/root-6.00.02-tm_zone.patch | 22 +++++++++++++
 sci-physics/root/metadata.xml                     | 38 +++++++++++------------
 sci-physics/root/root-6.00.02.ebuild              |  3 +-
 4 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index e2b9be7..9b455b6 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  29 Sep 2014; Justin Lecher <jlec@gentoo.org> root-6.00.02.ebuild,
+  +files/root-6.00.02-tm_zone.patch, metadata.xml:
+  Backport fix for build failure
+
 *root-5.34.18-r2 (06 Jul 2014)
 
   06 Jul 2014; Andrew Savchenko <bircoph@gmail.com> +root-5.34.18-r2.ebuild,

diff --git a/sci-physics/root/files/root-6.00.02-tm_zone.patch b/sci-physics/root/files/root-6.00.02-tm_zone.patch
new file mode 100644
index 0000000..cdd1b13
--- /dev/null
+++ b/sci-physics/root/files/root-6.00.02-tm_zone.patch
@@ -0,0 +1,22 @@
+From 08b08412bafc24fa635b0fdb832097a3aa2fa1d2 Mon Sep 17 00:00:00 2001
+From: Pere Mato <pere.mato@cern.ch>
+Date: Sun, 21 Sep 2014 19:27:30 +0200
+Subject: [PATCH] Fix for ROOT-6728 - Compilation error in TTimeStamp
+
+---
+ core/base/src/TTimeStamp.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/base/src/TTimeStamp.cxx b/core/base/src/TTimeStamp.cxx
+index 8709220..f0ff12d 100644
+--- a/core/base/src/TTimeStamp.cxx
++++ b/core/base/src/TTimeStamp.cxx
+@@ -813,7 +813,7 @@ void TTimeStamp::DumpTMStruct(const tm_t &tmstruct)
+           tmstruct.tm_isdst);
+ #if (defined(linux) && !defined(R__WINGCC)) || defined(R__MACOSX)
+    printf(",\n      tm_gmtoff %6ld, tm_zone \"%s\"",
+-#if defined(__USE_BSD) || defined(R__MACOSX)
++#if defined(__USE_BSD) || defined(R__MACOSX) || defined(__USE_MISC)
+    tmstruct.tm_gmtoff, tmstruct.tm_zone);
+ #else
+    tmstruct.__tm_gmtoff, tmstruct.__tm_zone);

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 622d99a..abe803e 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,14 +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>
-<herd>proxy-maintainers</herd>
-<longdescription lang="en">
+  <maintainer>
+    <email>bircoph@gmail.com</email>
+    <name>Andrew Savchenko</name>
+    <description>Maintainer. Assign bugs to him</description>
+  </maintainer>
+  <herd>sci-physics</herd>
+  <herd>proxy-maintainers</herd>
+  <longdescription lang="en">
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in
   high energy physics, but also in other data analysis applications. It
@@ -16,15 +16,15 @@
   statistics, serialization, optimization, linear algebra, graphics,
   GUI toolkit, and a complete visualization framework.
 </longdescription>
-<use>
-  <flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
-  <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-  <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
-  <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
-  <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-  <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
-  <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
-  <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
-  <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
-</use>
+  <use>
+    <flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
+    <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+    <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
+    <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
+    <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+    <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
+    <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+    <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
+    <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
+  </use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-6.00.02.ebuild b/sci-physics/root/root-6.00.02.ebuild
index 01d4eda..5208cc9 100644
--- a/sci-physics/root/root-6.00.02.ebuild
+++ b/sci-physics/root/root-6.00.02.ebuild
@@ -201,7 +201,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-6.00.01-prop-flags.patch \
 		"${FILESDIR}"/${PN}-6.00.01-llvm.patch \
 		"${FILESDIR}"/${PN}-6.00.01-geocad.patch \
-		"${FILESDIR}"/${PN}-6.00.01-tutorials-path.patch
+		"${FILESDIR}"/${PN}-6.00.01-tutorials-path.patch \
+		"${FILESDIR}"/${PN}-6.00.02-tm_zone.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die


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

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

commit:     521d91a20708bd163766ca4e9aa1aa686ed91b52
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Mon Feb 23 17:42:02 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Mon Feb 23 17:42:02 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=521d91a2

sci-physics/root: version bump

---
 sci-physics/root/ChangeLog                         |   7 +
 .../root/files/root-5.34.26-prop-flags.patch       |  19 +
 sci-physics/root/metadata.xml                      |   4 +-
 sci-physics/root/root-5.34.26.ebuild               | 453 +++++++++++++++++++++
 4 files changed, 482 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 4ef278c..6bf87cf 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.34.26 (23 Feb 2015)
+
+  23 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> +root-5.34.26.ebuild,
+  +files/root-5.34.26-prop-flags.patch, metadata.xml:
+  Version bump. Add http support. Add c++14 support. Rework compilers
+  handling.
+
   01 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.18-r2.ebuild,
   root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-9999.ebuild:
   Rename virtual/postgresql to dev-db/postgresql

diff --git a/sci-physics/root/files/root-5.34.26-prop-flags.patch b/sci-physics/root/files/root-5.34.26-prop-flags.patch
new file mode 100644
index 0000000..b81dbb5
--- /dev/null
+++ b/sci-physics/root/files/root-5.34.26-prop-flags.patch
@@ -0,0 +1,19 @@
+commit 3c8bc686abf57e7e2037c4c191cb63a1a5172b5b
+Author: Andrew Savchenko <bircoph@gmail.com>
+Date:   Sun Feb 22 03:45:21 2015 +0300
+
+    root-5.32.00-prop-flags.patch -> root-5.34.26-prop-flags.patch
+
+diff --git a/config/Makefile.in b/config/Makefile.in
+index 89674e7..91d25b9 100644
+--- a/config/Makefile.in
++++ b/config/Makefile.in
+@@ -29,7 +29,7 @@ EXTRA_CFLAGS   := -Iinclude @cflags@
+ USERCONF_CFLAGS:= @usercflags@
+ EXTRA_CXXFLAGS := -Iinclude @cflags@
+ USERCONF_CXXFLAGS:= @usercxxflags@
+-EXTRA_LDFLAGS  := @ldflags@
++EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
+ WERROR         := @werror@
+ WINRTDEBUG     := @winrtdebug@
+ 

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 26e546c..25b00d5 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -15,7 +15,9 @@
   GUI toolkit, and a complete visualization framework.
 </longdescription>
   <use>
-    <flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
+    <flag name="c++0x"> Build ROOT using the C++11 standard</flag>
+    <flag name="c++11"> Build ROOT using the C++11 standard</flag>
+    <flag name="c++14"> Build ROOT using the C++14 standard</flag>
     <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
     <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
     <flag name="http">Enable http server support including but not limited to fastcgi support</flag>

diff --git a/sci-physics/root/root-5.34.26.ebuild b/sci-physics/root/root-5.34.26.ebuild
new file mode 100644
index 0000000..6eeb274
--- /dev/null
+++ b/sci-physics/root/root-5.34.26.ebuild
@@ -0,0 +1,453 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.18-r1.ebuild,v 1.3 2014/03/27 18:51:54 bicatali Exp $
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \
+	toolchain-funcs user versionator
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+DOC_URI="ftp://root.cern.ch/${PN}/doc"
+
+SLOT="0/$(get_version_component_range 1-3 ${PV})"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+IUSE="+X afs avahi c++11 c++14 doc emacs examples fits fftw
+	graphviz http kerberos ldap +math minimal mpi mysql odbc
+	+opengl openmp oracle postgres prefix pythia6 pythia8
+	python qt4 +reflex ruby sqlite ssl xinetd xml xrootd"
+
+# TODO: add support for: davix
+# TODO: unbundle: vdt
+
+REQUIRED_USE="
+	!X? ( !minimal? ( !opengl !qt4 ) )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+CDEPEND="
+	app-arch/xz-utils:0=
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre:3=
+	media-fonts/dejavu
+	media-libs/freetype:2=
+	media-libs/giflib:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:0=
+	virtual/jpeg:0
+	virtual/shadow
+	X? (
+		media-libs/ftgl:0=
+		media-libs/glew:0=
+		x11-libs/libX11:0=
+		x11-libs/libXext:0=
+		x11-libs/libXpm:0=
+		!minimal? (
+			|| (
+				media-libs/libafterimage:0=[gif,jpeg,png,tiff]
+				>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff]
+			)
+			opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
+			qt4? (
+				dev-qt/qtgui:4=
+				dev-qt/qtopengl:4=
+				dev-qt/qt3support:4=
+				dev-qt/qtsvg:4=
+				dev-qt/qtwebkit:4=
+				dev-qt/qtxmlpatterns:4=
+			)
+			x11-libs/libXft:0=
+		)
+	)
+	!minimal? (
+		afs? ( net-fs/openafs )
+		avahi? ( net-dns/avahi:0= )
+		emacs? ( virtual/emacs )
+		fits? ( sci-libs/cfitsio:0= )
+		fftw? ( sci-libs/fftw:3.0= )
+		graphviz? ( media-gfx/graphviz:0= )
+		http? ( dev-libs/fcgi:0= )
+		kerberos? ( virtual/krb5 )
+		ldap? ( net-nds/openldap:0= )
+		math? (
+			sci-libs/gsl:0=
+			sci-mathematics/unuran:0=
+			mpi? ( virtual/mpi )
+		)
+		mysql? ( virtual/mysql )
+		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
+		oracle? ( dev-db/oracle-instantclient-basic:0= )
+		postgres? ( dev-db/postgresql:= )
+		pythia6? ( sci-physics/pythia:6= )
+		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
+		python? ( ${PYTHON_DEPS} )
+		ruby? (
+			dev-lang/ruby:=
+			dev-ruby/rubygems:=
+		)
+		sqlite? ( dev-db/sqlite:3= )
+		ssl? ( dev-libs/openssl:0= )
+		xml? ( dev-libs/libxml2:2= )
+		xrootd? ( >=net-libs/xrootd-3.3.5:0= )
+	)"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="doc? ( !minimal? ( ~app-doc/root-docs-${PV}[http=,math=] ) )"
+
+S="${WORKDIR}/${PN}"
+
+# install stuff in ${P} and not ${PF} for easier tracking in root-docs
+DOC_DIR="/usr/share/doc/${P}"
+
+die_compiler() {
+	eerror "You are using a $(tc-getCXX) without C++$1 capabilities"
+	die "Need one of the following C++$1 capable compilers:\n"\
+		"    >=sys-devel/gcc[cxx]-$2\n"\
+		"    >=sys-devel/clang-$3\n"\
+		"    >=dev-lang/icc-$4"
+}
+
+# check compiler to satisfy minimal versions
+# $1 - std version
+# $2 - g++
+# $3 - clang++
+# $4 - icc/icpc
+check_compiler() {
+	case "$(tc-getCXX)" in
+		*clang++*)
+			version_is_at_least "$3" "$(has_version sys-devel/clang)" || die_compiler "$1" "$2" "$3" "$4"
+		;;
+		*g++*)
+			version_is_at_least "$2" "$(gcc-version)" || die_compiler "$1" "$2" "$3" "$4"
+		;;
+		*icc*|*icpc*)
+			version_is_at_least "$4" "$(has_version dev-lang/icc)" || die_compiler "$1" "$2" "$3" "$4"
+		;;
+		*)
+			ewarn "You are using an unsupported compiler."
+			ewarn "Please report any issues upstream."
+		;;
+	esac
+}
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
+	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
+	echo
+
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	use minimal && return
+
+	if use math; then
+		if use openmp; then
+			if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+
+	use c++11 && check_compiler "11" "4.8" "3.3" "13"
+	use c++14 && check_compiler "14" "4.9" "3.4" "15"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
+		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
+		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
+		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
+		"${FILESDIR}"/${PN}-5.32.00-dotfont.patch \
+		"${FILESDIR}"/${PN}-5.34.05-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
+		"${FILESDIR}"/${PN}-5.34.13-desktop.patch \
+		"${FILESDIR}"/${PN}-5.34.26-prop-flags.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf3d/ftgl/{inc,src} || die
+	rm -r graf2d/freetype/src || die
+	rm -r graf3d/glew/{inc,src} || die
+	rm -r core/pcre/src || die
+	rm -r math/unuran/src/unuran-*.tar.gz || die
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \
+		xargs -0 rm || die
+	rm -r core/lzma/src/*.tar.gz || die
+	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
+		graf3d/gl/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# CSS should use local images
+	sed -i -e 's,http://.*/images/,,' etc/html/ROOT.css || die "html sed failed"
+
+	# fix reflex path (bug #497280)
+	sed -i -e 's|${ROOTSYS}/lib|@libdir@|' config/genreflex.in || die
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+}
+
+src_configure() {
+	local -a myconf
+	# Some compilers need special care
+	case "$(tc-getCXX)" in
+		*clang++*)
+			myconf=(
+				--with-clang
+				--with-f77="$(tc-getFC)"
+			)
+		;;
+		*icc*|*icpc*)
+			# For icc we need to provide architecture manually
+			# and not to tamper with tc-get*
+			use x86 && myconf=( linuxicc )
+			use amd64 && myconf=( linuxx8664icc )
+		;;
+		*)	# gcc goes here too
+			myconf=(
+				--with-cc="$(tc-getCC)"
+				--with-cxx="$(tc-getCXX)"
+				--with-f77="$(tc-getFC)"
+				--with-ld="$(tc-getCXX)"
+			)
+		;;
+	esac
+
+	# the configure script is not the standard autotools
+	local myconf+=(
+		--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"
+		--disable-werror
+		--nohowto
+	)
+
+	if use minimal; then
+		myconf+=(
+			$(usex X --gminimal --minimal)
+			--cflags='${CFLAGS}'
+			--cxxflags='${CXXFLAGS}'
+		)
+	else
+		myconf+=(
+			--with-afs-shared=yes
+			--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
+			--disable-builtin-afterimage
+			--disable-builtin-ftgl
+			--disable-builtin-freetype
+			--disable-builtin-glew
+			--disable-builtin-pcre
+			--disable-builtin-zlib
+			--disable-builtin-lzma
+			--disable-cling
+			--enable-astiff
+			--enable-explicitlink
+			--enable-gdml
+			--enable-memstat
+			--enable-shadowpw
+			--enable-shared
+			--enable-soversion
+			--enable-table
+			--fail-on-missing
+			--cflags='${CFLAGS}'
+			--cxxflags='${CXXFLAGS}'
+			$(use_enable X x11)
+			$(use_enable X asimage)
+			$(use_enable X xft)
+			$(use_enable afs)
+			$(use_enable avahi bonjour)
+			$(use_enable c++11 cxx11)
+			$(use_enable c++14 cxx14)
+			$(use_enable fits fitsio)
+			$(use_enable fftw fftw3)
+			$(use_enable graphviz gviz)
+			$(use_enable http)
+			$(use_enable kerberos krb5)
+			$(use_enable ldap)
+			$(use_enable math gsl-shared)
+			$(use_enable math genvector)
+			$(use_enable math mathmore)
+			$(use_enable math minuit2)
+			$(use_enable math roofit)
+			$(use_enable math tmva)
+			$(use_enable math unuran)
+			$(use_enable mysql)
+			$(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
+			$(use_enable odbc)
+			$(use_enable opengl)
+			$(use_enable oracle)
+			$(use_enable postgres pgsql)
+			$(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "")
+			$(use_enable prefix rpath)
+			$(use_enable pythia6)
+			$(use_enable pythia8)
+			$(use_enable python)
+			$(use_enable qt4 qt)
+			$(use_enable qt4 qtgsi)
+			$(use_enable reflex cintex)
+			$(use_enable reflex)
+			$(use_enable ruby)
+			$(use_enable sqlite)
+			$(use_enable ssl)
+			$(use_enable xml)
+			$(use_enable xrootd)
+			${EXTRA_ECONF}
+		)
+	fi
+
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	emake \
+		OPT="${CXXFLAGS}" \
+		F77OPT="${FFLAGS}" \
+		ROOTSYS="${S}" \
+		LD_LIBRARY_PATH="${S}/lib"
+	use emacs && ! use minimal && elisp-compile build/misc/*.el
+}
+
+daemon_install() {
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	echo "Icon=root-system-bin" >> etc/root.desktop
+	domenu etc/root.desktop
+	doicon build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+cleanup_install() {
+	# Cleanup of files either already distributed or unused on Gentoo
+	pushd "${ED}" > /dev/null
+	rm usr/share/root/fonts/LICENSE || die
+	rm etc/root/proof/*.sample || die
+	rm -r etc/root/daemons || die
+	# these should be in PATH
+	mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
+	rm ${DOC_DIR#/}/{INSTALL,LICENSE,COPYING.CINT} || die
+	use examples || rm -r ${DOC_DIR#/}/examples || die
+	cd usr/$(get_libdir)/root/cint/cint
+	rm lib/posix/mktypes lib/dll_stl/setup lib/G__* || die
+	rm lib/dll_stl/G__* lib/dll_stl/rootcint_* lib/posix/exten.o || die
+	rm include/makehpib || die
+	popd > /dev/null
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
+
+	if ! use minimal; then
+		use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
+		if use python; then
+			echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
+			python_optimize "${D}/usr/$(get_libdir)/root"
+			use reflex && python_optimize "${D}/usr/$(get_libdir)/root/python/genreflex/"
+		fi
+		use ruby && \
+			echo "RUBYLIB=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
+		use emacs && elisp-install ${PN} build/misc/*.{el,elc}
+		if use examples; then
+			# these should really be taken care of by the root make install
+			insinto ${DOC_DIR}/examples/tutorials/tmva
+			doins -r tmva/test
+		fi
+	fi
+	doenvd 99root
+
+	# The build system installs Emacs support unconditionally in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -r "${ED}"/usr/share/emacs || die
+
+	daemon_install
+	desktop_install
+	cleanup_install
+
+	# do not copress files used by ROOT's CLI (.credit, .demo, .license)
+	docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials}
+	# needed for .license command to work
+	dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}


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

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

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

sci-physics/root/: remove old

---
 sci-physics/root/ChangeLog                         |   6 +
 .../root/files/root-5.32.00-prop-flags.patch       |  15 -
 .../root/files/root-5.34.18-tutorials-path.patch   |  94 -----
 sci-physics/root/files/root-6.00.01-cling.patch    |  19 -
 sci-physics/root/metadata.xml                      |   1 -
 sci-physics/root/root-5.34.18-r2.ebuild            | 389 ------------------
 sci-physics/root/root-6.00.01-r1.ebuild            | 442 ---------------------
 7 files changed, 6 insertions(+), 960 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 6bf87cf..a01cdc1 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  23 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> -root-5.34.18-r2.ebuild,
+  -root-6.00.01-r1.ebuild, -files/root-5.32.00-prop-flags.patch,
+  -files/root-5.34.18-tutorials-path.patch, -files/root-6.00.01-cling.patch,
+  metadata.xml:
+  Remove old versions and unused patches.
+
 *root-5.34.26 (23 Feb 2015)
 
   23 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> +root-5.34.26.ebuild,

diff --git a/sci-physics/root/files/root-5.32.00-prop-flags.patch b/sci-physics/root/files/root-5.32.00-prop-flags.patch
deleted file mode 100644
index 7dfeb1c..0000000
--- a/sci-physics/root/files/root-5.32.00-prop-flags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- root/config/Makefile.in.orig	2013-01-21 22:04:43.011452938 +0400
-+++ root/config/Makefile.in	2013-01-21 22:04:18.027352209 +0400
-@@ -25,9 +25,9 @@
- USECONFIG      := @useconfig@
- MKLIBOPTIONS   := @mkliboption@
- 
--EXTRA_CFLAGS   := -Iinclude @cflags@
--EXTRA_CXXFLAGS := -Iinclude @cflags@
--EXTRA_LDFLAGS  := @ldflags@
-+EXTRA_CFLAGS   := -Iinclude @cflags@ $(CFLAGS)
-+EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS)
-+EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
- WINRTDEBUG     := @winrtdebug@
- 
- GLBPATCHFLAGS  := @glbpatchcflags@

diff --git a/sci-physics/root/files/root-5.34.18-tutorials-path.patch b/sci-physics/root/files/root-5.34.18-tutorials-path.patch
deleted file mode 100644
index 8bf8859..0000000
--- a/sci-physics/root/files/root-5.34.18-tutorials-path.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/config/RConfigure.in b/config/RConfigure.in
-index 5950401..e4fbfbf 100644
---- a/config/RConfigure.in
-+++ b/config/RConfigure.in
-@@ -11,6 +11,7 @@
- #define ROOTDATADIR   "@datadir@"
- #define ROOTDOCDIR    "@docdir@"
- #define ROOTMACRODIR  "@macrodir@"
-+#define ROOTTUTDIR    "@tutdir@"
- #define ROOTSRCDIR    "@srcdir@"
- #define ROOTICONPATH  "@iconpath@"
- #define EXTRAICONPATH "@extraiconpath@"
-diff --git a/configure b/configure
-index 131df92..2c8ea95 100755
---- a/configure
-+++ b/configure
-@@ -7537,6 +7537,7 @@ sed \
-     -e "s|@prefix@|$prefix|"               \
-     -e "s|@srcdir@|$srcdir|"               \
-     -e "s|@ttffontdir@|$fontdir|"          \
-+    -e "s|@tutdir@|$tutdir|"               \
-     -e "s|@setresuid@|$setresuid|"         \
-     -e "s|@hasmathmore@|$hasmathmore|"     \
-     -e "s|@haspthread@|$haspthread|"       \
-diff --git a/core/base/src/TApplication.cxx b/core/base/src/TApplication.cxx
-index 95fb1e5..3830955 100644
---- a/core/base/src/TApplication.cxx
-+++ b/core/base/src/TApplication.cxx
-@@ -794,6 +794,22 @@ Long_t TApplication::ProcessRemote(const char *line, Int_t *)
-    return 1;
- }
- 
-+namespace {
-+   static int PrintFile(const char* filename) {
-+      TString sFileName(filename);
-+      gSystem->ExpandPathName(sFileName);
-+      if (gSystem->AccessPathName(sFileName)) {
-+         Error("ProcessLine()", "Cannot find file %s", filename);
-+         return 1;
-+      }
-+      std::ifstream instr(sFileName);
-+      TString content;
-+      content.ReadFile(instr);
-+      Printf("%s", content.Data());
-+      return 0;
-+   }
-+}
-+
- //______________________________________________________________________________
- Long_t TApplication::ProcessLine(const char *line, Bool_t sync, Int_t *err)
- {
-@@ -827,11 +843,41 @@ Long_t TApplication::ProcessLine(const char *line, Bool_t sync, Int_t *err)
-       return 0;
-    }
- 
--   if (!strncmp(line, "?", 1)) {
-+   if (!strncmp(line, "?", 1) || !strncmp(line, ".help", 5)) {
-       Help(line);
-       return 1;
-    }
- 
-+   if (!strncmp(line, ".demo", 5)) {
-+      if (gROOT->IsBatch()) {
-+         Error("ProcessLine", "Cannot show demos in batch mode!");
-+         return 1;
-+      }
-+#ifdef ROOTTUTDIR
-+      ProcessLine(".x " ROOTTUTDIR "/demos.C");
-+#else
-+      ProcessLine(".x $(ROOTSYS)/tutorials/demos.C");
-+#endif
-+      return 0;
-+   }
-+
-+   if (!strncmp(line, ".license", 8)) {
-+#ifdef ROOTDOCDIR
-+      return PrintFile(ROOTDOCDIR "/LICENSE");
-+#else
-+      return PrintFile("$(ROOTSYS)/LICENSE");
-+#endif
-+   }
-+
-+   if (!strncmp(line, ".credits", 8)) {
-+#ifdef ROOTDOCDIR
-+      return PrintFile(ROOTDOCDIR "/CREDITS");
-+#else
-+      return PrintFile("$(ROOTSYS)/README/CREDITS");
-+#endif
-+     
-+   }
-+
-    if (!strncmp(line, ".pwd", 4)) {
-       if (gDirectory)
-          Printf("Current directory: %s", gDirectory->GetPath());

diff --git a/sci-physics/root/files/root-6.00.01-cling.patch b/sci-physics/root/files/root-6.00.01-cling.patch
deleted file mode 100644
index 146e89f..0000000
--- a/sci-physics/root/files/root-6.00.01-cling.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit eea9517c17bd86beda895a5a8b3ffe59af18596f
-Author: Axel Naumann <Axel.Naumann@cern.ch>
-Date:   Tue Jul 1 17:45:20 2014 +0200
-
-    From Pere: go via TSystem to use prefix if defined (ROOT-6410).
-
-diff --git a/core/meta/src/TCling.cxx b/core/meta/src/TCling.cxx
-index baec571..4976d4e 100644
---- a/core/meta/src/TCling.cxx
-+++ b/core/meta/src/TCling.cxx
-@@ -4703,7 +4703,7 @@ void* TCling::LazyFunctionCreatorAutoload(const std::string& mangled_name) {
-    TString lib;
-    Ssiz_t posLib = 0;
-    while (libs.Tokenize(lib, posLib)) {
--      if (Load(lib, kFALSE /*system*/) < 0) {
-+      if (gSystem->Load(lib, "", kFALSE /*system*/) < 0) {
-          // The library load failed, all done.
-          //fprintf(stderr, "load failed: %s\n", errmsg.c_str());
-          return 0;

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 25b00d5..579f100 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -15,7 +15,6 @@
   GUI toolkit, and a complete visualization framework.
 </longdescription>
   <use>
-    <flag name="c++0x"> Build ROOT using the C++11 standard</flag>
     <flag name="c++11"> Build ROOT using the C++11 standard</flag>
     <flag name="c++14"> Build ROOT using the C++14 standard</flag>
     <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>

diff --git a/sci-physics/root/root-5.34.18-r2.ebuild b/sci-physics/root/root-5.34.18-r2.ebuild
deleted file mode 100644
index 7108ae3..0000000
--- a/sci-physics/root/root-5.34.18-r2.ebuild
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.18-r1.ebuild,v 1.3 2014/03/27 18:51:54 bicatali Exp $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \
-	toolchain-funcs user versionator
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-DOC_URI="ftp://root.cern.ch/${PN}/doc"
-
-SLOT="0/$(get_version_component_range 1-3 ${PV})"
-LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-IUSE="+X afs avahi c++0x doc emacs examples fits fftw graphviz
-	kerberos ldap +math minimal mpi mysql odbc +opengl openmp
-	oracle postgres	prefix pythia6 pythia8 python qt4 +reflex
-	ruby sqlite	ssl xinetd xml xrootd"
-
-REQUIRED_USE="
-	!X? ( !opengl !qt4 )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	app-arch/xz-utils:0=
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre:3=
-	media-fonts/dejavu
-	media-libs/freetype:2=
-	media-libs/giflib:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:0=
-	virtual/jpeg:0
-	virtual/shadow
-	X? (
-		media-libs/ftgl:0=
-		media-libs/glew:0=
-		x11-libs/libX11:0=
-		x11-libs/libXext:0=
-		x11-libs/libXpm:0=
-		!minimal? (
-			|| (
-				media-libs/libafterimage:0=[gif,jpeg,png,tiff]
-				>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff]
-			)
-			opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
-			qt4? (
-				dev-qt/qtgui:4=
-				dev-qt/qtopengl:4=
-				dev-qt/qt3support:4=
-				dev-qt/qtsvg:4=
-				dev-qt/qtwebkit:4=
-				dev-qt/qtxmlpatterns:4=
-			)
-			x11-libs/libXft:0=
-		)
-	)
-	!minimal? (
-		afs? ( net-fs/openafs )
-		avahi? ( net-dns/avahi:0= )
-		emacs? ( virtual/emacs )
-		fits? ( sci-libs/cfitsio:0= )
-		fftw? ( sci-libs/fftw:3.0= )
-		graphviz? ( media-gfx/graphviz:0= )
-		kerberos? ( virtual/krb5 )
-		ldap? ( net-nds/openldap:0= )
-		math? (
-			sci-libs/gsl:0=
-			sci-mathematics/unuran:0=
-			mpi? ( virtual/mpi )
-		)
-		mysql? ( virtual/mysql )
-		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
-		oracle? ( dev-db/oracle-instantclient-basic:0= )
-		postgres? ( dev-db/postgresql:= )
-		pythia6? ( sci-physics/pythia:6= )
-		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
-		python? ( ${PYTHON_DEPS} )
-		ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems
-		)
-		sqlite? ( dev-db/sqlite:3= )
-		ssl? ( dev-libs/openssl:0= )
-		xml? ( dev-libs/libxml2:2= )
-		xrootd? ( >=net-libs/xrootd-3.3.5:0= )
-	)"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="doc? ( ~app-doc/root-docs-${PV}[math=] )"
-
-S="${WORKDIR}/${PN}"
-
-# install stuff in ${P} and not ${PF} for easier tracking in root-docs
-DOC_DIR="/usr/share/doc/${P}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
-	echo
-
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	use minimal && return
-
-	if use math; then
-		if use openmp; then
-			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
-				ewarn "You are using a g++ without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
-		! version_is_at_least "4.7" "$(gcc-version)"; then
-		eerror "You are using a g++ without C++0x capabilities"
-		die "Need an C++0x capable compiler"
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
-		"${FILESDIR}"/${PN}-5.32.00-prop-flags.patch \
-		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
-		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
-		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
-		"${FILESDIR}"/${PN}-5.32.00-dotfont.patch \
-		"${FILESDIR}"/${PN}-5.34.05-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
-		"${FILESDIR}"/${PN}-5.34.13-desktop.patch \
-		"${FILESDIR}"/${PN}-5.34.18-tutorials-path.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -r graf2d/asimage/src/libAfterImage || die
-	rm -r graf3d/ftgl/{inc,src} || die
-	rm -r graf2d/freetype/src || die
-	rm -r graf3d/glew/{inc,src} || die
-	rm -r core/pcre/src || die
-	rm -r math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \
-		xargs -0 rm || die
-	rm -r core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
-		graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# fix reflex path (bug #497280)
-	sed -i -e 's|${ROOTSYS}/lib|@libdir@|' config/genreflex.in || die
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-}
-
-src_configure() {
-
-	# the configure script is not the standard autotools
-	local myconf=(
-		--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-cc="$(tc-getCC)"
-		--with-cxx="$(tc-getCXX)"
-		--with-f77="$(tc-getFC)"
-		--with-ld="$(tc-getCXX)"
-		--nohowto
-	)
-
-	if use minimal; then
-		myconf+=( $(usex X --gminimal --minimal) )
-	else
-		myconf+=(
-			--with-afs-shared=yes
-			--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
-			--disable-builtin-afterimage
-			--disable-builtin-ftgl
-			--disable-builtin-freetype
-			--disable-builtin-glew
-			--disable-builtin-pcre
-			--disable-builtin-zlib
-			--disable-builtin-lzma
-			--disable-cling
-			--enable-astiff
-			--enable-explicitlink
-			--enable-gdml
-			--enable-memstat
-			--enable-shadowpw
-			--enable-shared
-			--enable-soversion
-			--enable-table
-			--fail-on-missing
-			$(use_enable X x11)
-			$(use_enable X asimage)
-			$(use_enable X xft)
-			$(use_enable afs)
-			$(use_enable avahi bonjour)
-			$(use_enable c++0x cxx11)
-			$(use_enable fits fitsio)
-			$(use_enable fftw fftw3)
-			$(use_enable graphviz gviz)
-			$(use_enable kerberos krb5)
-			$(use_enable ldap)
-			$(use_enable math gsl-shared)
-			$(use_enable math genvector)
-			$(use_enable math mathmore)
-			$(use_enable math minuit2)
-			$(use_enable math roofit)
-			$(use_enable math tmva)
-			$(use_enable math unuran)
-			$(use_enable mysql)
-			$(usex mysql \
-				"--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
-			$(use_enable odbc)
-			$(use_enable opengl)
-			$(use_enable oracle)
-			$(use_enable postgres pgsql)
-			$(usex postgres \
-				"--with-pgsql-incdir=$(pg_config --includedir)" "")
-			$(use_enable prefix rpath)
-			$(use_enable pythia6)
-			$(use_enable pythia8)
-			$(use_enable python)
-			$(use_enable qt4 qt)
-			$(use_enable qt4 qtgsi)
-			$(use_enable reflex cintex)
-			$(use_enable reflex)
-			$(use_enable ruby)
-			$(use_enable sqlite)
-			$(use_enable ssl)
-			$(use_enable xml)
-			$(use_enable xrootd)
-			${EXTRA_ECONF}
-		)
-	fi
-
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	emake \
-		OPT="${CXXFLAGS}" \
-		F77OPT="${FFLAGS}" \
-		ROOTSYS="${S}" \
-		LD_LIBRARY_PATH="${S}/lib"
-	use emacs && ! use minimal && elisp-compile build/misc/*.el
-}
-
-daemon_install() {
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	echo "Icon=root-system-bin" >> etc/root.desktop
-	domenu etc/root.desktop
-	doicon build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-cleanup_install() {
-	# Cleanup of files either already distributed or unused on Gentoo
-	pushd "${ED}" > /dev/null
-	rm usr/share/root/fonts/LICENSE || die
-	rm etc/root/proof/*.sample || die
-	rm -r etc/root/daemons || die
-	# these should be in PATH
-	mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
-	rm ${DOC_DIR#/}/{INSTALL,LICENSE,COPYING.CINT} || die
-	use examples || rm -r ${DOC_DIR#/}/examples || die
-	cd usr/$(get_libdir)/root/cint/cint
-	rm lib/posix/mktypes lib/dll_stl/setup lib/G__* || die
-	rm lib/dll_stl/G__* lib/dll_stl/rootcint_* lib/posix/exten.o || die
-	rm include/makehpib || die
-	popd > /dev/null
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
-
-	if ! use minimal; then
-		use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
-		if use python; then
-			echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
-			python_optimize "${D}/usr/$(get_libdir)/root"
-		fi
-		use ruby && \
-			echo "RUBYLIB=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
-		use emacs && elisp-install ${PN} build/misc/*.{el,elc}
-		if use examples; then
-			# these should really be taken care of by the root make install
-			insinto ${DOC_DIR}/examples/tutorials/tmva
-			doins -r tmva/test
-		fi
-	fi
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -r "${ED}"/usr/share/emacs || die
-
-	daemon_install
-	desktop_install
-	cleanup_install
-
-	# do not copress files used by ROOT's CLI (.credit, .demo, .license)
-	docompress -x "${DOC_DIR}"/{CREDITS,LICENSE,examples/tutorials}
-	# needed for .license command to work
-	dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

diff --git a/sci-physics/root/root-6.00.01-r1.ebuild b/sci-physics/root/root-6.00.01-r1.ebuild
deleted file mode 100644
index fae938e..0000000
--- a/sci-physics/root/root-6.00.01-r1.ebuild
+++ /dev/null
@@ -1,442 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.18-r1.ebuild,v 1.3 2014/03/27 18:51:54 bicatali Exp $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
-	KEYWORDS=""
-else
-	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}"
-fi
-
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \
-	toolchain-funcs user versionator
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-DOC_URI="ftp://root.cern.ch/${PN}/doc"
-
-SLOT="0/$(get_version_component_range 1-3 ${PV})"
-LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-IUSE="+X afs avahi doc emacs examples fits fftw geocad graphviz
-	http kerberos ldap +math minimal mpi mysql odbc +opengl openmp
-	oracle postgres	prefix pythia6 pythia8 python qt4 sqlite ssl
-	xinetd xml xrootd"
-
-# TODO: add support for: davix
-# TODO: ROOT-6 supports x32 ABI, but half of its dependencies doesn't
-# TODO: unbundle: cling, vdt
-
-REQUIRED_USE="
-	mpi? ( math !openmp )
-	opengl? ( X )
-	openmp? ( math !mpi )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt4? ( X )
-"
-
-CDEPEND="
-	app-arch/xz-utils:0=
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre:3=
-	media-fonts/dejavu
-	media-libs/freetype:2=
-	media-libs/giflib:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	>=sys-devel/clang-3.4
-	sys-libs/zlib:0=
-	virtual/jpeg:0
-	virtual/shadow
-	X? (
-		media-libs/ftgl:0=
-		media-libs/glew:0=
-		x11-libs/libX11:0=
-		x11-libs/libXext:0=
-		x11-libs/libXpm:0=
-		!minimal? (
-			opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
-			qt4? (
-				dev-qt/qtgui:4=
-				dev-qt/qtopengl:4=
-				dev-qt/qt3support:4=
-				dev-qt/qtsvg:4=
-				dev-qt/qtwebkit:4=
-				dev-qt/qtxmlpatterns:4=
-			)
-			x11-libs/libXft:0=
-		)
-	)
-	!minimal? (
-		afs? ( net-fs/openafs )
-		avahi? ( net-dns/avahi:0= )
-		emacs? ( virtual/emacs )
-		fits? ( sci-libs/cfitsio:0= )
-		fftw? ( sci-libs/fftw:3.0= )
-		geocad? ( sci-libs/opencascade:= )
-		graphviz? ( media-gfx/graphviz:0= )
-		http? ( dev-libs/fcgi:0= )
-		kerberos? ( virtual/krb5 )
-		ldap? ( net-nds/openldap:0= )
-		math? (
-			sci-libs/gsl:0=
-			sci-mathematics/unuran:0=
-			mpi? ( virtual/mpi )
-		)
-		mysql? ( virtual/mysql )
-		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
-		oracle? ( dev-db/oracle-instantclient-basic:0= )
-		postgres? ( dev-db/postgresql:= )
-		pythia6? ( sci-physics/pythia:6= )
-		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
-		python? ( ${PYTHON_DEPS} )
-		sqlite? ( dev-db/sqlite:3= )
-		ssl? ( dev-libs/openssl:0= )
-		xml? ( dev-libs/libxml2:2= )
-		xrootd? ( >=net-libs/xrootd-3.3.5:0= )
-	)"
-
-# TODO: ruby is not yet ported to ROOT-6, reenable when (if?) ready
-#		ruby? (
-#			dev-lang/ruby
-#			dev-ruby/rubygems
-#		)
-#
-# TODO: root-6.00.01 crashes with system libafterimage
-#			|| (
-#				media-libs/libafterimage:0=[gif,jpeg,png,tiff]
-#				>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff]
-#			)
-#			--disable-builtin-afterimage
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
-
-# install stuff in ${P} and not ${PF} for easier tracking in root-docs
-DOC_DIR="/usr/share/doc/${P}"
-
-die_compiler() {
-	die "Need one of the following C++11 capable compilers:"
-	die "    >=sys-devel/gcc[cxx]-4.8"
-	die "    >=sys-devel/clang-3.4"
-	die "    >=dev-lang/icc-13"
-}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
-	echo
-
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	use minimal && return
-
-	if use math; then
-		if use openmp; then
-			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
-				ewarn "You are using a g++ without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-
-	# check for supported compilers
-	case $(tc-getCXX) in
-		*g++*)
-			if ! version_is_at_least "4.8" "$(gcc-version)"; then
-				eerror "You are using a g++ without C++11 capabilities"
-				die_compiler
-			fi
-		;;
-		*clang++*)
-			# >=clang-3.4 is already in DEPEND
-		;;
-		*icc*|*icpc*)
-			if ! version_is_at_least "13" "$(has_version dev-lang/icc)"; then
-				eerror "You are using an icc without C++11 capabilities"
-				die_compiler
-			fi
-		;;
-		*)
-			ewarn "You are using an unsupported compiler."
-			ewarn "Please report any issues upstream."
-		;;
-	esac
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
-		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
-		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
-		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
-		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
-		"${FILESDIR}"/${PN}-5.34.13-desktop.patch \
-		"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
-		"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-6.00.01-prop-flags.patch \
-		"${FILESDIR}"/${PN}-6.00.01-llvm.patch \
-		"${FILESDIR}"/${PN}-6.00.01-geocad.patch \
-		"${FILESDIR}"/${PN}-6.00.01-cling.patch \
-		"${FILESDIR}"/${PN}-6.00.01-tutorials-path.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	#rm -r graf2d/asimage/src/libAfterImage || die
-	rm -r graf3d/ftgl/{inc,src} || die
-	rm -r graf2d/freetype/src || die
-	rm -r graf3d/glew/{inc,src} || die
-	rm -r core/pcre/src || die
-	rm -r math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \
-		xargs -0 rm || die
-	rm -r core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
-		graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# CSS should use local images
-	sed -i -e 's,http://.*/images/,,' etc/html/ROOT.css || die "html sed failed"
-}
-
-# NB: ROOT uses bundled LLVM, because it is patched and API-incompatible with
-# system LLVM.
-# NB: As of 6.00.0.1 cmake is not ready as it can't fully replace configure,
-# e.g. for afs and geocad.
-
-src_configure() {
-	local -a myconf
-	# Some compilers need special care
-	case $(tc-getCXX) in
-		*clang++*)
-			myconf=(
-				--with-clang
-				--with-f77="$(tc-getFC)"
-			)
-		;;
-		*icc*|*icpc*)
-			# For icc we need to provide architecture manually
-			# and not to tamper with tc-get*
-			use x86 && myconf=( linuxicc )
-			use amd64 && myconf=( linuxx8664icc )
-		;;
-		*)	# gcc goes here too
-			myconf=(
-				--with-cc="$(tc-getCC)"
-				--with-cxx="$(tc-getCXX)"
-				--with-f77="$(tc-getFC)"
-				--with-ld="$(tc-getCXX)"
-			)
-		;;
-	esac
-
-	# the configure script is not the standard autotools
-	myconf+=(
-		--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"
-		--disable-werror
-		--nohowto
-	)
-
-	if use minimal; then
-		myconf+=( $(usex X --gminimal --minimal) )
-	else
-		myconf+=(
-			--with-afs-shared=yes
-			--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
-			--disable-builtin-ftgl
-			--disable-builtin-freetype
-			--disable-builtin-glew
-			--disable-builtin-pcre
-			--disable-builtin-zlib
-			--disable-builtin-lzma
-			--enable-astiff
-			--enable-explicitlink
-			--enable-gdml
-			--enable-memstat
-			--enable-shadowpw
-			--enable-shared
-			--enable-soversion
-			--enable-table
-			--fail-on-missing
-			$(use_enable X x11)
-			$(use_enable X asimage)
-			$(use_enable X xft)
-			$(use_enable afs)
-			$(use_enable avahi bonjour)
-			$(use_enable fits fitsio)
-			$(use_enable fftw fftw3)
-			$(use_enable geocad)
-			$(use_enable graphviz gviz)
-			$(use_enable kerberos krb5)
-			$(use_enable ldap)
-			$(use_enable math genvector)
-			$(use_enable math gsl-shared)
-			$(use_enable math mathmore)
-			$(use_enable math minuit2)
-			$(use_enable math roofit)
-			$(use_enable math tmva)
-			$(use_enable math vc)
-			$(use_enable math vdt)
-			$(use_enable math unuran)
-			$(use_enable mysql)
-			$(usex mysql \
-				"--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
-			$(use_enable odbc)
-			$(use_enable opengl)
-			$(use_enable oracle)
-			$(use_enable postgres pgsql)
-			$(usex postgres \
-				"--with-pgsql-incdir=$(pg_config --includedir)" "")
-			$(use_enable prefix rpath)
-			$(use_enable pythia6)
-			$(use_enable pythia8)
-			$(use_enable python)
-			$(use_enable qt4 qt)
-			$(use_enable qt4 qtgsi)
-			$(use_enable sqlite)
-			$(use_enable ssl)
-			$(use_enable xml)
-			$(use_enable xrootd)
-			${EXTRA_ECONF}
-		)
-	fi
-
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	emake \
-		OPT="${CXXFLAGS}" \
-		F77OPT="${FFLAGS}" \
-		ROOTSYS="${S}" \
-		LD_LIBRARY_PATH="${S}/lib"
-	use emacs && ! use minimal && elisp-compile build/misc/*.el
-}
-
-daemon_install() {
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	echo "Icon=root-system-bin" >> etc/root.desktop
-	domenu etc/root.desktop
-	doicon build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-cleanup_install() {
-	# Cleanup of files either already distributed or unused on Gentoo
-	pushd "${ED}" > /dev/null
-	rm usr/share/root/fonts/LICENSE || die
-	rm etc/root/proof/*.sample || die
-	rm -r etc/root/daemons || die
-	# these should be in PATH
-	mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
-	rm ${DOC_DIR#/}/{INSTALL,LICENSE} || die
-	use examples || rm -r ${DOC_DIR#/}/examples || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README.md
-
-	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
-
-	if ! use minimal; then
-		use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
-		if use python; then
-			echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
-			python_optimize "${D}/usr/$(get_libdir)/root"
-		fi
-		use emacs && elisp-install ${PN} build/misc/*.{el,elc}
-		if use examples; then
-			# these should really be taken care of by the root make install
-			insinto ${DOC_DIR}/examples/tutorials/tmva
-			doins -r tmva/test
-		fi
-	fi
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -r "${ED}"/usr/share/emacs || die
-
-	daemon_install
-	desktop_install
-	cleanup_install
-
-	# do not copress files used by ROOT's CLI (.credit, .demo, .license)
-	docompress -x "${DOC_DIR}"/{CREDITS,LICENSE,examples/tutorials}
-	# needed for .license command to work
-	dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}


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

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2015-03-03  4:31 Andrew Savchenko
  0 siblings, 0 replies; 10+ messages in thread
From: Andrew Savchenko @ 2015-03-03  4:31 UTC (permalink / raw
  To: gentoo-commits

commit:     fdaad17b655abec00d1f4d5f2963774ad51e0dab
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Mar  3 04:28:38 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue Mar  3 04:28:38 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fdaad17b

sci-physics/root: 5.34.26 is now in portage

Package-Manager: portage-2.2.17
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

---
 sci-physics/root/ChangeLog                         |   5 +
 sci-physics/root/files/root-5.32.00-dotfont.patch  |  58 ---
 .../root/files/root-5.34.05-nobyte-compile.patch   | 137 -------
 sci-physics/root/metadata.xml                      |   3 -
 sci-physics/root/root-5.34.26.ebuild               | 449 ---------------------
 5 files changed, 5 insertions(+), 647 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 1553e5c..d1fdd9d 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  03 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> -root-5.34.26.ebuild,
+  -files/root-5.32.00-dotfont.patch, -files/root-5.34.05-nobyte-compile.patch,
+  metadata.xml:
+  5.34.26 is moved to the portage tree
+
   02 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
   Indentation fixes (in order to conform to portage version)
 

diff --git a/sci-physics/root/files/root-5.32.00-dotfont.patch b/sci-physics/root/files/root-5.32.00-dotfont.patch
deleted file mode 100644
index 85d6dea..0000000
--- a/sci-physics/root/files/root-5.32.00-dotfont.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- root/html/src/TClassDocOutput.cxx.orig	2012-05-25 16:18:10.000000000 +0400
-+++ root/html/src/TClassDocOutput.cxx	2012-05-29 21:36:53.813593012 +0400
-@@ -625,7 +625,7 @@
-       << "size=\"8,10\";" << endl
-       << "ratio=auto;" << endl
-       << "margin=0;" << endl
--      << "node [shape=plaintext,fontsize=40,width=4,height=0.75];" << endl
-+      << "node [shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\"DejaVu Serif\"];" << endl
-       << "\"" << fCurrentClass->GetName() << "\" [shape=ellipse];" << endl;
- 
-    std::stringstream ssDep;
-@@ -704,7 +704,7 @@
-             outdot << ";" << endl;
-          } else if (writeAndMoreFor) {
-                outdot << "  \"...andmore" << writeAndMoreFor->GetName()
--                      << "\" [label=\"...and more\",fontname=\"Times-Italic\",fillcolor=lightgrey,style=filled];" << endl;
-+                      << "\" [label=\"...and more\",fontname=\"DejaVu Serif Italic\",fillcolor=lightgrey,style=filled];" << endl;
-          }
-       }
-       if (!levelExists) break;
-@@ -733,7 +733,7 @@
-       << "ranksep=0.1;" << endl
-       << "nodesep=0;" << endl
-       << "margin=0;" << endl;
--   outdot << "  node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl;
-+   outdot << "  node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\"DejaVu Serif\"];" << endl;
- 
-    std::stringstream ssDep;
-    const int numColumns = 3;
-@@ -939,7 +939,7 @@
-       << "ranksep=0;" << endl
-       << "nodesep=0;" << endl
-       << "size=\"8,10\";" << endl
--      << "node [fontsize=20,shape=plaintext];" << endl;
-+      << "node [fontsize=20,shape=plaintext,fontname=\"DejaVu Serif\"];" << endl;
- 
-    for (std::list<std::string>::iterator iFile = listFilesToParse.begin();
-       iFile != listFilesToParse.end(); ++iFile) {
-@@ -999,7 +999,8 @@
-       << "ranksep=0.7;" << endl
-       << "nodesep=0.3;" << endl
-       << "size=\"8,8\";" << endl
--      << "ratio=compress;" << endl;
-+      << "ratio=compress;" << endl
-+      << "node [fontname=\"DejaVu Serif\"];" << endl;
- 
-    TString libs(fCurrentClass->GetSharedLibs());
-    outdot << "\"All Libraries\" [URL=\"LibraryDependencies.html\",shape=box,rank=max,fillcolor=lightgray,style=filled];" << endl;
-@@ -1109,7 +1110,8 @@
- 
-    dotout << "digraph G {" << endl
-           << "ratio=auto;" << endl
--          << "rankdir=RL;" << endl;
-+          << "rankdir=RL;" << endl
-+          << "node [fontname=\"DejaVu Serif\"];" << endl;
- 
-    // loop on all classes
-    TClassDocInfo* cdi = 0;

diff --git a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
deleted file mode 100644
index ec67a15..0000000
--- a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Naur root.as-needed/Makefile root/Makefile
---- a/Makefile.orig	2013-02-15 02:27:56.000000000 +0400
-+++ b/Makefile	2013-02-23 02:22:14.556465852 +0400
-@@ -1258,10 +1258,7 @@
- 	   for lib in $(RFLX_GRFLXPY); do \
- 	      rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \
- 	   done; \
--	   for lib in $(RFLX_GRFLXPYC); do \
--	      rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \
--	   done; \
--	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      dir=$(subst lib/,,$(RFLX_GRFLXDD)); \
- 	      while test "x$${dir}" != "x" && \
- 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.as-needed/bindings/pyroot/Module.mk	2011-07-10 10:42:48.991561304 +0400
-+++ root/bindings/pyroot/Module.mk	2011-07-10 10:43:21.493339703 +0400
-@@ -48,8 +48,6 @@
- ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- include/%.h:    $(PYROOTDIRI)/%.h
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
--$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \
-+$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) \
-                 $(ROOTLIBSDEP) $(PYTHONLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
---- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
-+++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
-@@ -691,10 +691,6 @@
- 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
- 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
- 		-X$(PREFIX)/include/root/Minuit2
- #		$(foreach i, \
-diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
-+++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
-@@ -31,10 +31,6 @@
- CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC    := $(CINTEXPY:.py=.pyc)
--CINTEXPYO    := $(CINTEXPY:.py=.pyo)
--endif
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
- 
- RFLX_LIBDIR = $(LIBDIR)
- 
-@@ -92,7 +89,7 @@
- 
- ALLEXECS += $(RFLX_GENMAPX)
- 
--POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN  += $(RFLX_GRFLXPY)
- 
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- 		  mkdir -p lib/python/genreflex; fi )
- 		cp $< $@
- 
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
--		@python -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
- 
-@@ -149,7 +144,7 @@
- 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
- 
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
- 
- clean-genreflex:
- 		@rm -rf lib/python/genreflex
-diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
-@@ -15,7 +15,7 @@
- #####################   sources   ####################
- 
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
- 
- #####################  gccxmlpath ####################
- 

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 0ff221b..7e1dbd5 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -15,15 +15,12 @@
   GUI toolkit, and a complete visualization framework.
 </longdescription>
 <use>
-  <flag name="c++11"> Build ROOT using the C++11 standard</flag>
-  <flag name="c++14"> Build ROOT using the C++14 standard</flag>
   <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
   <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
   <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
   <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
   <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
   <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
-  <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
   <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
 </use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-5.34.26.ebuild b/sci-physics/root/root-5.34.26.ebuild
deleted file mode 100644
index 15ec664..0000000
--- a/sci-physics/root/root-5.34.26.ebuild
+++ /dev/null
@@ -1,449 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.18-r1.ebuild,v 1.3 2014/03/27 18:51:54 bicatali Exp $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
-else
-	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-SRC_URI+=" http://dev.gentoo.org/~bircoph/patches/${PN}-5.34.26-ldflags.patch.xz"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \
-	toolchain-funcs user versionator
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-DOC_URI="ftp://root.cern.ch/${PN}/doc"
-
-SLOT="0/$(get_version_component_range 1-3 ${PV})"
-LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-IUSE="+X afs avahi c++11 c++14 doc emacs examples fits fftw
-	graphviz http kerberos ldap +math minimal mpi mysql odbc
-	+opengl openmp oracle postgres prefix pythia6 pythia8
-	python qt4 +reflex ruby sqlite ssl xinetd xml xrootd"
-
-# TODO: add support for: davix
-# TODO: unbundle: vdt
-
-REQUIRED_USE="
-	!X? ( !minimal? ( !opengl !qt4 ) )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-CDEPEND="
-	app-arch/xz-utils:0=
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre:3=
-	media-fonts/dejavu
-	media-libs/freetype:2=
-	media-libs/giflib:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:0=
-	virtual/jpeg:0
-	virtual/shadow
-	X? (
-		media-libs/ftgl:0=
-		media-libs/glew:0=
-		x11-libs/libX11:0=
-		x11-libs/libXext:0=
-		x11-libs/libXpm:0=
-		!minimal? (
-			|| (
-				media-libs/libafterimage:0=[gif,jpeg,png,tiff]
-				>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff]
-			)
-			opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
-			qt4? (
-				dev-qt/qtgui:4=
-				dev-qt/qtopengl:4=
-				dev-qt/qt3support:4=
-				dev-qt/qtsvg:4=
-				dev-qt/qtwebkit:4=
-				dev-qt/qtxmlpatterns:4=
-			)
-			x11-libs/libXft:0=
-		)
-	)
-	!minimal? (
-		afs? ( net-fs/openafs )
-		avahi? ( net-dns/avahi:0= )
-		emacs? ( virtual/emacs )
-		fits? ( sci-libs/cfitsio:0= )
-		fftw? ( sci-libs/fftw:3.0= )
-		graphviz? ( media-gfx/graphviz:0= )
-		http? ( dev-libs/fcgi:0= )
-		kerberos? ( virtual/krb5 )
-		ldap? ( net-nds/openldap:0= )
-		math? (
-			sci-libs/gsl:0=
-			sci-mathematics/unuran:0=
-			mpi? ( virtual/mpi )
-		)
-		mysql? ( virtual/mysql )
-		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
-		oracle? ( dev-db/oracle-instantclient-basic:0= )
-		postgres? ( dev-db/postgresql:= )
-		pythia6? ( sci-physics/pythia:6= )
-		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
-		python? ( ${PYTHON_DEPS} )
-		ruby? (
-			dev-lang/ruby:=
-			dev-ruby/rubygems:=
-		)
-		sqlite? ( dev-db/sqlite:3= )
-		ssl? ( dev-libs/openssl:0= )
-		xml? ( dev-libs/libxml2:2= )
-		xrootd? ( >=net-libs/xrootd-3.3.5:0= )
-	)"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="doc? ( !minimal? ( ~app-doc/root-docs-${PV}[http=,math=] ) )"
-
-S="${WORKDIR}/${PN}"
-
-# install stuff in ${P} and not ${PF} for easier tracking in root-docs
-DOC_DIR="/usr/share/doc/${P}"
-
-die_compiler() {
-	eerror "You are using a $(tc-getCXX) without C++$1 capabilities"
-	die "Need one of the following C++$1 capable compilers:\n"\
-		"    >=sys-devel/gcc[cxx]-$2\n"\
-		"    >=sys-devel/clang-$3\n"\
-		"    >=dev-lang/icc-$4"
-}
-
-# check compiler to satisfy minimal versions
-# $1 - std version
-# $2 - g++
-# $3 - clang++
-# $4 - icc/icpc
-check_compiler() {
-	case "$(tc-getCXX)" in
-		*clang++*)
-			version_is_at_least "$3" "$(has_version sys-devel/clang)" || die_compiler "$1" "$2" "$3" "$4"
-		;;
-		*g++*)
-			version_is_at_least "$2" "$(gcc-version)" || die_compiler "$1" "$2" "$3" "$4"
-		;;
-		*icc*|*icpc*)
-			version_is_at_least "$4" "$(has_version dev-lang/icc)" || die_compiler "$1" "$2" "$3" "$4"
-		;;
-		*)
-			ewarn "You are using an unsupported compiler."
-			ewarn "Please report any issues upstream."
-		;;
-	esac
-}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
-	echo
-
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	use minimal && return
-
-	if use math; then
-		if use openmp; then
-			if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! tc-has-openmp; then
-				ewarn "You are using a g++ without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-
-	use c++11 && check_compiler "11" "4.8" "3.3" "13"
-	use c++14 && check_compiler "14" "4.9" "3.4" "15"
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
-		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
-		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
-		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
-		"${FILESDIR}"/${PN}-5.32.00-dotfont.patch \
-		"${FILESDIR}"/${PN}-5.34.05-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
-		"${FILESDIR}"/${PN}-5.34.13-desktop.patch \
-		"${WORKDIR}"/${PN}-5.34.26-ldflags.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -r graf2d/asimage/src/libAfterImage || die
-	rm -r graf3d/ftgl/{inc,src} || die
-	rm -r graf2d/freetype/src || die
-	rm -r graf3d/glew/{inc,src} || die
-	rm -r core/pcre/src || die
-	rm -r math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \
-		xargs -0 rm || die
-	rm -r core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
-		graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# CSS should use local images
-	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
-
-	# fix reflex path (bug #497280)
-	sed -i -e 's|${ROOTSYS}/lib|@libdir@|' config/genreflex.in || die
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-}
-
-src_configure() {
-	local -a myconf
-	# Some compilers need special care
-	case "$(tc-getCXX)" in
-		*clang++*)
-			myconf=(
-				--with-clang
-				--with-f77="$(tc-getFC)"
-			)
-		;;
-		*icc*|*icpc*)
-			# For icc we need to provide architecture manually
-			# and not to tamper with tc-get*
-			use x86 && myconf=( linuxicc )
-			use amd64 && myconf=( linuxx8664icc )
-		;;
-		*)	# gcc goes here too
-			myconf=(
-				--with-cc="$(tc-getCC)"
-				--with-cxx="$(tc-getCXX)"
-				--with-f77="$(tc-getFC)"
-				--with-ld="$(tc-getCXX)"
-			)
-		;;
-	esac
-
-	# the configure script is not the standard autotools
-	myconf+=(
-		--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"
-		--disable-werror
-		--nohowto
-		--cflags='${CFLAGS}'
-		--cxxflags='${CXXFLAGS}'
-		--ldflags='${LDFLAGS}'
-	)
-
-	if use minimal; then
-		myconf+=( $(usex X --gminimal --minimal) )
-	else
-		myconf+=(
-			--with-afs-shared=yes
-			--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
-			--disable-builtin-afterimage
-			--disable-builtin-ftgl
-			--disable-builtin-freetype
-			--disable-builtin-glew
-			--disable-builtin-pcre
-			--disable-builtin-zlib
-			--disable-builtin-lzma
-			--disable-cling
-			--enable-astiff
-			--enable-explicitlink
-			--enable-gdml
-			--enable-memstat
-			--enable-shadowpw
-			--enable-shared
-			--enable-soversion
-			--enable-table
-			--fail-on-missing
-			$(use_enable X x11)
-			$(use_enable X asimage)
-			$(use_enable X xft)
-			$(use_enable afs)
-			$(use_enable avahi bonjour)
-			$(use_enable c++11 cxx11)
-			$(use_enable c++14 cxx14)
-			$(use_enable fits fitsio)
-			$(use_enable fftw fftw3)
-			$(use_enable graphviz gviz)
-			$(use_enable http)
-			$(use_enable kerberos krb5)
-			$(use_enable ldap)
-			$(use_enable math gsl-shared)
-			$(use_enable math genvector)
-			$(use_enable math mathmore)
-			$(use_enable math minuit2)
-			$(use_enable math roofit)
-			$(use_enable math tmva)
-			$(use_enable math unuran)
-			$(use_enable mysql)
-			$(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
-			$(use_enable odbc)
-			$(use_enable opengl)
-			$(use_enable oracle)
-			$(use_enable postgres pgsql)
-			$(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "")
-			$(use_enable prefix rpath)
-			$(use_enable pythia6)
-			$(use_enable pythia8)
-			$(use_enable python)
-			$(use_enable qt4 qt)
-			$(use_enable qt4 qtgsi)
-			$(use_enable reflex cintex)
-			$(use_enable reflex)
-			$(use_enable ruby)
-			$(use_enable sqlite)
-			$(use_enable ssl)
-			$(use_enable xml)
-			$(use_enable xrootd)
-			${EXTRA_ECONF}
-		)
-	fi
-
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	emake \
-		OPT="${CXXFLAGS}" \
-		F77OPT="${FFLAGS}" \
-		ROOTSYS="${S}" \
-		LD_LIBRARY_PATH="${S}/lib"
-	use emacs && ! use minimal && elisp-compile build/misc/*.el
-}
-
-daemon_install() {
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	echo "Icon=root-system-bin" >> etc/root.desktop
-	domenu etc/root.desktop
-	doicon build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-cleanup_install() {
-	# Cleanup of files either already distributed or unused on Gentoo
-	pushd "${ED}" > /dev/null
-	rm usr/share/root/fonts/LICENSE || die
-	rm etc/root/proof/*.sample || die
-	rm -r etc/root/daemons || die
-	# these should be in PATH
-	mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
-	rm ${DOC_DIR#/}/{INSTALL,LICENSE,COPYING.CINT} || die
-	use examples || rm -r ${DOC_DIR#/}/examples || die
-	cd usr/$(get_libdir)/root/cint/cint
-	rm lib/posix/mktypes lib/dll_stl/setup lib/G__* || die
-	rm lib/dll_stl/G__* lib/dll_stl/rootcint_* lib/posix/exten.o || die
-	rm include/makehpib || die
-	popd > /dev/null
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
-
-	if ! use minimal; then
-		use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
-		if use python; then
-			echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
-			python_optimize "${D}/usr/$(get_libdir)/root"
-			use reflex && python_optimize "${D}/usr/$(get_libdir)/root/python/genreflex/"
-		fi
-		use ruby && \
-			echo "RUBYLIB=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
-		use emacs && elisp-install ${PN} build/misc/*.{el,elc}
-		if use examples; then
-			# these should really be taken care of by the root make install
-			insinto ${DOC_DIR}/examples/tutorials/tmva
-			doins -r tmva/test
-		fi
-	fi
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -r "${ED}"/usr/share/emacs || die
-
-	daemon_install
-	desktop_install
-	cleanup_install
-
-	# do not copress files used by ROOT's CLI (.credit, .demo, .license)
-	docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials}
-	# needed for .license command to work
-	dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}


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

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2015-03-03  4:31 git@oystercatcher mirror+tproxy
  0 siblings, 0 replies; 10+ messages in thread
From: git@oystercatcher mirror+tproxy @ 2015-03-03  4:31 UTC (permalink / raw
  To: gentoo-commits

commit:     fdaad17b655abec00d1f4d5f2963774ad51e0dab
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Mar  3 04:28:38 2015 +0000
Commit:     git@oystercatcher mirror+tproxy <git <AT> oystercatcher <DOT> gentoo <DOT> org>
CommitDate: Tue Mar  3 04:28:38 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fdaad17b

sci-physics/root: 5.34.26 is now in portage

Package-Manager: portage-2.2.17
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

---
 sci-physics/root/ChangeLog                         |   5 +
 sci-physics/root/files/root-5.32.00-dotfont.patch  |  58 ---
 .../root/files/root-5.34.05-nobyte-compile.patch   | 137 -------
 sci-physics/root/metadata.xml                      |   3 -
 sci-physics/root/root-5.34.26.ebuild               | 449 ---------------------
 5 files changed, 5 insertions(+), 647 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 1553e5c..d1fdd9d 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  03 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> -root-5.34.26.ebuild,
+  -files/root-5.32.00-dotfont.patch, -files/root-5.34.05-nobyte-compile.patch,
+  metadata.xml:
+  5.34.26 is moved to the portage tree
+
   02 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
   Indentation fixes (in order to conform to portage version)
 

diff --git a/sci-physics/root/files/root-5.32.00-dotfont.patch b/sci-physics/root/files/root-5.32.00-dotfont.patch
deleted file mode 100644
index 85d6dea..0000000
--- a/sci-physics/root/files/root-5.32.00-dotfont.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- root/html/src/TClassDocOutput.cxx.orig	2012-05-25 16:18:10.000000000 +0400
-+++ root/html/src/TClassDocOutput.cxx	2012-05-29 21:36:53.813593012 +0400
-@@ -625,7 +625,7 @@
-       << "size=\"8,10\";" << endl
-       << "ratio=auto;" << endl
-       << "margin=0;" << endl
--      << "node [shape=plaintext,fontsize=40,width=4,height=0.75];" << endl
-+      << "node [shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\"DejaVu Serif\"];" << endl
-       << "\"" << fCurrentClass->GetName() << "\" [shape=ellipse];" << endl;
- 
-    std::stringstream ssDep;
-@@ -704,7 +704,7 @@
-             outdot << ";" << endl;
-          } else if (writeAndMoreFor) {
-                outdot << "  \"...andmore" << writeAndMoreFor->GetName()
--                      << "\" [label=\"...and more\",fontname=\"Times-Italic\",fillcolor=lightgrey,style=filled];" << endl;
-+                      << "\" [label=\"...and more\",fontname=\"DejaVu Serif Italic\",fillcolor=lightgrey,style=filled];" << endl;
-          }
-       }
-       if (!levelExists) break;
-@@ -733,7 +733,7 @@
-       << "ranksep=0.1;" << endl
-       << "nodesep=0;" << endl
-       << "margin=0;" << endl;
--   outdot << "  node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl;
-+   outdot << "  node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\"DejaVu Serif\"];" << endl;
- 
-    std::stringstream ssDep;
-    const int numColumns = 3;
-@@ -939,7 +939,7 @@
-       << "ranksep=0;" << endl
-       << "nodesep=0;" << endl
-       << "size=\"8,10\";" << endl
--      << "node [fontsize=20,shape=plaintext];" << endl;
-+      << "node [fontsize=20,shape=plaintext,fontname=\"DejaVu Serif\"];" << endl;
- 
-    for (std::list<std::string>::iterator iFile = listFilesToParse.begin();
-       iFile != listFilesToParse.end(); ++iFile) {
-@@ -999,7 +999,8 @@
-       << "ranksep=0.7;" << endl
-       << "nodesep=0.3;" << endl
-       << "size=\"8,8\";" << endl
--      << "ratio=compress;" << endl;
-+      << "ratio=compress;" << endl
-+      << "node [fontname=\"DejaVu Serif\"];" << endl;
- 
-    TString libs(fCurrentClass->GetSharedLibs());
-    outdot << "\"All Libraries\" [URL=\"LibraryDependencies.html\",shape=box,rank=max,fillcolor=lightgray,style=filled];" << endl;
-@@ -1109,7 +1110,8 @@
- 
-    dotout << "digraph G {" << endl
-           << "ratio=auto;" << endl
--          << "rankdir=RL;" << endl;
-+          << "rankdir=RL;" << endl
-+          << "node [fontname=\"DejaVu Serif\"];" << endl;
- 
-    // loop on all classes
-    TClassDocInfo* cdi = 0;

diff --git a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
deleted file mode 100644
index ec67a15..0000000
--- a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Naur root.as-needed/Makefile root/Makefile
---- a/Makefile.orig	2013-02-15 02:27:56.000000000 +0400
-+++ b/Makefile	2013-02-23 02:22:14.556465852 +0400
-@@ -1258,10 +1258,7 @@
- 	   for lib in $(RFLX_GRFLXPY); do \
- 	      rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \
- 	   done; \
--	   for lib in $(RFLX_GRFLXPYC); do \
--	      rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \
--	   done; \
--	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      dir=$(subst lib/,,$(RFLX_GRFLXDD)); \
- 	      while test "x$${dir}" != "x" && \
- 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.as-needed/bindings/pyroot/Module.mk	2011-07-10 10:42:48.991561304 +0400
-+++ root/bindings/pyroot/Module.mk	2011-07-10 10:43:21.493339703 +0400
-@@ -48,8 +48,6 @@
- ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- include/%.h:    $(PYROOTDIRI)/%.h
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
--$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \
-+$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) \
-                 $(ROOTLIBSDEP) $(PYTHONLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
---- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
-+++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
-@@ -691,10 +691,6 @@
- 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
- 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
- 		-X$(PREFIX)/include/root/Minuit2
- #		$(foreach i, \
-diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
-+++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
-@@ -31,10 +31,6 @@
- CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC    := $(CINTEXPY:.py=.pyc)
--CINTEXPYO    := $(CINTEXPY:.py=.pyo)
--endif
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
- 
- RFLX_LIBDIR = $(LIBDIR)
- 
-@@ -92,7 +89,7 @@
- 
- ALLEXECS += $(RFLX_GENMAPX)
- 
--POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN  += $(RFLX_GRFLXPY)
- 
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- 		  mkdir -p lib/python/genreflex; fi )
- 		cp $< $@
- 
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
--		@python -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
- 
-@@ -149,7 +144,7 @@
- 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
- 
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
- 
- clean-genreflex:
- 		@rm -rf lib/python/genreflex
-diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
-@@ -15,7 +15,7 @@
- #####################   sources   ####################
- 
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
- 
- #####################  gccxmlpath ####################
- 

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 0ff221b..7e1dbd5 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -15,15 +15,12 @@
   GUI toolkit, and a complete visualization framework.
 </longdescription>
 <use>
-  <flag name="c++11"> Build ROOT using the C++11 standard</flag>
-  <flag name="c++14"> Build ROOT using the C++14 standard</flag>
   <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
   <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
   <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
   <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
   <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
   <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
-  <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
   <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
 </use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-5.34.26.ebuild b/sci-physics/root/root-5.34.26.ebuild
deleted file mode 100644
index 15ec664..0000000
--- a/sci-physics/root/root-5.34.26.ebuild
+++ /dev/null
@@ -1,449 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.18-r1.ebuild,v 1.3 2014/03/27 18:51:54 bicatali Exp $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
-else
-	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-SRC_URI+=" http://dev.gentoo.org/~bircoph/patches/${PN}-5.34.26-ldflags.patch.xz"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \
-	toolchain-funcs user versionator
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-DOC_URI="ftp://root.cern.ch/${PN}/doc"
-
-SLOT="0/$(get_version_component_range 1-3 ${PV})"
-LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-IUSE="+X afs avahi c++11 c++14 doc emacs examples fits fftw
-	graphviz http kerberos ldap +math minimal mpi mysql odbc
-	+opengl openmp oracle postgres prefix pythia6 pythia8
-	python qt4 +reflex ruby sqlite ssl xinetd xml xrootd"
-
-# TODO: add support for: davix
-# TODO: unbundle: vdt
-
-REQUIRED_USE="
-	!X? ( !minimal? ( !opengl !qt4 ) )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-CDEPEND="
-	app-arch/xz-utils:0=
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre:3=
-	media-fonts/dejavu
-	media-libs/freetype:2=
-	media-libs/giflib:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:0=
-	virtual/jpeg:0
-	virtual/shadow
-	X? (
-		media-libs/ftgl:0=
-		media-libs/glew:0=
-		x11-libs/libX11:0=
-		x11-libs/libXext:0=
-		x11-libs/libXpm:0=
-		!minimal? (
-			|| (
-				media-libs/libafterimage:0=[gif,jpeg,png,tiff]
-				>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff]
-			)
-			opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
-			qt4? (
-				dev-qt/qtgui:4=
-				dev-qt/qtopengl:4=
-				dev-qt/qt3support:4=
-				dev-qt/qtsvg:4=
-				dev-qt/qtwebkit:4=
-				dev-qt/qtxmlpatterns:4=
-			)
-			x11-libs/libXft:0=
-		)
-	)
-	!minimal? (
-		afs? ( net-fs/openafs )
-		avahi? ( net-dns/avahi:0= )
-		emacs? ( virtual/emacs )
-		fits? ( sci-libs/cfitsio:0= )
-		fftw? ( sci-libs/fftw:3.0= )
-		graphviz? ( media-gfx/graphviz:0= )
-		http? ( dev-libs/fcgi:0= )
-		kerberos? ( virtual/krb5 )
-		ldap? ( net-nds/openldap:0= )
-		math? (
-			sci-libs/gsl:0=
-			sci-mathematics/unuran:0=
-			mpi? ( virtual/mpi )
-		)
-		mysql? ( virtual/mysql )
-		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
-		oracle? ( dev-db/oracle-instantclient-basic:0= )
-		postgres? ( dev-db/postgresql:= )
-		pythia6? ( sci-physics/pythia:6= )
-		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
-		python? ( ${PYTHON_DEPS} )
-		ruby? (
-			dev-lang/ruby:=
-			dev-ruby/rubygems:=
-		)
-		sqlite? ( dev-db/sqlite:3= )
-		ssl? ( dev-libs/openssl:0= )
-		xml? ( dev-libs/libxml2:2= )
-		xrootd? ( >=net-libs/xrootd-3.3.5:0= )
-	)"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="doc? ( !minimal? ( ~app-doc/root-docs-${PV}[http=,math=] ) )"
-
-S="${WORKDIR}/${PN}"
-
-# install stuff in ${P} and not ${PF} for easier tracking in root-docs
-DOC_DIR="/usr/share/doc/${P}"
-
-die_compiler() {
-	eerror "You are using a $(tc-getCXX) without C++$1 capabilities"
-	die "Need one of the following C++$1 capable compilers:\n"\
-		"    >=sys-devel/gcc[cxx]-$2\n"\
-		"    >=sys-devel/clang-$3\n"\
-		"    >=dev-lang/icc-$4"
-}
-
-# check compiler to satisfy minimal versions
-# $1 - std version
-# $2 - g++
-# $3 - clang++
-# $4 - icc/icpc
-check_compiler() {
-	case "$(tc-getCXX)" in
-		*clang++*)
-			version_is_at_least "$3" "$(has_version sys-devel/clang)" || die_compiler "$1" "$2" "$3" "$4"
-		;;
-		*g++*)
-			version_is_at_least "$2" "$(gcc-version)" || die_compiler "$1" "$2" "$3" "$4"
-		;;
-		*icc*|*icpc*)
-			version_is_at_least "$4" "$(has_version dev-lang/icc)" || die_compiler "$1" "$2" "$3" "$4"
-		;;
-		*)
-			ewarn "You are using an unsupported compiler."
-			ewarn "Please report any issues upstream."
-		;;
-	esac
-}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
-	echo
-
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	use minimal && return
-
-	if use math; then
-		if use openmp; then
-			if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! tc-has-openmp; then
-				ewarn "You are using a g++ without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-
-	use c++11 && check_compiler "11" "4.8" "3.3" "13"
-	use c++14 && check_compiler "14" "4.9" "3.4" "15"
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
-		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
-		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
-		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
-		"${FILESDIR}"/${PN}-5.32.00-dotfont.patch \
-		"${FILESDIR}"/${PN}-5.34.05-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
-		"${FILESDIR}"/${PN}-5.34.13-desktop.patch \
-		"${WORKDIR}"/${PN}-5.34.26-ldflags.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -r graf2d/asimage/src/libAfterImage || die
-	rm -r graf3d/ftgl/{inc,src} || die
-	rm -r graf2d/freetype/src || die
-	rm -r graf3d/glew/{inc,src} || die
-	rm -r core/pcre/src || die
-	rm -r math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \
-		xargs -0 rm || die
-	rm -r core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
-		graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# CSS should use local images
-	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
-
-	# fix reflex path (bug #497280)
-	sed -i -e 's|${ROOTSYS}/lib|@libdir@|' config/genreflex.in || die
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-}
-
-src_configure() {
-	local -a myconf
-	# Some compilers need special care
-	case "$(tc-getCXX)" in
-		*clang++*)
-			myconf=(
-				--with-clang
-				--with-f77="$(tc-getFC)"
-			)
-		;;
-		*icc*|*icpc*)
-			# For icc we need to provide architecture manually
-			# and not to tamper with tc-get*
-			use x86 && myconf=( linuxicc )
-			use amd64 && myconf=( linuxx8664icc )
-		;;
-		*)	# gcc goes here too
-			myconf=(
-				--with-cc="$(tc-getCC)"
-				--with-cxx="$(tc-getCXX)"
-				--with-f77="$(tc-getFC)"
-				--with-ld="$(tc-getCXX)"
-			)
-		;;
-	esac
-
-	# the configure script is not the standard autotools
-	myconf+=(
-		--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"
-		--disable-werror
-		--nohowto
-		--cflags='${CFLAGS}'
-		--cxxflags='${CXXFLAGS}'
-		--ldflags='${LDFLAGS}'
-	)
-
-	if use minimal; then
-		myconf+=( $(usex X --gminimal --minimal) )
-	else
-		myconf+=(
-			--with-afs-shared=yes
-			--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
-			--disable-builtin-afterimage
-			--disable-builtin-ftgl
-			--disable-builtin-freetype
-			--disable-builtin-glew
-			--disable-builtin-pcre
-			--disable-builtin-zlib
-			--disable-builtin-lzma
-			--disable-cling
-			--enable-astiff
-			--enable-explicitlink
-			--enable-gdml
-			--enable-memstat
-			--enable-shadowpw
-			--enable-shared
-			--enable-soversion
-			--enable-table
-			--fail-on-missing
-			$(use_enable X x11)
-			$(use_enable X asimage)
-			$(use_enable X xft)
-			$(use_enable afs)
-			$(use_enable avahi bonjour)
-			$(use_enable c++11 cxx11)
-			$(use_enable c++14 cxx14)
-			$(use_enable fits fitsio)
-			$(use_enable fftw fftw3)
-			$(use_enable graphviz gviz)
-			$(use_enable http)
-			$(use_enable kerberos krb5)
-			$(use_enable ldap)
-			$(use_enable math gsl-shared)
-			$(use_enable math genvector)
-			$(use_enable math mathmore)
-			$(use_enable math minuit2)
-			$(use_enable math roofit)
-			$(use_enable math tmva)
-			$(use_enable math unuran)
-			$(use_enable mysql)
-			$(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
-			$(use_enable odbc)
-			$(use_enable opengl)
-			$(use_enable oracle)
-			$(use_enable postgres pgsql)
-			$(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "")
-			$(use_enable prefix rpath)
-			$(use_enable pythia6)
-			$(use_enable pythia8)
-			$(use_enable python)
-			$(use_enable qt4 qt)
-			$(use_enable qt4 qtgsi)
-			$(use_enable reflex cintex)
-			$(use_enable reflex)
-			$(use_enable ruby)
-			$(use_enable sqlite)
-			$(use_enable ssl)
-			$(use_enable xml)
-			$(use_enable xrootd)
-			${EXTRA_ECONF}
-		)
-	fi
-
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	emake \
-		OPT="${CXXFLAGS}" \
-		F77OPT="${FFLAGS}" \
-		ROOTSYS="${S}" \
-		LD_LIBRARY_PATH="${S}/lib"
-	use emacs && ! use minimal && elisp-compile build/misc/*.el
-}
-
-daemon_install() {
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	echo "Icon=root-system-bin" >> etc/root.desktop
-	domenu etc/root.desktop
-	doicon build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-cleanup_install() {
-	# Cleanup of files either already distributed or unused on Gentoo
-	pushd "${ED}" > /dev/null
-	rm usr/share/root/fonts/LICENSE || die
-	rm etc/root/proof/*.sample || die
-	rm -r etc/root/daemons || die
-	# these should be in PATH
-	mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
-	rm ${DOC_DIR#/}/{INSTALL,LICENSE,COPYING.CINT} || die
-	use examples || rm -r ${DOC_DIR#/}/examples || die
-	cd usr/$(get_libdir)/root/cint/cint
-	rm lib/posix/mktypes lib/dll_stl/setup lib/G__* || die
-	rm lib/dll_stl/G__* lib/dll_stl/rootcint_* lib/posix/exten.o || die
-	rm include/makehpib || die
-	popd > /dev/null
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
-
-	if ! use minimal; then
-		use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
-		if use python; then
-			echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
-			python_optimize "${D}/usr/$(get_libdir)/root"
-			use reflex && python_optimize "${D}/usr/$(get_libdir)/root/python/genreflex/"
-		fi
-		use ruby && \
-			echo "RUBYLIB=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
-		use emacs && elisp-install ${PN} build/misc/*.{el,elc}
-		if use examples; then
-			# these should really be taken care of by the root make install
-			insinto ${DOC_DIR}/examples/tutorials/tmva
-			doins -r tmva/test
-		fi
-	fi
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -r "${ED}"/usr/share/emacs || die
-
-	daemon_install
-	desktop_install
-	cleanup_install
-
-	# do not copress files used by ROOT's CLI (.credit, .demo, .license)
-	docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials}
-	# needed for .license command to work
-	dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}


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

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2015-04-12 19:22 Andrew Savchenko
  0 siblings, 0 replies; 10+ messages in thread
From: Andrew Savchenko @ 2015-04-12 19:22 UTC (permalink / raw
  To: gentoo-commits

commit:     21403a331d44f269a6c4d13b58e849bbf4f9b1a6
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Apr 12 19:21:32 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Apr 12 19:21:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=21403a33

sci-physics/root: 6.02.05-r2 moved to the tree

 sci-physics/root/ChangeLog                         |   5 +
 .../root/files/root-6.00.01-prop-flags.patch       |  17 -
 sci-physics/root/files/root-6.02.05-dictpch.patch  |  31 --
 sci-physics/root/files/root-6.02.05-xrootd4.patch  |  11 -
 sci-physics/root/metadata.xml                      |   4 -
 sci-physics/root/root-6.02.05-r2.ebuild            | 482 ---------------------
 6 files changed, 5 insertions(+), 545 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index ac89d27..14a233a 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -root-6.02.05-r2.ebuild,
+  -files/root-6.00.01-prop-flags.patch, -files/root-6.02.05-dictpch.patch,
+  -files/root-6.02.05-xrootd4.patch:
+  root-6.02.05-r2 is in the portage tree now
+
   12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> root-6.02.05-r2.ebuild:
   Fix "pg_config: command not found" QA warning if postgres is not
   installed.

diff --git a/sci-physics/root/files/root-6.00.01-prop-flags.patch b/sci-physics/root/files/root-6.00.01-prop-flags.patch
deleted file mode 100644
index 3a10024..0000000
--- a/sci-physics/root/files/root-6.00.01-prop-flags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/config/Makefile.in b/config/Makefile.in
-index dd89044..4fc7de3 100644
---- a/config/Makefile.in
-+++ b/config/Makefile.in
-@@ -64,9 +64,9 @@ HOST           := @host@
- USECONFIG      := @useconfig@
- MKLIBOPTIONS   := @mkliboption@
- 
--EXTRA_CFLAGS   := -Iinclude @cflags@
--EXTRA_CXXFLAGS := -Iinclude @cflags@
--EXTRA_LDFLAGS  := @ldflags@
-+EXTRA_CFLAGS   := -Iinclude @cflags@ $(CFLAGS)
-+EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS)
-+EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
- WERROR         := @werror@
- WINRTDEBUG     := @winrtdebug@
- CTORSINITARRAY := @ctorsinitarray@

diff --git a/sci-physics/root/files/root-6.02.05-dictpch.patch b/sci-physics/root/files/root-6.02.05-dictpch.patch
deleted file mode 100644
index 80a416e..0000000
--- a/sci-physics/root/files/root-6.02.05-dictpch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- etc/dictpch/makepch-gentoo.sh.orig	2015-04-08 14:27:07.781026830 +0300
-+++ etc/dictpch/makepch-gentoo.sh	2015-04-12 13:40:48.226060739 +0300
-@@ -13,8 +13,8 @@
- # Copyright (c) 2014 Rene Brun and Fons Rademakers
- # Author: Axel Naumann <axel@cern.ch>, 2014-10-16
- 
--rootdir=.
--cfgdir=etc/dictpch
-+rootdir=ROOTDIR_TEMPLATE
-+cfgdir=etc/root/dictpch
- allheaders=$cfgdir/allHeaders.h
- alllinkdefs=$cfgdir/allLinkDefs.h
- cppflags=$cfgdir/allCppflags.txt
-@@ -36,7 +36,7 @@
-     rootbuild=-rootbuild
- fi
- 
--cxxflags="-D__CLING__ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DROOT_PCH -I$rootdir/include -I$rootdir/etc -I$rootdir/$cfgdir -I$rootdir/etc/cling `cat $rootdir/$cppflags`"
-+cxxflags="-D__CLING__ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DROOT_PCH -I$rootdir/usr/include/root -I$rootdir/etc/root -I$rootdir/$cfgdir -I$rootdir/etc/root/cling `cat $rootdir/$cppflags`"
- 
- if ! [ "x$1" = "x" ]; then
-     cxxflags="$cxxflags $1"
-@@ -44,7 +44,7 @@
- 
- # generate pch
- touch allDict.cxx.h
--$rootdir/bin/rootcling $rootbuild -1 -f allDict.cxx -noDictSelection -c $cxxflags $allheaders $@ $alllinkdefs
-+$rootdir/usr/bin/rootcling -1 -f allDict.cxx -noDictSelection -c $cxxflags $allheaders $@ $alllinkdefs
- res=$?
- if [ $res -eq 0 ] ; then
-   mv allDict_rdict.pch $pch

diff --git a/sci-physics/root/files/root-6.02.05-xrootd4.patch b/sci-physics/root/files/root-6.02.05-xrootd4.patch
deleted file mode 100644
index 0b4a4be..0000000
--- a/sci-physics/root/files/root-6.02.05-xrootd4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://sft.its.cern.ch/jira/browse/ROOT-6998
---- root-6.02.05/net/netxng/src/TNetXNGFile.cxx.orig	2015-02-09 11:59:47.000000000 +0300
-+++ root-6.02.05/net/netxng/src/TNetXNGFile.cxx	2015-04-05 11:32:31.893127758 +0300
-@@ -28,6 +28,7 @@
- #include <XrdCl/XrdClFile.hh>
- #include <XrdCl/XrdClXRootDResponses.hh>
- #include <XrdCl/XrdClDefaultEnv.hh>
-+#include <XrdVersion.hh>
- #include <iostream>
- 
- //------------------------------------------------------------------------------

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index a8f8c1f..7e1dbd5 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -16,15 +16,11 @@
 </longdescription>
 <use>
   <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-  <flag name="gdml">Enable GDML writer and reader</flag>
   <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
   <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
   <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-  <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag>
   <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
   <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
-  <flag name="shadow">Enable shadow authentication in rootd and proofd</flag>
-  <flag name="table">Build libTable contrib library</flag>
   <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
 </use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-6.02.05-r2.ebuild b/sci-physics/root/root-6.02.05-r2.ebuild
deleted file mode 100644
index b69ac9f..0000000
--- a/sci-physics/root/root-6.02.05-r2.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28.ebuild,v 1.1 2015/03/25 21:38:59 bircoph Exp $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
-else
-	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \
-	toolchain-funcs user versionator
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-DOC_URI="ftp://root.cern.ch/${PN}/doc"
-
-SLOT="0/$(get_version_component_range 1-3 ${PV})"
-LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-IUSE="+X afs avahi doc emacs examples fits fftw gdml geocad
-	graphviz http kerberos ldap +math +memstat mpi mysql odbc
-	+opengl openmp oracle postgres prefix pythia6 pythia8
-	python qt4 shadow sqlite ssl table +tiff xinetd xml xrootd"
-
-# TODO: add support for: davix
-# TODO: ROOT-6 supports x32 ABI, but half of its dependencies doesn't
-# TODO: unbundle: cling, vdt
-
-REQUIRED_USE="
-	!X? ( !opengl !qt4 !tiff )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-CDEPEND="
-	app-arch/xz-utils:0=
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre:3=
-	media-fonts/dejavu
-	media-libs/freetype:2=
-	media-libs/libpng:0=
-	>=sys-devel/clang-3.4:=
-	sys-libs/zlib:0=
-	virtual/shadow
-	X? (
-		media-libs/ftgl:0=
-		media-libs/glew:0=
-		x11-libs/libX11:0=
-		x11-libs/libXext:0=
-		x11-libs/libXpm:0=
-		|| (
-			media-libs/libafterimage:0=[gif,jpeg,png,tiff?]
-			>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff?]
-		)
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
-		qt4? (
-			dev-qt/qtgui:4=
-			dev-qt/qtopengl:4=
-			dev-qt/qt3support:4=
-			dev-qt/qtsvg:4=
-			dev-qt/qtwebkit:4=
-			dev-qt/qtxmlpatterns:4=
-		)
-		x11-libs/libXft:0=
-	)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi:0= )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	geocad? ( <sci-libs/opencascade-6.8.0:= )
-	graphviz? ( media-gfx/graphviz:0= )
-	http? ( dev-libs/fcgi:0= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:0= )
-	math? (
-		sci-libs/gsl:0=
-		sci-mathematics/unuran:0=
-		mpi? ( virtual/mpi )
-	)
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
-	oracle? ( dev-db/oracle-instantclient-basic:0= )
-	postgres? ( dev-db/postgresql:= )
-	pythia6? ( sci-physics/pythia:6= )
-	pythia8? ( >=sci-physics/pythia-8.1.80:8= )
-	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3= )
-	ssl? ( dev-libs/openssl:0= )
-	xml? ( dev-libs/libxml2:2= )
-	xrootd? ( >=net-libs/xrootd-3.3.5:0= )
-"
-
-# TODO: ruby is not yet ported to ROOT-6, reenable when (if?) ready
-#		ruby? (
-#			dev-lang/ruby:=
-#			dev-ruby/rubygems:=
-#		)
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
-
-# install stuff in ${P} and not ${PF} for easier tracking in root-docs
-DOC_DIR="/usr/share/doc/${P}"
-
-OC_UNSUPPORTED="6.8.0"
-
-die_compiler() {
-	eerror "You are using a $(tc-getCXX) without C++$1 capabilities"
-	die "Need one of the following C++$1 capable compilers:\n"\
-		"    >=sys-devel/gcc[cxx]-$2\n"\
-		"    >=sys-devel/clang-$3\n"\
-		"    >=dev-lang/icc-$4"
-}
-
-# check compiler to satisfy minimal versions
-# $1 - std version
-# $2 - g++
-# $3 - clang++
-# $4 - icc/icpc
-check_compiler() {
-	case "$(tc-getCXX)" in
-		*clang++*)
-			version_is_at_least "$3" "$(has_version sys-devel/clang)" || die_compiler "$1" "$2" "$3" "$4"
-		;;
-		*g++*)
-			version_is_at_least "$2" "$(gcc-version)" || die_compiler "$1" "$2" "$3" "$4"
-		;;
-		*icc*|*icpc*)
-			version_is_at_least "$4" "$(has_version dev-lang/icc)" || die_compiler "$1" "$2" "$3" "$4"
-			eerror "ROOT-6 is known not to build with ICC."
-			eerror "Please report any isuses upstream."
-		;;
-		*)
-			ewarn "You are using an unsupported compiler."
-			ewarn "Please report any issues upstream."
-		;;
-	esac
-}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
-	echo
-
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp; then
-			if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! tc-has-openmp; then
-				ewarn "You are using a g++ without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-
-	# c++11 support is mandatory
-	check_compiler "11" "4.8" "3.4" "13"
-
-	# Active version of opencascade may be >= $OC_UNSUPPORTED,
-	# so we need to eselect proper version (it must exist due to DEPEND requirement)
-	if use geocad; then
-		oc_current=$(eselect opencascade show)
-		# Proceed only if active version is unsupported
-		if version_is_at_least "${OC_UNSUPPORTED}" "${oc_current}"; then
-			local -a vlist
-			vlist=( $(version_sort $(eselect opencascade list | awk '/^ / { print $2 }')) )
-			local i
-			# search for higehr version < $OC_UNSUPPORTED
-			# list is sorted acsending, so loop backwards
-			for (( i=$(( ${#vlist[@]} -1 )); i>=0; i-- )); do
-				version_is_at_least "${OC_UNSUPPORTED}" "${vlist[i]}" || break
-			done
-			[[ $i == "-1" ]] && die "No suitable opencascade eselect slot is available (<${OC_UNSUPPORTED})"
-
-			einfo "Switching opencascade to supported slot: ${oc_current} -> ${vlist[i]}"
-			eselect opencascade set ${vlist[i]} > /dev/null || die "eselect opencascade set ${vlist[i]} failed!"
-		else
-			# forget it, effectively disabling eselect cleanup
-			unset oc_current
-		fi
-	fi
-}
-
-src_prepare() {
-	# Second version of makepch is required in order to generate
-	# PCH file appropriate for Gentoo include headers layout.
-	# This can be done only at install stage, when files are placed
-	# as appropriate. Premature modification of makepch.sh will
-	# broke build process, however.
-	cp "etc/dictpch/makepch.sh" "etc/dictpch/makepch-gentoo.sh" || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
-		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
-		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
-		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
-		"${FILESDIR}"/${PN}-5.34.13-desktop.patch \
-		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
-		"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
-		"${FILESDIR}"/${PN}-6.00.01-geocad.patch \
-		"${FILESDIR}"/${PN}-6.00.01-llvm.patch \
-		"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-6.00.01-prop-flags.patch \
-		"${FILESDIR}"/${PN}-6.02.05-dictpch.patch \
-		"${FILESDIR}"/${PN}-6.02.05-xrootd4.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -r graf2d/asimage/src/libAfterImage || die
-	rm -r graf3d/ftgl/{inc,src} || die
-	rm -r graf2d/freetype/src || die
-	rm -r graf3d/glew/{inc,src} || die
-	rm -r core/pcre/src || die
-	rm -r math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \
-		xargs -0 rm || die
-	rm -r core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
-		graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# CSS should use local images
-	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-}
-
-# NB: ROOT uses bundled LLVM, because it is patched and API-incompatible with
-# system LLVM.
-# NB: As of 6.00.0.1 cmake is not ready as it can't fully replace configure,
-# e.g. for afs and geocad.
-
-src_configure() {
-	local -a myconf
-	# Some compilers need special care
-	case "$(tc-getCXX)" in
-		*clang++*)
-			myconf=(
-				--with-clang
-				--with-f77="$(tc-getFC)"
-			)
-		;;
-		*icc*|*icpc*)
-			# For icc we need to provide architecture manually
-			# and not to tamper with tc-get*
-			use x86 && myconf=( linuxicc )
-			use amd64 && myconf=( linuxx8664icc )
-		;;
-		*)	# gcc goes here too
-			myconf=(
-				--with-cc="$(tc-getCC)"
-				--with-cxx="$(tc-getCXX)"
-				--with-f77="$(tc-getFC)"
-				--with-ld="$(tc-getCXX)"
-			)
-		;;
-	esac
-
-	# the configure script is not the standard autotools
-	myconf+=(
-		--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"
-		--disable-builtin-afterimage
-		--disable-builtin-ftgl
-		--disable-builtin-freetype
-		--disable-builtin-glew
-		--disable-builtin-pcre
-		--disable-builtin-zlib
-		--disable-builtin-lzma
-		--disable-werror
-		--enable-explicitlink
-		--enable-shared
-		--enable-soversion
-		--fail-on-missing
-		--nohowto
-		--with-afs-shared=yes
-		--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
-		$(use_enable X x11)
-		$(use_enable X asimage)
-		$(use_enable X xft)
-		$(use_enable afs)
-		$(use_enable avahi bonjour)
-		$(use_enable fits fitsio)
-		$(use_enable fftw fftw3)
-		$(use_enable gdml)
-		$(use_enable geocad)
-		$(use_enable graphviz gviz)
-		$(use_enable http)
-		$(use_enable kerberos krb5)
-		$(use_enable ldap)
-		$(use_enable math genvector)
-		$(use_enable math gsl-shared)
-		$(use_enable math mathmore)
-		$(use_enable math minuit2)
-		$(use_enable math roofit)
-		$(use_enable math tmva)
-		$(use_enable math vc)
-		$(use_enable math vdt)
-		$(use_enable math unuran)
-		$(use_enable memstat)
-		$(use_enable mysql)
-		$(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
-		$(use_enable odbc)
-		$(use_enable opengl)
-		$(use_enable oracle)
-		$(use_enable postgres pgsql)
-		$(use_enable prefix rpath)
-		$(use_enable pythia6)
-		$(use_enable pythia8)
-		$(use_enable python)
-		$(use_enable qt4 qt)
-		$(use_enable qt4 qtgsi)
-		$(use_enable shadow shadowpw)
-		$(use_enable sqlite)
-		$(use_enable ssl)
-		$(use_enable table)
-		$(use_enable tiff astiff)
-		$(use_enable xml)
-		$(use_enable xrootd)
-		${EXTRA_ECONF}
-	)
-
-	# usex can't be used here, because pg_config may be not
-	# installed with USE="-postgres"
-	use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir) )
-
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	emake \
-		OPT="${CXXFLAGS}" \
-		F77OPT="${FFLAGS}" \
-		ROOTSYS="${S}" \
-		LD_LIBRARY_PATH="${S}/lib"
-	use emacs && elisp-compile build/misc/*.el
-}
-
-daemon_install() {
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	local i
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	echo "Icon=root-system-bin" >> etc/root.desktop
-	domenu etc/root.desktop
-	doicon build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-cleanup_install() {
-	# Cleanup of files either already distributed or unused on Gentoo
-	pushd "${ED}" > /dev/null
-	rm usr/share/root/fonts/LICENSE || die
-	rm etc/root/proof/*.sample || die
-	rm -r etc/root/daemons || die
-	# these should be in PATH
-	mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
-	rm ${DOC_DIR#/}/{INSTALL,LICENSE} || die
-	use examples || rm -r ${DOC_DIR#/}/examples || die
-
-	# clean hardcoded sandbox paths
-	rm etc/root/dictpch/allCppflags.txt.tmp || die
-	sed -i "s|${S}/||" etc/root/cling/llvm/Config/llvm-config.h || die
-	# regenerate pch for Gentoo headers layout
-	rm "etc/root/allDict.cxx.pch" || die
-	sed -i 's|etc/dictpch|etc/root/dictpch|' etc/root/dictpch/allLinkDefs.h || die
-	sed -i 's|etc/cling|etc/root/cling|' etc/root/dictpch/allHeaders.h || die
-	sed -i "s|ROOTDIR_TEMPLATE|${ED}|" etc/root/dictpch/makepch-gentoo.sh || die
-	etc/root/dictpch/makepch-gentoo.sh etc/root/allDict.cxx.pch || die "PCH generation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README.md
-
-	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
-
-	if use python; then
-		echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
-		python_optimize "${D}/usr/$(get_libdir)/root"
-	fi
-	use emacs && elisp-install ${PN} build/misc/*.{el,elc}
-	if use examples; then
-		# these should really be taken care of by the root make install
-		insinto ${DOC_DIR}/examples/tutorials/tmva
-		doins -r tmva/test
-	fi
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -r "${ED}"/usr/share/emacs || die
-
-	daemon_install
-	desktop_install
-	cleanup_install
-
-	# do not copress files used by ROOT's CLI (.credit, .demo, .license)
-	docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials}
-	# needed for .license command to work
-	dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	# restort opencascade eselect slot
-	if use geocad && [[ -n ${oc_current} ]]; then
-		einfo "Switching to user set slot: $(eselect opencascade show) -> ${oc_current}"
-		eselect opencascade set ${oc_current} > /dev/null || eerror "eselect opencascade set ${vlist[i]} failed!"
-		unset oc_current
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}


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

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2015-04-13  6:25 Justin Lecher
  0 siblings, 0 replies; 10+ messages in thread
From: Justin Lecher @ 2015-04-13  6:25 UTC (permalink / raw
  To: gentoo-commits

commit:     cd559bc8acd09f8c6d72b28cf098a064f2b1c406
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Apr 12 19:21:32 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 06:24:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=cd559bc8

sci-physics/root: 6.02.05-r2 moved to the tree

 sci-physics/root/ChangeLog                         |   5 +
 .../root/files/root-6.00.01-prop-flags.patch       |  17 -
 sci-physics/root/files/root-6.02.05-dictpch.patch  |  31 --
 sci-physics/root/files/root-6.02.05-xrootd4.patch  |  11 -
 sci-physics/root/metadata.xml                      |   4 -
 sci-physics/root/root-6.02.05-r2.ebuild            | 482 ---------------------
 6 files changed, 5 insertions(+), 545 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index ac89d27..14a233a 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -root-6.02.05-r2.ebuild,
+  -files/root-6.00.01-prop-flags.patch, -files/root-6.02.05-dictpch.patch,
+  -files/root-6.02.05-xrootd4.patch:
+  root-6.02.05-r2 is in the portage tree now
+
   12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> root-6.02.05-r2.ebuild:
   Fix "pg_config: command not found" QA warning if postgres is not
   installed.

diff --git a/sci-physics/root/files/root-6.00.01-prop-flags.patch b/sci-physics/root/files/root-6.00.01-prop-flags.patch
deleted file mode 100644
index 3a10024..0000000
--- a/sci-physics/root/files/root-6.00.01-prop-flags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/config/Makefile.in b/config/Makefile.in
-index dd89044..4fc7de3 100644
---- a/config/Makefile.in
-+++ b/config/Makefile.in
-@@ -64,9 +64,9 @@ HOST           := @host@
- USECONFIG      := @useconfig@
- MKLIBOPTIONS   := @mkliboption@
- 
--EXTRA_CFLAGS   := -Iinclude @cflags@
--EXTRA_CXXFLAGS := -Iinclude @cflags@
--EXTRA_LDFLAGS  := @ldflags@
-+EXTRA_CFLAGS   := -Iinclude @cflags@ $(CFLAGS)
-+EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS)
-+EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
- WERROR         := @werror@
- WINRTDEBUG     := @winrtdebug@
- CTORSINITARRAY := @ctorsinitarray@

diff --git a/sci-physics/root/files/root-6.02.05-dictpch.patch b/sci-physics/root/files/root-6.02.05-dictpch.patch
deleted file mode 100644
index 80a416e..0000000
--- a/sci-physics/root/files/root-6.02.05-dictpch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- etc/dictpch/makepch-gentoo.sh.orig	2015-04-08 14:27:07.781026830 +0300
-+++ etc/dictpch/makepch-gentoo.sh	2015-04-12 13:40:48.226060739 +0300
-@@ -13,8 +13,8 @@
- # Copyright (c) 2014 Rene Brun and Fons Rademakers
- # Author: Axel Naumann <axel@cern.ch>, 2014-10-16
- 
--rootdir=.
--cfgdir=etc/dictpch
-+rootdir=ROOTDIR_TEMPLATE
-+cfgdir=etc/root/dictpch
- allheaders=$cfgdir/allHeaders.h
- alllinkdefs=$cfgdir/allLinkDefs.h
- cppflags=$cfgdir/allCppflags.txt
-@@ -36,7 +36,7 @@
-     rootbuild=-rootbuild
- fi
- 
--cxxflags="-D__CLING__ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DROOT_PCH -I$rootdir/include -I$rootdir/etc -I$rootdir/$cfgdir -I$rootdir/etc/cling `cat $rootdir/$cppflags`"
-+cxxflags="-D__CLING__ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DROOT_PCH -I$rootdir/usr/include/root -I$rootdir/etc/root -I$rootdir/$cfgdir -I$rootdir/etc/root/cling `cat $rootdir/$cppflags`"
- 
- if ! [ "x$1" = "x" ]; then
-     cxxflags="$cxxflags $1"
-@@ -44,7 +44,7 @@
- 
- # generate pch
- touch allDict.cxx.h
--$rootdir/bin/rootcling $rootbuild -1 -f allDict.cxx -noDictSelection -c $cxxflags $allheaders $@ $alllinkdefs
-+$rootdir/usr/bin/rootcling -1 -f allDict.cxx -noDictSelection -c $cxxflags $allheaders $@ $alllinkdefs
- res=$?
- if [ $res -eq 0 ] ; then
-   mv allDict_rdict.pch $pch

diff --git a/sci-physics/root/files/root-6.02.05-xrootd4.patch b/sci-physics/root/files/root-6.02.05-xrootd4.patch
deleted file mode 100644
index 0b4a4be..0000000
--- a/sci-physics/root/files/root-6.02.05-xrootd4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://sft.its.cern.ch/jira/browse/ROOT-6998
---- root-6.02.05/net/netxng/src/TNetXNGFile.cxx.orig	2015-02-09 11:59:47.000000000 +0300
-+++ root-6.02.05/net/netxng/src/TNetXNGFile.cxx	2015-04-05 11:32:31.893127758 +0300
-@@ -28,6 +28,7 @@
- #include <XrdCl/XrdClFile.hh>
- #include <XrdCl/XrdClXRootDResponses.hh>
- #include <XrdCl/XrdClDefaultEnv.hh>
-+#include <XrdVersion.hh>
- #include <iostream>
- 
- //------------------------------------------------------------------------------

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index a8f8c1f..7e1dbd5 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -16,15 +16,11 @@
 </longdescription>
 <use>
   <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-  <flag name="gdml">Enable GDML writer and reader</flag>
   <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
   <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
   <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-  <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag>
   <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
   <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
-  <flag name="shadow">Enable shadow authentication in rootd and proofd</flag>
-  <flag name="table">Build libTable contrib library</flag>
   <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
 </use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-6.02.05-r2.ebuild b/sci-physics/root/root-6.02.05-r2.ebuild
deleted file mode 100644
index b69ac9f..0000000
--- a/sci-physics/root/root-6.02.05-r2.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28.ebuild,v 1.1 2015/03/25 21:38:59 bircoph Exp $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
-else
-	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \
-	toolchain-funcs user versionator
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-DOC_URI="ftp://root.cern.ch/${PN}/doc"
-
-SLOT="0/$(get_version_component_range 1-3 ${PV})"
-LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-IUSE="+X afs avahi doc emacs examples fits fftw gdml geocad
-	graphviz http kerberos ldap +math +memstat mpi mysql odbc
-	+opengl openmp oracle postgres prefix pythia6 pythia8
-	python qt4 shadow sqlite ssl table +tiff xinetd xml xrootd"
-
-# TODO: add support for: davix
-# TODO: ROOT-6 supports x32 ABI, but half of its dependencies doesn't
-# TODO: unbundle: cling, vdt
-
-REQUIRED_USE="
-	!X? ( !opengl !qt4 !tiff )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-CDEPEND="
-	app-arch/xz-utils:0=
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre:3=
-	media-fonts/dejavu
-	media-libs/freetype:2=
-	media-libs/libpng:0=
-	>=sys-devel/clang-3.4:=
-	sys-libs/zlib:0=
-	virtual/shadow
-	X? (
-		media-libs/ftgl:0=
-		media-libs/glew:0=
-		x11-libs/libX11:0=
-		x11-libs/libXext:0=
-		x11-libs/libXpm:0=
-		|| (
-			media-libs/libafterimage:0=[gif,jpeg,png,tiff?]
-			>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff?]
-		)
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
-		qt4? (
-			dev-qt/qtgui:4=
-			dev-qt/qtopengl:4=
-			dev-qt/qt3support:4=
-			dev-qt/qtsvg:4=
-			dev-qt/qtwebkit:4=
-			dev-qt/qtxmlpatterns:4=
-		)
-		x11-libs/libXft:0=
-	)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi:0= )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	geocad? ( <sci-libs/opencascade-6.8.0:= )
-	graphviz? ( media-gfx/graphviz:0= )
-	http? ( dev-libs/fcgi:0= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:0= )
-	math? (
-		sci-libs/gsl:0=
-		sci-mathematics/unuran:0=
-		mpi? ( virtual/mpi )
-	)
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
-	oracle? ( dev-db/oracle-instantclient-basic:0= )
-	postgres? ( dev-db/postgresql:= )
-	pythia6? ( sci-physics/pythia:6= )
-	pythia8? ( >=sci-physics/pythia-8.1.80:8= )
-	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3= )
-	ssl? ( dev-libs/openssl:0= )
-	xml? ( dev-libs/libxml2:2= )
-	xrootd? ( >=net-libs/xrootd-3.3.5:0= )
-"
-
-# TODO: ruby is not yet ported to ROOT-6, reenable when (if?) ready
-#		ruby? (
-#			dev-lang/ruby:=
-#			dev-ruby/rubygems:=
-#		)
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
-
-# install stuff in ${P} and not ${PF} for easier tracking in root-docs
-DOC_DIR="/usr/share/doc/${P}"
-
-OC_UNSUPPORTED="6.8.0"
-
-die_compiler() {
-	eerror "You are using a $(tc-getCXX) without C++$1 capabilities"
-	die "Need one of the following C++$1 capable compilers:\n"\
-		"    >=sys-devel/gcc[cxx]-$2\n"\
-		"    >=sys-devel/clang-$3\n"\
-		"    >=dev-lang/icc-$4"
-}
-
-# check compiler to satisfy minimal versions
-# $1 - std version
-# $2 - g++
-# $3 - clang++
-# $4 - icc/icpc
-check_compiler() {
-	case "$(tc-getCXX)" in
-		*clang++*)
-			version_is_at_least "$3" "$(has_version sys-devel/clang)" || die_compiler "$1" "$2" "$3" "$4"
-		;;
-		*g++*)
-			version_is_at_least "$2" "$(gcc-version)" || die_compiler "$1" "$2" "$3" "$4"
-		;;
-		*icc*|*icpc*)
-			version_is_at_least "$4" "$(has_version dev-lang/icc)" || die_compiler "$1" "$2" "$3" "$4"
-			eerror "ROOT-6 is known not to build with ICC."
-			eerror "Please report any isuses upstream."
-		;;
-		*)
-			ewarn "You are using an unsupported compiler."
-			ewarn "Please report any issues upstream."
-		;;
-	esac
-}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
-	echo
-
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp; then
-			if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! tc-has-openmp; then
-				ewarn "You are using a g++ without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-
-	# c++11 support is mandatory
-	check_compiler "11" "4.8" "3.4" "13"
-
-	# Active version of opencascade may be >= $OC_UNSUPPORTED,
-	# so we need to eselect proper version (it must exist due to DEPEND requirement)
-	if use geocad; then
-		oc_current=$(eselect opencascade show)
-		# Proceed only if active version is unsupported
-		if version_is_at_least "${OC_UNSUPPORTED}" "${oc_current}"; then
-			local -a vlist
-			vlist=( $(version_sort $(eselect opencascade list | awk '/^ / { print $2 }')) )
-			local i
-			# search for higehr version < $OC_UNSUPPORTED
-			# list is sorted acsending, so loop backwards
-			for (( i=$(( ${#vlist[@]} -1 )); i>=0; i-- )); do
-				version_is_at_least "${OC_UNSUPPORTED}" "${vlist[i]}" || break
-			done
-			[[ $i == "-1" ]] && die "No suitable opencascade eselect slot is available (<${OC_UNSUPPORTED})"
-
-			einfo "Switching opencascade to supported slot: ${oc_current} -> ${vlist[i]}"
-			eselect opencascade set ${vlist[i]} > /dev/null || die "eselect opencascade set ${vlist[i]} failed!"
-		else
-			# forget it, effectively disabling eselect cleanup
-			unset oc_current
-		fi
-	fi
-}
-
-src_prepare() {
-	# Second version of makepch is required in order to generate
-	# PCH file appropriate for Gentoo include headers layout.
-	# This can be done only at install stage, when files are placed
-	# as appropriate. Premature modification of makepch.sh will
-	# broke build process, however.
-	cp "etc/dictpch/makepch.sh" "etc/dictpch/makepch-gentoo.sh" || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
-		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
-		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
-		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
-		"${FILESDIR}"/${PN}-5.34.13-desktop.patch \
-		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
-		"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
-		"${FILESDIR}"/${PN}-6.00.01-geocad.patch \
-		"${FILESDIR}"/${PN}-6.00.01-llvm.patch \
-		"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-6.00.01-prop-flags.patch \
-		"${FILESDIR}"/${PN}-6.02.05-dictpch.patch \
-		"${FILESDIR}"/${PN}-6.02.05-xrootd4.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -r graf2d/asimage/src/libAfterImage || die
-	rm -r graf3d/ftgl/{inc,src} || die
-	rm -r graf2d/freetype/src || die
-	rm -r graf3d/glew/{inc,src} || die
-	rm -r core/pcre/src || die
-	rm -r math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \
-		xargs -0 rm || die
-	rm -r core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
-		graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# CSS should use local images
-	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-}
-
-# NB: ROOT uses bundled LLVM, because it is patched and API-incompatible with
-# system LLVM.
-# NB: As of 6.00.0.1 cmake is not ready as it can't fully replace configure,
-# e.g. for afs and geocad.
-
-src_configure() {
-	local -a myconf
-	# Some compilers need special care
-	case "$(tc-getCXX)" in
-		*clang++*)
-			myconf=(
-				--with-clang
-				--with-f77="$(tc-getFC)"
-			)
-		;;
-		*icc*|*icpc*)
-			# For icc we need to provide architecture manually
-			# and not to tamper with tc-get*
-			use x86 && myconf=( linuxicc )
-			use amd64 && myconf=( linuxx8664icc )
-		;;
-		*)	# gcc goes here too
-			myconf=(
-				--with-cc="$(tc-getCC)"
-				--with-cxx="$(tc-getCXX)"
-				--with-f77="$(tc-getFC)"
-				--with-ld="$(tc-getCXX)"
-			)
-		;;
-	esac
-
-	# the configure script is not the standard autotools
-	myconf+=(
-		--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"
-		--disable-builtin-afterimage
-		--disable-builtin-ftgl
-		--disable-builtin-freetype
-		--disable-builtin-glew
-		--disable-builtin-pcre
-		--disable-builtin-zlib
-		--disable-builtin-lzma
-		--disable-werror
-		--enable-explicitlink
-		--enable-shared
-		--enable-soversion
-		--fail-on-missing
-		--nohowto
-		--with-afs-shared=yes
-		--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
-		$(use_enable X x11)
-		$(use_enable X asimage)
-		$(use_enable X xft)
-		$(use_enable afs)
-		$(use_enable avahi bonjour)
-		$(use_enable fits fitsio)
-		$(use_enable fftw fftw3)
-		$(use_enable gdml)
-		$(use_enable geocad)
-		$(use_enable graphviz gviz)
-		$(use_enable http)
-		$(use_enable kerberos krb5)
-		$(use_enable ldap)
-		$(use_enable math genvector)
-		$(use_enable math gsl-shared)
-		$(use_enable math mathmore)
-		$(use_enable math minuit2)
-		$(use_enable math roofit)
-		$(use_enable math tmva)
-		$(use_enable math vc)
-		$(use_enable math vdt)
-		$(use_enable math unuran)
-		$(use_enable memstat)
-		$(use_enable mysql)
-		$(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
-		$(use_enable odbc)
-		$(use_enable opengl)
-		$(use_enable oracle)
-		$(use_enable postgres pgsql)
-		$(use_enable prefix rpath)
-		$(use_enable pythia6)
-		$(use_enable pythia8)
-		$(use_enable python)
-		$(use_enable qt4 qt)
-		$(use_enable qt4 qtgsi)
-		$(use_enable shadow shadowpw)
-		$(use_enable sqlite)
-		$(use_enable ssl)
-		$(use_enable table)
-		$(use_enable tiff astiff)
-		$(use_enable xml)
-		$(use_enable xrootd)
-		${EXTRA_ECONF}
-	)
-
-	# usex can't be used here, because pg_config may be not
-	# installed with USE="-postgres"
-	use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir) )
-
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	emake \
-		OPT="${CXXFLAGS}" \
-		F77OPT="${FFLAGS}" \
-		ROOTSYS="${S}" \
-		LD_LIBRARY_PATH="${S}/lib"
-	use emacs && elisp-compile build/misc/*.el
-}
-
-daemon_install() {
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	local i
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	echo "Icon=root-system-bin" >> etc/root.desktop
-	domenu etc/root.desktop
-	doicon build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-cleanup_install() {
-	# Cleanup of files either already distributed or unused on Gentoo
-	pushd "${ED}" > /dev/null
-	rm usr/share/root/fonts/LICENSE || die
-	rm etc/root/proof/*.sample || die
-	rm -r etc/root/daemons || die
-	# these should be in PATH
-	mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
-	rm ${DOC_DIR#/}/{INSTALL,LICENSE} || die
-	use examples || rm -r ${DOC_DIR#/}/examples || die
-
-	# clean hardcoded sandbox paths
-	rm etc/root/dictpch/allCppflags.txt.tmp || die
-	sed -i "s|${S}/||" etc/root/cling/llvm/Config/llvm-config.h || die
-	# regenerate pch for Gentoo headers layout
-	rm "etc/root/allDict.cxx.pch" || die
-	sed -i 's|etc/dictpch|etc/root/dictpch|' etc/root/dictpch/allLinkDefs.h || die
-	sed -i 's|etc/cling|etc/root/cling|' etc/root/dictpch/allHeaders.h || die
-	sed -i "s|ROOTDIR_TEMPLATE|${ED}|" etc/root/dictpch/makepch-gentoo.sh || die
-	etc/root/dictpch/makepch-gentoo.sh etc/root/allDict.cxx.pch || die "PCH generation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README.md
-
-	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
-
-	if use python; then
-		echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
-		python_optimize "${D}/usr/$(get_libdir)/root"
-	fi
-	use emacs && elisp-install ${PN} build/misc/*.{el,elc}
-	if use examples; then
-		# these should really be taken care of by the root make install
-		insinto ${DOC_DIR}/examples/tutorials/tmva
-		doins -r tmva/test
-	fi
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -r "${ED}"/usr/share/emacs || die
-
-	daemon_install
-	desktop_install
-	cleanup_install
-
-	# do not copress files used by ROOT's CLI (.credit, .demo, .license)
-	docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials}
-	# needed for .license command to work
-	dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	# restort opencascade eselect slot
-	if use geocad && [[ -n ${oc_current} ]]; then
-		einfo "Switching to user set slot: $(eselect opencascade show) -> ${oc_current}"
-		eselect opencascade set ${oc_current} > /dev/null || eerror "eselect opencascade set ${vlist[i]} failed!"
-		unset oc_current
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}


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

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

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

sci-physics/root: version bump

 sci-physics/root/ChangeLog                         |   7 +
 sci-physics/root/files/root-5.32.00-dotfont.patch  |  58 +++
 .../root/files/root-5.34.05-nobyte-compile.patch   | 137 +++++++
 sci-physics/root/files/root-5.34.26-ldflags.patch  |  19 +
 sci-physics/root/metadata.xml                      |   7 +
 sci-physics/root/root-5.34.32.ebuild               | 434 +++++++++++++++++++++
 6 files changed, 662 insertions(+)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 14a233a..10c7d9e 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.34.32 (17 Jul 2015)
+
+  17 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> +root-5.34.32.ebuild,
+  +files/root-5.32.00-dotfont.patch, +files/root-5.34.05-nobyte-compile.patch,
+  +files/root-5.34.26-ldflags.patch:
+  Version bump. Added for testing.
+
   12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -root-6.02.05-r2.ebuild,
   -files/root-6.00.01-prop-flags.patch, -files/root-6.02.05-dictpch.patch,
   -files/root-6.02.05-xrootd4.patch:

diff --git a/sci-physics/root/files/root-5.32.00-dotfont.patch b/sci-physics/root/files/root-5.32.00-dotfont.patch
new file mode 100644
index 0000000..85d6dea
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-dotfont.patch
@@ -0,0 +1,58 @@
+--- root/html/src/TClassDocOutput.cxx.orig	2012-05-25 16:18:10.000000000 +0400
++++ root/html/src/TClassDocOutput.cxx	2012-05-29 21:36:53.813593012 +0400
+@@ -625,7 +625,7 @@
+       << "size=\"8,10\";" << endl
+       << "ratio=auto;" << endl
+       << "margin=0;" << endl
+-      << "node [shape=plaintext,fontsize=40,width=4,height=0.75];" << endl
++      << "node [shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\"DejaVu Serif\"];" << endl
+       << "\"" << fCurrentClass->GetName() << "\" [shape=ellipse];" << endl;
+ 
+    std::stringstream ssDep;
+@@ -704,7 +704,7 @@
+             outdot << ";" << endl;
+          } else if (writeAndMoreFor) {
+                outdot << "  \"...andmore" << writeAndMoreFor->GetName()
+-                      << "\" [label=\"...and more\",fontname=\"Times-Italic\",fillcolor=lightgrey,style=filled];" << endl;
++                      << "\" [label=\"...and more\",fontname=\"DejaVu Serif Italic\",fillcolor=lightgrey,style=filled];" << endl;
+          }
+       }
+       if (!levelExists) break;
+@@ -733,7 +733,7 @@
+       << "ranksep=0.1;" << endl
+       << "nodesep=0;" << endl
+       << "margin=0;" << endl;
+-   outdot << "  node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl;
++   outdot << "  node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\"DejaVu Serif\"];" << endl;
+ 
+    std::stringstream ssDep;
+    const int numColumns = 3;
+@@ -939,7 +939,7 @@
+       << "ranksep=0;" << endl
+       << "nodesep=0;" << endl
+       << "size=\"8,10\";" << endl
+-      << "node [fontsize=20,shape=plaintext];" << endl;
++      << "node [fontsize=20,shape=plaintext,fontname=\"DejaVu Serif\"];" << endl;
+ 
+    for (std::list<std::string>::iterator iFile = listFilesToParse.begin();
+       iFile != listFilesToParse.end(); ++iFile) {
+@@ -999,7 +999,8 @@
+       << "ranksep=0.7;" << endl
+       << "nodesep=0.3;" << endl
+       << "size=\"8,8\";" << endl
+-      << "ratio=compress;" << endl;
++      << "ratio=compress;" << endl
++      << "node [fontname=\"DejaVu Serif\"];" << endl;
+ 
+    TString libs(fCurrentClass->GetSharedLibs());
+    outdot << "\"All Libraries\" [URL=\"LibraryDependencies.html\",shape=box,rank=max,fillcolor=lightgray,style=filled];" << endl;
+@@ -1109,7 +1110,8 @@
+ 
+    dotout << "digraph G {" << endl
+           << "ratio=auto;" << endl
+-          << "rankdir=RL;" << endl;
++          << "rankdir=RL;" << endl
++          << "node [fontname=\"DejaVu Serif\"];" << endl;
+ 
+    // loop on all classes
+    TClassDocInfo* cdi = 0;

diff --git a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
new file mode 100644
index 0000000..ec67a15
--- /dev/null
+++ b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
@@ -0,0 +1,137 @@
+diff -Naur root.as-needed/Makefile root/Makefile
+--- a/Makefile.orig	2013-02-15 02:27:56.000000000 +0400
++++ b/Makefile	2013-02-23 02:22:14.556465852 +0400
+@@ -1258,10 +1258,7 @@
+ 	   for lib in $(RFLX_GRFLXPY); do \
+ 	      rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \
+ 	   done; \
+-	   for lib in $(RFLX_GRFLXPYC); do \
+-	      rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \
+-	   done; \
+-	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
++	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      dir=$(subst lib/,,$(RFLX_GRFLXDD)); \
+ 	      while test "x$${dir}" != "x" && \
+ 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
+diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
+--- root.as-needed/bindings/pyroot/Module.mk	2011-07-10 10:42:48.991561304 +0400
++++ root/bindings/pyroot/Module.mk	2011-07-10 10:43:21.493339703 +0400
+@@ -48,8 +48,6 @@
+ ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
+ $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
+ endif
+-ROOTPYC      := $(ROOTPY:.py=.pyc)
+-ROOTPYO      := $(ROOTPY:.py=.pyo)
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
+@@ -68,10 +66,8 @@
+ include/%.h:    $(PYROOTDIRI)/%.h
+ 		cp $< $@
+ 
+-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
+-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+-$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \
++$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) \
+                 $(ROOTLIBSDEP) $(PYTHONLIBDEP)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
+@@ -113,7 +109,7 @@
+ 
+ distclean-$(MODNAME): clean-$(MODNAME)
+ 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
+-		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
++		   $(ROOTPY) $(PYROOTMAP) \
+ 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
+ 
+ distclean::     distclean-$(MODNAME)
+diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
+--- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
++++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
+@@ -691,10 +691,6 @@
+ 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
+ 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
+ 		-X$(PREFIX)/include/root/Minuit2
+ #		$(foreach i, \
+diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
+--- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
++++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
+@@ -31,10 +31,6 @@
+ CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
+ $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
+ endif
+-ifneq ($(BUILDPYTHON),no)
+-CINTEXPYC    := $(CINTEXPY:.py=.pyc)
+-CINTEXPYO    := $(CINTEXPY:.py=.pyo)
+-endif
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
+@@ -86,8 +82,6 @@
+ 		fi)
+ 		cp $< $@
+ 
+-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
+-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
+                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
+diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
+--- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
++++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
+@@ -48,9 +48,6 @@
+ RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
+ RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
+ RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
+-ifneq ($(BUILDPYTHON),no)
+-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
+-endif
+ 
+ RFLX_LIBDIR = $(LIBDIR)
+ 
+@@ -92,7 +89,7 @@
+ 
+ ALLEXECS += $(RFLX_GENMAPX)
+ 
+-POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++POSTBIN  += $(RFLX_GRFLXPY)
+ 
+ ##### local rules #####
+ .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
+@@ -122,8 +119,6 @@
+ 		  mkdir -p lib/python/genreflex; fi )
+ 		cp $< $@
+ 
+-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
+-		@python -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
+ 
+@@ -149,7 +144,7 @@
+ 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
+ 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
+ 
+-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
+ 
+ clean-genreflex:
+ 		@rm -rf lib/python/genreflex
+diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
+--- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
++++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
+@@ -15,7 +15,7 @@
+ #####################   sources   ####################
+ 
+ FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
+-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
++SET(GENREFLEX_SCRIPT PARENT_SCOPE)
+ 
+ #####################  gccxmlpath ####################
+ 

diff --git a/sci-physics/root/files/root-5.34.26-ldflags.patch b/sci-physics/root/files/root-5.34.26-ldflags.patch
new file mode 100644
index 0000000..b81dbb5
--- /dev/null
+++ b/sci-physics/root/files/root-5.34.26-ldflags.patch
@@ -0,0 +1,19 @@
+commit 3c8bc686abf57e7e2037c4c191cb63a1a5172b5b
+Author: Andrew Savchenko <bircoph@gmail.com>
+Date:   Sun Feb 22 03:45:21 2015 +0300
+
+    root-5.32.00-prop-flags.patch -> root-5.34.26-prop-flags.patch
+
+diff --git a/config/Makefile.in b/config/Makefile.in
+index 89674e7..91d25b9 100644
+--- a/config/Makefile.in
++++ b/config/Makefile.in
+@@ -29,7 +29,7 @@ EXTRA_CFLAGS   := -Iinclude @cflags@
+ USERCONF_CFLAGS:= @usercflags@
+ EXTRA_CXXFLAGS := -Iinclude @cflags@
+ USERCONF_CXXFLAGS:= @usercxxflags@
+-EXTRA_LDFLAGS  := @ldflags@
++EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
+ WERROR         := @werror@
+ WINRTDEBUG     := @winrtdebug@
+ 

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 7e1dbd5..86bcf98 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -15,12 +15,19 @@
   GUI toolkit, and a complete visualization framework.
 </longdescription>
 <use>
+  <flag name="c++11"> Build ROOT using the C++11 standard</flag>
+  <flag name="c++14"> Build ROOT using the C++14 standard</flag>
   <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+  <flag name="gdml">Enable GDML writer and reader</flag>
   <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
   <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
   <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+  <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag>
   <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
   <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+  <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
+  <flag name="shadow">Enable shadow authentication in rootd and proofd</flag>
+  <flag name="table">Build libTable contrib library</flag>
   <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
 </use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-5.34.32.ebuild b/sci-physics/root/root-5.34.32.ebuild
new file mode 100644
index 0000000..283102f
--- /dev/null
+++ b/sci-physics/root/root-5.34.32.ebuild
@@ -0,0 +1,434 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v 1.1 2015/04/12 22:24:42 bircoph Exp $
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
+else
+	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \
+	toolchain-funcs user versionator
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+
+SLOT="0/$(get_version_component_range 1-3 ${PV})"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+IUSE="+X afs avahi c++11 c++14 doc emacs examples fits fftw gdml
+	graphviz http kerberos ldap +math +memstat mpi mysql odbc
+	+opengl openmp oracle postgres prefix pythia6 pythia8
+	python qt4 +reflex ruby shadow sqlite ssl table +tiff xinetd xml xrootd"
+
+# TODO: add support for: davix
+# TODO: unbundle: vdt
+
+REQUIRED_USE="
+	!X? ( !opengl !qt4 !tiff )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+CDEPEND="
+	app-arch/xz-utils:0=
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre:3=
+	media-fonts/dejavu
+	media-libs/freetype:2=
+	media-libs/libpng:0=
+	sys-libs/zlib:0=
+	X? (
+		media-libs/ftgl:0=
+		media-libs/glew:0=
+		x11-libs/libX11:0=
+		x11-libs/libXext:0=
+		x11-libs/libXpm:0=
+		|| (
+			media-libs/libafterimage:0=[gif,jpeg,png,tiff?]
+			>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff?]
+		)
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
+		qt4? (
+			dev-qt/qtgui:4=
+			dev-qt/qtopengl:4=
+			dev-qt/qt3support:4=
+			dev-qt/qtsvg:4=
+			dev-qt/qtwebkit:4=
+			dev-qt/qtxmlpatterns:4=
+		)
+		x11-libs/libXft:0=
+	)
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi:0= )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	graphviz? ( media-gfx/graphviz:0= )
+	http? ( dev-libs/fcgi:0= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:0= )
+	math? (
+		sci-libs/gsl:0=
+		sci-mathematics/unuran:0=
+		mpi? ( virtual/mpi )
+	)
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
+	oracle? ( dev-db/oracle-instantclient-basic:0= )
+	postgres? ( dev-db/postgresql:= )
+	pythia6? ( sci-physics/pythia:6= )
+	pythia8? ( >=sci-physics/pythia-8.1.80:8= <sci-physics/pythia-8.2.0:8= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		dev-lang/ruby:=
+		dev-ruby/rubygems:=
+	)
+	shadow? ( virtual/shadow )
+	sqlite? ( dev-db/sqlite:3= )
+	ssl? ( dev-libs/openssl:0= )
+	xml? ( dev-libs/libxml2:2= )
+	xrootd? ( >=net-libs/xrootd-3.3.5:0= )
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
+
+S="${WORKDIR}/${PN}"
+
+# install stuff in ${P} and not ${PF} for easier tracking in root-docs
+DOC_DIR="/usr/share/doc/${P}"
+
+die_compiler() {
+	eerror "You are using a $(tc-getCXX)-$5 without C++$1 capabilities"
+	die "Need one of the following C++$1 capable compilers:\n"\
+		"    >=sys-devel/gcc[cxx]-$2\n"\
+		"    >=sys-devel/clang-$3\n"\
+		"    >=dev-lang/icc-$4"
+}
+
+# check compiler to satisfy minimal versions
+# $1 - std version
+# $2 - g++
+# $3 - clang++
+# $4 - icc/icpc
+check_compiler() {
+	local ver
+	case "$(tc-getCXX)" in
+		*clang++*)
+			ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')"
+		;;
+		*g++*)
+			ver="$(gcc-version)"
+		;;
+		*icc*|*icpc*)
+			ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')"
+		;;
+		*)
+			ewarn "You are using an unsupported compiler."
+			ewarn "Please report any issues upstream."
+			return 0
+		;;
+	esac
+	version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
+}
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
+	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
+	echo
+
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use math; then
+		if use openmp; then
+			if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+
+	use c++11 && check_compiler "11" "4.8" "3.3" "13"
+	use c++14 && check_compiler "14" "4.9" "3.4" "15"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
+		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
+		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
+		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
+		"${FILESDIR}"/${PN}-5.32.00-dotfont.patch \
+		"${FILESDIR}"/${PN}-5.34.05-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
+		"${FILESDIR}"/${PN}-5.34.26-ldflags.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf3d/ftgl/{inc,src} || die
+	rm -r graf2d/freetype/src || die
+	rm -r graf3d/glew/{inc,src} || die
+	rm -r core/pcre/src || die
+	rm -r math/unuran/src/unuran-*.tar.gz || die
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \
+		xargs -0 rm || die
+	rm -r core/lzma/src/*.tar.gz || die
+	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
+		graf3d/gl/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# CSS should use local images
+	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+
+	# fix reflex path (bug #497280)
+	sed -i -e 's|${ROOTSYS}/lib|@libdir@|' config/genreflex.in || die
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+}
+
+src_configure() {
+	local -a myconf
+	# Some compilers need special care
+	case "$(tc-getCXX)" in
+		*clang++*)
+			myconf=(
+				--with-clang
+				--with-f77="$(tc-getFC)"
+			)
+		;;
+		*icc*|*icpc*)
+			# For icc we need to provide architecture manually
+			# and not to tamper with tc-get*
+			use x86 && myconf=( linuxicc )
+			use amd64 && myconf=( linuxx8664icc )
+		;;
+		*)	# gcc goes here too
+			myconf=(
+				--with-cc="$(tc-getCC)"
+				--with-cxx="$(tc-getCXX)"
+				--with-f77="$(tc-getFC)"
+				--with-ld="$(tc-getCXX)"
+			)
+		;;
+	esac
+
+	# the configure script is not the standard autotools
+	myconf+=(
+		--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"
+		--cflags='${CFLAGS}'
+		--cxxflags='${CXXFLAGS}'
+		--disable-builtin-afterimage
+		--disable-builtin-ftgl
+		--disable-builtin-freetype
+		--disable-builtin-glew
+		--disable-builtin-lzma
+		--disable-builtin-pcre
+		--disable-builtin-zlib
+		--disable-cling
+		--disable-werror
+		--enable-explicitlink
+		--enable-shared
+		--enable-soversion
+		--fail-on-missing
+		--nohowto
+		--with-afs-shared=yes
+		--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
+		$(use_enable X x11)
+		$(use_enable X asimage)
+		$(use_enable X xft)
+		$(use_enable afs)
+		$(use_enable avahi bonjour)
+		$(use_enable c++11 cxx11)
+		$(use_enable c++14 cxx14)
+		$(use_enable fits fitsio)
+		$(use_enable fftw fftw3)
+		$(use_enable gdml)
+		$(use_enable graphviz gviz)
+		$(use_enable http)
+		$(use_enable kerberos krb5)
+		$(use_enable ldap)
+		$(use_enable math genvector)
+		$(use_enable math gsl-shared)
+		$(use_enable math mathmore)
+		$(use_enable math minuit2)
+		$(use_enable math roofit)
+		$(use_enable math tmva)
+		$(use_enable math vc)
+		$(use_enable math vdt)
+		$(use_enable math unuran)
+		$(use_enable memstat)
+		$(use_enable mysql)
+		$(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
+		$(use_enable odbc)
+		$(use_enable opengl)
+		$(use_enable oracle)
+		$(use_enable postgres pgsql)
+		$(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "")
+		$(use_enable prefix rpath)
+		$(use_enable pythia6)
+		$(use_enable pythia8)
+		$(use_enable python)
+		$(use_enable qt4 qt)
+		$(use_enable qt4 qtgsi)
+		$(use_enable reflex cintex)
+		$(use_enable reflex)
+		$(use_enable ruby)
+		$(use_enable shadow shadowpw)
+		$(use_enable sqlite)
+		$(use_enable ssl)
+		$(use_enable table)
+		$(use_enable tiff astiff)
+		$(use_enable xml)
+		$(use_enable xrootd)
+		${EXTRA_ECONF}
+	)
+
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	emake \
+		OPT="${CXXFLAGS}" \
+		F77OPT="${FFLAGS}" \
+		ROOTSYS="${S}" \
+		LD_LIBRARY_PATH="${S}/lib"
+	use emacs && elisp-compile build/misc/*.el
+}
+
+daemon_install() {
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	local i
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	echo "Icon=root-system-bin" >> etc/root.desktop
+	domenu etc/root.desktop
+	doicon build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+cleanup_install() {
+	# Cleanup of files either already distributed or unused on Gentoo
+	pushd "${ED}" > /dev/null
+	rm usr/share/root/fonts/LICENSE || die
+	rm etc/root/proof/*.sample || die
+	rm -r etc/root/daemons || die
+	# these should be in PATH
+	mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
+	rm ${DOC_DIR#/}/{INSTALL,LICENSE,COPYING.CINT} || die
+	use examples || rm -r ${DOC_DIR#/}/examples || die
+	cd usr/$(get_libdir)/root/cint/cint
+	rm lib/posix/mktypes lib/dll_stl/setup lib/G__* || die
+	rm lib/dll_stl/G__* lib/dll_stl/rootcint_* lib/posix/exten.o || die
+	rm include/makehpib || die
+	popd > /dev/null
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
+
+	use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
+	if use python; then
+		echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
+		python_optimize "${D}/usr/$(get_libdir)/root"
+		use reflex && python_optimize "${D}/usr/$(get_libdir)/root/python/genreflex/"
+	fi
+	use ruby && \
+		echo "RUBYLIB=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
+	use emacs && elisp-install ${PN} build/misc/*.{el,elc}
+	if use examples; then
+		# these should really be taken care of by the root make install
+		insinto ${DOC_DIR}/examples/tutorials/tmva
+		doins -r tmva/test
+	fi
+	doenvd 99root
+
+	# The build system installs Emacs support unconditionally in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -r "${ED}"/usr/share/emacs || die
+
+	daemon_install
+	desktop_install
+	cleanup_install
+
+	# do not copress files used by ROOT's CLI (.credit, .demo, .license)
+	docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials}
+	# needed for .license command to work
+	dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}


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

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2015-10-01  6:06 Justin Lecher
  0 siblings, 0 replies; 10+ messages in thread
From: Justin Lecher @ 2015-10-01  6:06 UTC (permalink / raw
  To: gentoo-commits

commit:     6f07c2d62ee51108028aef334392b84ac39a9c81
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Sep 27 18:27:34 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 18:29:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=6f07c2d6

sci-physics/root: Drop desktop-patch (upstreamed), add http-useflag enabling THttpServer.

Package-Manager: portage-2.2.22

 sci-physics/root/ChangeLog                        |  4 ++++
 sci-physics/root/files/root-5.34.13-desktop.patch | 12 ------------
 sci-physics/root/root-9999.ebuild                 |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 566f40c..77f4c1f 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  27 Sep 2015; Oliver Freyermuth <o.freyermuth@googlemail.com> root-9999.ebuild:
+  sci-physics/root: Drop desktop-patch (upstreamed), 
+  add http-useflag enabling THttpServer.
+
   18 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> -root-5.34.32.ebuild,
   -files/root-5.32.00-dotfont.patch, -files/root-5.34.05-nobyte-compile.patch,
   -files/root-5.34.26-ldflags.patch, metadata.xml:

diff --git a/sci-physics/root/files/root-5.34.13-desktop.patch b/sci-physics/root/files/root-5.34.13-desktop.patch
deleted file mode 100644
index 7d47bcf..0000000
--- a/sci-physics/root/files/root-5.34.13-desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/etc/root.desktop b/etc/root.desktop
-index ca38211..688ecfa 100644
---- a/etc/root.desktop
-+++ b/etc/root.desktop
-@@ -8,5 +8,5 @@ Name[de]=ROOT
- Comment=An object-oriented data analysis framework
- Comment[de]=Ein objektorientiertes Framework zur Datenanalyse
- StartupNotify=true
--MimeType=application/x-root;text/x-c++src
--Categories=Science;Development;Application;
-+MimeType=application/x-root;text/x-c++src;
-+Categories=Science;Development;

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 91415ff..3ff5618 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -195,7 +195,6 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
 		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
 		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
-		"${FILESDIR}"/${PN}-5.34.13-desktop.patch \
 		"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
 		"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-6.00.01-llvm.patch \
@@ -309,6 +308,7 @@ src_configure() {
 			$(use_enable fftw fftw3)
 			$(use_enable geocad)
 			$(use_enable graphviz gviz)
+			$(use_enable http)
 			$(use_enable kerberos krb5)
 			$(use_enable ldap)
 			$(use_enable math genvector)


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

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2015-11-17 15:46 Justin Lecher
  0 siblings, 0 replies; 10+ messages in thread
From: Justin Lecher @ 2015-11-17 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     7bb9ac34e68c7add57a2a5f9772b5a0897a1085b
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Nov 15 19:03:49 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 19:03:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7bb9ac34

sci-physics/root: Update to upstream changes.
New nobyte-compile patch, paths for gl2ps changed,
DOCS files changed.

Package-Manager: portage-2.2.24

 sci-physics/root/ChangeLog                         |  6 +++++
 ...ile.patch => root-6.06.00-nobyte-compile.patch} | 28 +++++++++++++---------
 sci-physics/root/root-9999.ebuild                  |  5 ++--
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index accb1de..b816975 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  15 Nov 2015; Oliver Freyermuth <o.freyermuth@googlemail.com>
+  +files/root-6.06.00-nobyte-compile.patch,
+  -files/root-6.00.01-nobyte-compile.patch, root-9999.ebuild:
+  sci-physics/root: Update to upstream changes. New nobyte-compile patch, paths
+  for gl2ps changed,  DOCS files changed.
+
   27 Sep 2015; Oliver Freyermuth <o.freyermuth@googlemail.com>
   -files/root-6.00.01-geocad.patch, root-9999.ebuild:
   sci-physics/root:  Remove geocad-patch, is now upstream.

diff --git a/sci-physics/root/files/root-6.00.01-nobyte-compile.patch b/sci-physics/root/files/root-6.06.00-nobyte-compile.patch
similarity index 57%
rename from sci-physics/root/files/root-6.00.01-nobyte-compile.patch
rename to sci-physics/root/files/root-6.06.00-nobyte-compile.patch
index aa58f20..61ffef7 100644
--- a/sci-physics/root/files/root-6.00.01-nobyte-compile.patch
+++ b/sci-physics/root/files/root-6.06.00-nobyte-compile.patch
@@ -1,33 +1,39 @@
-diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.as-needed/bindings/pyroot/Module.mk	2011-07-10 10:42:48.991561304 +0400
-+++ root/bindings/pyroot/Module.mk	2011-07-10 10:43:21.493339703 +0400
-@@ -48,8 +48,6 @@
- ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
+diff --git a/bindings/pyroot/Module.mk b/bindings/pyroot/Module.mk
+index 8c2782d..f41e0aa 100644
+--- a/bindings/pyroot/Module.mk
++++ b/bindings/pyroot/Module.mk
+@@ -65,10 +65,6 @@ $(LPATH)/ROOTaaS/%: $(MODDIR)/ROOTaaS/%
+ 	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
+ 	cp -R $< $@
  endif
 -ROOTPYC      := $(ROOTPY:.py=.pyc)
 -ROOTPYO      := $(ROOTPY:.py=.pyo)
+-ROOTAASC     := $(ROOTAAS:.py=.pyc)
+-ROOTAASO     := $(ROOTAAS:.py=.pyo)
  
  # used in the main Makefile
  ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
+@@ -87,12 +83,9 @@ INCLUDEFILES += $(PYROOTDEP)
  include/%.h:    $(PYROOTDIRI)/%.h
  		cp $< $@
  
 -%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
 -%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
+-
 -$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \
 +$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) \
-                 $(ROOTLIBSDEP) $(PYTHONLIBDEP)
+                 $(ROOTLIBSDEP) $(PYTHONLIBDEP) \
+-                $(ROOTAAS) $(ROOTAASC) $(ROOTAASO)
++                $(ROOTAAS)
+ 
  		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
+@@ -138,7 +131,7 @@ clean::         clean-$(MODNAME)
  
  distclean-$(MODNAME): clean-$(MODNAME)
  		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
 -		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
 +		   $(ROOTPY) $(PYROOTMAP) \
  		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
+ 		@rm -rf $(LPATH)/ROOTaaS bin/ROOTaaS
  
- distclean::     distclean-$(MODNAME)

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 1b3ed72..8bf3758 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -196,7 +196,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
 		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
 		"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
-		"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-6.06.00-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-6.00.01-llvm.patch
 
 	# make sure we use system libs and headers
@@ -210,7 +210,7 @@ src_prepare() {
 	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \
 		xargs -0 rm || die
 	rm -r core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	rm graf3d/gl/src/gl2ps.* || die
 	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
 		graf3d/gl/Module.mk || die
 
@@ -397,6 +397,7 @@ cleanup_install() {
 }
 
 src_install() {
+	DOCS=($(find README/* -maxdepth 1 -type f))
 	default
 	dodoc README.md
 


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

end of thread, other threads:[~2015-11-17 15:46 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-17 15:46 [gentoo-commits] proj/sci:master commit in: sci-physics/root/, sci-physics/root/files/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2015-10-01  6:06 Justin Lecher
2015-07-17  9:43 Andrew Savchenko
2015-04-13  6:25 Justin Lecher
2015-04-12 19:22 Andrew Savchenko
2015-03-03  4:31 git@oystercatcher mirror+tproxy
2015-03-03  4:31 Andrew Savchenko
2015-02-23 17:55 Andrew Savchenko
2015-02-23 17:44 Andrew Savchenko
2014-09-29 13:13 Justin Lecher

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