* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2011-07-12 17:59 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2011-07-12 17:59 UTC (permalink / raw
To: gentoo-commits
zmedico 11/07/12 17:59:02
Modified: portage-9999.ebuild ChangeLog
Log:
Require python:2.6[threads] since import of the io module in python-2.6 raises ImportError for the thread module if threading is disabled.
(Portage version: 2.2.0_alpha43_p46/cvs/Linux i686)
Revision Changes Path
1.29 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.28&r2=1.29
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- portage-9999.ebuild 10 Jul 2011 14:03:25 -0000 1.28
+++ portage-9999.ebuild 12 Jul 2011 17:59:02 -0000 1.29
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.28 2011/07/10 14:03:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.29 2011/07/12 17:59:02 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -14,12 +14,14 @@
SLOT="0"
IUSE="build doc epydoc +ipc +less python2 python3 selinux"
+# Import of the io module in python-2.6 raises ImportError for the
+# thread module if threading is disabled.
python_dep="python3? ( =dev-lang/python-3* )
!python2? ( !python3? (
- build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )
- !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )
+ build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
+ !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
) )
- python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) )"
+ python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
# The pysqlite blocker is for bug #282760.
DEPEND="${python_dep}
1.849 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.849&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.849&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.848&r2=1.849
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.848
retrieving revision 1.849
diff -u -r1.848 -r1.849
--- ChangeLog 10 Jul 2011 14:03:25 -0000 1.848
+++ ChangeLog 12 Jul 2011 17:59:02 -0000 1.849
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.848 2011/07/10 14:03:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.849 2011/07/12 17:59:02 zmedico Exp $
+
+ 12 Jul 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Require python:2.6[threads] since import of the io module in python-2.6
+ raises ImportError for the thread module if threading is disabled.
10 Jul 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
Install minimal tests for preinst sanity check.
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2015-04-25 15:46 Brian Dolbec (dolsen)
0 siblings, 0 replies; 48+ messages in thread
From: Brian Dolbec (dolsen) @ 2015-04-25 15:46 UTC (permalink / raw
To: gentoo-commits
dolsen 15/04/25 15:46:24
Modified: portage-9999.ebuild ChangeLog
Log:
Update EGIT_REPO_URI
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xD80F5F1E1245142E)
Revision Changes Path
1.113 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.112&r2=1.113
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- portage-9999.ebuild 25 Apr 2015 15:32:30 -0000 1.112
+++ portage-9999.ebuild 25 Apr 2015 15:46:24 -0000 1.113
@@ -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/sys-apps/portage/portage-9999.ebuild,v 1.112 2015/04/25 15:32:30 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.113 2015/04/25 15:46:24 dolsen Exp $
EAPI=5
@@ -73,7 +73,7 @@
done
}
-EGIT_REPO_URI="git://git.gentoo.org/proj/portage.git
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git
https://github.com/gentoo/portage.git"
python_prepare_all() {
1.1439 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1439&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1439&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1438&r2=1.1439
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1438
retrieving revision 1.1439
diff -u -r1.1438 -r1.1439
--- ChangeLog 25 Apr 2015 15:32:30 -0000 1.1438
+++ ChangeLog 25 Apr 2015 15:46:24 -0000 1.1439
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1438 2015/04/25 15:32:30 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1439 2015/04/25 15:46:24 dolsen Exp $
+
+ 25 Apr 2015; Brian Dolbec <dolsen@gentoo.org> portage-9999.ebuild:
+ Update EGIT_REPO_URI
25 Apr 2015; Brian Dolbec <dolsen@gentoo.org> portage-9999.ebuild:
Update EGIT_SRC uri.
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2015-04-25 15:32 Brian Dolbec (dolsen)
0 siblings, 0 replies; 48+ messages in thread
From: Brian Dolbec (dolsen) @ 2015-04-25 15:32 UTC (permalink / raw
To: gentoo-commits
dolsen 15/04/25 15:32:30
Modified: portage-9999.ebuild ChangeLog
Log:
Update EGIT_SRC uri.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xD80F5F1E1245142E)
Revision Changes Path
1.112 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.111&r2=1.112
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- portage-9999.ebuild 8 Apr 2015 20:37:45 -0000 1.111
+++ portage-9999.ebuild 25 Apr 2015 15:32:30 -0000 1.112
@@ -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/sys-apps/portage/portage-9999.ebuild,v 1.111 2015/04/08 20:37:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.112 2015/04/25 15:32:30 dolsen Exp $
EAPI=5
@@ -73,7 +73,7 @@
done
}
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git
+EGIT_REPO_URI="git://git.gentoo.org/proj/portage.git
https://github.com/gentoo/portage.git"
python_prepare_all() {
1.1438 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1438&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1438&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1437&r2=1.1438
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1437
retrieving revision 1.1438
diff -u -r1.1437 -r1.1438
--- ChangeLog 21 Apr 2015 04:45:48 -0000 1.1437
+++ ChangeLog 25 Apr 2015 15:32:30 -0000 1.1438
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1437 2015/04/21 04:45:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1438 2015/04/25 15:32:30 dolsen Exp $
+
+ 25 Apr 2015; Brian Dolbec <dolsen@gentoo.org> portage-9999.ebuild:
+ Update EGIT_SRC uri.
21 Apr 2015; Jeroen Roovers <jer@gentoo.org> portage-2.2.18.ebuild:
Stable for HPPA (bug #541116).
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2015-02-13 17:47 Brian Dolbec (dolsen)
0 siblings, 0 replies; 48+ messages in thread
From: Brian Dolbec (dolsen) @ 2015-02-13 17:47 UTC (permalink / raw
To: gentoo-commits
dolsen 15/02/13 17:47:58
Modified: portage-9999.ebuild ChangeLog
Log:
Revert the new USE flags, fix a Changelog typo.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0xD80F5F1E1245142E)
Revision Changes Path
1.110 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.109&r2=1.110
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- portage-9999.ebuild 12 Feb 2015 05:34:22 -0000 1.109
+++ portage-9999.ebuild 13 Feb 2015 17:47:58 -0000 1.110
@@ -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/sys-apps/portage/portage-9999.ebuild,v 1.109 2015/02/12 05:34:22 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.110 2015/02/13 17:47:58 dolsen Exp $
EAPI=5
@@ -20,7 +20,7 @@
LICENSE="GPL-2"
KEYWORDS=""
SLOT="0"
-IUSE="build cvs doc epydoc git +ipc linguas_ru selinux subversion xattr"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
dev-lang/python-exec:2
@@ -41,14 +41,11 @@
app-shells/bash:0[readline]
>=app-admin/eselect-1.2
)
- cvs? ( dev-vcs/cvs )
elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
elibc_glibc? ( >=sys-apps/sandbox-2.2 )
elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
- git? ( dev-vcs/git )
>=app-misc/pax-utils-0.1.17
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
- subversion? ( dev-vcs/subversion )
xattr? ( kernel_linux? (
>=sys-apps/install-xattr-0.3
$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
@@ -80,7 +77,6 @@
https://github.com/gentoo/portage.git"
python_prepare_all() {
- esetup.py select_plugins
distutils-r1_python_prepare_all
if ! use ipc ; then
1.1430 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1430&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1430&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1429&r2=1.1430
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1429
retrieving revision 1.1430
diff -u -r1.1429 -r1.1430
--- ChangeLog 12 Feb 2015 05:34:22 -0000 1.1429
+++ ChangeLog 13 Feb 2015 17:47:58 -0000 1.1430
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1429 2015/02/12 05:34:22 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1430 2015/02/13 17:47:58 dolsen Exp $
+
+ 13 Feb 2015; Brian Dolbec <dolsen@gentoo.org> portage-9999.ebuild:
+ Update ebuild back to automagic, undeclared vcs deps. Fix typo in bug # for
+ 2.2.16 release.
*portage-2.2.17 (12 Feb 2015)
@@ -14,7 +18,7 @@
08 Feb 2015; Brian Dolbec <dolsen@gentoo.org> +portage-2.2.16.ebuild:
Version bump. First release with the new plug-in sync system. Fixes bugs
- 583512, 538314, 537298, 534722, 536926, 536392, 492932, 142579, 282927,
+ 538512, 538314, 537298, 534722, 536926, 536392, 492932, 142579, 282927,
535850, 533036, 463266, 533884, 531656, 531724, 534070, 532670, 532784,
532594, 525718, 532224, 504116, 412471, 531690, 531854, 522032.
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2014-12-06 17:34 Brian Dolbec (dolsen)
0 siblings, 0 replies; 48+ messages in thread
From: Brian Dolbec (dolsen) @ 2014-12-06 17:34 UTC (permalink / raw
To: gentoo-commits
dolsen 14/12/06 17:34:23
Modified: portage-9999.ebuild ChangeLog
Log:
add einfo messages
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x65E309F2189DB0B8)
Revision Changes Path
1.106 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.106&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.106&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.105&r2=1.106
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- portage-9999.ebuild 26 Sep 2014 20:32:03 -0000 1.105
+++ portage-9999.ebuild 6 Dec 2014 17:34:23 -0000 1.106
@@ -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/sys-apps/portage/portage-9999.ebuild,v 1.105 2014/09/26 20:32:03 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.106 2014/12/06 17:34:23 dolsen Exp $
EAPI=5
@@ -213,3 +213,29 @@
chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
fi
}
+
+pkg_postinst() {
+ einfo "This version of portage now has the new plugin-sync system"
+ einfo "An additional 'auto-sync = yes' setting is needed for each repo"
+ einfo "you wish 'emerge --sync' to sync"
+ einfo "The default setting is 'no'"
+ einfo "The primary sync action is now controlled via the emaint command"
+ einfo "The emaint sync module is more flexible in its capabilities"
+ einfo "It is similar to layman's -s and -S options"
+ einfo ""
+ einfo " 'emerge --sync' is now equivalent to 'emaint sync -a'"
+ einfo ""
+ einfo "run 'emaint sync --auto' to sync all auto-sync enabled repos"
+ einfo " options are:"
+ einfo " -A, --allrepos Sync all repos that have a sync-url defined"
+ einfo " -a, --auto Sync auto-sync enabled repos only"
+ einfo " -r REPO, --repo REPO Sync the specified repo"
+ einfo " even if 'auto-sync = no' is set"
+ einfo ""
+ einfo "Currently installed sync-type modules include:"
+ einfo " rsync, git, cvs, svn, websync"
+ einfo " the websync module currently runs emerge-webrsync for you"
+ einfo ""
+ einfo "For sync module specifications: https://wiki.gentoo.org/wiki/Project:Portage/Sync"
+ einfo ""
+}
1.1419 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1419&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1419&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1418&r2=1.1419
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1418
retrieving revision 1.1419
diff -u -r1.1418 -r1.1419
--- ChangeLog 4 Dec 2014 10:13:11 -0000 1.1418
+++ ChangeLog 6 Dec 2014 17:34:23 -0000 1.1419
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1418 2014/12/04 10:13:11 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1419 2014/12/06 17:34:23 dolsen Exp $
+
+ 06 Dec 2014; Brian Dolbec <dolsen@gentoo.org> portage-9999.ebuild:
+ Add einfo messages for the new plugin-sync system
04 Dec 2014; Mikle Kolyada <zlogene@gentoo.org> portage-2.2.14.ebuild:
amd64 stable wrt bug #531594
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2014-09-26 17:04 Brian Dolbec (dolsen)
0 siblings, 0 replies; 48+ messages in thread
From: Brian Dolbec (dolsen) @ 2014-09-26 17:04 UTC (permalink / raw
To: gentoo-commits
dolsen 14/09/26 17:04:07
Modified: portage-9999.ebuild ChangeLog
Log:
Move the admin scripts to /usr/sbin/ in pkg_preinst instead
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0x65E309F2189DB0B8)
Revision Changes Path
1.103 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.102&r2=1.103
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- portage-9999.ebuild 26 Sep 2014 02:28:58 -0000 1.102
+++ portage-9999.ebuild 26 Sep 2014 17:04:07 -0000 1.103
@@ -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/sys-apps/portage/portage-9999.ebuild,v 1.102 2014/09/26 02:28:58 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.103 2014/09/26 17:04:07 dolsen Exp $
EAPI=5
@@ -157,6 +157,8 @@
}
python_install() {
+ # Install sbin scripts to bindir for python-exec linking
+ # they will be relocated in pkg_preinst()
distutils-r1_python_install \
--system-prefix="${EPREFIX}/usr" \
--bindir="$(python_get_scriptdir)" \
@@ -202,12 +204,13 @@
chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
fi
- local sbin_deprecated='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
- local relative_path=../lib/portage/bin
- einfo "Creating symlinks for deprecated /usr/sbin/ paths"
-
- for target in ${sbin_deprecated}; do
- einfo "linking: ${relative_path}/deprecated-path to sbin/${target}"
- dosym "${relative_path}/deprecated-path" "usr/sbin/${target}" || die "Failed to create symlinks"
+ # Due to distutils/python-exec limitations
+ # they must be installed to /usr/bin.
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+ einfo "Moving admin scripts to the correct directory"
+ dodir /usr/sbin
+ for target in ${sbin_relocations}; do
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+ mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}"
done
}
1.1411 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1411&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1411&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1410&r2=1.1411
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1410
retrieving revision 1.1411
diff -u -r1.1410 -r1.1411
--- ChangeLog 26 Sep 2014 02:28:58 -0000 1.1410
+++ ChangeLog 26 Sep 2014 17:04:07 -0000 1.1411
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1410 2014/09/26 02:28:58 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1411 2014/09/26 17:04:07 dolsen Exp $
+
+ 26 Sep 2014; Brian Dolbec <dolsen@gentoo.org> portage-9999.ebuild:
+ Move the admin scripts to /usr/sbin/ in pkg_preinst
26 Sep 2014; Brian Dolbec <dolsen@gentoo.org> portage-9999.ebuild:
Add the deprecation /usr/sbin/ symlinks. Comment out the preinst sanity check
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2014-09-26 2:28 Brian Dolbec (dolsen)
0 siblings, 0 replies; 48+ messages in thread
From: Brian Dolbec (dolsen) @ 2014-09-26 2:28 UTC (permalink / raw
To: gentoo-commits
dolsen 14/09/26 02:28:58
Modified: portage-9999.ebuild ChangeLog
Log:
Update live ebuild for needed changes
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0x65E309F2189DB0B8)
Revision Changes Path
1.102 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.102&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.102&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.101&r2=1.102
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- portage-9999.ebuild 12 Sep 2014 07:04:31 -0000 1.101
+++ portage-9999.ebuild 26 Sep 2014 02:28:58 -0000 1.102
@@ -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/sys-apps/portage/portage-9999.ebuild,v 1.101 2014/09/12 07:04:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.102 2014/09/26 02:28:58 dolsen Exp $
EAPI=5
@@ -182,14 +182,16 @@
}
pkg_preinst() {
- if [[ $ROOT == / ]] ; then
- # Run some minimal tests as a sanity check.
- local test_runner=$(find "${ED}" -name runTests)
- if [[ -n $test_runner && -x $test_runner ]] ; then
- einfo "Running preinst sanity tests..."
- "$test_runner" || die "preinst sanity tests failed"
- fi
- fi
+ # comment out sanity test until it is fixed to work
+ # with the new PORTAGE_PYM_PATH
+ #if [[ $ROOT == / ]] ; then
+ ## Run some minimal tests as a sanity check.
+ #local test_runner=$(find "${ED}" -name runTests)
+ #if [[ -n $test_runner && -x $test_runner ]] ; then
+ #einfo "Running preinst sanity tests..."
+ #"$test_runner" || die "preinst sanity tests failed"
+ #fi
+ #fi
# elog dir must exist to avoid logrotate error for bug #415911.
# This code runs in preinst in order to bypass the mapping of
@@ -199,4 +201,13 @@
if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
fi
+
+ local sbin_deprecated='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+ local relative_path=../lib/portage/bin
+ einfo "Creating symlinks for deprecated /usr/sbin/ paths"
+
+ for target in ${sbin_deprecated}; do
+ einfo "linking: ${relative_path}/deprecated-path to sbin/${target}"
+ dosym "${relative_path}/deprecated-path" "usr/sbin/${target}" || die "Failed to create symlinks"
+ done
}
1.1410 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1410&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1410&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1409&r2=1.1410
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1409
retrieving revision 1.1410
diff -u -r1.1409 -r1.1410
--- ChangeLog 17 Sep 2014 06:51:11 -0000 1.1409
+++ ChangeLog 26 Sep 2014 02:28:58 -0000 1.1410
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1409 2014/09/17 06:51:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1410 2014/09/26 02:28:58 dolsen Exp $
+
+ 26 Sep 2014; Brian Dolbec <dolsen@gentoo.org> portage-9999.ebuild:
+ Add the deprecation /usr/sbin/ symlinks. Comment out the preinst sanity check
+ untill fixed for the new install method.
17 Sep 2014; Zac Medico <zmedico@gentoo.org> portage-2.2.13.ebuild:
Fix last commit to account for PYTHON_TARGETS.
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2014-09-12 7:04 Michal Gorny (mgorny)
0 siblings, 0 replies; 48+ messages in thread
From: Michal Gorny (mgorny) @ 2014-09-12 7:04 UTC (permalink / raw
To: gentoo-commits
mgorny 14/09/12 07:04:31
Modified: portage-9999.ebuild ChangeLog
Log:
Restore correct git repo.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.101 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.100&r2=1.101
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- portage-9999.ebuild 11 Sep 2014 22:46:40 -0000 1.100
+++ portage-9999.ebuild 12 Sep 2014 07:04:31 -0000 1.101
@@ -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/sys-apps/portage/portage-9999.ebuild,v 1.100 2014/09/11 22:46:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.101 2014/09/12 07:04:31 mgorny Exp $
EAPI=5
@@ -74,9 +74,8 @@
done
}
-EGIT_REPO_URI="https://github.com/mgorny/portage.git"
-EGIT_BRANCH=new-install
-EGIT_MIN_CLONE_TYPE=single
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git
+ https://github.com/gentoo/portage.git"
python_prepare_all() {
distutils-r1_python_prepare_all
1.1406 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1406&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1406&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1405&r2=1.1406
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1405
retrieving revision 1.1406
diff -u -r1.1405 -r1.1406
--- ChangeLog 11 Sep 2014 22:46:40 -0000 1.1405
+++ ChangeLog 12 Sep 2014 07:04:31 -0000 1.1406
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1405 2014/09/11 22:46:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1406 2014/09/12 07:04:31 mgorny Exp $
+
+ 12 Sep 2014; Michał Górny <mgorny@gentoo.org> portage-9999.ebuild:
+ Restore correct git repo.
11 Sep 2014; Michał Górny <mgorny@gentoo.org> portage-9999.ebuild:
Switch to distutils-r1 now that setup.py is in git.
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2014-09-11 22:46 Michal Gorny (mgorny)
0 siblings, 0 replies; 48+ messages in thread
From: Michal Gorny (mgorny) @ 2014-09-11 22:46 UTC (permalink / raw
To: gentoo-commits
mgorny 14/09/11 22:46:40
Modified: portage-9999.ebuild ChangeLog
Log:
Switch to distutils-r1 now that setup.py is in git.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.100 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.99&r2=1.100
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- portage-9999.ebuild 5 Aug 2014 14:19:02 -0000 1.99
+++ portage-9999.ebuild 11 Sep 2014 22:46:40 -0000 1.100
@@ -1,51 +1,32 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.99 2014/08/05 14:19:02 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.100 2014/09/11 22:46:40 mgorny Exp $
+
+EAPI=5
-EAPI=3
PYTHON_COMPAT=(
pypy
python3_2 python3_3 python3_4
python2_7
)
-inherit git-r3 eutils multilib
+# Note: substituted below
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1 git-r3 multilib
DESCRIPTION="Portage is the package management and distribution system for Gentoo"
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
+
LICENSE="GPL-2"
KEYWORDS=""
SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru pypy python2 python3 selinux xattr"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-for _pyimpl in ${PYTHON_COMPAT[@]} ; do
- IUSE+=" python_targets_${_pyimpl}"
-done
-unset _pyimpl
-
-python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
- !pypy? ( !python2? ( !python3? (
- >=dev-lang/python-2.7[ssl]
- ) ) )
- pypy? ( !python2? ( !python3? ( virtual/pypy:0[bzip2] ) ) )
- python2? ( !python3? ( dev-lang/python:2.7[ssl] ) )"
-python_dep="${python_dep_ssl//\[ssl\]}"
-python_dep="${python_dep//,ssl}"
-python_dep="${python_dep//ssl,}"
-
-python_dep="${python_dep}
- python_targets_pypy? ( virtual/pypy:0 )
- python_targets_python2_7? ( dev-lang/python:2.7 )
- python_targets_python3_2? ( dev-lang/python:3.2 )
- python_targets_python3_3? ( dev-lang/python:3.3 )
- python_targets_python3_4? ( dev-lang/python:3.4 )
-"
-
-# make-3.82 is for bug #455858
-DEPEND="${python_dep}
- >=sys-devel/make-3.82
+DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
+ dev-lang/python-exec:2
>=sys-apps/sed-4.0.5 sys-devel/patch
doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
- epydoc? ( >=dev-python/epydoc-2.0 )"
+ epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
# Require sandbox-2.2 for bug #288863.
# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
# quite slow, so it's not considered in the dependencies as an alternative to
@@ -53,22 +34,23 @@
# for now, don't pull in xattr deps for other kernels.
# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
# For compgen, require bash[readline] (bug #445576).
-RDEPEND="${python_dep}
- !build? ( >=sys-apps/sed-4.0.5
+RDEPEND="
+ dev-lang/python-exec:2
+ !build? (
+ >=sys-apps/sed-4.0.5
|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) )
>=app-admin/eselect-1.2
- || ( ${python_dep_ssl} dev-python/python-mhash )
)
elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
elibc_glibc? ( >=sys-apps/sandbox-2.2 )
elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
>=app-misc/pax-utils-0.1.17
- selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
xattr? ( kernel_linux? (
>=sys-apps/install-xattr-0.3
- $(for python_impl in python{2_7,3_2} pypy; do
- echo "python_targets_${python_impl}? ( dev-python/pyxattr[python_targets_${python_impl}] )"
- done) ) )
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+ python{2_7,3_2} pypy)
+ ) )
!<app-shells/bash-3.2_p17
!<app-admin/logrotate-3.8.0"
PDEPEND="
@@ -79,6 +61,8 @@
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
# NOTE: FEATURES=installsources requires debugedit and rsync
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
SRC_ARCHIVES="http://dev.gentoo.org/~dolsen/releases/portage"
prefix_src_archives() {
@@ -90,134 +74,12 @@
done
}
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git
- https://github.com/gentoo/portage.git"
+EGIT_REPO_URI="https://github.com/mgorny/portage.git"
+EGIT_BRANCH=new-install
EGIT_MIN_CLONE_TYPE=single
-compatible_python_is_selected() {
- [[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-current_python_has_xattr() {
- [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
- local PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
- [[ $("${PYTHON}" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
- "${PYTHON}" -c 'import xattr' 2>/dev/null
-}
-
-call_with_python_impl() {
- [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
- env EPYTHON=${EPYTHON} "$@"
-}
-
-get_python_interpreter() {
- [ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
- local impl=$1 python
- case "${impl}" in
- python*)
- python=${impl/_/.}
- ;;
- pypy)
- python=${impl}
- ;;
- *)
- die "Unrecognized python target: ${impl}"
- esac
- echo ${python}
-}
-
-get_python_sitedir() {
- [ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
- local impl=$1
- local site_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages
- [[ -d ${EROOT}${site_dir} ]] || \
- ewarn "site-packages dir missing for ${impl}: ${EROOT}${site_dir}"
- echo "${site_dir}"
-}
-
-python_compileall() {
- [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
- local d=${EPREFIX}$1 PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
- local d_image=${D}${d#/}
- [[ -d ${d_image} ]] || die "directory does not exist: ${d_image}"
- case "${EPYTHON}" in
- python*)
- "${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die
- # Note: Using -OO breaks emaint, since it requires __doc__,
- # and __doc__ is None when -OO is used.
- "${PYTHON}" -O -m compileall -q -f -d "${d}" "${d_image}" || die
- ;;
- pypy*)
- "${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die
- ;;
- *)
- die "Unrecognized EPYTHON value: ${EPYTHON}"
- esac
-}
-
-pkg_setup() {
- if use python2 && use python3 ; then
- ewarn "Both python2 and python3 USE flags are enabled, but only one"
- ewarn "can be in the shebangs. Using python3."
- fi
- if use pypy && use python3 ; then
- ewarn "Both pypy and python3 USE flags are enabled, but only one"
- ewarn "can be in the shebangs. Using python3."
- fi
- if use pypy && use python2 ; then
- ewarn "Both pypy and python2 USE flags are enabled, but only one"
- ewarn "can be in the shebangs. Using python2"
- fi
- if ! use pypy && ! use python2 && ! use python3 && \
- ! compatible_python_is_selected ; then
- ewarn "Attempting to select a compatible default python interpreter"
- local x success=0
- for x in "${EPREFIX}"/usr/bin/python2.* ; do
- x=${x#${EPREFIX}/usr/bin/python2.}
- if [[ $x -ge 6 ]] 2>/dev/null ; then
- eselect python set python2.$x
- if compatible_python_is_selected ; then
- elog "Default python interpreter is now set to python-2.$x"
- success=1
- break
- fi
- fi
- done
- if [ $success != 1 ] ; then
- eerror "Unable to select a compatible default python interpreter!"
- die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
- fi
- fi
-
- # We use EPYTHON to designate the active python interpreter,
- # but we only export when needed, via call_with_python_impl.
- EPYTHON=python
- export -n EPYTHON
- if use python3; then
- EPYTHON=python3
- elif use python2; then
- EPYTHON=python2
- elif use pypy; then
- EPYTHON=pypy
- fi
-}
-
-src_prepare() {
- epatch_user
-
- einfo "Producing ChangeLog from Git history..."
- git log ebcf8975b37a8aae9735eb491a9b4cb63549bd5d^.. \
- > "${S}"/ChangeLog || die
-
- local _version=$(git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')
- _version=${_version:1}
- einfo "Setting portage.VERSION to ${_version} ..."
- sed -e "s/^VERSION =.*/VERSION = '${_version}'/" -i pym/portage/__init__.py || \
- die "Failed to patch portage.VERSION"
- sed -e "1s/VERSION/${_version}/" -i doc/fragment/version || \
- die "Failed to patch VERSION in doc/fragment/version"
- sed -e "1s/VERSION/${_version}/" -i $(find man -type f) || \
- die "Failed to patch VERSION in man page headers"
+python_prepare_all() {
+ distutils-r1_python_prepare_all
if ! use ipc ; then
einfo "Disabling ipc..."
@@ -232,25 +94,6 @@
|| die "failed to append to make.globals"
fi
- local set_shebang=
- if use python3; then
- set_shebang=python3
- elif use python2; then
- set_shebang=python2
- elif use pypy; then
- set_shebang=pypy
- fi
- if [[ -n ${set_shebang} ]] ; then
- einfo "Converting shebangs for ${set_shebang}..."
- while read -r -d $'\0' ; do
- local shebang=$(head -n1 "$REPLY")
- if [[ ${shebang} == "#!/usr/bin/python"* ]] ; then
- sed -i -e "1s:python:${set_shebang}:" "$REPLY" || \
- die "sed failed"
- fi
- done < <(find . -type f -print0)
- fi
-
if [[ -n ${EPREFIX} ]] ; then
einfo "Setting portage.const.EPREFIX ..."
sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
@@ -300,74 +143,43 @@
fi
}
-src_compile() {
- if use doc; then
- call_with_python_impl \
- emake docbook || die
- fi
+python_compile_all() {
+ local targets=()
+ use doc && targets+=( docbook )
+ use epydoc && targets+=( epydoc )
- if use epydoc; then
- einfo "Generating api docs"
- call_with_python_impl \
- emake epydoc || die
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
fi
}
-src_test() {
- ./runtests.sh || die "tests failed"
+python_test() {
+ esetup.py test
}
-src_install() {
- call_with_python_impl \
- emake DESTDIR="${D}" \
- sysconfdir="${EPREFIX}/etc" \
- prefix="${EPREFIX}/usr" \
- install || die
-
- # Use dodoc for compression, since the Makefile doesn't do that.
- dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
-
- # Allow external portage API consumers to import portage python modules
- # (this used to be done with PYTHONPATH setting in /etc/env.d).
- # For each of PYTHON_TARGETS, install a tree of *.py symlinks in
- # site-packages, and compile with the corresponding interpreter.
- local impl files mod_dir dest_mod_dir python relative_path x
- for impl in "${PYTHON_COMPAT[@]}" ; do
- use "python_targets_${impl}" || continue
- if use build && [[ ${ROOT} == / &&
- ! -x ${EPREFIX}/usr/bin/$(get_python_interpreter ${impl}) ]] ; then
- # Tolerate --nodeps at beginning of stage1 for catalyst
- ewarn "skipping python_targets_${impl}, interpreter not found"
- continue
- fi
- while read -r mod_dir ; do
- cd "${ED}/usr/lib/portage/pym/${mod_dir}" || die
- files=$(echo *.py)
- if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then
- # __pycache__ directories contain no py files
- continue
- fi
- dest_mod_dir=$(get_python_sitedir ${impl})/${mod_dir}
- dodir "${dest_mod_dir}" || die
- relative_path=../../../lib/portage/pym/${mod_dir}
- x=/${mod_dir}
- while [ -n "${x}" ] ; do
- relative_path=../${relative_path}
- x=${x%/*}
- done
- for x in ${files} ; do
- dosym "${relative_path}/${x}" \
- "${dest_mod_dir}/${x}" || die
- done
- done < <(cd "${ED}"/usr/lib/portage/pym || die ; find * -type d ! -path "portage/tests*")
- cd "${S}" || die
- EPYTHON=$(get_python_interpreter ${impl}) \
- python_compileall "$(get_python_sitedir ${impl})"
- done
+python_install() {
+ distutils-r1_python_install \
+ --system-prefix="${EPREFIX}/usr" \
+ --bindir="$(python_get_scriptdir)" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+ --sbindir="$(python_get_scriptdir)" \
+ --sysconfdir="${EPREFIX}/etc" \
+ "${@}"
+}
- # Compile /usr/lib/portage/pym with the active interpreter, since portage
- # internal commands force this directory to the beginning of sys.path.
- python_compileall /usr/lib/portage/pym
+python_install_all() {
+ distutils-r1_python_install_all
+
+ local targets=()
+ use doc && targets+=( install_docbook )
+ use epydoc && targets+=( install_epydoc )
+
+ # install docs
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
}
pkg_preinst() {
@@ -380,12 +192,6 @@
fi
fi
- if use xattr && ! current_python_has_xattr ; then
- ewarn "For optimal performance in xattr handling, install"
- ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
- ewarn "enable USE=python3 for $CATEGORY/$PN."
- fi
-
# elog dir must exist to avoid logrotate error for bug #415911.
# This code runs in preinst in order to bypass the mapping of
# portage:portage to root:root which happens after src_install.
1.1405 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1405&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1405&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1404&r2=1.1405
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1404
retrieving revision 1.1405
diff -u -r1.1404 -r1.1405
--- ChangeLog 31 Aug 2014 21:27:58 -0000 1.1404
+++ ChangeLog 11 Sep 2014 22:46:40 -0000 1.1405
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1404 2014/08/31 21:27:58 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1405 2014/09/11 22:46:40 mgorny Exp $
+
+ 11 Sep 2014; Michał Górny <mgorny@gentoo.org> portage-9999.ebuild:
+ Switch to distutils-r1 now that setup.py is in git.
*portage-2.2.12-r1 (31 Aug 2014)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2014-07-26 9:48 Michal Gorny (mgorny)
0 siblings, 0 replies; 48+ messages in thread
From: Michal Gorny (mgorny) @ 2014-07-26 9:48 UTC (permalink / raw
To: gentoo-commits
mgorny 14/07/26 09:48:43
Modified: portage-9999.ebuild ChangeLog
Log:
Remove code for python2_6 & pypy2_0 which both are removed nowadays.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.96 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.95&r2=1.96
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- portage-9999.ebuild 6 Apr 2014 17:00:03 -0000 1.95
+++ portage-9999.ebuild 26 Jul 2014 09:48:43 -0000 1.96
@@ -1,12 +1,12 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.95 2014/04/06 17:00:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.96 2014/07/26 09:48:43 mgorny Exp $
EAPI=3
PYTHON_COMPAT=(
- pypy pypy2_0
+ pypy
python3_2 python3_3 python3_4
- python2_6 python2_7
+ python2_7
)
inherit git-r3 eutils multilib
@@ -22,22 +22,18 @@
done
unset _pyimpl
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
!pypy? ( !python2? ( !python3? (
- || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
+ >=dev-lang/python-2.7[ssl]
) ) )
pypy? ( !python2? ( !python3? ( virtual/pypy:0[bzip2] ) ) )
- python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
+ python2? ( !python3? ( dev-lang/python:2.7[ssl] ) )"
python_dep="${python_dep_ssl//\[ssl\]}"
python_dep="${python_dep//,ssl}"
python_dep="${python_dep//ssl,}"
python_dep="${python_dep}
python_targets_pypy? ( virtual/pypy:0 )
- python_targets_pypy2_0? ( virtual/pypy:2.0 )
- python_targets_python2_6? ( dev-lang/python:2.6 )
python_targets_python2_7? ( dev-lang/python:2.7 )
python_targets_python3_2? ( dev-lang/python:3.2 )
python_targets_python3_3? ( dev-lang/python:3.3 )
@@ -69,7 +65,7 @@
>=app-misc/pax-utils-0.1.17
selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
xattr? ( kernel_linux? (
- $(for python_impl in python{2_6,2_7,3_2} pypy pypy2_0; do
+ $(for python_impl in python{2_7,3_2} pypy; do
echo "python_targets_${python_impl}? ( dev-python/pyxattr[python_targets_${python_impl}] )"
done) ) )
!<app-shells/bash-3.2_p17
@@ -123,10 +119,6 @@
pypy)
python=${impl}
;;
- pypy*)
- python=${impl/_/.}
- python=${python/pypy/pypy-c}
- ;;
*)
die "Unrecognized python target: ${impl}"
esac
1.1398 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1398&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1398&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1397&r2=1.1398
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1397
retrieving revision 1.1398
diff -u -r1.1397 -r1.1398
--- ChangeLog 6 Apr 2014 17:00:03 -0000 1.1397
+++ ChangeLog 26 Jul 2014 09:48:43 -0000 1.1398
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1397 2014/04/06 17:00:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1398 2014/07/26 09:48:43 mgorny Exp $
+
+ 26 Jul 2014; Michał Górny <mgorny@gentoo.org> portage-9999.ebuild:
+ Remove code for python2_6 & pypy2_0 which both are removed nowadays.
06 Apr 2014; Michał Górny <mgorny@gentoo.org> metadata.xml,
portage-2.2.10.ebuild, portage-9999.ebuild:
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2014-04-06 15:32 Michal Gorny (mgorny)
0 siblings, 0 replies; 48+ messages in thread
From: Michal Gorny (mgorny) @ 2014-04-06 15:32 UTC (permalink / raw
To: gentoo-commits
mgorny 14/04/06 15:32:44
Modified: portage-9999.ebuild ChangeLog
Log:
Switch to git-r3.
(Portage version: 2.2.10_p15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.94 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.93&r2=1.94
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- portage-9999.ebuild 13 Feb 2014 11:37:51 -0000 1.93
+++ portage-9999.ebuild 6 Apr 2014 15:32:44 -0000 1.94
@@ -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/sys-apps/portage/portage-9999.ebuild,v 1.93 2014/02/13 11:37:51 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.94 2014/04/06 15:32:44 mgorny Exp $
EAPI=3
PYTHON_COMPAT=(
@@ -8,7 +8,7 @@
python3_2 python3_3 python3_4
python2_6 python2_7
)
-inherit git-2 eutils multilib
+inherit git-r3 eutils multilib
DESCRIPTION="Portage is the package management and distribution system for Gentoo"
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
@@ -81,7 +81,7 @@
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
# NOTE: FEATURES=installsources requires debugedit and rsync
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+SRC_ARCHIVES="http://dev.gentoo.org/~dolsen/releases/portage"
prefix_src_archives() {
local x y
@@ -94,7 +94,7 @@
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git
https://github.com/gentoo/portage.git"
-S="${WORKDIR}"/${PN}
+EGIT_MIN_CLONE_TYPE=single
compatible_python_is_selected() {
[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
@@ -209,12 +209,10 @@
epatch_user
einfo "Producing ChangeLog from Git history..."
- pushd "${S}/.git" >/dev/null || die
git log ebcf8975b37a8aae9735eb491a9b4cb63549bd5d^.. \
> "${S}"/ChangeLog || die
- popd >/dev/null || die
- local _version=$(cd "${S}/.git" && git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')
+ local _version=$(git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')
_version=${_version:1}
einfo "Setting portage.VERSION to ${_version} ..."
sed -e "s/^VERSION =.*/VERSION = '${_version}'/" -i pym/portage/__init__.py || \
1.1396 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1396&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1396&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1395&r2=1.1396
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1395
retrieving revision 1.1396
diff -u -r1.1395 -r1.1396
--- ChangeLog 26 Mar 2014 02:27:41 -0000 1.1395
+++ ChangeLog 6 Apr 2014 15:32:44 -0000 1.1396
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1395 2014/03/26 02:27:41 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1396 2014/04/06 15:32:44 mgorny Exp $
+
+ 06 Apr 2014; Michał Górny <mgorny@gentoo.org> portage-9999.ebuild:
+ Switch to git-r3.
*portage-2.2.10 (26 Mar 2014)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2014-01-13 23:25 Mike Gilbert (floppym)
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert (floppym) @ 2014-01-13 23:25 UTC (permalink / raw
To: gentoo-commits
floppym 14/01/13 23:25:48
Modified: portage-9999.ebuild ChangeLog
Log:
Switch github to https instead of ssh.
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path
1.91 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.90&r2=1.91
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- portage-9999.ebuild 13 Jan 2014 19:56:36 -0000 1.90
+++ portage-9999.ebuild 13 Jan 2014 23:25:48 -0000 1.91
@@ -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/sys-apps/portage/portage-9999.ebuild,v 1.90 2014/01/13 19:56:36 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.91 2014/01/13 23:25:48 floppym Exp $
EAPI=3
PYTHON_COMPAT=(
@@ -90,7 +90,7 @@
}
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git
- git@github.com:gentoo/portage.git"
+ https://github.com/gentoo/portage.git"
S="${WORKDIR}"/${PN}
compatible_python_is_selected() {
1.1377 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1377&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1377&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1376&r2=1.1377
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1376
retrieving revision 1.1377
diff -u -r1.1376 -r1.1377
--- ChangeLog 13 Jan 2014 19:56:36 -0000 1.1376
+++ ChangeLog 13 Jan 2014 23:25:48 -0000 1.1377
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1376 2014/01/13 19:56:36 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1377 2014/01/13 23:25:48 floppym Exp $
+
+ 13 Jan 2014; Mike Gilbert <floppym@gentoo.org> portage-9999.ebuild:
+ Switch github to https instead of ssh.
13 Jan 2014; Brian Dolbec <dolsen@gentoo.org> portage-9999.ebuild:
Add the github repo as a backup uri.
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2014-01-13 19:56 Brian Dolbec (dolsen)
0 siblings, 0 replies; 48+ messages in thread
From: Brian Dolbec (dolsen) @ 2014-01-13 19:56 UTC (permalink / raw
To: gentoo-commits
dolsen 14/01/13 19:56:36
Modified: portage-9999.ebuild ChangeLog
Log:
Add the github repo as backup uri
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0x65E309F2189DB0B8)
Revision Changes Path
1.90 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.89&r2=1.90
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- portage-9999.ebuild 20 Sep 2013 00:45:10 -0000 1.89
+++ portage-9999.ebuild 13 Jan 2014 19:56:36 -0000 1.90
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.89 2013/09/20 00:45:10 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.90 2014/01/13 19:56:36 dolsen Exp $
EAPI=3
PYTHON_COMPAT=(
@@ -89,7 +89,8 @@
done
}
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git
+ git@github.com:gentoo/portage.git"
S="${WORKDIR}"/${PN}
compatible_python_is_selected() {
1.1376 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1376&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1376&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1375&r2=1.1376
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1375
retrieving revision 1.1376
diff -u -r1.1375 -r1.1376
--- ChangeLog 6 Jan 2014 00:34:43 -0000 1.1375
+++ ChangeLog 13 Jan 2014 19:56:36 -0000 1.1376
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1375 2014/01/06 00:34:43 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1376 2014/01/13 19:56:36 dolsen Exp $
+
+ 13 Jan 2014; Brian Dolbec <dolsen@gentoo.org> portage-9999.ebuild:
+ Add the github repo as a backup uri.
*portage-2.2.8 (06 Jan 2014)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2013-07-26 20:07 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2013-07-26 20:07 UTC (permalink / raw
To: gentoo-commits
zmedico 13/07/26 20:07:50
Modified: portage-9999.ebuild ChangeLog
Log:
Remove pkg_postinst upgrade code that should be irrelevant for portage-9999 users these days.
(Portage version: 2.2.0_alpha189/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Revision Changes Path
1.86 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.85&r2=1.86
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- portage-9999.ebuild 26 Jul 2013 08:05:39 -0000 1.85
+++ portage-9999.ebuild 26 Jul 2013 20:07:49 -0000 1.86
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.85 2013/07/26 08:05:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.86 2013/07/26 20:07:49 zmedico Exp $
EAPI=3
PYTHON_COMPAT=(
@@ -397,39 +397,4 @@
if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
fi
-
- has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
- && WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
-
- # If portage-2.1.6 is installed and the preserved_libs_registry exists,
- # assume that the NEEDED.ELF.2 files have already been generated.
- has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
- ! { [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
- has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ; } \
- && NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
-}
-
-pkg_postinst() {
- if $WORLD_MIGRATION_UPGRADE && \
- grep -q "^@" "${EROOT}/var/lib/portage/world"; then
- einfo "moving set references from the worldfile into world_sets"
- cd "${EROOT}/var/lib/portage/"
- grep "^@" world >> world_sets
- sed -i -e '/^@/d' world
- fi
-
- if ${NEEDED_REBUILD_UPGRADE} ; then
- einfo "rebuilding NEEDED.ELF.2 files"
- local cpv filename line newline
- for cpv in "${EROOT}/var/db/pkg"/*/*; do
- [[ -f "${cpv}/NEEDED" && ! -f "${cpv}/NEEDED.ELF.2" ]] || continue
- while read -r line; do
- filename=${line% *}
- newline=$(scanelf -BF "%a;%F;%S;%r;%n" "${ROOT%/}${filename}")
- newline=${newline// - }
- [[ ${#ROOT} -gt 1 ]] && newline=${newline/${ROOT%/}}
- echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
- done < "${cpv}/NEEDED"
- done
- fi
}
1.1319 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1319&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1319&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1318&r2=1.1319
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1318
retrieving revision 1.1319
diff -u -r1.1318 -r1.1319
--- ChangeLog 26 Jul 2013 07:46:57 -0000 1.1318
+++ ChangeLog 26 Jul 2013 20:07:49 -0000 1.1319
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1318 2013/07/26 07:46:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1319 2013/07/26 20:07:49 zmedico Exp $
+
+ 26 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Remove pkg_postinst upgrade code that should be irrelevant for portage-9999
+ users these days.
26 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-2.1.13.ebuild,
portage-2.2.0_alpha189.ebuild:
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2013-07-25 22:09 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2013-07-25 22:09 UTC (permalink / raw
To: gentoo-commits
zmedico 13/07/25 22:09:16
Modified: portage-9999.ebuild ChangeLog
Log:
Adjust make.globals for prefix support.
(Portage version: 2.2.0_alpha188_p56/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Revision Changes Path
1.84 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.84&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.84&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.83&r2=1.84
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- portage-9999.ebuild 25 Jul 2013 18:11:37 -0000 1.83
+++ portage-9999.ebuild 25 Jul 2013 22:09:16 -0000 1.84
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.83 2013/07/25 18:11:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.84 2013/07/25 22:09:16 zmedico Exp $
EAPI=3
PYTHON_COMPAT=(
@@ -276,7 +276,8 @@
done < <(find . -type f -print0)
einfo "Adjusting make.globals ..."
- sed -e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
+ sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+ -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-i cnf/make.globals || die "sed failed"
einfo "Adjusting repos.conf ..."
1.1315 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1315&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1315&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1314&r2=1.1315
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1314
retrieving revision 1.1315
diff -u -r1.1314 -r1.1315
--- ChangeLog 25 Jul 2013 18:11:37 -0000 1.1314
+++ ChangeLog 25 Jul 2013 22:09:16 -0000 1.1315
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1314 2013/07/25 18:11:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1315 2013/07/25 22:09:16 zmedico Exp $
+
+ 25 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Adjust make.globals for prefix support.
25 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
Adjust repos.conf main-repo for prefix support.
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2013-07-25 18:11 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2013-07-25 18:11 UTC (permalink / raw
To: gentoo-commits
zmedico 13/07/25 18:11:37
Modified: portage-9999.ebuild ChangeLog
Log:
Adjust repos.conf main-repo for prefix support.
(Portage version: 2.2.0_alpha188_p57/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Revision Changes Path
1.83 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.82&r2=1.83
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- portage-9999.ebuild 23 Jul 2013 03:18:29 -0000 1.82
+++ portage-9999.ebuild 25 Jul 2013 18:11:37 -0000 1.83
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.82 2013/07/23 03:18:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.83 2013/07/25 18:11:37 zmedico Exp $
EAPI=3
PYTHON_COMPAT=(
@@ -280,7 +280,9 @@
-i cnf/make.globals || die "sed failed"
einfo "Adjusting repos.conf ..."
- sed -e "s|^\(location = \)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+ -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.freens.org/gentoo-portage-prefix|" \
-i cnf/repos.conf || die "sed failed"
1.1314 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1314&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1314&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1313&r2=1.1314
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1313
retrieving revision 1.1314
diff -u -r1.1313 -r1.1314
--- ChangeLog 23 Jul 2013 03:18:30 -0000 1.1313
+++ ChangeLog 25 Jul 2013 18:11:37 -0000 1.1314
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1313 2013/07/23 03:18:30 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1314 2013/07/25 18:11:37 zmedico Exp $
+
+ 25 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Adjust repos.conf main-repo for prefix support.
23 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
Adjust repos.conf sync-uri for prefix support.
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2013-07-23 3:18 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2013-07-23 3:18 UTC (permalink / raw
To: gentoo-commits
zmedico 13/07/23 03:18:30
Modified: portage-9999.ebuild ChangeLog
Log:
Adjust repos.conf sync-uri for prefix support.
(Portage version: 2.2.0_alpha188_p35/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Revision Changes Path
1.82 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.81&r2=1.82
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- portage-9999.ebuild 22 Jul 2013 03:13:45 -0000 1.81
+++ portage-9999.ebuild 23 Jul 2013 03:18:29 -0000 1.82
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.81 2013/07/22 03:13:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.82 2013/07/23 03:18:29 zmedico Exp $
EAPI=3
PYTHON_COMPAT=(
@@ -276,12 +276,12 @@
done < <(find . -type f -print0)
einfo "Adjusting make.globals ..."
- sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
- -e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
+ sed -e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
-i cnf/make.globals || die "sed failed"
einfo "Adjusting repos.conf ..."
sed -e "s|^\(location = \)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.freens.org/gentoo-portage-prefix|" \
-i cnf/repos.conf || die "sed failed"
einfo "Adding FEATURES=force-prefix to make.globals ..."
1.1313 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1313&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1313&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1312&r2=1.1313
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1312
retrieving revision 1.1313
diff -u -r1.1312 -r1.1313
--- ChangeLog 22 Jul 2013 03:13:45 -0000 1.1312
+++ ChangeLog 23 Jul 2013 03:18:30 -0000 1.1313
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1312 2013/07/22 03:13:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1313 2013/07/23 03:18:30 zmedico Exp $
+
+ 23 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Adjust repos.conf sync-uri for prefix support.
22 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
Adjust repos.conf for prefix support.
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2013-07-22 3:13 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2013-07-22 3:13 UTC (permalink / raw
To: gentoo-commits
zmedico 13/07/22 03:13:46
Modified: portage-9999.ebuild ChangeLog
Log:
Adjust repos.conf for prefix support.
(Portage version: 2.2.0_alpha188_p11/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Revision Changes Path
1.81 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.80&r2=1.81
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- portage-9999.ebuild 21 Jul 2013 16:42:22 -0000 1.80
+++ portage-9999.ebuild 22 Jul 2013 03:13:45 -0000 1.81
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.80 2013/07/21 16:42:22 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.81 2013/07/22 03:13:45 zmedico Exp $
EAPI=3
PYTHON_COMPAT=(
@@ -277,10 +277,13 @@
einfo "Adjusting make.globals ..."
sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
- -e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
-e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
-i cnf/make.globals || die "sed failed"
+ einfo "Adjusting repos.conf ..."
+ sed -e "s|^\(location = \)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
+ -i cnf/repos.conf || die "sed failed"
+
einfo "Adding FEATURES=force-prefix to make.globals ..."
echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
|| die "failed to append to make.globals"
1.1312 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1312&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1312&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1311&r2=1.1312
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1311
retrieving revision 1.1312
diff -u -r1.1311 -r1.1312
--- ChangeLog 21 Jul 2013 16:44:57 -0000 1.1311
+++ ChangeLog 22 Jul 2013 03:13:45 -0000 1.1312
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1311 2013/07/21 16:44:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1312 2013/07/22 03:13:45 zmedico Exp $
+
+ 22 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Adjust repos.conf for prefix support.
21 Jul 2013; Zac Medico <zmedico@gentoo.org> -portage-2.1.12.11.ebuild,
-portage-2.2.0_alpha186.ebuild:
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2013-07-21 16:42 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2013-07-21 16:42 UTC (permalink / raw
To: gentoo-commits
zmedico 13/07/21 16:42:23
Modified: portage-9999.ebuild ChangeLog
Log:
Update for make.conf rename to make.conf.example.
(Portage version: 2.2.0_alpha188_p11/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Revision Changes Path
1.80 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.79&r2=1.80
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- portage-9999.ebuild 1 Jul 2013 02:24:59 -0000 1.79
+++ portage-9999.ebuild 21 Jul 2013 16:42:22 -0000 1.80
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.79 2013/07/01 02:24:59 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.80 2013/07/21 16:42:22 zmedico Exp $
EAPI=3
PYTHON_COMPAT=(
@@ -287,8 +287,8 @@
fi
cd "${S}/cnf" || die
- if [ -f "make.conf.${ARCH}".diff ]; then
- patch make.conf "make.conf.${ARCH}".diff || \
+ if [ -f "make.conf.example.${ARCH}".diff ]; then
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \
die "Failed to patch make.conf.example"
else
eerror ""
1.1310 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1310&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1310&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1309&r2=1.1310
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1309
retrieving revision 1.1310
diff -u -r1.1309 -r1.1310
--- ChangeLog 10 Jul 2013 20:41:49 -0000 1.1309
+++ ChangeLog 21 Jul 2013 16:42:22 -0000 1.1310
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1309 2013/07/10 20:41:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1310 2013/07/21 16:42:22 zmedico Exp $
+
+ 21 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Update for make.conf rename to make.conf.example.
10 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-2.1.12.13.ebuild,
portage-2.2.0_alpha188.ebuild:
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2013-05-16 13:59 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2013-05-16 13:59 UTC (permalink / raw
To: gentoo-commits
zmedico 13/05/16 13:59:27
Modified: portage-9999.ebuild ChangeLog
Log:
Eliminate subshell in boolean expression.
(Portage version: 2.2.0_alpha175/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Revision Changes Path
1.77 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.76&r2=1.77
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- portage-9999.ebuild 16 May 2013 00:34:25 -0000 1.76
+++ portage-9999.ebuild 16 May 2013 13:59:27 -0000 1.77
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.76 2013/05/16 00:34:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.77 2013/05/16 13:59:27 zmedico Exp $
EAPI=3
PYTHON_COMPAT=(
@@ -399,8 +399,8 @@
# If portage-2.1.6 is installed and the preserved_libs_registry exists,
# assume that the NEEDED.ELF.2 files have already been generated.
has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
- ! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
- has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
+ ! { [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
+ has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ; } \
&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
}
1.1267 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1267&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1267&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1266&r2=1.1267
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1266
retrieving revision 1.1267
diff -u -r1.1266 -r1.1267
--- ChangeLog 16 May 2013 00:34:25 -0000 1.1266
+++ ChangeLog 16 May 2013 13:59:27 -0000 1.1267
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1266 2013/05/16 00:34:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1267 2013/05/16 13:59:27 zmedico Exp $
+
+ 16 May 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Eliminate subshell in boolean expression.
*portage-2.2.0_alpha175 (16 May 2013)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2013-03-21 23:39 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2013-03-21 23:39 UTC (permalink / raw
To: gentoo-commits
zmedico 13/03/21 23:39:11
Modified: portage-9999.ebuild ChangeLog
Log:
Add experimental PYTHON_TARGETS support (instead of setting PYTHONPATH via /etc/env.d).
(Portage version: 2.2.0_alpha168_p8/cvs/Linux i686, RepoMan options: --force, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Revision Changes Path
1.69 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.68&r2=1.69
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- portage-9999.ebuild 6 Feb 2013 19:46:46 -0000 1.68
+++ portage-9999.ebuild 21 Mar 2013 23:39:11 -0000 1.69
@@ -1,9 +1,14 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.68 2013/02/06 19:46:46 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.69 2013/03/21 23:39:11 zmedico Exp $
EAPI=3
-inherit git-2 eutils python
+PYTHON_COMPAT=(
+ pypy1_9 pypy2_0
+ python3_1 python3_2 python3_3 python3_4
+ python2_6 python2_7
+)
+inherit git-2 eutils multilib python
DESCRIPTION="Portage is the package management and distribution system for Gentoo"
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
@@ -12,6 +17,11 @@
SLOT="0"
IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr"
+for _pyimpl in ${PYTHON_COMPAT[@]} ; do
+ IUSE+=" python_targets_${_pyimpl}"
+done
+unset _pyimpl
+
# Import of the io module in python-2.6 raises ImportError for the
# thread module if threading is disabled.
python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
@@ -24,6 +34,17 @@
python_dep="${python_dep//,ssl}"
python_dep="${python_dep//ssl,}"
+python_dep="${python_dep}
+ python_targets_pypy1_9? ( dev-python/pypy:1.9 )
+ python_targets_pypy2_0? ( dev-python/pypy:2.0 )
+ python_targets_python2_6? ( dev-lang/python:2.6 )
+ python_targets_python2_7? ( dev-lang/python:2.7 )
+ python_targets_python3_1? ( dev-lang/python:3.1 )
+ python_targets_python3_2? ( dev-lang/python:3.2 )
+ python_targets_python3_3? ( dev-lang/python:3.3 )
+ python_targets_python3_4? ( dev-lang/python:3.4 )
+"
+
# The pysqlite blocker is for bug #282760.
# make-3.82 is for bug #455858
DEPEND="${python_dep}
@@ -100,8 +121,8 @@
! compatible_python_is_selected ; then
ewarn "Attempting to select a compatible default python interpreter"
local x success=0
- for x in /usr/bin/python2.* ; do
- x=${x#/usr/bin/python2.}
+ for x in "${EPREFIX}"/usr/bin/python2.* ; do
+ x=${x#${EPREFIX}/usr/bin/python2.}
if [[ $x -ge 6 ]] 2>/dev/null ; then
eselect python set python2.$x
if compatible_python_is_selected ; then
@@ -240,12 +261,47 @@
# Use dodoc for compression, since the Makefile doesn't do that.
dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
- # Set PYTHONPATH for portage API consumers. This way we don't have
- # to rely on patched python having the correct path, since it has
- # been known to incorrectly add /usr/libx32/portage/pym to sys.path.
- echo "PYTHONPATH=\"${EPREFIX}/usr/lib/portage/pym\"" > \
- "${T}/05portage" || die
- doenvd "${T}/05portage"
+ # Allow external portage API consumers to import portage python modules
+ # (this used to be done with PYTHONPATH setting in /etc/env.d).
+ # For each of PYTHON_TARGETS, install a tree of *.py symlinks in
+ # site-packages, and compile with the corresponding interpreter.
+ local impl files mod_dir dest_mod_dir python relative_path files x
+ for impl in "${PYTHON_COMPAT[@]}" ; do
+ use "python_targets_${impl}" || continue
+ while read -r mod_dir ; do
+ cd "${S}/pym/${mod_dir}" || die
+ files=$(echo *.py)
+ if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then
+ # __pycache__ directories contain no py files
+ continue
+ fi
+ dest_mod_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages/${mod_dir}
+ dodir "${dest_mod_dir}" || die
+ relative_path=../../../lib/portage/pym/${mod_dir}
+ x=/${mod_dir}
+ while [ -n "${x}" ] ; do
+ relative_path=../${relative_path}
+ x=${x%/*}
+ done
+ for x in ${files} ; do
+ dosym "${relative_path}/${x}" \
+ "${dest_mod_dir}/${x}" || die
+ done
+ done < <(cd "${S}"/pym || die ; find * -type d ! -path "portage/tests*")
+ case "${impl}" in
+ python*)
+ python=${impl/_/.}
+ python=${EPREFIX}/usr/bin/${python}
+ "${python}" -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+ "${python}" -OO -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+ ;;
+ pypy*)
+ python=${impl/_/.}
+ python=${EPREFIX}/usr/bin/${python/pypy/pypy-c}
+ "${python}" -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+ ;;
+ esac
+ done
}
pkg_preinst() {
@@ -276,10 +332,6 @@
}
pkg_postinst() {
- # Compile all source files recursively. Any orphans
- # will be identified and removed in postrm.
- python_mod_optimize /usr/lib/portage/pym
-
if $WORLD_MIGRATION_UPGRADE && \
grep -q "^@" "${EROOT}/var/lib/portage/world"; then
einfo "moving set references from the worldfile into world_sets"
1.1230 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1230&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1230&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1229&r2=1.1230
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1229
retrieving revision 1.1230
diff -u -r1.1229 -r1.1230
--- ChangeLog 20 Mar 2013 17:46:29 -0000 1.1229
+++ ChangeLog 21 Mar 2013 23:39:11 -0000 1.1230
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1229 2013/03/20 17:46:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1230 2013/03/21 23:39:11 zmedico Exp $
+
+ 21 Mar 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Add experimental PYTHON_TARGETS support (instead of setting PYTHONPATH via
+ /etc/env.d).
20 Mar 2013; Jeroen Roovers <jer@gentoo.org> portage-2.1.11.55.ebuild:
Stable for HPPA (bug #462134).
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2013-01-14 23:15 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2013-01-14 23:15 UTC (permalink / raw
To: gentoo-commits
zmedico 13/01/14 23:15:40
Modified: portage-9999.ebuild ChangeLog
Log:
Remove LINGUAS loop which is handled by the Makefile now.
(Portage version: 2.2.0_alpha152/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Revision Changes Path
1.66 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.65&r2=1.66
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- portage-9999.ebuild 14 Jan 2013 17:47:27 -0000 1.65
+++ portage-9999.ebuild 14 Jan 2013 23:15:40 -0000 1.66
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.65 2013/01/14 17:47:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.66 2013/01/14 23:15:40 zmedico Exp $
EAPI=3
inherit git-2 eutils python
@@ -212,14 +212,6 @@
eerror "Please notify the arch maintainer about this issue. Using generic."
eerror ""
fi
-
- local x
- for x in ru ; do
- if ! use linguas_${x} ; then
- einfo "Removing unused man pages for ${x} locale ..."
- rm -rf "${S}/man/${x}"
- fi
- done
}
src_compile() {
1.1166 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1166&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1166&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1165&r2=1.1166
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1165
retrieving revision 1.1166
diff -u -r1.1165 -r1.1166
--- ChangeLog 14 Jan 2013 19:55:35 -0000 1.1165
+++ ChangeLog 14 Jan 2013 23:15:40 -0000 1.1166
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1165 2013/01/14 19:55:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1166 2013/01/14 23:15:40 zmedico Exp $
+
+ 14 Jan 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Remove LINGUAS loop which is handled by the Makefile now.
*portage-2.2.0_alpha152 (14 Jan 2013)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2013-01-14 17:47 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2013-01-14 17:47 UTC (permalink / raw
To: gentoo-commits
zmedico 13/01/14 17:47:27
Modified: portage-9999.ebuild ChangeLog
Log:
Add linguas_ru for bug #450372.
(Portage version: 2.2.0_alpha151/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Revision Changes Path
1.65 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.64&r2=1.65
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- portage-9999.ebuild 5 Jan 2013 01:19:27 -0000 1.64
+++ portage-9999.ebuild 14 Jan 2013 17:47:27 -0000 1.65
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.64 2013/01/05 01:19:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.65 2013/01/14 17:47:27 zmedico Exp $
EAPI=3
inherit git-2 eutils python
@@ -10,7 +10,7 @@
LICENSE="GPL-2"
KEYWORDS=""
SLOT="0"
-IUSE="build doc epydoc +ipc pypy2_0 python2 python3 selinux xattr"
+IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr"
# Import of the io module in python-2.6 raises ImportError for the
# thread module if threading is disabled.
@@ -140,7 +140,7 @@
die "Failed to patch portage.VERSION"
sed -e "1s/VERSION/${_version}/" -i doc/fragment/version || \
die "Failed to patch VERSION in doc/fragment/version"
- sed -e "1s/VERSION/${_version}/" -i man/* || \
+ sed -e "1s/VERSION/${_version}/" -i $(find man -type f) || \
die "Failed to patch VERSION in man page headers"
if ! use ipc ; then
@@ -212,6 +212,14 @@
eerror "Please notify the arch maintainer about this issue. Using generic."
eerror ""
fi
+
+ local x
+ for x in ru ; do
+ if ! use linguas_${x} ; then
+ einfo "Removing unused man pages for ${x} locale ..."
+ rm -rf "${S}/man/${x}"
+ fi
+ done
}
src_compile() {
1.1163 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1163&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1163&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1162&r2=1.1163
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1162
retrieving revision 1.1163
diff -u -r1.1162 -r1.1163
--- ChangeLog 11 Jan 2013 08:33:55 -0000 1.1162
+++ ChangeLog 14 Jan 2013 17:47:27 -0000 1.1163
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1162 2013/01/11 08:33:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1163 2013/01/14 17:47:27 zmedico Exp $
+
+ 14 Jan 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Add linguas_ru for bug #450372.
*portage-2.2.0_alpha151 (11 Jan 2013)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2012-07-24 19:17 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2012-07-24 19:17 UTC (permalink / raw
To: gentoo-commits
zmedico 12/07/24 19:17:41
Modified: portage-9999.ebuild ChangeLog
Log:
Remove /etc/make.globals symlink code (bug #427862).
(Portage version: 2.2.0_alpha120/cvs/Linux i686)
Revision Changes Path
1.54 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.53&r2=1.54
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- portage-9999.ebuild 24 Jul 2012 09:11:35 -0000 1.53
+++ portage-9999.ebuild 24 Jul 2012 19:17:41 -0000 1.54
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.53 2012/07/24 09:11:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.54 2012/07/24 19:17:41 zmedico Exp $
EAPI=3
inherit git-2 eutils multilib python
@@ -270,10 +270,6 @@
ewarn "to enable RMD160 hash support."
ewarn "See bug #198398 for more information."
fi
- if [[ ! -L "${EROOT}/etc/make.globals" &&
- -f "${EROOT}/etc/make.globals" ]]; then
- rm "${EROOT}/etc/make.globals"
- fi
has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
1.1065 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1065&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1065&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1064&r2=1.1065
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1064
retrieving revision 1.1065
diff -u -r1.1064 -r1.1065
--- ChangeLog 24 Jul 2012 09:11:35 -0000 1.1064
+++ ChangeLog 24 Jul 2012 19:17:41 -0000 1.1065
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1064 2012/07/24 09:11:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1065 2012/07/24 19:17:41 zmedico Exp $
+
+ 24 Jul 2012; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Remove /etc/make.globals symlink code (bug #427862).
24 Jul 2012; Michał Górny <mgorny@gentoo.org> portage-9999.ebuild:
Apply user patches.
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2012-07-24 9:11 Michal Gorny (mgorny)
0 siblings, 0 replies; 48+ messages in thread
From: Michal Gorny (mgorny) @ 2012-07-24 9:11 UTC (permalink / raw
To: gentoo-commits
mgorny 12/07/24 09:11:35
Modified: portage-9999.ebuild ChangeLog
Log:
Apply user patches.
(Portage version: 2.2.0_alpha120_p6/cvs/Linux x86_64)
Revision Changes Path
1.53 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.52&r2=1.53
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- portage-9999.ebuild 7 Jul 2012 05:38:27 -0000 1.52
+++ portage-9999.ebuild 24 Jul 2012 09:11:35 -0000 1.53
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.52 2012/07/07 05:38:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.53 2012/07/24 09:11:35 mgorny Exp $
EAPI=3
inherit git-2 eutils multilib python
@@ -128,6 +128,8 @@
}
src_prepare() {
+ epatch_user
+
einfo "Producing ChangeLog from Git history..."
pushd "${S}/.git" >/dev/null || die
git log ebcf8975b37a8aae9735eb491a9b4cb63549bd5d^.. \
1.1064 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1064&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1064&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1063&r2=1.1064
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1063
retrieving revision 1.1064
diff -u -r1.1063 -r1.1064
--- ChangeLog 18 Jul 2012 22:55:09 -0000 1.1063
+++ ChangeLog 24 Jul 2012 09:11:35 -0000 1.1064
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1063 2012/07/18 22:55:09 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1064 2012/07/24 09:11:35 mgorny Exp $
+
+ 24 Jul 2012; Michał Górny <mgorny@gentoo.org> portage-9999.ebuild:
+ Apply user patches.
*portage-2.2.0_alpha120 (18 Jul 2012)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2012-06-23 7:32 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2012-06-23 7:32 UTC (permalink / raw
To: gentoo-commits
zmedico 12/06/23 07:32:47
Modified: portage-9999.ebuild ChangeLog
Log:
Merge diff from 2.2.0_alpha111 ebuild.
(Portage version: 2.1.11/cvs/Linux i686)
Revision Changes Path
1.50 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.49&r2=1.50
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- portage-9999.ebuild 13 Jun 2012 06:11:55 -0000 1.49
+++ portage-9999.ebuild 23 Jun 2012 07:32:47 -0000 1.50
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.49 2012/06/13 06:11:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.50 2012/06/23 07:32:47 zmedico Exp $
EAPI=3
inherit git-2 eutils multilib python
@@ -262,13 +262,11 @@
ewarn "to enable RMD160 hash support."
ewarn "See bug #198398 for more information."
fi
- if [ ! -L "${EROOT}/etc/make.globals" ]; then
- rm -f "${EROOT}/etc/make.globals"
+ if [[ ! -L "${EROOT}/etc/make.globals" &&
+ -f "${EROOT}/etc/make.globals" ]]; then
+ rm "${EROOT}/etc/make.globals"
fi
- has_version "<${CATEGORY}/${PN}-2.2_alpha" \
- && MINOR_UPGRADE=true || MINOR_UPGRADE=false
-
has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
@@ -278,9 +276,6 @@
! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
-
- [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
- && REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
}
pkg_postinst() {
@@ -288,7 +283,8 @@
# will be identified and removed in postrm.
python_mod_optimize /usr/$(get_libdir)/portage/pym
- if $WORLD_MIGRATION_UPGRADE ; then
+ if $WORLD_MIGRATION_UPGRADE && \
+ grep -q "^@" "${EROOT}/var/lib/portage/world"; then
einfo "moving set references from the worldfile into world_sets"
cd "${EROOT}/var/lib/portage/"
grep "^@" world >> world_sets
@@ -313,24 +309,6 @@
fi
done
fi
-
- if $REPO_LAYOUT_CONF_WARN ; then
- ewarn
- echo "If you want overlay eclasses to override eclasses from" \
- "other repos then see the portage(5) man page" \
- "for information about the new layout.conf and repos.conf" \
- "configuration files." \
- | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
- ewarn
- fi
-
- if $MINOR_UPGRADE ; then
- elog "If you're upgrading from a pre-2.2 version of portage you might"
- elog "want to remerge world (emerge -e world) to take full advantage"
- elog "of some of the new features in 2.2."
- elog "This is not required however for portage to function properly."
- elog
- fi
}
pkg_postrm() {
1.1039 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1039&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1039&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1038&r2=1.1039
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1038
retrieving revision 1.1039
diff -u -r1.1038 -r1.1039
--- ChangeLog 23 Jun 2012 07:29:07 -0000 1.1038
+++ ChangeLog 23 Jun 2012 07:32:47 -0000 1.1039
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1038 2012/06/23 07:29:07 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1039 2012/06/23 07:32:47 zmedico Exp $
+
+ 23 Jun 2012; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Merge diff from 2.2.0_alpha111 ebuild.
*portage-2.2.0_alpha111 (23 Jun 2012)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2012-06-04 23:04 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2012-06-04 23:04 UTC (permalink / raw
To: gentoo-commits
zmedico 12/06/04 23:04:14
Modified: portage-9999.ebuild ChangeLog
Log:
Support bash <4.1 again.
(Portage version: 2.2.0_alpha110/cvs/Linux i686)
Revision Changes Path
1.48 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.47&r2=1.48
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- portage-9999.ebuild 2 Jun 2012 19:32:06 -0000 1.47
+++ portage-9999.ebuild 4 Jun 2012 23:04:14 -0000 1.48
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.47 2012/06/02 19:32:06 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.48 2012/06/04 23:04:14 zmedico Exp $
EAPI=3
inherit git-2 eutils multilib python
@@ -33,7 +33,7 @@
# for now, don't pull in xattr deps for other kernels.
RDEPEND="${python_dep}
!build? ( >=sys-apps/sed-4.0.5
- >=app-shells/bash-4.1
+ >=app-shells/bash-3.2_p17
>=app-admin/eselect-1.2 )
elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
elibc_glibc? ( >=sys-apps/sandbox-2.2 )
@@ -41,7 +41,7 @@
>=app-misc/pax-utils-0.1.17
xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
- !<app-shells/bash-4.1
+ !<app-shells/bash-3.2_p17
!<app-admin/logrotate-3.8.0"
PDEPEND="
!build? (
1.1030 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1030&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1030&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1029&r2=1.1030
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1029
retrieving revision 1.1030
diff -u -r1.1029 -r1.1030
--- ChangeLog 4 Jun 2012 23:02:34 -0000 1.1029
+++ ChangeLog 4 Jun 2012 23:04:14 -0000 1.1030
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1029 2012/06/04 23:02:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1030 2012/06/04 23:04:14 zmedico Exp $
+
+ 04 Jun 2012; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Support bash <4.1 again.
*portage-2.1.10.65 (04 Jun 2012)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2012-03-23 19:02 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2012-03-23 19:02 UTC (permalink / raw
To: gentoo-commits
zmedico 12/03/23 19:02:17
Modified: portage-9999.ebuild ChangeLog
Log:
Add die for dodoc failure.
(Portage version: 2.2.0_alpha95/cvs/Linux i686)
Revision Changes Path
1.46 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.45&r2=1.46
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- portage-9999.ebuild 17 Mar 2012 01:57:23 -0000 1.45
+++ portage-9999.ebuild 23 Mar 2012 19:02:17 -0000 1.46
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.45 2012/03/17 01:57:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.46 2012/03/23 19:02:17 zmedico Exp $
EAPI=3
inherit git-2 eutils multilib python
@@ -235,7 +235,7 @@
install || die
# Use dodoc for compression, since the Makefile doesn't do that.
- dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
+ dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
}
pkg_preinst() {
1.989 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.989&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.989&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.988&r2=1.989
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.988
retrieving revision 1.989
diff -u -r1.988 -r1.989
--- ChangeLog 23 Mar 2012 19:01:04 -0000 1.988
+++ ChangeLog 23 Mar 2012 19:02:17 -0000 1.989
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.988 2012/03/23 19:01:04 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.989 2012/03/23 19:02:17 zmedico Exp $
+
+ 23 Mar 2012; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Add die for dodoc failure.
*portage-2.2.0_alpha95 (23 Mar 2012)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2012-03-17 1:57 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2012-03-17 1:57 UTC (permalink / raw
To: gentoo-commits
zmedico 12/03/17 01:57:23
Modified: portage-9999.ebuild ChangeLog
Log:
Call the new Makefile for src_compile and src_install.
(Portage version: 2.2.0_alpha90_p21/cvs/Linux i686)
Revision Changes Path
1.45 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.44&r2=1.45
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- portage-9999.ebuild 18 Feb 2012 23:11:02 -0000 1.44
+++ portage-9999.ebuild 17 Mar 2012 01:57:23 -0000 1.45
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.44 2012/02/18 23:11:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.45 2012/03/17 01:57:23 zmedico Exp $
EAPI=3
inherit git-2 eutils multilib python
@@ -122,6 +122,12 @@
}
src_prepare() {
+ einfo "Producing ChangeLog from Git history..."
+ pushd "${S}/.git" >/dev/null || die
+ git log ebcf8975b37a8aae9735eb491a9b4cb63549bd5d^.. \
+ > "${S}"/ChangeLog || die
+ popd >/dev/null || die
+
local _version=$(cd "${S}/.git" && git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')
_version=${_version:1}
einfo "Setting portage.VERSION to ${_version} ..."
@@ -187,151 +193,49 @@
echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
|| die "failed to append to make.globals"
fi
-}
-
-src_compile() {
- if use doc; then
- cd "${S}"/doc
- touch fragment/date
- make xhtml xhtml-nochunks || die "failed to make docs"
- fi
-
- if use epydoc; then
- einfo "Generating api docs"
- mkdir "${WORKDIR}"/api
- local my_modules epydoc_opts=""
- my_modules="$(find "${S}/pym" -name "*.py" \
- | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
- -e 's:/:.:g' | sort)" || die "error listing modules"
- # workaround for bug 282760
- > "$S/pym/pysqlite2.py"
- PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
- epydoc -o "${WORKDIR}"/api \
- -qqqqq --no-frames --show-imports $epydoc_opts \
- --name "${PN}" --url "${HOMEPAGE}" \
- ${my_modules} || die "epydoc failed"
- rm "$S/pym/pysqlite2.py"
- fi
-}
-src_test() {
- ./runtests.sh || die "tests failed"
-}
-
-src_install() {
- local libdir=$(get_libdir)
- local portage_base="/usr/${libdir}/portage"
- local portage_share_config=/usr/share/portage/config
-
- cd "${S}"/cnf
- insinto /etc
- doins etc-update.conf dispatch-conf.conf || die
-
- insinto "$portage_share_config/sets"
- doins "$S"/cnf/sets/*.conf || die
- insinto "$portage_share_config"
- doins "$S/cnf/make.globals" || die
+ cd "${S}/cnf" || die
if [ -f "make.conf.${ARCH}".diff ]; then
patch make.conf "make.conf.${ARCH}".diff || \
die "Failed to patch make.conf.example"
- newins make.conf make.conf.example || die
else
eerror ""
eerror "Portage does not have an arch-specific configuration for this arch."
eerror "Please notify the arch maintainer about this issue. Using generic."
eerror ""
- newins make.conf make.conf.example || die
fi
- dosym ..${portage_share_config}/make.globals /etc/make.globals
-
- insinto /etc/logrotate.d
- doins "${S}"/cnf/logrotate.d/elog-save-summary || die
-
# BSD and OSX need a sed wrapper so that find/xargs work properly
if use userland_GNU; then
- rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
+ rm -f "${S}"/bin/ebuild-helpers/sed || \
+ die "Failed to remove sed wrapper"
fi
+}
- local x symlinks files
-
- cd "$S" || die "cd failed"
- for x in $(find bin -type d) ; do
- exeinto $portage_base/$x || die "exeinto failed"
- cd "$S"/$x || die "cd failed"
- files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
- if [ -n "$files" ] ; then
- doexe $files || die "doexe failed"
- fi
- symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
- if [ -n "$symlinks" ] ; then
- cp -P $symlinks "${ED}$portage_base/$x" || die "cp failed"
- fi
- done
-
- cd "$S" || die "cd failed"
- for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
- insinto $portage_base/$x || die "insinto failed"
- cd "$S"/$x || die "cd failed"
- # __pycache__ directories contain no py files
- [[ "*.py" != $(echo *.py) ]] || continue
- doins *.py || die "doins failed"
- symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
- if [ -n "$symlinks" ] ; then
- cp -P $symlinks "${ED}$portage_base/$x" || die "cp failed"
- fi
- done
-
- # We install some minimal tests for use as a preinst sanity check.
- # These tests must be able to run without a full source tree and
- # without relying on a previous portage instance being installed.
- cd "$S" || die "cd failed"
- exeinto $portage_base/pym/portage/tests || die
- doexe pym/portage/tests/runTests || die
- insinto $portage_base/pym/portage/tests || die
- doins pym/portage/tests/*.py || die
- insinto $portage_base/pym/portage/tests/lint || die
- doins pym/portage/tests/lint/*.py || die
- doins pym/portage/tests/lint/__test__ || die
-
- # Symlinks to directories cause up/downgrade issues and the use of these
- # modules outside of portage is probably negligible.
- for x in "${ED}${portage_base}/pym/"{cache,elog_modules} ; do
- [ ! -L "${x}" ] && continue
- die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
- done
+src_compile() {
+ if use doc; then
+ emake docbook || die
+ fi
- doman "${S}"/man/*.[0-9]
+ if use epydoc; then
+ einfo "Generating api docs"
+ emake epydoc || die
+ fi
+}
- echo 'Producing ChangeLog from Git history...'
- ( cd "${S}/.git" && git log > "${S}"/ChangeLog )
- dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die 'dodoc failed'
- use doc && dohtml -r "${S}"/doc/*
- use epydoc && dohtml -r "${WORKDIR}"/api
-
- dodir /usr/bin
- for x in ebuild egencache emerge portageq quickpkg repoman ; do
- dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
- done
+src_test() {
+ ./runtests.sh || die "tests failed"
+}
- dodir /usr/sbin
- local my_syms="archive-conf
- dispatch-conf
- emaint
- emerge-webrsync
- env-update
- etc-update
- fixpackages
- regenworld"
- local x
- for x in ${my_syms}; do
- dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
- done
- dosym env-update /usr/sbin/update-env
- dosym etc-update /usr/sbin/update-etc
+src_install() {
+ emake DESTDIR="${D}" \
+ sysconfdir="${EPREFIX}/etc" \
+ prefix="${EPREFIX}/usr" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
+ install || die
- dodir /etc/portage
- keepdir /etc/portage
+ # Use dodoc for compression, since the Makefile doesn't do that.
+ dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
}
pkg_preinst() {
1.977 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.977&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.977&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.976&r2=1.977
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.976
retrieving revision 1.977
diff -u -r1.976 -r1.977
--- ChangeLog 16 Mar 2012 19:12:45 -0000 1.976
+++ ChangeLog 17 Mar 2012 01:57:23 -0000 1.977
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.976 2012/03/16 19:12:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.977 2012/03/17 01:57:23 zmedico Exp $
+
+ 17 Mar 2012; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Call the new Makefile for src_compile and src_install.
16 Mar 2012; Brent Baude <ranger@gentoo.org> portage-2.1.10.49.ebuild:
Marking portage-2.1.10.49 ppc for bug 408391
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2012-02-14 19:06 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2012-02-14 19:06 UTC (permalink / raw
To: gentoo-commits
zmedico 12/02/14 19:06:20
Modified: portage-9999.ebuild ChangeLog
Log:
Require pypy[bzip2], for quickpkg.
(Portage version: 2.2.0_alpha86_p10/cvs/Linux i686)
Revision Changes Path
1.43 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.42&r2=1.43
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- portage-9999.ebuild 14 Feb 2012 00:09:00 -0000 1.42
+++ portage-9999.ebuild 14 Feb 2012 19:06:20 -0000 1.43
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.42 2012/02/14 00:09:00 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.43 2012/02/14 19:06:20 zmedico Exp $
EAPI=3
inherit git-2 eutils multilib python
@@ -19,7 +19,7 @@
build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
!build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
) ) )
- pypy1_8? ( !python2? ( !python3? ( dev-python/pypy:1.8 ) ) )
+ pypy1_8? ( !python2? ( !python3? ( dev-python/pypy:1.8[bzip2] ) ) )
python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
# The pysqlite blocker is for bug #282760.
1.961 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.961&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.961&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.960&r2=1.961
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.960
retrieving revision 1.961
diff -u -r1.960 -r1.961
--- ChangeLog 14 Feb 2012 00:09:00 -0000 1.960
+++ ChangeLog 14 Feb 2012 19:06:20 -0000 1.961
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.960 2012/02/14 00:09:00 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.961 2012/02/14 19:06:20 zmedico Exp $
+
+ 14 Feb 2012; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Require pypy[bzip2], for quickpkg.
14 Feb 2012; Zac Medico <zmedico@gentoo.org> metadata.xml,
portage-9999.ebuild:
^ permalink raw reply [flat|nested] 48+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2011-12-22 4:46 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2011-12-22 4:46 UTC (permalink / raw
To: gentoo-commits
zmedico 11/12/22 04:46:55
Modified: portage-9999.ebuild ChangeLog
Log:
Adjust make.globals PORTDIR and PORTAGE_TMPDIR for prefix installs.
(Portage version: 2.2.0_alpha81_p52/cvs/Linux i686)
Revision Changes Path
1.40 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.39&r2=1.40
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- portage-9999.ebuild 11 Dec 2011 20:18:53 -0000 1.39
+++ portage-9999.ebuild 22 Dec 2011 04:46:55 -0000 1.40
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.39 2011/12/11 20:18:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.40 2011/12/22 04:46:55 zmedico Exp $
EAPI=3
inherit git-2 eutils multilib python
@@ -158,8 +158,10 @@
fi
done
- einfo "Setting SYNC in make.globals ..."
+ einfo "Adjusting make.globals ..."
sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
+ -e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
+ -e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
-i cnf/make.globals || die "sed failed"
einfo "Adding FEATURES=force-prefix to make.globals ..."
1.935 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.935&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.935&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.934&r2=1.935
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.934
retrieving revision 1.935
diff -u -r1.934 -r1.935
--- ChangeLog 21 Dec 2011 21:42:47 -0000 1.934
+++ ChangeLog 22 Dec 2011 04:46:55 -0000 1.935
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.934 2011/12/21 21:42:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.935 2011/12/22 04:46:55 zmedico Exp $
+
+ 22 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Adjust make.globals PORTDIR and PORTAGE_TMPDIR for prefix installs.
21 Dec 2011; Markus Meier <maekke@gentoo.org> portage-2.1.10.41.ebuild:
arm stable, bug #394695
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2011-12-10 0:50 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2011-12-10 0:50 UTC (permalink / raw
To: gentoo-commits
zmedico 11/12/10 00:50:04
Modified: portage-9999.ebuild ChangeLog
Log:
Add USE=xattr and corresponding deps.
(Portage version: 2.2.0_alpha79_p44/cvs/Linux i686)
Revision Changes Path
1.38 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.37&r2=1.38
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- portage-9999.ebuild 9 Dec 2011 20:29:45 -0000 1.37
+++ portage-9999.ebuild 10 Dec 2011 00:50:04 -0000 1.38
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.37 2011/12/09 20:29:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.38 2011/12/10 00:50:04 zmedico Exp $
EAPI=3
inherit git-2 eutils multilib python
@@ -10,7 +10,7 @@
LICENSE="GPL-2"
KEYWORDS=""
SLOT="0"
-IUSE="build doc epydoc +ipc python2 python3 selinux"
+IUSE="build doc epydoc +ipc python2 python3 selinux xattr"
# Import of the io module in python-2.6 raises ImportError for the
# thread module if threading is disabled.
@@ -27,6 +27,10 @@
doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
RDEPEND="${python_dep}
!build? ( >=sys-apps/sed-4.0.5
>=app-shells/bash-3.2_p17
@@ -35,6 +39,7 @@
elibc_glibc? ( >=sys-apps/sandbox-2.2 )
elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
>=app-misc/pax-utils-0.1.17
+ xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
!<app-shells/bash-3.2_p17
!<app-admin/logrotate-3.8.0"
@@ -118,6 +123,12 @@
die "failed to patch AbstractEbuildProcess.py"
fi
+ if use xattr && use kernel_linux ; then
+ einfo "Adding FEATURES=xattr to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
if use python3; then
einfo "Converting shebangs for python3..."
python_convert_shebangs -r 3 .
1.924 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.924&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.924&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.923&r2=1.924
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.923
retrieving revision 1.924
diff -u -r1.923 -r1.924
--- ChangeLog 9 Dec 2011 20:29:45 -0000 1.923
+++ ChangeLog 10 Dec 2011 00:50:04 -0000 1.924
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.923 2011/12/09 20:29:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.924 2011/12/10 00:50:04 zmedico Exp $
+
+ 10 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Add USE=xattr and corresponding deps.
09 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
Adjust SYNC in make.globals for prefix installs.
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2011-12-09 20:29 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2011-12-09 20:29 UTC (permalink / raw
To: gentoo-commits
zmedico 11/12/09 20:29:45
Modified: portage-9999.ebuild ChangeLog
Log:
Adjust SYNC in make.globals for prefix installs.
(Portage version: 2.2.0_alpha79_p44/cvs/Linux i686)
Revision Changes Path
1.37 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.36&r2=1.37
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- portage-9999.ebuild 9 Dec 2011 17:59:29 -0000 1.36
+++ portage-9999.ebuild 9 Dec 2011 20:29:45 -0000 1.37
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.36 2011/12/09 17:59:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.37 2011/12/09 20:29:45 zmedico Exp $
EAPI=3
inherit git-2 eutils multilib python
@@ -141,6 +141,10 @@
fi
done
+ einfo "Setting SYNC in make.globals ..."
+ sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
+ -i cnf/make.globals || die "sed failed"
+
einfo "Adding FEATURES=force-prefix to make.globals ..."
echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
|| die "failed to append to make.globals"
1.923 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.923&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.923&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.922&r2=1.923
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.922
retrieving revision 1.923
diff -u -r1.922 -r1.923
--- ChangeLog 9 Dec 2011 17:59:29 -0000 1.922
+++ ChangeLog 9 Dec 2011 20:29:45 -0000 1.923
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.922 2011/12/09 17:59:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.923 2011/12/09 20:29:45 zmedico Exp $
+
+ 09 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Adjust SYNC in make.globals for prefix installs.
09 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
Enable FEATURES=force-prefix in make.globals for prefix installs.
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2011-12-09 17:59 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2011-12-09 17:59 UTC (permalink / raw
To: gentoo-commits
zmedico 11/12/09 17:59:30
Modified: portage-9999.ebuild ChangeLog
Log:
Enable FEATURES=force-prefix in make.globals for prefix installs.
(Portage version: 2.2.0_alpha79_p44/cvs/Linux i686)
Revision Changes Path
1.36 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.35&r2=1.36
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- portage-9999.ebuild 8 Dec 2011 22:44:01 -0000 1.35
+++ portage-9999.ebuild 9 Dec 2011 17:59:29 -0000 1.36
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.35 2011/12/08 22:44:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.36 2011/12/09 17:59:29 zmedico Exp $
EAPI=3
inherit git-2 eutils multilib python
@@ -140,6 +140,10 @@
die "sed failed"
fi
done
+
+ einfo "Adding FEATURES=force-prefix to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
fi
}
1.922 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.922&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.922&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.921&r2=1.922
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.921
retrieving revision 1.922
diff -u -r1.921 -r1.922
--- ChangeLog 8 Dec 2011 22:44:01 -0000 1.921
+++ ChangeLog 9 Dec 2011 17:59:29 -0000 1.922
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.921 2011/12/08 22:44:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.922 2011/12/09 17:59:29 zmedico Exp $
+
+ 09 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Enable FEATURES=force-prefix in make.globals for prefix installs.
08 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
Add support for prefix installs.
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2011-12-08 22:44 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2011-12-08 22:44 UTC (permalink / raw
To: gentoo-commits
zmedico 11/12/08 22:44:01
Modified: portage-9999.ebuild ChangeLog
Log:
Add support for prefix installs.
(Portage version: 2.2.0_alpha79_p39/cvs/Linux i686)
Revision Changes Path
1.35 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.34&r2=1.35
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- portage-9999.ebuild 12 Nov 2011 16:16:11 -0000 1.34
+++ portage-9999.ebuild 8 Dec 2011 22:44:01 -0000 1.35
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.34 2011/11/12 16:16:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.35 2011/12/08 22:44:01 zmedico Exp $
EAPI=3
inherit git-2 eutils multilib python
@@ -125,6 +125,22 @@
einfo "Converting shebangs for python2..."
python_convert_shebangs -r 2 .
fi
+
+ if [[ -n ${EPREFIX} ]] ; then
+ einfo "Setting portage.const.EPREFIX ..."
+ sed -e "s|^EPREFIX=.*|EPREFIX=\"${EPREFIX}\"|" -i pym/portage/const.py || \
+ die "Failed to patch portage.const.EPREFIX"
+
+ einfo "Prefixing shebangs ..."
+ find . -type f -print0 | \
+ while read -r -d $'\0' ; do
+ local shebang=$(head -n1 "$REPLY")
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+ die "sed failed"
+ fi
+ done
+ fi
}
src_compile() {
1.921 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.921&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.921&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.920&r2=1.921
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.920
retrieving revision 1.921
diff -u -r1.920 -r1.921
--- ChangeLog 29 Nov 2011 06:53:36 -0000 1.920
+++ ChangeLog 8 Dec 2011 22:44:01 -0000 1.921
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.920 2011/11/29 06:53:36 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.921 2011/12/08 22:44:01 zmedico Exp $
+
+ 08 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Add support for prefix installs.
29 Nov 2011; Zac Medico <zmedico@gentoo.org> -portage-2.1.10.38.ebuild,
-portage-2.2.0_alpha78.ebuild:
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2011-11-11 18:21 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2011-11-11 18:21 UTC (permalink / raw
To: gentoo-commits
zmedico 11/11/11 18:21:44
Modified: portage-9999.ebuild ChangeLog
Log:
Remove obsolete less dependency (bug #384663) and tweak style of preinst/postinst boolean conditions.
(Portage version: 2.2.0_alpha73_p1/cvs/Linux i686)
Revision Changes Path
1.32 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.31&r2=1.32
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- portage-9999.ebuild 2 Nov 2011 05:26:03 -0000 1.31
+++ portage-9999.ebuild 11 Nov 2011 18:21:44 -0000 1.32
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.31 2011/11/02 05:26:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.32 2011/11/11 18:21:44 zmedico Exp $
EAPI=3
inherit git-2 eutils multilib python
@@ -10,7 +10,7 @@
LICENSE="GPL-2"
KEYWORDS=""
SLOT="0"
-IUSE="build doc epydoc +ipc +less python2 python3 selinux"
+IUSE="build doc epydoc +ipc python2 python3 selinux"
# Import of the io module in python-2.6 raises ImportError for the
# thread module if threading is disabled.
@@ -40,7 +40,6 @@
!<app-admin/logrotate-3.8.0"
PDEPEND="
!build? (
- less? ( sys-apps/less )
>=net-misc/rsync-2.6.4
userland_GNU? ( >=sys-apps/coreutils-6.4 )
)"
@@ -295,21 +294,21 @@
rm -f "${EROOT}/etc/make.globals"
fi
- has_version "<${CATEGORY}/${PN}-2.2_alpha"
- MINOR_UPGRADE=$?
+ has_version "<${CATEGORY}/${PN}-2.2_alpha" \
+ && MINOR_UPGRADE=true || MINOR_UPGRADE=false
- has_version "<=${CATEGORY}/${PN}-2.2_pre5"
- WORLD_MIGRATION_UPGRADE=$?
+ has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
+ && WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
# If portage-2.1.6 is installed and the preserved_libs_registry exists,
# assume that the NEEDED.ELF.2 files have already been generated.
has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
- has_version ">=${CATEGORY}/${PN}-2.1.6_rc" )
- NEEDED_REBUILD_UPGRADE=$?
+ has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
+ && NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
- [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
- REPO_LAYOUT_CONF_WARN=$?
+ [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
+ && REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
}
pkg_postinst() {
@@ -317,14 +316,14 @@
# will be identified and removed in postrm.
python_mod_optimize /usr/$(get_libdir)/portage/pym
- if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then
+ if $WORLD_MIGRATION_UPGRADE ; then
einfo "moving set references from the worldfile into world_sets"
cd "${EROOT}/var/lib/portage/"
grep "^@" world >> world_sets
sed -i -e '/^@/d' world
fi
- if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then
+ if $NEEDED_REBUILD_UPGRADE ; then
einfo "rebuilding NEEDED.ELF.2 files"
for cpv in "${EROOT}/var/db/pkg"/*/*; do
if [ -f "${cpv}/NEEDED" ]; then
@@ -343,7 +342,7 @@
done
fi
- if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
+ if $REPO_LAYOUT_CONF_WARN ; then
ewarn
echo "If you want overlay eclasses to override eclasses from" \
"other repos then see the portage(5) man page" \
@@ -358,7 +357,7 @@
einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
einfo
- if [ $MINOR_UPGRADE = 0 ] ; then
+ if $MINOR_UPGRADE ; then
elog "If you're upgrading from a pre-2.2 version of portage you might"
elog "want to remerge world (emerge -e world) to take full advantage"
elog "of some of the new features in 2.2."
1.903 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.903&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.903&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.902&r2=1.903
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.902
retrieving revision 1.903
diff -u -r1.902 -r1.903
--- ChangeLog 10 Nov 2011 16:18:28 -0000 1.902
+++ ChangeLog 11 Nov 2011 18:21:44 -0000 1.903
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.902 2011/11/10 16:18:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.903 2011/11/11 18:21:44 zmedico Exp $
+
+ 11 Nov 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Remove obsolete less dependency (bug #384663) and tweak style of
+ preinst/postinst boolean conditions.
10 Nov 2011; Zac Medico <zmedico@gentoo.org> portage-2.1.6.13.ebuild,
portage-2.1.6.7.ebuild:
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2011-11-02 5:26 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2011-11-02 5:26 UTC (permalink / raw
To: gentoo-commits
zmedico 11/11/02 05:26:03
Modified: portage-9999.ebuild ChangeLog
Log:
Bump to EAPI 3 and add prefix support.
(Portage version: 2.2.0_alpha72_p4/cvs/Linux i686)
Revision Changes Path
1.31 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.30&r2=1.31
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- portage-9999.ebuild 26 Jul 2011 16:24:30 -0000 1.30
+++ portage-9999.ebuild 2 Nov 2011 05:26:03 -0000 1.31
@@ -1,10 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.30 2011/07/26 16:24:30 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.31 2011/11/02 05:26:03 zmedico Exp $
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=2
+EAPI=3
inherit git-2 eutils multilib python
DESCRIPTION="Portage is the package management and distribution system for Gentoo"
@@ -206,7 +204,7 @@
fi
symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
if [ -n "$symlinks" ] ; then
- cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+ cp -P $symlinks "${ED}$portage_base/$x" || die "cp failed"
fi
done
@@ -219,7 +217,7 @@
doins *.py || die "doins failed"
symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
if [ -n "$symlinks" ] ; then
- cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+ cp -P $symlinks "${ED}$portage_base/$x" || die "cp failed"
fi
done
@@ -237,7 +235,7 @@
# Symlinks to directories cause up/downgrade issues and the use of these
# modules outside of portage is probably negligible.
- for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do
+ for x in "${ED}${portage_base}/pym/"{cache,elog_modules} ; do
[ ! -L "${x}" ] && continue
die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
done
@@ -278,7 +276,7 @@
pkg_preinst() {
if [[ $ROOT == / ]] ; then
# Run some minimal tests as a sanity check.
- local test_runner=$(find "$D" -name runTests)
+ local test_runner=$(find "${ED}" -name runTests)
if [[ -n $test_runner && -x $test_runner ]] ; then
einfo "Running preinst sanity tests..."
"$test_runner" || die "preinst sanity tests failed"
@@ -293,8 +291,8 @@
ewarn "to enable RMD160 hash support."
ewarn "See bug #198398 for more information."
fi
- if [ -f "${ROOT}/etc/make.globals" ]; then
- rm "${ROOT}/etc/make.globals"
+ if [ ! -L "${EROOT}/etc/make.globals" ]; then
+ rm -f "${EROOT}/etc/make.globals"
fi
has_version "<${CATEGORY}/${PN}-2.2_alpha"
@@ -306,7 +304,7 @@
# If portage-2.1.6 is installed and the preserved_libs_registry exists,
# assume that the NEEDED.ELF.2 files have already been generated.
has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
- ! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \
+ ! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
has_version ">=${CATEGORY}/${PN}-2.1.6_rc" )
NEEDED_REBUILD_UPGRADE=$?
@@ -321,14 +319,14 @@
if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then
einfo "moving set references from the worldfile into world_sets"
- cd "${ROOT}/var/lib/portage/"
+ cd "${EROOT}/var/lib/portage/"
grep "^@" world >> world_sets
sed -i -e '/^@/d' world
fi
if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then
einfo "rebuilding NEEDED.ELF.2 files"
- for cpv in "${ROOT}/var/db/pkg"/*/*; do
+ for cpv in "${EROOT}/var/db/pkg"/*/*; do
if [ -f "${cpv}/NEEDED" ]; then
rm -f "${cpv}/NEEDED.ELF.2"
while read line; do
1.898 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.898&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.898&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.897&r2=1.898
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.897
retrieving revision 1.898
diff -u -r1.897 -r1.898
--- ChangeLog 30 Oct 2011 08:14:52 -0000 1.897
+++ ChangeLog 2 Nov 2011 05:26:03 -0000 1.898
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.897 2011/10/30 08:14:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.898 2011/11/02 05:26:03 zmedico Exp $
+
+ 02 Nov 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Bump to EAPI 3 and add prefix support.
*portage-2.2.0_alpha72 (30 Oct 2011)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2011-07-10 14:03 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2011-07-10 14:03 UTC (permalink / raw
To: gentoo-commits
zmedico 11/07/10 14:03:26
Modified: portage-9999.ebuild ChangeLog
Log:
Install minimal tests for preinst sanity check.
(Portage version: 2.2.0_alpha43_p31/cvs/Linux i686)
Revision Changes Path
1.28 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.27&r2=1.28
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- portage-9999.ebuild 28 Jun 2011 10:03:46 -0000 1.27
+++ portage-9999.ebuild 10 Jul 2011 14:03:25 -0000 1.28
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.27 2011/06/28 10:03:46 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.28 2011/07/10 14:03:25 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -220,6 +220,18 @@
fi
done
+ # We install some minimal tests for use as a preinst sanity check.
+ # These tests must be able to run without a full source tree and
+ # without relying on a previous portage instance being installed.
+ cd "$S" || die "cd failed"
+ exeinto $portage_base/pym/portage/tests || die
+ doexe pym/portage/tests/runTests || die
+ insinto $portage_base/pym/portage/tests || die
+ doins pym/portage/tests/*.py || die
+ insinto $portage_base/pym/portage/tests/lint || die
+ doins pym/portage/tests/lint/*.py || die
+ doins pym/portage/tests/lint/__test__ || die
+
# Symlinks to directories cause up/downgrade issues and the use of these
# modules outside of portage is probably negligible.
for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do
@@ -261,6 +273,15 @@
}
pkg_preinst() {
+ if [[ $ROOT == / ]] ; then
+ # Run some minimal tests as a sanity check.
+ local test_runner=$(find "$D" -name runTests)
+ if [[ -n $test_runner && -x $test_runner ]] ; then
+ einfo "Running preinst sanity tests..."
+ "$test_runner" || die "preinst sanity tests failed"
+ fi
+ fi
+
if ! use build && ! has_version dev-python/pycrypto && \
! has_version '>=dev-lang/python-2.6[ssl]' ; then
ewarn "If you are an ebuild developer and you plan to commit ebuilds"
1.848 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.848&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.848&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.847&r2=1.848
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.847
retrieving revision 1.848
diff -u -r1.847 -r1.848
--- ChangeLog 9 Jul 2011 09:31:22 -0000 1.847
+++ ChangeLog 10 Jul 2011 14:03:25 -0000 1.848
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.847 2011/07/09 09:31:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.848 2011/07/10 14:03:25 zmedico Exp $
+
+ 10 Jul 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Install minimal tests for preinst sanity check.
09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> portage-2.1.10.3.ebuild:
ppc64 stable wrt #373523
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2011-05-06 4:21 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2011-05-06 4:21 UTC (permalink / raw
To: gentoo-commits
zmedico 11/05/06 04:21:51
Modified: portage-9999.ebuild ChangeLog
Log:
Migrate to git-2.eclass.
(Portage version: 2.2.0_alpha31/cvs/Linux i686)
Revision Changes Path
1.23 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.22&r2=1.23
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- portage-9999.ebuild 9 Apr 2011 22:34:01 -0000 1.22
+++ portage-9999.ebuild 6 May 2011 04:21:51 -0000 1.23
@@ -1,11 +1,11 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.22 2011/04/09 22:34:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.23 2011/05/06 04:21:51 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
EAPI=2
-inherit git eutils multilib python
+inherit git-2 eutils multilib python
DESCRIPTION="Portage is the package management and distribution system for Gentoo"
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
@@ -105,7 +105,7 @@
einfo "Setting portage.VERSION to ${_version} ..."
sed -e "s/^VERSION=.*/VERSION='${_version}'/" -i pym/portage/__init__.py || \
die "Failed to patch portage.VERSION"
- sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
+ sed -e "1s/VERSION/${_version}/" -i doc/fragment/version || \
die "Failed to patch VERSION in doc/fragment/version"
sed -e "1s/VERSION/${_version}/" -i man/* || \
die "Failed to patch VERSION in man page headers"
1.823 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.823&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.823&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.822&r2=1.823
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.822
retrieving revision 1.823
diff -u -r1.822 -r1.823
--- ChangeLog 5 May 2011 19:42:06 -0000 1.822
+++ ChangeLog 6 May 2011 04:21:51 -0000 1.823
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.822 2011/05/05 19:42:06 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.823 2011/05/06 04:21:51 zmedico Exp $
+
+ 06 May 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Migrate to git-2.eclass.
*portage-2.2.0_alpha31 (05 May 2011)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2011-02-25 20:46 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2011-02-25 20:46 UTC (permalink / raw
To: gentoo-commits
zmedico 11/02/25 20:46:25
Modified: portage-9999.ebuild ChangeLog
Log:
25 Feb 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
Fix broken doexe call with all symlinks.
(Portage version: 2.2.0_alpha25/cvs/Linux i686)
Revision Changes Path
1.20 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.19&r2=1.20
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- portage-9999.ebuild 8 Feb 2011 23:00:59 -0000 1.19
+++ portage-9999.ebuild 25 Feb 2011 20:46:25 -0000 1.20
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.19 2011/02/08 23:00:59 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.20 2011/02/25 20:46:25 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -187,14 +187,16 @@
rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
fi
- local x symlinks
+ local x symlinks files
cd "$S" || die "cd failed"
for x in $(find bin -type d) ; do
exeinto $portage_base/$x || die "exeinto failed"
cd "$S"/$x || die "cd failed"
- doexe $(find . -mindepth 1 -maxdepth 1 -type f ! -type l) || \
- die "doexe failed"
+ files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
+ if [ -n "$files" ] ; then
+ doexe $files || die "doexe failed"
+ fi
symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
if [ -n "$symlinks" ] ; then
cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
1.804 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.804&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.804&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.803&r2=1.804
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.803
retrieving revision 1.804
diff -u -r1.803 -r1.804
--- ChangeLog 22 Feb 2011 19:46:40 -0000 1.803
+++ ChangeLog 25 Feb 2011 20:46:25 -0000 1.804
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.803 2011/02/22 19:46:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.804 2011/02/25 20:46:25 zmedico Exp $
+
+ 25 Feb 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Fix broken doexe call with all symlinks.
*portage-2.2.0_alpha25 (22 Feb 2011)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2010-09-20 4:32 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2010-09-20 4:32 UTC (permalink / raw
To: gentoo-commits
zmedico 10/09/20 04:32:31
Modified: portage-9999.ebuild ChangeLog
Log:
20 Sep 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
Bug #338006 - Omit --stat option when generating ChangeLog.
(Portage version: 2.2_rc85/cvs/Linux i686)
Revision Changes Path
1.14 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.13&r2=1.14
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- portage-9999.ebuild 17 Sep 2010 07:24:33 -0000 1.13
+++ portage-9999.ebuild 20 Sep 2010 04:32:31 -0000 1.14
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.13 2010/09/17 07:24:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.14 2010/09/20 04:32:31 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -209,7 +209,7 @@
doman "${S}"/man/*.[0-9]
echo 'Producing ChangeLog from Git history...'
- ( cd "${S}/.git" && git log --stat > "${S}"/ChangeLog )
+ ( cd "${S}/.git" && git log > "${S}"/ChangeLog )
dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die 'dodoc failed'
use doc && dohtml -r "${S}"/doc/*
use epydoc && dohtml -r "${WORKDIR}"/api
1.735 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.735&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.735&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.734&r2=1.735
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.734
retrieving revision 1.735
diff -u -r1.734 -r1.735
--- ChangeLog 20 Sep 2010 04:26:53 -0000 1.734
+++ ChangeLog 20 Sep 2010 04:32:31 -0000 1.735
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.734 2010/09/20 04:26:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.735 2010/09/20 04:32:31 zmedico Exp $
+
+ 20 Sep 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Bug #338006 - Omit --stat option when generating ChangeLog.
*portage-2.2_rc85 (20 Sep 2010)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2010-08-30 22:16 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2010-08-30 22:16 UTC (permalink / raw
To: gentoo-commits
zmedico 10/08/30 22:16:27
Modified: portage-9999.ebuild ChangeLog
Log:
Bug #267103 - Add /etc/portage to CONFIG_PROTECT_MASK.
(Portage version: 2.2_rc72_p31/cvs/Linux i686)
Revision Changes Path
1.9 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.8&r2=1.9
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- portage-9999.ebuild 30 Aug 2010 21:55:25 -0000 1.8
+++ portage-9999.ebuild 30 Aug 2010 22:16:27 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.8 2010/08/30 21:55:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.9 2010/08/30 22:16:27 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -140,6 +140,13 @@
insinto /etc
doins etc-update.conf dispatch-conf.conf || die
+ # This allows config file updates that are applied for package
+ # moves to take effect immediately.
+ echo 'CONFIG_PROTECT_MASK="/etc/portage"' > "$T"/50portage \
+ || die "failed to create 50portage"
+ doenvd "$T"/50portage || die "doenvd 50portage failed"
+ rm "$T"/50portage
+
insinto "$portage_share_config/sets"
doins "$S"/cnf/sets/*.conf || die
insinto "$portage_share_config"
1.716 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.716&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.716&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.715&r2=1.716
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.715
retrieving revision 1.716
diff -u -r1.715 -r1.716
--- ChangeLog 30 Aug 2010 21:55:25 -0000 1.715
+++ ChangeLog 30 Aug 2010 22:16:27 -0000 1.716
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.715 2010/08/30 21:55:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.716 2010/08/30 22:16:27 zmedico Exp $
+
+ 30 Aug 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Bug #267103 - Add /etc/portage to CONFIG_PROTECT_MASK.
30 Aug 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
Fix src_prepare to use the new VERSION sed template in order to substitute
^ permalink raw reply [flat|nested] 48+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2010-08-30 21:55 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2010-08-30 21:55 UTC (permalink / raw
To: gentoo-commits
zmedico 10/08/30 21:55:25
Modified: portage-9999.ebuild ChangeLog
Log:
Fix src_prepare to use the new VERSION sed template in order to substitute man page headers.
(Portage version: 2.2_rc72_p31/cvs/Linux i686)
Revision Changes Path
1.8 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.7&r2=1.8
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- portage-9999.ebuild 14 Aug 2010 18:55:53 -0000 1.7
+++ portage-9999.ebuild 30 Aug 2010 21:55:25 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.7 2010/08/14 18:55:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.8 2010/08/30 21:55:25 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -89,10 +89,13 @@
}
src_prepare() {
- local _version="'$(cd "${S}/.git" && git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')'[1:]"
+ local _version=$(cd "${S}/.git" && git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')
+ _version=${_version:1}
einfo "Setting portage.VERSION to ${_version} ..."
- sed -i "s/^VERSION=.*/VERSION=${_version}/" pym/portage/__init__.py || \
+ sed -e "s/^VERSION=.*/VERSION='${_version}'/" -i pym/portage/__init__.py || \
die "Failed to patch portage.VERSION"
+ sed -e "1s/VERSION/${_version}/" -i man/* || \
+ die "Failed to patch VERSION in man page headers"
if use python3; then
python_convert_shebangs -r 3 .
1.715 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.715&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.715&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.714&r2=1.715
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.714
retrieving revision 1.715
diff -u -r1.714 -r1.715
--- ChangeLog 29 Aug 2010 16:53:33 -0000 1.714
+++ ChangeLog 30 Aug 2010 21:55:25 -0000 1.715
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.714 2010/08/29 16:53:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.715 2010/08/30 21:55:25 zmedico Exp $
+
+ 30 Aug 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Fix src_prepare to use the new VERSION sed template in order to substitute
+ man page headers.
*portage-2.2_rc72 (29 Aug 2010)
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2010-08-14 18:55 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2010-08-14 18:55 UTC (permalink / raw
To: gentoo-commits
zmedico 10/08/14 18:55:53
Modified: portage-9999.ebuild ChangeLog
Log:
Use runtests.sh in src_test().
(Portage version: 2.2_rc67_p522/cvs/Linux i686)
Revision Changes Path
1.7 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.6&r2=1.7
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- portage-9999.ebuild 3 Aug 2010 04:29:58 -0000 1.6
+++ portage-9999.ebuild 14 Aug 2010 18:55:53 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.6 2010/08/03 04:29:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.7 2010/08/14 18:55:53 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -125,10 +125,7 @@
}
src_test() {
- PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
- ./pym/portage/tests/runTests || die "test(s) failed"
- # Prevent installation of *.pyc for python scripts.
- find "$S/bin" -name "*.py[co]" -print0 | xargs -0 rm
+ ./runtests.sh || die "tests failed"
}
src_install() {
1.709 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.709&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.709&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.708&r2=1.709
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.708
retrieving revision 1.709
diff -u -r1.708 -r1.709
--- ChangeLog 3 Aug 2010 04:29:58 -0000 1.708
+++ ChangeLog 14 Aug 2010 18:55:53 -0000 1.709
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.708 2010/08/03 04:29:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.709 2010/08/14 18:55:53 zmedico Exp $
+
+ 14 Aug 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Use runtests.sh in src_test().
03 Aug 2010; Zac Medico <zmedico@gentoo.org> portage-2.1.7.17.ebuild,
portage-2.1.8.3.ebuild, portage-2.2_rc67.ebuild, portage-9999.ebuild:
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2010-07-27 7:52 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2010-07-27 7:52 UTC (permalink / raw
To: gentoo-commits
zmedico 10/07/27 07:52:42
Modified: portage-9999.ebuild ChangeLog
Log:
Fix installation of sets/portage.conf (was sets.conf):
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=addd9a9b6027260bfbde35efc5408b5efe5341d6
(Portage version: 2.2_rc67_p275/cvs/Linux i686)
Revision Changes Path
1.5 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.4&r2=1.5
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- portage-9999.ebuild 28 Apr 2010 07:26:51 -0000 1.4
+++ portage-9999.ebuild 27 Jul 2010 07:52:42 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.4 2010/04/28 07:26:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.5 2010/07/27 07:52:42 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -137,8 +137,10 @@
insinto /etc
doins etc-update.conf dispatch-conf.conf || die
- insinto "${portage_share_config}"
- doins "${S}/cnf/"{sets.conf,make.globals} || die
+ insinto "$portage_share_config/sets"
+ doins "$S"/cnf/sets/*.conf || die
+ insinto "$portage_share_config"
+ doins "$S/cnf/make.globals" || die
if [ -f "make.conf.${ARCH}".diff ]; then
patch make.conf "make.conf.${ARCH}".diff || \
die "Failed to patch make.conf.example"
1.707 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.707&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.707&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.706&r2=1.707
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.706
retrieving revision 1.707
diff -u -r1.706 -r1.707
--- ChangeLog 20 Jul 2010 23:10:32 -0000 1.706
+++ ChangeLog 27 Jul 2010 07:52:42 -0000 1.707
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.706 2010/07/20 23:10:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.707 2010/07/27 07:52:42 zmedico Exp $
+
+ 27 Jul 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Fix installation of sets/portage.conf (was sets.conf).
20 Jul 2010; Zac Medico <zmedico@gentoo.org> -portage-2.2_rc62.ebuild:
Remove old version.
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2010-04-28 7:26 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2010-04-28 7:26 UTC (permalink / raw
To: gentoo-commits
zmedico 10/04/28 07:26:51
Modified: portage-9999.ebuild ChangeLog
Log:
Fix whitespace handling when installing bin and pym directores.
(Portage version: 2.2_rc67_p93/cvs/Linux i686)
Revision Changes Path
1.4 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.3&r2=1.4
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- portage-9999.ebuild 28 Mar 2010 05:49:39 -0000 1.3
+++ portage-9999.ebuild 28 Apr 2010 07:26:51 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.3 2010/03/28 05:49:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.4 2010/04/28 07:26:51 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -163,8 +163,8 @@
local x symlinks
- for x in $(find "$S"/bin -type d) ; do
- x=${x#$S/}
+ cd "$S" || die "cd failed"
+ for x in $(find bin -type d) ; do
exeinto $portage_base/$x || die "exeinto failed"
cd "$S"/$x || die "cd failed"
doexe $(find . -mindepth 1 -maxdepth 1 -type f ! -type l) || \
@@ -175,8 +175,8 @@
fi
done
- for x in $(find "$S"/pym -type d) ; do
- x=${x#$S/}
+ cd "$S" || die "cd failed"
+ for x in $(find pym/* -type d) ; do
insinto $portage_base/$x || die "insinto failed"
cd "$S"/$x || die "cd failed"
doins *.py || die "doins failed"
1.702 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.702&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.702&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.701&r2=1.702
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.701
retrieving revision 1.702
diff -u -r1.701 -r1.702
--- ChangeLog 14 Apr 2010 18:52:02 -0000 1.701
+++ ChangeLog 28 Apr 2010 07:26:51 -0000 1.702
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.701 2010/04/14 18:52:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.702 2010/04/28 07:26:51 zmedico Exp $
+
+ 28 Apr 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ Fix whitespace handling when installing bin and pym directores.
14 Apr 2010; Jeroen Roovers <jer@gentoo.org> portage-2.1.8.3.ebuild:
Stable for HPPA (bug #314247).
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2010-03-28 5:49 Zac Medico (zmedico)
0 siblings, 0 replies; 48+ messages in thread
From: Zac Medico (zmedico) @ 2010-03-28 5:49 UTC (permalink / raw
To: gentoo-commits
zmedico 10/03/28 05:49:39
Modified: portage-9999.ebuild ChangeLog
Log:
In src_test, remove *.pyc from bin directory so they won't be installed.
(Portage version: 2.2_rc67_p37/cvs/Linux x86_64)
Revision Changes Path
1.3 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.2&r2=1.3
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- portage-9999.ebuild 25 Mar 2010 02:38:15 -0000 1.2
+++ portage-9999.ebuild 28 Mar 2010 05:49:39 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.2 2010/03/25 02:38:15 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.3 2010/03/28 05:49:39 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -124,6 +124,8 @@
src_test() {
PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
./pym/portage/tests/runTests || die "test(s) failed"
+ # Prevent installation of *.pyc for python scripts.
+ find "$S/bin" -name "*.py[co]" -print0 | xargs -0 rm
}
src_install() {
1.696 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.696&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.696&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.695&r2=1.696
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.695
retrieving revision 1.696
diff -u -r1.695 -r1.696
--- ChangeLog 25 Mar 2010 02:38:15 -0000 1.695
+++ ChangeLog 28 Mar 2010 05:49:39 -0000 1.696
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.695 2010/03/25 02:38:15 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.696 2010/03/28 05:49:39 zmedico Exp $
+
+ 28 Mar 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+ In src_test, remove *.pyc from bin directory so they won't be installed.
25 Mar 2010; Sebastian Pipping <sping@gentoo.org> portage-9999.ebuild:
Fix live ebuild versioning:
^ permalink raw reply [flat|nested] 48+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog
@ 2010-03-25 2:38 Sebastian Pipping (sping)
0 siblings, 0 replies; 48+ messages in thread
From: Sebastian Pipping (sping) @ 2010-03-25 2:38 UTC (permalink / raw
To: gentoo-commits
sping 10/03/25 02:38:15
Modified: portage-9999.ebuild ChangeLog
Log:
sys-apps/portage: Fix live ebuild versioning
(Portage version: 2.2_rc67_p26/cvs/Linux i686)
Revision Changes Path
1.2 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.1&r2=1.2
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- portage-9999.ebuild 25 Mar 2010 02:17:04 -0000 1.1
+++ portage-9999.ebuild 25 Mar 2010 02:38:15 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.1 2010/03/25 02:17:04 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.2 2010/03/25 02:38:15 sping Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -86,7 +86,7 @@
}
src_prepare() {
- local _version="'$(cd "${S}/.git" && git describe --tags)'[1:]"
+ local _version="'$(cd "${S}/.git" && git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')'[1:]"
einfo "Setting portage.VERSION to ${_version} ..."
sed -i "s/^VERSION=.*/VERSION=${_version}/" pym/portage/__init__.py || \
die "Failed to patch portage.VERSION"
1.695 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.695&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.695&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.694&r2=1.695
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.694
retrieving revision 1.695
diff -u -r1.694 -r1.695
--- ChangeLog 25 Mar 2010 02:17:04 -0000 1.694
+++ ChangeLog 25 Mar 2010 02:38:15 -0000 1.695
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.694 2010/03/25 02:17:04 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.695 2010/03/25 02:38:15 sping Exp $
+
+ 25 Mar 2010; Sebastian Pipping <sping@gentoo.org> portage-9999.ebuild:
+ Fix live ebuild versioning:
+ - OLD: 2.2_rc67-26-g1f09ba1
+ - NEW: 2.2_rc67_p26
*portage-9999 (25 Mar 2010)
^ permalink raw reply [flat|nested] 48+ messages in thread
end of thread, other threads:[~2015-04-25 15:46 UTC | newest]
Thread overview: 48+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-12 17:59 [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog Zac Medico (zmedico)
-- strict thread matches above, loose matches on Subject: below --
2015-04-25 15:46 Brian Dolbec (dolsen)
2015-04-25 15:32 Brian Dolbec (dolsen)
2015-02-13 17:47 Brian Dolbec (dolsen)
2014-12-06 17:34 Brian Dolbec (dolsen)
2014-09-26 17:04 Brian Dolbec (dolsen)
2014-09-26 2:28 Brian Dolbec (dolsen)
2014-09-12 7:04 Michal Gorny (mgorny)
2014-09-11 22:46 Michal Gorny (mgorny)
2014-07-26 9:48 Michal Gorny (mgorny)
2014-04-06 15:32 Michal Gorny (mgorny)
2014-01-13 23:25 Mike Gilbert (floppym)
2014-01-13 19:56 Brian Dolbec (dolsen)
2013-07-26 20:07 Zac Medico (zmedico)
2013-07-25 22:09 Zac Medico (zmedico)
2013-07-25 18:11 Zac Medico (zmedico)
2013-07-23 3:18 Zac Medico (zmedico)
2013-07-22 3:13 Zac Medico (zmedico)
2013-07-21 16:42 Zac Medico (zmedico)
2013-05-16 13:59 Zac Medico (zmedico)
2013-03-21 23:39 Zac Medico (zmedico)
2013-01-14 23:15 Zac Medico (zmedico)
2013-01-14 17:47 Zac Medico (zmedico)
2012-07-24 19:17 Zac Medico (zmedico)
2012-07-24 9:11 Michal Gorny (mgorny)
2012-06-23 7:32 Zac Medico (zmedico)
2012-06-04 23:04 Zac Medico (zmedico)
2012-03-23 19:02 Zac Medico (zmedico)
2012-03-17 1:57 Zac Medico (zmedico)
2012-02-14 19:06 Zac Medico (zmedico)
2011-12-22 4:46 Zac Medico (zmedico)
2011-12-10 0:50 Zac Medico (zmedico)
2011-12-09 20:29 Zac Medico (zmedico)
2011-12-09 17:59 Zac Medico (zmedico)
2011-12-08 22:44 Zac Medico (zmedico)
2011-11-11 18:21 Zac Medico (zmedico)
2011-11-02 5:26 Zac Medico (zmedico)
2011-07-10 14:03 Zac Medico (zmedico)
2011-05-06 4:21 Zac Medico (zmedico)
2011-02-25 20:46 Zac Medico (zmedico)
2010-09-20 4:32 Zac Medico (zmedico)
2010-08-30 22:16 Zac Medico (zmedico)
2010-08-30 21:55 Zac Medico (zmedico)
2010-08-14 18:55 Zac Medico (zmedico)
2010-07-27 7:52 Zac Medico (zmedico)
2010-04-28 7:26 Zac Medico (zmedico)
2010-03-28 5:49 Zac Medico (zmedico)
2010-03-25 2:38 Sebastian Pipping (sping)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox