sci-physics/root: upstream-like ldflags patch

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

5 files changed, 14 insertions, 30 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index b8503a4d8..6f4801ac2 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/Manifest b/sci-physics/root/Manifest
index 8007483ce..14ba186cf 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,2 +1,3 @@
+DIST root-5.34.26-ldflags.patch.xz 3736 SHA256 fed46036dac3e95693936b9bb809426c064feb674977b83a3d011f4a3a0438aa SHA512 0e33a20949d7681d29e33fcb2f47e40d66e7a2ae7e0f80042f55b3b73ed38f440b717576f8909a009bdb239a60a9726c6d0cb9133a8bce15e4f2b67e987d2093 WHIRLPOOL 4263df3cc5716e5ea2e449a2018c1d349823819b6478911ee866b81ae9d3f846d13034da9c6e4e20d05de65c95a9a6825fb554e45477311f32b21e7f7b9ee999
 DIST root_v5.34.26.source.tar.gz 75171961 SHA256 c1fd2a249bb7210914b42e35dba4f1262cfa46b79ef7a41f73d7f08f8c54a643 SHA512 f5da5e20d1763608a32d78c48581e574a3f51aef47ecf6987a4064d1fb3234dfc9f626e041a17213f881f52f807ed6a6da60bf1d24951fa7dc2cadd94f8dd8b4 WHIRLPOOL 77b48b815c971642da68b71732a0ea3372648634281be634037b13cb58488f7075ec8bfc9a684e55d85cd9b038f229be29b19a15dfc829f0ce63a5f17241c23c
 DIST root_v6.00.02.source.tar.gz 97811067 SHA256 db92818781f842c33b8b583f1f9be02b51cedbf5f2943df986cbbd0c0006a06f SHA512 bd72eb43d2a4ace27738ba2dc509f6d81ec3555e59454426d28c2c5522b4b19d2678ed515b84efaf953146c1f50c65e304532456d76076d03598bda67c69e8a5 WHIRLPOOL 12b87e9b1612ea3625f7ea0970b733887051b5173b728b5f13a032eb103eeda22de8a4c18417e02a92fe02f29b9acd9114fa1420fac42bea31bde07c7a0ce697
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 a5c052cdd..979220f02 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 b81dbb5ed..000000000
--- 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 fdd69438a..15ec66497 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)