[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass
mgorny 15/08/08 09:32:50
Modified: ChangeLog git-r3.eclass
Log:
Add some boldness to output. Update/fix pkg_needrebuild() for
smart-live-rebuild.
Revision ChangesPath
1.1750 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1750view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1750content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1749r2=1.1750
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1749
retrieving revision 1.1750
diff -u -r1.1749 -r1.1750
--- ChangeLog 7 Aug 2015 02:05:19 - 1.1749
+++ ChangeLog 8 Aug 2015 09:32:50 - 1.1750
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1749 2015/08/07
02:05:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1750 2015/08/08
09:32:50 mgorny Exp $
+
+ 08 Aug 2015; Michał Górny mgo...@gentoo.org git-r3.eclass:
+ Add some boldness to output. Update/fix pkg_needrebuild() for
+ smart-live-rebuild.
07 Aug 2015; Davide Pesavento p...@gentoo.org qt5-build.eclass:
Fix bugs #549140 and #552942.
1.51 eclass/git-r3.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.51view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.51content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.50r2=1.51
Index: git-r3.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- git-r3.eclass 9 Jul 2015 20:21:05 - 1.50
+++ git-r3.eclass 8 Aug 2015 09:32:50 - 1.51
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.50 2015/07/09
20:21:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.51 2015/08/08
09:32:50 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -185,19 +185,19 @@
;;
single)
if [[ ${EGIT_CLONE_TYPE} == shallow ]]; then
- einfo git-r3: ebuild needs to be cloned in
'single' mode, adjusting
+ einfo git-r3: ebuild needs to be cloned in
'\e[1msingle\e[22m' mode, adjusting
EGIT_CLONE_TYPE=single
fi
;;
single+tags)
if [[ ${EGIT_CLONE_TYPE} == shallow ||
${EGIT_CLONE_TYPE} == single ]]; then
- einfo git-r3: ebuild needs to be cloned in
'single+tags' mode, adjusting
+ einfo git-r3: ebuild needs to be cloned in
'\e[1msingle+tags\e[22m' mode, adjusting
EGIT_CLONE_TYPE=single+tags
fi
;;
mirror)
if [[ ${EGIT_CLONE_TYPE} != mirror ]]; then
- einfo git-r3: ebuild needs to be cloned in
'mirror' mode, adjusting
+ einfo git-r3: ebuild needs to be cloned in
'\e[1mmirror\e[22m' mode, adjusting
EGIT_CLONE_TYPE=mirror
fi
;;
@@ -532,7 +532,7 @@
umask ${EVCS_UMASK} || die Bad options to umask:
${EVCS_UMASK}
fi
for r in ${repos[@]}; do
- einfo Fetching ${r} ...
+ einfo Fetching \e[1m${r}\e[22m ...
local fetch_command=( git fetch ${r} )
local clone_type=${EGIT_CLONE_TYPE}
@@ -553,11 +553,11 @@
# so automatically switch to single+tags mode.
if [[ ${clone_type} == shallow ]]; then
einfo Google Code does not support shallow
clones
- einfo using EGIT_CLONE_TYPE=single+tags
+ einfo using
\e[1mEGIT_CLONE_TYPE=single+tags\e[22m
clone_type=single+tags
elif [[ ${clone_type} == single ]]; then
einfo git-r3: Google Code does not send tags
properly in 'single' mode
- einfo using EGIT_CLONE_TYPE=single+tags
+ einfo using
\e[1mEGIT_CLONE_TYPE=single+tags\e[22m
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass
mgorny 15/07/09 20:21:05
Modified: ChangeLog git-r3.eclass
Log:
Do not attempt to use submodules for which the checkout path does not exist
(has been removed), bug #551100.
Revision ChangesPath
1.1707 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1707view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1707content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1706r2=1.1707
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1706
retrieving revision 1.1707
diff -u -r1.1706 -r1.1707
--- ChangeLog 9 Jul 2015 15:43:03 - 1.1706
+++ ChangeLog 9 Jul 2015 20:21:05 - 1.1707
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1706 2015/07/09
15:43:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1707 2015/07/09
20:21:05 mgorny Exp $
+
+ 09 Jul 2015; Michał Górny mgo...@gentoo.org git-r3.eclass:
+ Do not attempt to use submodules for which the checkout path does not exist
+ (has been removed), bug #551100.
09 Jul 2015; Michał Górny mgo...@gentoo.org gnome2.eclass:
Remove meaningless nonfatal from elibtoolize call, bug #551154.
1.50 eclass/git-r3.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.50view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.50content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.49r2=1.50
Index: git-r3.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- git-r3.eclass 22 Jun 2015 08:39:36 - 1.49
+++ git-r3.eclass 9 Jul 2015 20:21:05 - 1.50
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.49 2015/06/22
08:39:36 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.50 2015/07/09
20:21:05 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -710,16 +710,23 @@
local subname=${submodules[0]}
local url=${submodules[1]}
local path=${submodules[2]}
- local commit=$(git rev-parse ${local_ref}:${path})
- if [[ ! ${commit} ]]; then
- die Unable to get commit id for submodule
${subname}
- fi
+ # use only submodules for which path does exist
+ # (this is in par with 'git submodule'), bug #551100
+ # note: git cat-file does not work for submodules
+ if [[ $(git ls-tree -d ${local_ref} ${path}) ]]
+ then
+ local commit=$(git rev-parse
${local_ref}:${path} || die)
- local subrepos
- _git-r3_set_subrepos ${url} ${repos[@]}
+ if [[ ! ${commit} ]]; then
+ die Unable to get commit id for
submodule ${subname}
+ fi
- git-r3_fetch ${subrepos[*]} ${commit}
${local_id}/${subname}
+ local subrepos
+ _git-r3_set_subrepos ${url} ${repos[@]}
+
+ git-r3_fetch ${subrepos[*]} ${commit}
${local_id}/${subname}
+ fi
submodules=( ${submodules[@]:3} ) # shift
done
@@ -849,11 +856,16 @@
local subname=${submodules[0]}
local url=${submodules[1]}
local path=${submodules[2]}
- local subrepos
- _git-r3_set_subrepos ${url} ${repos[@]}
- git-r3_checkout ${subrepos[*]} ${out_dir}/${path} \
- ${local_id}/${subname}
+ # use only submodules for which path does exist
+ # (this is in par with 'git submodule'), bug #551100
+ if [[ -d ${out_dir}/${path} ]]; then
+ local subrepos
+ _git-r3_set_subrepos ${url} ${repos[@]}
+
+ git-r3_checkout ${subrepos[*]}
${out_dir}/${path} \
+
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass
mrueg 15/06/22 08:39:36
Modified: ChangeLog git-r3.eclass
Log:
Fix typo.
Revision ChangesPath
1.1677 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1677view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1677content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1676r2=1.1677
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1676
retrieving revision 1.1677
diff -u -r1.1676 -r1.1677
--- ChangeLog 19 Jun 2015 14:11:24 - 1.1676
+++ ChangeLog 22 Jun 2015 08:39:36 - 1.1677
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1676 2015/06/19
14:11:24 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1677 2015/06/22
08:39:36 mrueg Exp $
+
+ 22 Jun 2015; Manuel Rüger mr...@gentoo.org git-r3.eclass:
+ Fix typo.
19 Jun 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
Allow EANT_GENTOO_CLASSPATH_EXTRA to work when EANT_GENTOO_CLASSPATH is
1.49 eclass/git-r3.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.49view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.49content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.48r2=1.49
Index: git-r3.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- git-r3.eclass 4 Feb 2015 09:44:24 - 1.48
+++ git-r3.eclass 22 Jun 2015 08:39:36 - 1.49
@@ -1,13 +1,13 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.48 2015/02/04
09:44:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.49 2015/06/22
08:39:36 mrueg Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
# Michał Górny mgo...@gentoo.org
# @BLURB: Eclass for fetching and unpacking git repositories.
# @DESCRIPTION:
-# Third generation eclass for easing maitenance of live ebuilds using
+# Third generation eclass for easing maintenance of live ebuilds using
# git as remote repository.
case ${EAPI:-0} in
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass
mgorny 14/07/28 14:12:22
Modified: ChangeLog git-r3.eclass
Log:
Use ROOT=/ when checking for git features, bug #518374. Patch provided by
Michael Haubenwallner.
Revision ChangesPath
1.1326 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1326view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1326content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1325r2=1.1326
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1325
retrieving revision 1.1326
diff -u -r1.1325 -r1.1326
--- ChangeLog 25 Jul 2014 23:18:34 - 1.1325
+++ ChangeLog 28 Jul 2014 14:12:22 - 1.1326
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1325 2014/07/25
23:18:34 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1326 2014/07/28
14:12:22 mgorny Exp $
+
+ 28 Jul 2014; Michał Górny mgo...@gentoo.org git-r3.eclass:
+ Use ROOT=/ when checking for git features, bug #518374. Patch provided by
+ Michael Haubenwallner.
25 Jul 2014; Christoph Junghans ott...@gentoo.org mercurial.eclass:
Added EHG_CHECKOUT_DIR to override checkout destination
1.46 eclass/git-r3.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.46view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.46content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.45r2=1.46
Index: git-r3.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- git-r3.eclass 7 Jul 2014 14:41:56 - 1.45
+++ git-r3.eclass 28 Jul 2014 14:12:22 - 1.46
@@ -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/eclass/git-r3.eclass,v 1.45 2014/07/07
14:41:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.46 2014/07/28
14:12:22 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -513,7 +513,7 @@
local fetch_command=( git fetch ${r} )
local clone_type=${EGIT_CLONE_TYPE}
- if [[ ${r} == https://* ]] ! has_version
'dev-vcs/git[curl]'; then
+ if [[ ${r} == https://* ]] ! ROOT=/ has_version
'dev-vcs/git[curl]'; then
eerror git-r3: fetching from https:// requested. In
order to support https,
eerror dev-vcs/git needs to be built with USE=curl.
Example solution:
eerror
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass
mgorny 14/07/28 14:13:50
Modified: ChangeLog git-r3.eclass
Log:
Mention git-clone man page for URI syntax, bug #511636.
Revision ChangesPath
1.1327 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1327view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1327content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1326r2=1.1327
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1326
retrieving revision 1.1327
diff -u -r1.1326 -r1.1327
--- ChangeLog 28 Jul 2014 14:12:22 - 1.1326
+++ ChangeLog 28 Jul 2014 14:13:50 - 1.1327
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1326 2014/07/28
14:12:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1327 2014/07/28
14:13:50 mgorny Exp $
+
+ 28 Jul 2014; Michał Górny mgo...@gentoo.org git-r3.eclass:
+ Mention git-clone man page for URI syntax, bug #511636.
28 Jul 2014; Michał Górny mgo...@gentoo.org git-r3.eclass:
Use ROOT=/ when checking for git features, bug #518374. Patch provided by
1.47 eclass/git-r3.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.47view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.47content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.46r2=1.47
Index: git-r3.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- git-r3.eclass 28 Jul 2014 14:12:22 - 1.46
+++ git-r3.eclass 28 Jul 2014 14:13:50 - 1.47
@@ -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/eclass/git-r3.eclass,v 1.46 2014/07/28
14:12:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.47 2014/07/28
14:13:50 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -114,7 +114,8 @@
# @DESCRIPTION:
# URIs to the repository, e.g. git://foo, https://foo. If multiple URIs
# are provided, the eclass will consider them as fallback URIs to try
-# if the first URI does not work.
+# if the first URI does not work. For supported URI syntaxes, read up
+# the manpage for git-clone(1).
#
# It can be overriden via env using ${PN}_LIVE_REPO variable.
#
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass
mgorny 14/07/07 14:41:56
Modified: ChangeLog git-r3.eclass
Log:
Stop forcing -m0755 on EGIT3_STORE_DIR and parents, bug #516508.
Revision ChangesPath
1.1317 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1317view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1317content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1316r2=1.1317
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1316
retrieving revision 1.1317
diff -u -r1.1316 -r1.1317
--- ChangeLog 7 Jul 2014 12:43:35 - 1.1316
+++ ChangeLog 7 Jul 2014 14:41:56 - 1.1317
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1316 2014/07/07
12:43:35 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1317 2014/07/07
14:41:56 mgorny Exp $
+
+ 07 Jul 2014; Michał Górny mgo...@gentoo.org git-r3.eclass:
+ Stop forcing -m0755 on EGIT3_STORE_DIR and parents, bug #516508.
07 Jul 2014; Michael Haubenwallner ha...@gentoo.org
ELT-patches/aixrtl/1.5.0-cmds-c, ELT-patches/aixrtl/1.5.0-cmds-cxx,
1.45 eclass/git-r3.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.45view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.45content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.44r2=1.45
Index: git-r3.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- git-r3.eclass 20 Jun 2014 11:40:28 - 1.44
+++ git-r3.eclass 7 Jul 2014 14:41:56 - 1.45
@@ -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/eclass/git-r3.eclass,v 1.44 2014/06/20
11:40:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.45 2014/07/07
14:41:56 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -302,7 +302,7 @@
if [[ ! -d ${EGIT3_STORE_DIR} ]]; then
(
addwrite /
- mkdir -m0755 -p ${EGIT3_STORE_DIR} || die
+ mkdir -p ${EGIT3_STORE_DIR} || die
) || die Unable to create ${EGIT3_STORE_DIR}
fi
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass
mgorny 14/06/20 11:40:28
Modified: ChangeLog git-r3.eclass
Log:
Fix typo in submodule fetching, reported by Hans Vercammen.
Revision ChangesPath
1.1296 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1296view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1296content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1295r2=1.1296
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1295
retrieving revision 1.1296
diff -u -r1.1295 -r1.1296
--- ChangeLog 20 Jun 2014 00:03:33 - 1.1295
+++ ChangeLog 20 Jun 2014 11:40:28 - 1.1296
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1295 2014/06/20
00:03:33 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1296 2014/06/20
11:40:28 mgorny Exp $
+
+ 20 Jun 2014; Michał Górny mgo...@gentoo.org git-r3.eclass:
+ Fix typo in submodule fetching, reported by Hans Vercammen.
19 Jun 2014; Brian Evans grkni...@gentoo.org mysql-v2.eclass,
mysql-cmake.eclass:
Sync with mysql overlay.
1.44 eclass/git-r3.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.44view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.44content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.43r2=1.44
Index: git-r3.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- git-r3.eclass 1 Jun 2014 22:07:59 - 1.43
+++ git-r3.eclass 20 Jun 2014 11:40:28 - 1.44
@@ -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/eclass/git-r3.eclass,v 1.43 2014/06/01
22:07:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.44 2014/06/20
11:40:28 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -825,7 +825,7 @@
local subrepos
_git-r3_set_subrepos ${url} ${repos[@]}
- git-r3_checkout ${url} ${out_dir}/${path} \
+ git-r3_checkout ${subrepos[*]} ${out_dir}/${path} \
${local_id}/${subname}
submodules=( ${submodules[@]:3} ) # shift
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass
mgorny 14/06/01 22:07:59
Modified: ChangeLog git-r3.eclass
Log:
Properly canonicalize relative submodule URIs, bug #501250.
Revision ChangesPath
1.1279 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1279view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1279content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1278r2=1.1279
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1278
retrieving revision 1.1279
diff -u -r1.1278 -r1.1279
--- ChangeLog 31 May 2014 10:23:36 - 1.1278
+++ ChangeLog 1 Jun 2014 22:07:59 - 1.1279
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1278 2014/05/31
10:23:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1279 2014/06/01
22:07:59 mgorny Exp $
+
+ 01 Jun 2014; Michał Górny mgo...@gentoo.org git-r3.eclass,
+ +tests/git-r3:subrepos.sh:
+ Properly canonicalize relative submodule URIs, bug #501250.
31 May 2014; Michał Górny mgo...@gentoo.org systemd.eclass:
Add systemd_{do,new}userunit.
1.43 eclass/git-r3.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.43view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.43content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.42r2=1.43
Index: git-r3.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- git-r3.eclass 23 May 2014 07:09:07 - 1.42
+++ git-r3.eclass 1 Jun 2014 22:07:59 - 1.43
@@ -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/eclass/git-r3.eclass,v 1.42 2014/05/23
07:09:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.43 2014/06/01
22:07:59 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -352,6 +352,49 @@
done (echo ${data} | git config -f /dev/fd/0 -l || die)
}
+# @FUNCTION: _git-r3_set_subrepos
+# @USAGE: submodule-uri parent-repo-uri...
+# @INTERNAL
+# @DESCRIPTION:
+# Create 'subrepos' array containing absolute (canonical) submodule URIs
+# for the given submodule-uri. If the URI is relative, URIs will be
+# constructed using all parent-repo-uris. Otherwise, this single URI
+# will be placed in the array.
+_git-r3_set_subrepos() {
+ debug-print-function ${FUNCNAME} $@
+
+ local suburl=${1}
+ subrepos=( ${@:2} )
+
+ if [[ ${suburl} == ./* || ${suburl} == ../* ]]; then
+ # drop all possible trailing slashes for consistency
+ subrepos=( ${subrepos[@]%%/} )
+
+ while true; do
+ if [[ ${suburl} == ./* ]]; then
+ suburl=${suburl:2}
+ elif [[ ${suburl} == ../* ]]; then
+ suburl=${suburl:3}
+
+ # XXX: correctness checking
+
+ # drop the last path component
+ subrepos=( ${subrepos[@]%/*} )
+ # and then the trailing slashes, again
+ subrepos=( ${subrepos[@]%%/} )
+ else
+ break
+ fi
+ done
+
+ # append the preprocessed path to the preprocessed URIs
+ subrepos=( ${subrepos[@]/%//${suburl}})
+ else
+ subrepos=( ${suburl} )
+ fi
+}
+
+
# @FUNCTION: _git-r3_is_local_repo
# @USAGE: repo-uri
# @INTERNAL
@@ -645,11 +688,9 @@
if [[ ! ${commit} ]]; then
die Unable to get commit id for submodule
${subname}
fi
- if [[ ${url} == ./* || ${url} == ../* ]]; then
- local subrepos=( ${repos[@]/%//${url}} )
- else
- local subrepos=( ${url} )
- fi
+
+ local subrepos
+ _git-r3_set_subrepos ${url} ${repos[@]}
git-r3_fetch ${subrepos[*]} ${commit}
${local_id}/${subname}
@@ -781,10 +822,8 @@
local subname=${submodules[0]}
local url=${submodules[1]}
local path=${submodules[2]}
-
-
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass
mgorny 14/05/23 07:09:08
Modified: ChangeLog git-r3.eclass
Log:
Give an explanatory error when trying to fetch https:// with
dev-vcs/git[-curl]. Bug #510768.
Revision ChangesPath
1.1265 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1265view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1265content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1264r2=1.1265
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1264
retrieving revision 1.1265
diff -u -r1.1264 -r1.1265
--- ChangeLog 22 May 2014 16:35:11 - 1.1264
+++ ChangeLog 23 May 2014 07:09:07 - 1.1265
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1264 2014/05/22
16:35:11 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1265 2014/05/23
07:09:07 mgorny Exp $
+
+ 23 May 2014; Michał Górny mgo...@gentoo.org git-r3.eclass:
+ Give an explanatory error when trying to fetch https:// with
+ dev-vcs/git[-curl]. Bug #510768.
22 May 2014; Sergei Trofimovich sly...@gentoo.org haskell-cabal.eclass:
cabal_chdeps() now defaults to MY_PN (autogenerated by hackport) if exists,
1.42 eclass/git-r3.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.42view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.42content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.41r2=1.42
Index: git-r3.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- git-r3.eclass 17 Apr 2014 20:28:37 - 1.41
+++ git-r3.eclass 23 May 2014 07:09:07 - 1.42
@@ -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/eclass/git-r3.eclass,v 1.41 2014/04/17
20:28:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.42 2014/05/23
07:09:07 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -470,6 +470,15 @@
local fetch_command=( git fetch ${r} )
local clone_type=${EGIT_CLONE_TYPE}
+ if [[ ${r} == https://* ]] ! has_version
'dev-vcs/git[curl]'; then
+ eerror git-r3: fetching from https:// requested. In
order to support https,
+ eerror dev-vcs/git needs to be built with USE=curl.
Example solution:
+ eerror
+ eerror echo dev-vcs/git curl
/etc/portage/package.use
+ eerror emerge -1v dev-vcs/git
+ die dev-vcs/git built with USE=curl required.
+ fi
+
if [[ ${r} == https://code.google.com/* ]]; then
# Google Code has special magic on top of git that:
# 1) can't handle shallow clones at all,
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass
mgorny 14/04/17 20:28:37
Modified: ChangeLog git-r3.eclass
Log:
Automatically switch to EGIT_CLONE_TYPE=single+tags for Google Code.
Revision ChangesPath
1.1212 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1212view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1212content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1211r2=1.1212
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1211
retrieving revision 1.1212
diff -u -r1.1211 -r1.1212
--- ChangeLog 17 Apr 2014 18:16:54 - 1.1211
+++ ChangeLog 17 Apr 2014 20:28:37 - 1.1212
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1211 2014/04/17
18:16:54 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1212 2014/04/17
20:28:37 mgorny Exp $
+
+ 17 Apr 2014; Michał Górny mgo...@gentoo.org git-r3.eclass:
+ Automatically switch to EGIT_CLONE_TYPE=single+tags for Google Code.
17 Apr 2014; Michael Palimaka kensing...@gentoo.org kde4-meta.eclass:
Sync with overlay. Remove unused inherit. Switch to git-r3 eclass. Fix file
1.41 eclass/git-r3.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.41view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.41content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.40r2=1.41
Index: git-r3.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- git-r3.eclass 24 Mar 2014 21:32:31 - 1.40
+++ git-r3.eclass 17 Apr 2014 20:28:37 - 1.41
@@ -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/eclass/git-r3.eclass,v 1.40 2014/03/24
21:32:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.41 2014/04/17
20:28:37 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -468,8 +468,25 @@
einfo Fetching ${r} ...
local fetch_command=( git fetch ${r} )
+ local clone_type=${EGIT_CLONE_TYPE}
- if [[ ${EGIT_CLONE_TYPE} == mirror ]]; then
+ if [[ ${r} == https://code.google.com/* ]]; then
+ # Google Code has special magic on top of git that:
+ # 1) can't handle shallow clones at all,
+ # 2) fetches duplicately when tags are pulled in with
branch
+ # so automatically switch to single+tags mode.
+ if [[ ${clone_type} == shallow ]]; then
+ einfo Google Code does not support shallow
clones
+ einfo using EGIT_CLONE_TYPE=single+tags
+ clone_type=single+tags
+ elif [[ ${clone_type} == single ]]; then
+ einfo git-r3: Google Code does not send tags
properly in 'single' mode
+ einfo using EGIT_CLONE_TYPE=single+tags
+ clone_type=single+tags
+ fi
+ fi
+
+ if [[ ${clone_type} == mirror ]]; then
fetch_command+=(
--prune
# mirror the remote branches as local branches
@@ -510,8 +527,8 @@
fi
# fetching by commit in shallow mode?
can't do.
- if [[ ${EGIT_CLONE_TYPE} == shallow ]];
then
- local EGIT_CLONE_TYPE=single
+ if [[ ${clone_type} == shallow ]]; then
+ clone_type=single
fi
fi
fi
@@ -526,7 +543,7 @@
+${fetch_l}:${fetch_r}
)
- if [[ ${EGIT_CLONE_TYPE} == single+tags ]]; then
+ if [[ ${clone_type} == single+tags ]]; then
fetch_command+=(
# pull tags explicitly as requested
+refs/tags/*:refs/tags/*
@@ -534,11 +551,11 @@
fi
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass
mgorny 14/03/24 21:32:31
Modified: ChangeLog git-r3.eclass
Log:
Add a single+tags mode to handle Google Code more efficiently, bug #503708.
Revision ChangesPath
1.1183 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1183view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1183content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1182r2=1.1183
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1182
retrieving revision 1.1183
diff -u -r1.1182 -r1.1183
--- ChangeLog 21 Mar 2014 22:03:00 - 1.1182
+++ ChangeLog 24 Mar 2014 21:32:31 - 1.1183
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1182 2014/03/21
22:03:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1183 2014/03/24
21:32:31 mgorny Exp $
+
+ 24 Mar 2014; Michał Górny mgo...@gentoo.org git-r3.eclass:
+ Add a single+tags mode to handle Google Code more efficiently, bug #503708.
21 Mar 2014; Robin H. Johnson robb...@gentoo.org linux-info.eclass:
linux-info: Bug #504346: Change one message from error to warning, kernel
1.40 eclass/git-r3.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.40view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.40content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.39r2=1.40
Index: git-r3.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- git-r3.eclass 3 Mar 2014 21:45:06 - 1.39
+++ git-r3.eclass 24 Mar 2014 21:32:31 - 1.40
@@ -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/eclass/git-r3.eclass,v 1.39 2014/03/03
21:45:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.40 2014/03/24
21:32:31 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -47,6 +47,14 @@
# for development or hosting a local git mirror. However, clones
# of repositories with large diverged branches may quickly grow large.
#
+# The 'single+tags' type clones the requested branch and all tags
+# in the repository. All notes are fetched as well. EGIT_COMMIT
+# can safely specify hashes throughout the current branch and all tags.
+# No purging of old references is done (if you often switch branches,
+# you may need to remove stale branches yourself). This mode is intended
+# mostly for use with broken git servers such as Google Code that fail
+# to fetch tags along with the branch in 'single' mode.
+#
# The 'single' type clones only the requested branch or tag. Tags
# referencing commits throughout the branch history are fetched as well,
# and all notes. EGIT_COMMIT can safely specify only hashes
@@ -72,9 +80,10 @@
# supposed to set EGIT_CLONE_TYPE instead.
#
# A common case is to use 'single' whenever the build system requires
-# access to full branch history or the remote (Google Code) does not
-# support shallow clones. Please use sparingly, and to fix fatal errors
-# rather than 'non-pretty versions'.
+# access to full branch history, or 'single+tags' when Google Code
+# or a similar remote is used that does not support shallow clones
+# and fetching tags along with commits. Please use sparingly, and to fix
+# fatal errors rather than 'non-pretty versions'.
: ${EGIT_MIN_CLONE_TYPE:=shallow}
# @ECLASS-VARIABLE: EGIT3_STORE_DIR
@@ -154,7 +163,7 @@
# check the clone type
case ${EGIT_CLONE_TYPE} in
- mirror|single|shallow)
+ mirror|single+tags|single|shallow)
;;
*)
die Invalid EGIT_CLONE_TYPE=${EGIT_CLONE_TYPE}
@@ -168,6 +177,12 @@
EGIT_CLONE_TYPE=single
fi
;;
+ single+tags)
+ if [[ ${EGIT_CLONE_TYPE} == shallow ||
${EGIT_CLONE_TYPE} == single ]]; then
+ einfo git-r3: ebuild needs to be cloned in
'single+tags' mode, adjusting
+ EGIT_CLONE_TYPE=single+tags
+ fi
+ ;;
mirror)
if [[ ${EGIT_CLONE_TYPE} != mirror ]]; then
einfo git-r3: ebuild needs to be cloned in
'mirror' mode, adjusting
@@ -510,6 +525,13 @@
