| 1 |
grobian 14/07/27 10:38:48 |
| 2 |
|
| 3 |
Modified: ChangeLog git-2.0.2.ebuild git-9999.ebuild |
| 4 |
git-9999-r3.ebuild git-9999-r2.ebuild |
| 5 |
git-9999-r1.ebuild |
| 6 |
Log: |
| 7 |
Fix compilation with USE=subversion on platforms without intl and iconv in libc, bug #516168, force for odd syntax errors in dependencies in untouched ebuilds that Portage otherwise is fine with |
| 8 |
|
| 9 |
(Portage version: 2.2.10.1-prefix/cvs/Darwin i386, RepoMan options: --force, signed Manifest commit with key 0x5F75F607C5C74E89) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.271 dev-vcs/git/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.271&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.271&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.270&r2=1.271 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v |
| 21 |
retrieving revision 1.270 |
| 22 |
retrieving revision 1.271 |
| 23 |
diff -u -r1.270 -r1.271 |
| 24 |
--- ChangeLog 20 Jul 2014 21:22:53 -0000 1.270 |
| 25 |
+++ ChangeLog 27 Jul 2014 10:38:48 -0000 1.271 |
| 26 |
@@ -1,6 +1,11 @@ |
| 27 |
# ChangeLog for dev-vcs/git |
| 28 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.270 2014/07/20 21:22:53 polynomial-c Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.271 2014/07/27 10:38:48 grobian Exp $ |
| 31 |
+ |
| 32 |
+ 27 Jul 2014; Fabian Groffen <grobian@g.o> git-2.0.2.ebuild, |
| 33 |
+ git-9999.ebuild, git-9999-r1.ebuild, git-9999-r2.ebuild, git-9999-r3.ebuild: |
| 34 |
+ Fix compilation with USE=subversion on platforms without intl and iconv in |
| 35 |
+ libc, bug #516168 |
| 36 |
|
| 37 |
*git-2.0.2 (20 Jul 2014) |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.2 dev-vcs/git/git-2.0.2.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild?rev=1.2&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild?rev=1.2&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild?r1=1.1&r2=1.2 |
| 47 |
|
| 48 |
Index: git-2.0.2.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild,v |
| 51 |
retrieving revision 1.1 |
| 52 |
retrieving revision 1.2 |
| 53 |
diff -u -r1.1 -r1.2 |
| 54 |
--- git-2.0.2.ebuild 20 Jul 2014 21:22:53 -0000 1.1 |
| 55 |
+++ git-2.0.2.ebuild 27 Jul 2014 10:38:48 -0000 1.2 |
| 56 |
@@ -1,6 +1,6 @@ |
| 57 |
# Copyright 1999-2014 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild,v 1.1 2014/07/20 21:22:53 polynomial-c Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild,v 1.2 2014/07/27 10:38:48 grobian Exp $ |
| 61 |
|
| 62 |
EAPI=5 |
| 63 |
|
| 64 |
@@ -325,7 +325,12 @@ |
| 65 |
|
| 66 |
if use subversion ; then |
| 67 |
cd "${S}"/contrib/svn-fe |
| 68 |
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed" |
| 69 |
+ # by defining EXTLIBS we override the detection for libintl and |
| 70 |
+ # libiconv, bug #516168 |
| 71 |
+ local nlsiconv= |
| 72 |
+ use nls && use !elibc_glibc && nlsiconv+=" -lintl" |
| 73 |
+ use iconv && use !elibc_glibc && nlsiconv+=" -liconv" |
| 74 |
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" |
| 75 |
if use doc ; then |
| 76 |
git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" |
| 77 |
fi |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.59 dev-vcs/git/git-9999.ebuild |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.59&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.59&content-type=text/plain |
| 85 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?r1=1.58&r2=1.59 |
| 86 |
|
| 87 |
Index: git-9999.ebuild |
| 88 |
=================================================================== |
| 89 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v |
| 90 |
retrieving revision 1.58 |
| 91 |
retrieving revision 1.59 |
| 92 |
diff -u -r1.58 -r1.59 |
| 93 |
--- git-9999.ebuild 24 Jun 2014 01:44:07 -0000 1.58 |
| 94 |
+++ git-9999.ebuild 27 Jul 2014 10:38:48 -0000 1.59 |
| 95 |
@@ -1,6 +1,6 @@ |
| 96 |
# Copyright 1999-2014 Gentoo Foundation |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.58 2014/06/24 01:44:07 tetromino Exp $ |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.59 2014/07/27 10:38:48 grobian Exp $ |
| 100 |
|
| 101 |
EAPI=5 |
| 102 |
|
| 103 |
@@ -325,7 +325,12 @@ |
| 104 |
|
| 105 |
if use subversion ; then |
| 106 |
cd "${S}"/contrib/svn-fe |
| 107 |
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed" |
| 108 |
+ # by defining EXTLIBS we override the detection for libintl and |
| 109 |
+ # libiconv, bug #516168 |
| 110 |
+ local nlsiconv= |
| 111 |
+ use nls && use !elibc_glibc && nlsiconv+=" -lintl" |
| 112 |
+ use iconv && use !elibc_glibc && nlsiconv+=" -liconv" |
| 113 |
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" |
| 114 |
if use doc ; then |
| 115 |
git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" |
| 116 |
fi |
| 117 |
|
| 118 |
|
| 119 |
|
| 120 |
1.5 dev-vcs/git/git-9999-r3.ebuild |
| 121 |
|
| 122 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild?rev=1.5&view=markup |
| 123 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild?rev=1.5&content-type=text/plain |
| 124 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild?r1=1.4&r2=1.5 |
| 125 |
|
| 126 |
Index: git-9999-r3.ebuild |
| 127 |
=================================================================== |
| 128 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v |
| 129 |
retrieving revision 1.4 |
| 130 |
retrieving revision 1.5 |
| 131 |
diff -u -r1.4 -r1.5 |
| 132 |
--- git-9999-r3.ebuild 24 Jun 2014 01:44:07 -0000 1.4 |
| 133 |
+++ git-9999-r3.ebuild 27 Jul 2014 10:38:48 -0000 1.5 |
| 134 |
@@ -1,6 +1,6 @@ |
| 135 |
# Copyright 1999-2014 Gentoo Foundation |
| 136 |
# Distributed under the terms of the GNU General Public License v2 |
| 137 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.4 2014/06/24 01:44:07 tetromino Exp $ |
| 138 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.5 2014/07/27 10:38:48 grobian Exp $ |
| 139 |
|
| 140 |
EAPI=5 |
| 141 |
|
| 142 |
@@ -325,7 +325,12 @@ |
| 143 |
|
| 144 |
if use subversion ; then |
| 145 |
cd "${S}"/contrib/svn-fe |
| 146 |
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed" |
| 147 |
+ # by defining EXTLIBS we override the detection for libintl and |
| 148 |
+ # libiconv, bug #516168 |
| 149 |
+ local nlsiconv= |
| 150 |
+ use nls && use !elibc_glibc && nlsiconv+=" -lintl" |
| 151 |
+ use iconv && use !elibc_glibc && nlsiconv+=" -liconv" |
| 152 |
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" |
| 153 |
if use doc ; then |
| 154 |
git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" |
| 155 |
fi |
| 156 |
|
| 157 |
|
| 158 |
|
| 159 |
1.4 dev-vcs/git/git-9999-r2.ebuild |
| 160 |
|
| 161 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild?rev=1.4&view=markup |
| 162 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild?rev=1.4&content-type=text/plain |
| 163 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild?r1=1.3&r2=1.4 |
| 164 |
|
| 165 |
Index: git-9999-r2.ebuild |
| 166 |
=================================================================== |
| 167 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v |
| 168 |
retrieving revision 1.3 |
| 169 |
retrieving revision 1.4 |
| 170 |
diff -u -r1.3 -r1.4 |
| 171 |
--- git-9999-r2.ebuild 24 Jun 2014 01:44:07 -0000 1.3 |
| 172 |
+++ git-9999-r2.ebuild 27 Jul 2014 10:38:48 -0000 1.4 |
| 173 |
@@ -1,6 +1,6 @@ |
| 174 |
# Copyright 1999-2014 Gentoo Foundation |
| 175 |
# Distributed under the terms of the GNU General Public License v2 |
| 176 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.3 2014/06/24 01:44:07 tetromino Exp $ |
| 177 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.4 2014/07/27 10:38:48 grobian Exp $ |
| 178 |
|
| 179 |
EAPI=5 |
| 180 |
|
| 181 |
@@ -325,7 +325,12 @@ |
| 182 |
|
| 183 |
if use subversion ; then |
| 184 |
cd "${S}"/contrib/svn-fe |
| 185 |
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed" |
| 186 |
+ # by defining EXTLIBS we override the detection for libintl and |
| 187 |
+ # libiconv, bug #516168 |
| 188 |
+ local nlsiconv= |
| 189 |
+ use nls && use !elibc_glibc && nlsiconv+=" -lintl" |
| 190 |
+ use iconv && use !elibc_glibc && nlsiconv+=" -liconv" |
| 191 |
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" |
| 192 |
if use doc ; then |
| 193 |
git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" |
| 194 |
fi |
| 195 |
|
| 196 |
|
| 197 |
|
| 198 |
1.4 dev-vcs/git/git-9999-r1.ebuild |
| 199 |
|
| 200 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild?rev=1.4&view=markup |
| 201 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild?rev=1.4&content-type=text/plain |
| 202 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild?r1=1.3&r2=1.4 |
| 203 |
|
| 204 |
Index: git-9999-r1.ebuild |
| 205 |
=================================================================== |
| 206 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v |
| 207 |
retrieving revision 1.3 |
| 208 |
retrieving revision 1.4 |
| 209 |
diff -u -r1.3 -r1.4 |
| 210 |
--- git-9999-r1.ebuild 24 Jun 2014 01:44:07 -0000 1.3 |
| 211 |
+++ git-9999-r1.ebuild 27 Jul 2014 10:38:48 -0000 1.4 |
| 212 |
@@ -1,6 +1,6 @@ |
| 213 |
# Copyright 1999-2014 Gentoo Foundation |
| 214 |
# Distributed under the terms of the GNU General Public License v2 |
| 215 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.3 2014/06/24 01:44:07 tetromino Exp $ |
| 216 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.4 2014/07/27 10:38:48 grobian Exp $ |
| 217 |
|
| 218 |
EAPI=5 |
| 219 |
|
| 220 |
@@ -325,7 +325,12 @@ |
| 221 |
|
| 222 |
if use subversion ; then |
| 223 |
cd "${S}"/contrib/svn-fe |
| 224 |
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed" |
| 225 |
+ # by defining EXTLIBS we override the detection for libintl and |
| 226 |
+ # libiconv, bug #516168 |
| 227 |
+ local nlsiconv= |
| 228 |
+ use nls && use !elibc_glibc && nlsiconv+=" -lintl" |
| 229 |
+ use iconv && use !elibc_glibc && nlsiconv+=" -liconv" |
| 230 |
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" |
| 231 |
if use doc ; then |
| 232 |
git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" |
| 233 |
fi |
Archives