From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 32F541381F3 for ; Tue, 28 May 2013 20:28:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7688E0A64; Tue, 28 May 2013 20:28:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F271E0A64 for ; Tue, 28 May 2013 20:28:32 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0BC9E33E14E for ; Tue, 28 May 2013 20:28:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 34A2EE4402 for ; Tue, 28 May 2013 20:28:28 +0000 (UTC) From: "Andrew Savchenko" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" Message-ID: <1369772758.6d9bea070c2086e48644f5907051d0b21aa5af69.bircoph@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/root/ChangeLog sci-physics/root/root-5.34.05.ebuild sci-physics/root/root-5.34.07.ebuild X-VCS-Directories: sci-physics/root/ X-VCS-Committer: bircoph X-VCS-Committer-Name: Andrew Savchenko X-VCS-Revision: 6d9bea070c2086e48644f5907051d0b21aa5af69 X-VCS-Branch: master Date: Tue, 28 May 2013 20:28:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ffce215b-ef54-43e5-8c8d-0280328efb31 X-Archives-Hash: d58015ec9631cbd5867948eef5257b89 commit: 6d9bea070c2086e48644f5907051d0b21aa5af69 Author: Andrew Savchenko gmail com> AuthorDate: Tue May 28 20:25:58 2013 +0000 Commit: Andrew Savchenko gmail com> CommitDate: Tue May 28 20:25:58 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6d9bea07 root: fix build with postgres --- sci-physics/root/ChangeLog | 7 +++++ .../{root-5.34.05.ebuild => root-5.34.07.ebuild} | 34 ++++++++++++---------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 3317e68..bae3fb6 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2013 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.07 (28 May 2013) + + 28 May 2013; Andrew Savchenko -root-5.34.05.ebuild, + +root-5.34.07.ebuild: + Fix build with USE="postgres": Gentoo doesn't provide + /usr/include/postgresql symlink anymore. Remove old. + 03 Mar 2013; Justin Lecher root-5.34.05.ebuild, root-9999.ebuild, metadata.xml: Update to new qt deps names diff --git a/sci-physics/root/root-5.34.05.ebuild b/sci-physics/root/root-5.34.07.ebuild similarity index 93% rename from sci-physics/root/root-5.34.05.ebuild rename to sci-physics/root/root-5.34.07.ebuild index ee7dad8..6c85440 100644 --- a/sci-physics/root/root-5.34.05.ebuild +++ b/sci-physics/root/root-5.34.07.ebuild @@ -1,14 +1,12 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.03.ebuild,v 1.2 2013/01/22 17:18:55 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.07.ebuild,v 1.1 2013/05/23 23:52:31 bicatali Exp $ -EAPI=4 - -PYTHON_DEPEND="python? 2" +EAPI=5 if [[ ${PV} == "9999" ]] ; then - _SVN=subversion - ESVN_REPO_URI="http://root.cern.ch/svn/root/trunk" + _GIT=git-2 + EGIT_REPO_URI="http://root.cern.ch/git/root.git" SRC_URI="" KEYWORDS="" else @@ -16,7 +14,8 @@ else KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi -inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN} versionator +PYTHON_COMPAT=( python2_{5,6,7} ) +inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator ROOFIT_DOC_PV=2.91-33 TMVA_DOC_PV=4.03 @@ -89,6 +88,7 @@ CDEPEND=" postgres? ( dev-db/postgresql-base ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) + python? ( ${PYTHON_DEPS} ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) @@ -115,8 +115,7 @@ S="${WORKDIR}/${PN}" pkg_setup() { fortran-2_pkg_setup - python_set_active_version 2 - python_pkg_setup + use python && python-single-r1_pkg_setup echo elog "There are extra options on packages not yet in Gentoo:" elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus," @@ -207,6 +206,8 @@ src_prepare() { } src_configure() { + local myconfflags="" + use postgres && myconfflags+=" --with-pgsql-incdir=$(pg_config --includedir)" # the configure script is not the standard autotools ./configure \ --prefix="${EPREFIX}"/usr \ @@ -271,6 +272,7 @@ src_configure() { $(use_enable ssl) \ $(use_enable xml) \ $(use_enable xrootd) \ + ${myconfflags} \ ${EXTRA_ECONF} \ || die "configure failed" } @@ -321,10 +323,9 @@ daemon_install() { desktop_install() { cd "${S}" - sed -e 's,@prefix@,/usr,' \ - build/package/debian/root-system-bin.desktop.in > root.desktop - domenu root.desktop - doicon "${S}"/build/package/debian/root-system-bin.png + 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 @@ -338,7 +339,10 @@ src_install() { echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root - use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root + if use python; then + echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root + python_optimize /usr/$(get_libdir)/root + fi use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root doenvd 99root @@ -370,10 +374,8 @@ src_install() { pkg_postinst() { fdo-mime_desktop_database_update - use python && python_mod_optimize /usr/$(get_libdir)/root } pkg_postrm() { fdo-mime_desktop_database_update - use python && python_mod_cleanup /usr/$(get_libdir)/root }