| 1 |
zmedico 10/10/07 06:15:30 |
| 2 |
|
| 3 |
Modified: metadata.xml portage-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add an 'ipc' USE flag so it can be disabled if it causes problems. |
| 6 |
|
| 7 |
(Portage version: 2.2_rc90_p4/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.17 sys-apps/portage/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/metadata.xml?rev=1.17&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/metadata.xml?rev=1.17&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/metadata.xml?r1=1.16&r2=1.17 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/metadata.xml,v |
| 19 |
retrieving revision 1.16 |
| 20 |
retrieving revision 1.17 |
| 21 |
diff -u -r1.16 -r1.17 |
| 22 |
--- metadata.xml 20 Jul 2010 23:03:42 -0000 1.16 |
| 23 |
+++ metadata.xml 7 Oct 2010 06:15:30 -0000 1.17 |
| 24 |
@@ -9,6 +9,7 @@ |
| 25 |
<maintainer><email>dev-portage@g.o</email></maintainer> |
| 26 |
<use> |
| 27 |
<flag name="epydoc">Build html API documentation with epydoc.</flag> |
| 28 |
+ <flag name="ipc">Use inter-process communication between portage and running ebuilds.</flag> |
| 29 |
<flag name="python3">Use python3 as Python interpreter.</flag> |
| 30 |
</use> |
| 31 |
</pkgmetadata> |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.16 sys-apps/portage/portage-9999.ebuild |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.16&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.16&content-type=text/plain |
| 39 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.15&r2=1.16 |
| 40 |
|
| 41 |
Index: portage-9999.ebuild |
| 42 |
=================================================================== |
| 43 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v |
| 44 |
retrieving revision 1.15 |
| 45 |
retrieving revision 1.16 |
| 46 |
diff -u -r1.15 -r1.16 |
| 47 |
--- portage-9999.ebuild 26 Sep 2010 08:56:20 -0000 1.15 |
| 48 |
+++ portage-9999.ebuild 7 Oct 2010 06:15:30 -0000 1.16 |
| 49 |
@@ -1,6 +1,6 @@ |
| 50 |
# Copyright 1999-2010 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.15 2010/09/26 08:56:20 zmedico Exp $ |
| 53 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.16 2010/10/07 06:15:30 zmedico Exp $ |
| 54 |
|
| 55 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 56 |
# syntax support) which also requires EAPI 2. |
| 57 |
@@ -13,7 +13,7 @@ |
| 58 |
KEYWORDS="" |
| 59 |
PROVIDE="virtual/portage" |
| 60 |
SLOT="0" |
| 61 |
-IUSE="build doc epydoc python3 selinux" |
| 62 |
+IUSE="build doc epydoc +ipc python3 selinux" |
| 63 |
|
| 64 |
python_dep="python3? ( =dev-lang/python-3* ) |
| 65 |
!python3? ( |
| 66 |
@@ -100,7 +100,15 @@ |
| 67 |
sed -e "1s/VERSION/${_version}/" -i man/* || \ |
| 68 |
die "Failed to patch VERSION in man page headers" |
| 69 |
|
| 70 |
+ if ! use ipc ; then |
| 71 |
+ einfo "Disabling ipc..." |
| 72 |
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
| 73 |
+ -i pym/_emerge/AbstractEbuildProcess.py || \ |
| 74 |
+ die "failed to patch AbstractEbuildProcess.py" |
| 75 |
+ fi |
| 76 |
+ |
| 77 |
if use python3; then |
| 78 |
+ einfo "Converting shebangs for python3..." |
| 79 |
python_convert_shebangs -r 3 . |
| 80 |
fi |
| 81 |
} |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.745 sys-apps/portage/ChangeLog |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.745&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.745&content-type=text/plain |
| 89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.744&r2=1.745 |
| 90 |
|
| 91 |
Index: ChangeLog |
| 92 |
=================================================================== |
| 93 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
| 94 |
retrieving revision 1.744 |
| 95 |
retrieving revision 1.745 |
| 96 |
diff -u -r1.744 -r1.745 |
| 97 |
--- ChangeLog 6 Oct 2010 21:09:37 -0000 1.744 |
| 98 |
+++ ChangeLog 7 Oct 2010 06:15:30 -0000 1.745 |
| 99 |
@@ -1,6 +1,10 @@ |
| 100 |
# ChangeLog for sys-apps/portage |
| 101 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 102 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.744 2010/10/06 21:09:37 zmedico Exp $ |
| 103 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.745 2010/10/07 06:15:30 zmedico Exp $ |
| 104 |
+ |
| 105 |
+ 07 Oct 2010; Zac Medico <zmedico@g.o> portage-9999.ebuild, |
| 106 |
+ metadata.xml: |
| 107 |
+ Add an 'ipc' USE flag so it can be disabled if it causes problems. |
| 108 |
|
| 109 |
*portage-2.2_rc90 (06 Oct 2010) |
Archives