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

["Andrew Savchenko" <bircoph@gmail.com>]

commit:     b9d3bbace219538f5b0c8d6e65743d05f3012b54
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Mon Mar  2 07:12:48 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Mon Mar  2 07:12:48 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b9d3bbac

sci-physics/root: upstream-like ldflags patch

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-chklib64.patch   |  1 +
 sci-physics/root/files/root-5.34.26-prop-flags.patch | 19 -------------------
 sci-physics/root/root-5.34.26.ebuild                 | 18 +++++++-----------
 4 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index b8503a4..6f4801a 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 $
 
+  02 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.26.ebuild,
+  files/root-5.32.00-chklib64.patch, -files/root-5.34.26-prop-flags.patch:
+  Add configurable LDFLAGS the same way as upstream did for
+  configurable CFLAGS/CXXFLAGS. Optimize configure variables.
+
   24 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.26.ebuild:
   Remove full path from local images, otherwise html header
   background is missing.

diff --git a/sci-physics/root/files/root-5.32.00-chklib64.patch b/sci-physics/root/files/root-5.32.00-chklib64.patch
index a5c052c..979220f 100644
--- a/sci-physics/root/files/root-5.32.00-chklib64.patch
+++ b/sci-physics/root/files/root-5.32.00-chklib64.patch
@@ -1,3 +1,4 @@
+bug fix for #406817
 --- configure.orig	2012-02-29 19:46:41.000000000 +0400
 +++ configure	2012-03-22 03:28:43.458968696 +0400
 @@ -441,14 +441,13 @@

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
deleted file mode 100644
index b81dbb5..0000000
--- a/sci-physics/root/files/root-5.34.26-prop-flags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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/root-5.34.26.ebuild b/sci-physics/root/root-5.34.26.ebuild
index fdd6943..15ec664 100644
--- a/sci-physics/root/root-5.34.26.ebuild
+++ b/sci-physics/root/root-5.34.26.ebuild
@@ -7,12 +7,11 @@ 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
+SRC_URI+=" http://dev.gentoo.org/~bircoph/patches/${PN}-5.34.26-ldflags.patch.xz"
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -196,7 +195,7 @@ src_prepare() {
 		"${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
+		"${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
@@ -264,7 +263,7 @@ src_configure() {
 	esac
 
 	# the configure script is not the standard autotools
-	local myconf+=(
+	myconf+=(
 		--prefix="${EPREFIX}/usr"
 		--etcdir="${EPREFIX}/etc/root"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/${PN}"
@@ -273,14 +272,13 @@ src_configure() {
 		--testdir="${EPREFIX}${DOC_DIR}/examples/tests"
 		--disable-werror
 		--nohowto
+		--cflags='${CFLAGS}'
+		--cxxflags='${CXXFLAGS}'
+		--ldflags='${LDFLAGS}'
 	)
 
 	if use minimal; then
-		myconf+=(
-			$(usex X --gminimal --minimal)
-			--cflags='${CFLAGS}'
-			--cxxflags='${CXXFLAGS}'
-		)
+		myconf+=( $(usex X --gminimal --minimal) )
 	else
 		myconf+=(
 			--with-afs-shared=yes
@@ -302,8 +300,6 @@ src_configure() {
 			--enable-soversion
 			--enable-table
 			--fail-on-missing
-			--cflags='${CFLAGS}'
-			--cxxflags='${CXXFLAGS}'
 			$(use_enable X x11)
 			$(use_enable X asimage)
 			$(use_enable X xft)