grobian 14/07/27 10:38:48
Modified: ChangeLog git-2.0.2.ebuild git-9999.ebuild
git-9999-r3.ebuild git-9999-r2.ebuild
git-9999-r1.ebuild
Log:
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
(Portage version: 2.2.10.1-prefix/cvs/Darwin i386, RepoMan options: --force,
signed Manifest commit with key 0x5F75F607C5C74E89)
Revision Changes Path
1.271 dev-vcs/git/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.271&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.271&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.270&r2=1.271
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- ChangeLog 20 Jul 2014 21:22:53 -0000 1.270
+++ ChangeLog 27 Jul 2014 10:38:48 -0000 1.271
@@ -1,6 +1,11 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.270 2014/07/20
21:22:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.271 2014/07/27
10:38:48 grobian Exp $
+
+ 27 Jul 2014; Fabian Groffen <grob...@gentoo.org> git-2.0.2.ebuild,
+ git-9999.ebuild, git-9999-r1.ebuild, git-9999-r2.ebuild, git-9999-r3.ebuild:
+ Fix compilation with USE=subversion on platforms without intl and iconv in
+ libc, bug #516168
*git-2.0.2 (20 Jul 2014)
1.2 dev-vcs/git/git-2.0.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild?r1=1.1&r2=1.2
Index: git-2.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-2.0.2.ebuild 20 Jul 2014 21:22:53 -0000 1.1
+++ git-2.0.2.ebuild 27 Jul 2014 10:38:48 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild,v 1.2
2014/07/27 10:38:48 grobian Exp $
EAPI=5
@@ -325,7 +325,12 @@
if use subversion ; then
cd "${S}"/contrib/svn-fe
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+ # by defining EXTLIBS we override the detection for libintl and
+ # libiconv, bug #516168
+ local nlsiconv=
+ use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+ use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe
failed"
if use doc ; then
git_emake svn-fe.{1,html} || die "emake svn-fe.1
svn-fe.html failed"
fi
1.59 dev-vcs/git/git-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.59&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.59&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?r1=1.58&r2=1.59
Index: git-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- git-9999.ebuild 24 Jun 2014 01:44:07 -0000 1.58
+++ git-9999.ebuild 27 Jul 2014 10:38:48 -0000 1.59
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.58
2014/06/24 01:44:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.59
2014/07/27 10:38:48 grobian Exp $
EAPI=5
@@ -325,7 +325,12 @@
if use subversion ; then
cd "${S}"/contrib/svn-fe
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+ # by defining EXTLIBS we override the detection for libintl and
+ # libiconv, bug #516168
+ local nlsiconv=
+ use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+ use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe
failed"
if use doc ; then
git_emake svn-fe.{1,html} || die "emake svn-fe.1
svn-fe.html failed"
fi
1.5 dev-vcs/git/git-9999-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild?r1=1.4&r2=1.5
Index: git-9999-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- git-9999-r3.ebuild 24 Jun 2014 01:44:07 -0000 1.4
+++ git-9999-r3.ebuild 27 Jul 2014 10:38:48 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.4
2014/06/24 01:44:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.5
2014/07/27 10:38:48 grobian Exp $
EAPI=5
@@ -325,7 +325,12 @@
if use subversion ; then
cd "${S}"/contrib/svn-fe
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+ # by defining EXTLIBS we override the detection for libintl and
+ # libiconv, bug #516168
+ local nlsiconv=
+ use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+ use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe
failed"
if use doc ; then
git_emake svn-fe.{1,html} || die "emake svn-fe.1
svn-fe.html failed"
fi
1.4 dev-vcs/git/git-9999-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild?r1=1.3&r2=1.4
Index: git-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git-9999-r2.ebuild 24 Jun 2014 01:44:07 -0000 1.3
+++ git-9999-r2.ebuild 27 Jul 2014 10:38:48 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.3
2014/06/24 01:44:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.4
2014/07/27 10:38:48 grobian Exp $
EAPI=5
@@ -325,7 +325,12 @@
if use subversion ; then
cd "${S}"/contrib/svn-fe
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+ # by defining EXTLIBS we override the detection for libintl and
+ # libiconv, bug #516168
+ local nlsiconv=
+ use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+ use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe
failed"
if use doc ; then
git_emake svn-fe.{1,html} || die "emake svn-fe.1
svn-fe.html failed"
fi
1.4 dev-vcs/git/git-9999-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild?r1=1.3&r2=1.4
Index: git-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git-9999-r1.ebuild 24 Jun 2014 01:44:07 -0000 1.3
+++ git-9999-r1.ebuild 27 Jul 2014 10:38:48 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.3
2014/06/24 01:44:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.4
2014/07/27 10:38:48 grobian Exp $
EAPI=5
@@ -325,7 +325,12 @@
if use subversion ; then
cd "${S}"/contrib/svn-fe
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+ # by defining EXTLIBS we override the detection for libintl and
+ # libiconv, bug #516168
+ local nlsiconv=
+ use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+ use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe
failed"
if use doc ; then
git_emake svn-fe.{1,html} || die "emake svn-fe.1
svn-fe.html failed"
fi
