summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2013-04-17 19:06:43 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2013-04-17 19:06:43 +0000
commita19da422895d43c798c6961a4e0f1f84833a2cfe (patch)
tree4d3badaf72bd99a08bea4da70c7205846d72ae8c /dev-vcs
parentFix LICENSE, see 00readme file, bug 445310. (diff)
downloadhistorical-a19da422895d43c798c6961a4e0f1f84833a2cfe.tar.gz
historical-a19da422895d43c798c6961a4e0f1f84833a2cfe.tar.bz2
historical-a19da422895d43c798c6961a4e0f1f84833a2cfe.zip
Bug #466178: better use of variables to make svn-fe always compile right.
Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/git/ChangeLog5
-rw-r--r--dev-vcs/git/Manifest4
-rw-r--r--dev-vcs/git/git-1.8.2.1.ebuild9
3 files changed, 8 insertions, 10 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/Manifest b/dev-vcs/git/Manifest
index ed1f37ffecf9..7395cb2ab69b 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -45,8 +45,8 @@ EBUILD git-1.7.3.4-r1.ebuild 14028 SHA256 61d5e1bcdf37f4d5cb93e32780642a25352cee
EBUILD git-1.7.8.6.ebuild 14683 SHA256 38f21df5f6abefb90ce93129adacf4b307decd48417d6830eced6ec0b595cbd0 SHA512 7ef0bc6125d06100636bfc15fef7d0cacef08f2c9a75beaa7331f1e5c5e06a7cd96f84b0ec975be8fd290efccaf0b9e40edb524063a2a9bfe69870bd2b2c9185 WHIRLPOOL 06ed98a81369963955aafa2186b30fa64ec544f8f1b268c7bb228d83c0e371e70223a69f7ed69da7df47ddc1a10459c40f36e3b2659d9c85c57e0dc036870d9c
EBUILD git-1.8.0.2.ebuild 17163 SHA256 931df741e5eeccee8c67048dd07074777228a6cb4321518a8150a13fd5ec00f0 SHA512 077d8dace76b90c7486d6e3cdb6d8691a4d6634107c69e672a6c7eb105921265b5b545fa727ca8426f069ecac4decc1b9873da689ef0f15623064a5df497053f WHIRLPOOL 0c46e4baae87498094750fb75dd500e4af8d9c7e2c1c3c4394b45bc78bd91a0cfa73ae20384297799bd2763fd7527be6609c60a92a5e4ce3fa997fea61703e86
EBUILD git-1.8.1.5.ebuild 17189 SHA256 bec81381b6dc3763d99fa20f6828c844a6b801aa5df41b6b99e07c87ff7c4a3d SHA512 22ee72cb4efff7ab5ff7ae53db9292b4a7e72ea75566e2664b001a8c8a761e7bfa3a4e28d4a7fa4ec777db497a0b56964ca2efdedd11fc2f34c9d9ab37ea335e WHIRLPOOL a5c025332de62d0a1e3832ec8ed1b873e5a44c16b4be41c05292553a4375b41ed996263e4c5ad1dedb800601790084d6ed6e0e010f35cd0ace41fc04b8360439
-EBUILD git-1.8.2.1.ebuild 17523 SHA256 da7c90b967899668d93483979cbebe9f5d0c777d93e2e214187f9da4966bf5f6 SHA512 8336b420a86e50cb0302aa5c78ed313e608c7a4dac15f76d530ae9f735dcce31aa6a636eb0ab287b2a63d70e84005b21ce88bf0775141db0b93ae3582afd7e32 WHIRLPOOL 33e2de3e210de67f9b7e352f5a3dc0c26f7acdd7d32537ca5eac172dfa0997c2174411e6820f7e17b2acafca2d3da46bc45b689c99182171cd6718520ba76b54
+EBUILD git-1.8.2.1.ebuild 17452 SHA256 e4805485606b6926288347c802082a276829c928264a102f7cf5adeb0317fae4 SHA512 ee8752a9a86028aedd4a49e0abee075682cbb07a244123fb8e4e4b8122c57e5da2dd8b84c75f3b2c7bd1629c6cf89933e83a8ab2b023d7d8aee9d059a6f65bc3 WHIRLPOOL ecaf4af3026e092a68e35c88507e3dcf71ae6d9fbefa6f2a5eb7636886de9941aecd5f86ad57d67c3fdcdaebfba5257e6bdf9b313b0922c5be58bb1fe4a79cda
EBUILD git-9999.ebuild 17172 SHA256 80fa1e30f62651fc00e77333085f02ae3ac1b64aa121173357ef29ebd62d4e9d SHA512 d2093d164077a1d6fc05894c61b553db9544a78cf7d6b07786627086eb1c71c61594ab36abcad5486719c8e237e2be3a86034f8333a8182b1aec7130683f908b WHIRLPOOL 3739f67305c4eaf5497f7025337c71b383ee68b5a10d08c334ac7aa5153ec590c21eaf3a33440e38cc70173980514734f353f12f25db02a8a79e3cc1d18ca20b
-MISC ChangeLog 4026 SHA256 86e42a8fb82c492eeba2abfc3f47c6585e8be6430605edf9f8ef9b60b301911d SHA512 dc5f98142a4fc809c6f200b0a9937b628502045a14728149bb912fc42e2cc6e2c79031c9dabc52272dbab77750b0474e540d2c413b7a4d2f75dfe74699c35f5f WHIRLPOOL 18b8d2101413e0f8ee5447fd0eba95ad71704b3883d9c670039321f5e0830148e8e415b1fcd31493de02a3c87b5ca04b5212fee2ea0132895c519163f1c6fa83
+MISC ChangeLog 4176 SHA256 7b03bf7bbb00ae07a7c0ec4754fc9215f9a06c8f606fb8a3904e1a1f4af00503 SHA512 c3e8cd73b8c4a415a56170c93bb1958a6a33daf048fc42009d2b56836664a26335e46b647a57ed648af85cb046fa6628fdef9c8d7397e7a617a33fbf5664a430 WHIRLPOOL d5915ba3d9022db8165b1ffd4ab0f0660b79735a19b52842cb5ab4a3c294189fb15598b9ded36cfbfaea244ff44f3a961b755ad10a58034fa53e8fca94fa7283
MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
MISC metadata.xml 1821 SHA256 3f0864988fd1d6ca97db612f9157275bf00336143969acb9d82ca6e6523127f5 SHA512 9f2d7adaf973837028f0c7cb305ac9917a88f07490ee172e570fc70860385de5c2b00edd6c22a37c9448d9260f51554e87b32b24e3bbbcc521f9ce5bbcb1fce0 WHIRLPOOL 7c135c44361168708252533d60a05f2c7d4b202c96c212e75d3057fa5ad80928c7d7452359b7e068c7a1f41dd4276c5917ac47ae010ec93821b2a9a3518f7aa9
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() {