Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-2.1.13.2.ebuild portage-2.2.0_alpha191.ebuild ChangeLog
Date: Tue, 30 Jul 2013 18:38:37
Message-Id: 20130730183830.219672171C@flycatcher.gentoo.org
1 zmedico 13/07/30 18:38:30
2
3 Modified: portage-2.1.13.2.ebuild
4 portage-2.2.0_alpha191.ebuild ChangeLog
5 Log:
6 Support git:// in pkg_postinst generated repos.conf.
7
8 (Portage version: 2.2.0_alpha191/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
9
10 Revision Changes Path
11 1.3 sys-apps/portage/portage-2.1.13.2.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild?r1=1.2&r2=1.3
16
17 Index: portage-2.1.13.2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- portage-2.1.13.2.ebuild 30 Jul 2013 07:01:10 -0000 1.2
24 +++ portage-2.1.13.2.ebuild 30 Jul 2013 18:38:29 -0000 1.3
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild,v 1.2 2013/07/30 07:01:10 zmedico Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild,v 1.3 2013/07/30 18:38:29 zmedico Exp $
30
31 # Require EAPI 2 since we now require at least python-2.6 (for python 3
32 # syntax support) which also requires EAPI 2.
33 @@ -457,13 +457,16 @@
34 REPOS_CONF_SYNC=$(grep "^sync-uri =" "${ROOT}/usr/share/portage/config/repos.conf")
35 REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
36 fi
37 + local sync_type=
38 + [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
39 +
40 cat <<-EOF > "${T}/repos.conf"
41 [DEFAULT]
42 main-repo = ${repo_name:-gentoo}
43
44 [${repo_name:-gentoo}]
45 location = ${PORTDIR:-/usr/portage}
46 - sync-type = rsync
47 + sync-type = ${sync_type:-rsync}
48 sync-uri = ${REPOS_CONF_SYNC}
49 EOF
50 local dest=${ROOT}/etc/portage/repos.conf
51
52
53
54 1.2 sys-apps/portage/portage-2.2.0_alpha191.ebuild
55
56 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha191.ebuild?rev=1.2&view=markup
57 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha191.ebuild?rev=1.2&content-type=text/plain
58 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha191.ebuild?r1=1.1&r2=1.2
59
60 Index: portage-2.2.0_alpha191.ebuild
61 ===================================================================
62 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha191.ebuild,v
63 retrieving revision 1.1
64 retrieving revision 1.2
65 diff -u -r1.1 -r1.2
66 --- portage-2.2.0_alpha191.ebuild 30 Jul 2013 07:03:31 -0000 1.1
67 +++ portage-2.2.0_alpha191.ebuild 30 Jul 2013 18:38:29 -0000 1.2
68 @@ -1,6 +1,6 @@
69 # Copyright 1999-2013 Gentoo Foundation
70 # Distributed under the terms of the GNU General Public License v2
71 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha191.ebuild,v 1.1 2013/07/30 07:03:31 zmedico Exp $
72 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha191.ebuild,v 1.2 2013/07/30 18:38:29 zmedico Exp $
73
74 # Require EAPI 2 since we now require at least python-2.6 (for python 3
75 # syntax support) which also requires EAPI 2.
76 @@ -480,13 +480,16 @@
77 REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT}/usr/share/portage/config/repos.conf")
78 REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
79 fi
80 + local sync_type=
81 + [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
82 +
83 cat <<-EOF > "${T}/repos.conf"
84 [DEFAULT]
85 main-repo = ${repo_name:-gentoo}
86
87 [${repo_name:-gentoo}]
88 location = ${PORTDIR:-${EPREFIX}/usr/portage}
89 - sync-type = rsync
90 + sync-type = ${sync_type:-rsync}
91 sync-uri = ${REPOS_CONF_SYNC}
92 EOF
93 local dest=${EROOT}/etc/portage/repos.conf
94
95
96
97 1.1327 sys-apps/portage/ChangeLog
98
99 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1327&view=markup
100 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1327&content-type=text/plain
101 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1326&r2=1.1327
102
103 Index: ChangeLog
104 ===================================================================
105 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
106 retrieving revision 1.1326
107 retrieving revision 1.1327
108 diff -u -r1.1326 -r1.1327
109 --- ChangeLog 30 Jul 2013 07:03:31 -0000 1.1326
110 +++ ChangeLog 30 Jul 2013 18:38:29 -0000 1.1327
111 @@ -1,6 +1,10 @@
112 # ChangeLog for sys-apps/portage
113 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
114 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1326 2013/07/30 07:03:31 zmedico Exp $
115 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1327 2013/07/30 18:38:29 zmedico Exp $
116 +
117 + 30 Jul 2013; Zac Medico <zmedico@g.o> portage-2.1.13.2.ebuild,
118 + portage-2.2.0_alpha191.ebuild:
119 + Support git:// in pkg_postinst generated repos.conf.
120
121 *portage-2.2.0_alpha191 (30 Jul 2013)