Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: Wed, 31 Jul 2013 01:14:23
Message-Id: 20130731011416.32DEA2171C@flycatcher.gentoo.org
1 zmedico 13/07/31 01:14:16
2
3 Modified: portage-2.1.13.2.ebuild
4 portage-2.2.0_alpha191.ebuild ChangeLog
5 Log:
6 Generating make.conf PORTDIR setting for backward compatibility.
7
8 (Portage version: 2.2.0_alpha191/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
9
10 Revision Changes Path
11 1.4 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.4&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild?rev=1.4&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.3&r2=1.4
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.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- portage-2.1.13.2.ebuild 30 Jul 2013 18:38:29 -0000 1.3
24 +++ portage-2.1.13.2.ebuild 31 Jul 2013 01:14:16 -0000 1.4
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.3 2013/07/30 18:38:29 zmedico Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild,v 1.4 2013/07/31 01:14:16 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 @@ -478,6 +478,26 @@
34 # their config (bug #478726).
35 [[ -e ${ROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
36 mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
37 +
38 + if [[ ${PORTDIR} == /usr/portage ]] ; then
39 + einfo "Generating make.conf PORTDIR setting for backward compatibility"
40 + for dest in "${ROOT}/etc/make.conf" "${ROOT}/etc/portage/make.conf" ; do
41 + [[ -e ${dest} ]] && break
42 + done
43 + [[ -d ${dest} ]] && dest=${dest}/portdir.conf
44 + rm -rf "${T}/make.conf"
45 + [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
46 + cat <<-EOF >> "${T}/make.conf"
47 +
48 + # Set PORTDIR for backward compatibility with various tools:
49 + # gentoo-bashcomp - bug #478444
50 + # euse - bug #474574
51 + # euses and ufed - bug #478318
52 + PORTDIR="/usr/portage"
53 + EOF
54 + mkdir -p "${dest%/*}"
55 + mv "${T}/make.conf" "$(new_config_protect "${dest}")"
56 + fi
57 fi
58
59 if ${NEEDED_REBUILD_UPGRADE} ; then
60
61
62
63 1.3 sys-apps/portage/portage-2.2.0_alpha191.ebuild
64
65 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha191.ebuild?rev=1.3&view=markup
66 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha191.ebuild?rev=1.3&content-type=text/plain
67 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha191.ebuild?r1=1.2&r2=1.3
68
69 Index: portage-2.2.0_alpha191.ebuild
70 ===================================================================
71 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha191.ebuild,v
72 retrieving revision 1.2
73 retrieving revision 1.3
74 diff -u -r1.2 -r1.3
75 --- portage-2.2.0_alpha191.ebuild 30 Jul 2013 18:38:29 -0000 1.2
76 +++ portage-2.2.0_alpha191.ebuild 31 Jul 2013 01:14:16 -0000 1.3
77 @@ -1,6 +1,6 @@
78 # Copyright 1999-2013 Gentoo Foundation
79 # Distributed under the terms of the GNU General Public License v2
80 -# $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 $
81 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha191.ebuild,v 1.3 2013/07/31 01:14:16 zmedico Exp $
82
83 # Require EAPI 2 since we now require at least python-2.6 (for python 3
84 # syntax support) which also requires EAPI 2.
85 @@ -501,6 +501,26 @@
86 # their config (bug #478726).
87 [[ -e ${EROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
88 mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
89 +
90 + if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
91 + einfo "Generating make.conf PORTDIR setting for backward compatibility"
92 + for dest in "${EROOT}/etc/make.conf" "${EROOT}/etc/portage/make.conf" ; do
93 + [[ -e ${dest} ]] && break
94 + done
95 + [[ -d ${dest} ]] && dest=${dest}/portdir.conf
96 + rm -rf "${T}/make.conf"
97 + [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
98 + cat <<-EOF >> "${T}/make.conf"
99 +
100 + # Set PORTDIR for backward compatibility with various tools:
101 + # gentoo-bashcomp - bug #478444
102 + # euse - bug #474574
103 + # euses and ufed - bug #478318
104 + PORTDIR="${EPREFIX}/usr/portage"
105 + EOF
106 + mkdir -p "${dest%/*}"
107 + mv "${T}/make.conf" "$(new_config_protect "${dest}")"
108 + fi
109 fi
110
111 if ${NEEDED_REBUILD_UPGRADE} ; then
112
113
114
115 1.1328 sys-apps/portage/ChangeLog
116
117 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1328&view=markup
118 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1328&content-type=text/plain
119 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1327&r2=1.1328
120
121 Index: ChangeLog
122 ===================================================================
123 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
124 retrieving revision 1.1327
125 retrieving revision 1.1328
126 diff -u -r1.1327 -r1.1328
127 --- ChangeLog 30 Jul 2013 18:38:29 -0000 1.1327
128 +++ ChangeLog 31 Jul 2013 01:14:16 -0000 1.1328
129 @@ -1,6 +1,10 @@
130 # ChangeLog for sys-apps/portage
131 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
132 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1327 2013/07/30 18:38:29 zmedico Exp $
133 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1328 2013/07/31 01:14:16 zmedico Exp $
134 +
135 + 31 Jul 2013; Zac Medico <zmedico@g.o> portage-2.1.13.2.ebuild,
136 + portage-2.2.0_alpha191.ebuild:
137 + Generating make.conf PORTDIR setting for backward compatibility.
138
139 30 Jul 2013; Zac Medico <zmedico@g.o> portage-2.1.13.2.ebuild,
140 portage-2.2.0_alpha191.ebuild:
Report Message
Find on MARC Find on Google Groups