diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2013-04-17 19:06:31 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2013-04-17 19:06:31 +0000 |
commit | 7b08024def563eecb962c75cf19ee54ce3ede441 (patch) | |
tree | 8f50a36d77bc5831906feef3fa84c7bff7fdb900 /dev-vcs/git | |
parent | Fix LICENSE, see 00readme file, bug 445310. (diff) | |
download | gentoo-2-7b08024def563eecb962c75cf19ee54ce3ede441.tar.gz gentoo-2-7b08024def563eecb962c75cf19ee54ce3ede441.tar.bz2 gentoo-2-7b08024def563eecb962c75cf19ee54ce3ede441.zip |
Bug #466178: better use of variables to make svn-fe always compile right.
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key )
Diffstat (limited to 'dev-vcs/git')
-rw-r--r-- | dev-vcs/git/ChangeLog | 5 | ||||
-rw-r--r-- | dev-vcs/git/git-1.8.2.1.ebuild | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index dcc065caee2b..a2ca1096c2d1 100644 --- a/dev-vcs/git/ChangeLog +++ b/dev-vcs/git/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-vcs/git # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.197 2013/04/16 16:04:47 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.198 2013/04/17 19:06:31 robbat2 Exp $ + + 17 Apr 2013; Robin H. Johnson <robbat2@gentoo.org> git-1.8.2.1.ebuild: + Bug #466178: better use of variables to make svn-fe always compile right. *git-1.8.2.1 (16 Apr 2013) diff --git a/dev-vcs/git/git-1.8.2.1.ebuild b/dev-vcs/git/git-1.8.2.1.ebuild index e3a288b517f5..be058b67d3bf 100644 --- a/dev-vcs/git/git-1.8.2.1.ebuild +++ b/dev-vcs/git/git-1.8.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.2.1.ebuild,v 1.1 2013/04/16 16:04:47 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.2.1.ebuild,v 1.2 2013/04/17 19:06:31 robbat2 Exp $ EAPI=4 @@ -233,7 +233,7 @@ src_prepare() { -e 's:^\(AR = \).*$:\1$(OPTAR):' \ -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" + Makefile contrib/svn-fe/Makefile || die "sed failed" # Never install the private copy of Error.pm (bug #296310) sed -i \ @@ -249,11 +249,6 @@ src_prepare() { -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ contrib/subtree/Makefile - - # Fix svn-fe ignoring LDFLAGS - sed -i \ - -e '/^LDFLAGS/s,^,#,g' \ - contrib/svn-fe/Makefile } git_emake() { |