summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-02-11 19:52:57 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-02-11 19:52:57 +0000
commite3f55010bf681ad66621935846c92e4bf3f66e7a (patch)
treea6f7dcb54fed7d92d8a0d589df27459982b74634
parentRemove --no-as-needed, xmlrpc-c caused the bug and is now fixed. If you want ... (diff)
downloadhistorical-e3f55010bf681ad66621935846c92e4bf3f66e7a.tar.gz
historical-e3f55010bf681ad66621935846c92e4bf3f66e7a.tar.bz2
historical-e3f55010bf681ad66621935846c92e4bf3f66e7a.zip
Fix sed for LDFLAGS, and make CFLAGS sed as robust as that.
Package-Manager: portage-2.1.4.3
-rw-r--r--dev-util/git/ChangeLog5
-rw-r--r--dev-util/git/Manifest12
-rw-r--r--dev-util/git/git-1.5.4.ebuild6
3 files changed, 13 insertions, 10 deletions
diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index d5dd223ea804..7bc5158592a7 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/git
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.255 2008/02/03 18:33:23 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.256 2008/02/11 19:52:57 flameeyes Exp $
+
+ 11 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> git-1.5.4.ebuild:
+ Fix sed for LDFLAGS, and make CFLAGS sed as robust as that.
03 Feb 2008; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.4.ebuild:
Add USE=threads as per bug #208422
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index c31699e456c0..ab11af70998d 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -30,13 +30,13 @@ EBUILD git-1.5.1.6.ebuild 4399 RMD160 6ffd38687bfca4241034a3047d24c1794829b34d S
EBUILD git-1.5.2.5.ebuild 4437 RMD160 0d6241aa454380876b2fd2fd95a4fbf679742e42 SHA1 e7eff8a303a3609432ece65581601fee853ae34d SHA256 04a7bbf40e9ffdaf234063af961fa4c3c71958c556ddfc2cdbba33f3b153d094
EBUILD git-1.5.3.7-r1.ebuild 6371 RMD160 847ed38b63b34256ce17991dc6c4dbd34c207955 SHA1 d6edbbd1bcd150992f69eb2655e1ab5b4a925420 SHA256 7d881d0f76b68244aa0021e71beb8537197f2147aa464b5707c39217ec6be87c
EBUILD git-1.5.3.8.ebuild 6388 RMD160 a76f9cc851a04c6b898f7f34d85b5433e28cfe2a SHA1 d10fbe86d2825b563025c0014db93cbbfd57d47c SHA256 13dc2bf683b369d4b61016587072db9c6b6af54ff0aa32ff2a542ec968a42b84
-EBUILD git-1.5.4.ebuild 6561 RMD160 981901caea096efedcc56e1d43de395ad82ae084 SHA1 5085f28f965087e21cd89fe01bf2cb0ad25127a0 SHA256 ff7ae0dd7f646335ec5acf6fa0978585252b8b9e14f548474f117a954b484823
-MISC ChangeLog 37344 RMD160 080f28577aa4f3afda1b423f881c0e1090a5e455 SHA1 31d4cb2dce582f608721033f5c10e7643ce82d5c SHA256 7789306ecf565aab7f3a86cd0ec615213937b48bf23c2ee26d91e3a1555b72c1
+EBUILD git-1.5.4.ebuild 6565 RMD160 17d6172114dcbbc24d390b93fc9598318e0b4906 SHA1 3a7b86bacacb291fccdde45b7cd1832bc7cdda35 SHA256 8ba59eba4f2377e33302bf9830657c68f3c6fec3b600e234a5b1a4b36e0bee15
+MISC ChangeLog 37482 RMD160 1ba5da48d5777dc6cb02e477d8ca44ce52f2edf0 SHA1 4eff401dc6c2fcdb57e26ebfa053d2d0cc296047 SHA256 ea6aa20fc4c11136e2e10f22fe8579dfc4381cf437c0fc65c8d2f38b541c5f68
MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFHpgkHViELBEf1JB0RAkj8AJ98n6/z76+VHhmhSpKzWxuEsQdaQwCfQXCY
-9M/bFkeSyB9Vhw6G/aFZvD8=
-=cQFj
+iD8DBQFHsKegAiZjviIA2XgRAm7SAKC8F/FY2rXkpUY8NIlYitNQQ7BIsACfUTZe
++9tbRA+lkql/opyYRARPtZ0=
+=PNiO
-----END PGP SIGNATURE-----
diff --git a/dev-util/git/git-1.5.4.ebuild b/dev-util/git/git-1.5.4.ebuild
index 5840bdb3d9ad..2eb5d029bd78 100644
--- a/dev-util/git/git-1.5.4.ebuild
+++ b/dev-util/git/git-1.5.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4.ebuild,v 1.2 2008/02/03 18:33:23 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4.ebuild,v 1.3 2008/02/11 19:52:57 flameeyes Exp $
inherit toolchain-funcs eutils elisp-common perl-module bash-completion
@@ -81,8 +81,8 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-1.5.3-symlinks.patch
sed -i \
- -e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \
- -e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \
+ -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \
+ -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \
-e "s:^\(CC = \).*$:\1$(tc-getCC):" \
-e "s:^\(AR = \).*$:\1$(tc-getAR):" \
-e 's:ln :ln -s :g' \