bircoph 15/03/17 22:07:42 Modified: ChangeLog root-5.34.26.ebuild Log: Use simpler ldflags patch Signed-off-by: Andrew Savchenko <birc...@gentoo.org> (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 565953B95372756C)
Revision Changes Path 1.138 sci-physics/root/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?rev=1.138&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?rev=1.138&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?r1=1.137&r2=1.138 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- ChangeLog 2 Mar 2015 08:46:28 -0000 1.137 +++ ChangeLog 17 Mar 2015 22:07:42 -0000 1.138 @@ -1,6 +1,12 @@ # ChangeLog for sci-physics/root # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.137 2015/03/02 08:46:28 bircoph Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.138 2015/03/17 22:07:42 bircoph Exp $ + + 17 Mar 2015; Andrew Savchenko <birc...@gentoo.org> root-5.34.26.ebuild, + +files/root-5.34.26-ldflags.patch: + Upstream is not interested in ldflags patch: + https://sft.its.cern.ch/jira/browse/ROOT-7106 + so reverting to much simpler solution. 02 Mar 2015; Andrew Savchenko <birc...@gentoo.org> -root-5.34.18.ebuild, -root-5.34.18-r1.ebuild, -files/root-5.32.00-prop-flags.patch, 1.2 sci-physics/root/root-5.34.26.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.26.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.26.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.26.ebuild?r1=1.1&r2=1.2 Index: root-5.34.26.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.26.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- root-5.34.26.ebuild 2 Mar 2015 08:27:34 -0000 1.1 +++ root-5.34.26.ebuild 17 Mar 2015 22:07:42 -0000 1.2 @@ -1,6 +1,6 @@ # 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.26.ebuild,v 1.1 2015/03/02 08:27:34 bircoph Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.26.ebuild,v 1.2 2015/03/17 22:07:42 bircoph Exp $ EAPI=5 @@ -11,7 +11,6 @@ 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 ) @@ -195,7 +194,7 @@ "${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 + "${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 @@ -274,7 +273,6 @@ --nohowto --cflags='${CFLAGS}' --cxxflags='${CXXFLAGS}' - --ldflags='${LDFLAGS}' ) if use minimal; then