1 |
grobian 10/07/31 10:17:23 |
2 |
|
3 |
Modified: ChangeLog git-1.7.2-r1.ebuild |
4 |
Log: |
5 |
Fix compilation with USE=-iconv on non-glibc platforms since disabling of iconv is still ignored due to bugs mentioned in the ebuild |
6 |
|
7 |
(Portage version: 2.2.01.15449-prefix/cvs/SunOS i386) |
8 |
|
9 |
Revision Changes Path |
10 |
1.21 dev-vcs/git/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.21&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.21&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.20&r2=1.21 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v |
19 |
retrieving revision 1.20 |
20 |
retrieving revision 1.21 |
21 |
diff -u -r1.20 -r1.21 |
22 |
--- ChangeLog 30 Jul 2010 21:01:32 -0000 1.20 |
23 |
+++ ChangeLog 31 Jul 2010 10:17:23 -0000 1.21 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for dev-vcs/git |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.20 2010/07/30 21:01:32 robbat2 Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.21 2010/07/31 10:17:23 grobian Exp $ |
29 |
+ |
30 |
+ 31 Jul 2010; Fabian Groffen <grobian@g.o> git-1.7.2-r1.ebuild: |
31 |
+ Fix compilation with USE=-iconv on non-glibc platforms since disabling of |
32 |
+ iconv is still ignored due to bugs mentioned in the ebuild |
33 |
|
34 |
30 Jul 2010; Robin H. Johnson <robbat2@g.o> -git-1.6.3.1.ebuild, |
35 |
-git-1.6.3.3.ebuild, -git-1.6.3.4.ebuild, -git-1.6.4.ebuild, |
36 |
|
37 |
|
38 |
|
39 |
1.2 dev-vcs/git/git-1.7.2-r1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.2-r1.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.2-r1.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.2-r1.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: git-1.7.2-r1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2-r1.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- git-1.7.2-r1.ebuild 22 Jul 2010 21:34:50 -0000 1.1 |
52 |
+++ git-1.7.2-r1.ebuild 31 Jul 2010 10:17:23 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $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 $ |
57 |
+# $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 $ |
58 |
|
59 |
EAPI=3 |
60 |
|
61 |
@@ -123,11 +123,13 @@ |
62 |
|
63 |
# can't define this to null, since the entire makefile depends on it |
64 |
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile |
65 |
- use !elibc_glibc && use iconv && myopts="${myopts} NEEDS_LIBICONV=YesPlease" |
66 |
|
67 |
use iconv \ |
68 |
- || einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205." |
69 |
+ || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." |
70 |
# || myopts="${myopts} NO_ICONV=YesPlease" |
71 |
+ # because, above, we need to do this unconditionally (no "&& use iconv") |
72 |
+ use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" |
73 |
+ |
74 |
use tk \ |
75 |
|| myopts="${myopts} NO_TCLTK=YesPlease" |
76 |
use perl \ |