diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-07-31 10:17:23 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-07-31 10:17:23 +0000 |
| commit | f18696cd3e68290a0ba349ff9bd82ce2b9f74d27 (patch) | |
| tree | edd388fd5e17efd6ca54c58d72c8c09c3e7ed67d /dev-vcs | |
| parent | fixes bug #313367. (diff) | |
| download | historical-f18696cd3e68290a0ba349ff9bd82ce2b9f74d27.tar.gz historical-f18696cd3e68290a0ba349ff9bd82ce2b9f74d27.tar.bz2 historical-f18696cd3e68290a0ba349ff9bd82ce2b9f74d27.zip | |
Fix compilation with USE=-iconv on non-glibc platforms since disabling of iconv is still ignored due to bugs mentioned in the ebuild
Package-Manager: portage-2.2.01.15449-prefix/cvs/SunOS i386
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/git/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-vcs/git/Manifest | 4 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.2-r1.ebuild | 8 |
3 files changed, 12 insertions, 6 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index d629ffe635b6..d734c6ffe3ad 100644 --- a/dev-vcs/git/ChangeLog +++ b/dev-vcs/git/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-vcs/git # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.20 2010/07/30 21:01:32 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.21 2010/07/31 10:17:23 grobian Exp $ + + 31 Jul 2010; Fabian Groffen <grobian@gentoo.org> git-1.7.2-r1.ebuild: + Fix compilation with USE=-iconv on non-glibc platforms since disabling of + iconv is still ignored due to bugs mentioned in the ebuild 30 Jul 2010; Robin H. Johnson <robbat2@gentoo.org> -git-1.6.3.1.ebuild, -git-1.6.3.3.ebuild, -git-1.6.3.4.ebuild, -git-1.6.4.ebuild, diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 8e6adcb7394c..65dbf91b6066 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -27,8 +27,8 @@ EBUILD git-1.6.4.4.ebuild 10075 RMD160 0818f0cae5d77f8d6d85f01f8b9a45c2594c1cdd EBUILD git-1.7.0.ebuild 11272 RMD160 8b3478cd46278a13724b798e8dba11fda746e838 SHA1 4a55859bd11e669b272cc025d5712ba557f3316f SHA256 a7bf9fb9fc6a9630a329fda61a617307775d5043585ef7ad7473dfe0a72f4d61 EBUILD git-1.7.1-r1.ebuild 11470 RMD160 6a49198be27c24cf0b748c9218b2ff44a2356a47 SHA1 5cefb98e56d56cc321c8ba33c21b073d7dad6b8e SHA256 3e8d1108af941cf7ed5f254c71cfaa3e56e4208e34d3877bf882bc6c27fadd05 EBUILD git-1.7.1.1.ebuild 11479 RMD160 ecd11a8ca56f9bb38848b2f8278e0068e8c90863 SHA1 f4f8171dec318b06f215376aca40eab53db857b9 SHA256 10cb900acf3a1756b69ea795286b855968856b2e9ea71adbce168b3614738cc1 -EBUILD git-1.7.2-r1.ebuild 13295 RMD160 55ae3df669a9664143d8851d5e7186c6e5915deb SHA1 f848bccb38c719205bc5c644907a375e1422d2a1 SHA256 b8eb76568e2a6ba17edffd08df661fb676049b646715c4eedbea77d606b1086c +EBUILD git-1.7.2-r1.ebuild 13354 RMD160 80acc1878a806700c7edff75119c0ba8f50cbb12 SHA1 cc39e564e0b97002d70dcddee788960c9361ebff SHA256 8741a3d7adae5ae4965387668593a22ed3f18ed964cecf9170eea7650e66371b EBUILD git-1.7.2.ebuild 11477 RMD160 6fba2a275d31a4da89f12a1c4711f9fdc3560ea2 SHA1 7b98fb9bf0db758703a71ddee015bf5e4bcfb101 SHA256 99777afb7828342d731afb033308c3c149cd4ba3ea4f3a79223c7957d8c01900 EBUILD git-9999.ebuild 11267 RMD160 01f76a5e2f10faefecef89641377296535061860 SHA1 66f75a31674acf05dce53d164a8349c28bf428f2 SHA256 bebf393f824d891625a074bab936fa66dc0c195f638b23af99214b1fe7112597 -MISC ChangeLog 68273 RMD160 3e7481f85a0b99119707ab3219209eef8e31e922 SHA1 01e647aa2108b68216f993b18d5b133c389b81c7 SHA256 308ef70e57277926dee15629fadd328040b65570a250811450380dbba0dc7108 +MISC ChangeLog 68483 RMD160 03e0fc758b5a51a56a8807979c43320c502f2c7a SHA1 e52f6f2bb6e9f830820d7c8d792481ca932a950d SHA256 a072f6e5f30e11fa08b5624b3ba5b3f8c936842b2da6b60ce7df6428d97aa22c MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b diff --git a/dev-vcs/git/git-1.7.2-r1.ebuild b/dev-vcs/git/git-1.7.2-r1.ebuild index 4d8f1e6cf0d7..eae47ee4c6a4 100644 --- a/dev-vcs/git/git-1.7.2-r1.ebuild +++ b/dev-vcs/git/git-1.7.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2-r1.ebuild,v 1.1 2010/07/22 21:34:50 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2-r1.ebuild,v 1.2 2010/07/31 10:17:23 grobian Exp $ EAPI=3 @@ -123,11 +123,13 @@ exportmakeopts() { # can't define this to null, since the entire makefile depends on it sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - use !elibc_glibc && use iconv && myopts="${myopts} NEEDS_LIBICONV=YesPlease" use iconv \ - || einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205." + || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." # || myopts="${myopts} NO_ICONV=YesPlease" + # because, above, we need to do this unconditionally (no "&& use iconv") + use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" + use tk \ || myopts="${myopts} NO_TCLTK=YesPlease" use perl \ |