Merge from Prefix

Package-Manager: portage-2.2.00.14552-prefix/cvs/Darwin powerpc
RepoMan-Options: --force

22 files changed, 89 insertions, 44 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index 815c9f8a5ecd..872b85795e99 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.80 2009/09/22 04:40:05 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.81 2009/10/11 10:37:08 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org>
+  pygobject-2.18.0-r2.ebuild:
+  Merge from Prefix
 
   21 Sep 2009; Tom Gall <tgall@gentoo.org> pygobject-2.18.0.ebuild:
   stable on ppc64, bug #277947
diff --git a/dev-python/pygobject/pygobject-2.18.0-r2.ebuild b/dev-python/pygobject/pygobject-2.18.0-r2.ebuild
index 52f58cee3524..e92104bf0a85 100644
--- a/dev-python/pygobject/pygobject-2.18.0-r2.ebuild
+++ b/dev-python/pygobject/pygobject-2.18.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.18.0-r2.ebuild,v 1.1 2009/08/28 17:15:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.18.0-r2.ebuild,v 1.2 2009/10/11 10:37:08 grobian Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples libffi test"
 
 RDEPEND=">=dev-lang/python-2.4.4-r5
@@ -85,10 +85,11 @@ src_test() {
 }
 
 src_install() {
+	[[ -z ${ED} ]] && local ED=${D}
 	installation() {
 		gnome2_src_install
-		mv "${D}$(python_get_sitedir)/pygtk.py" "${D}$(python_get_sitedir)/pygtk.py-2.0"
-		mv "${D}$(python_get_sitedir)/pygtk.pth" "${D}$(python_get_sitedir)/pygtk.pth-2.0"
+		mv "${ED}$(python_get_sitedir)/pygtk.py" "${D}$(python_get_sitedir)/pygtk.py-2.0"
+		mv "${ED}$(python_get_sitedir)/pygtk.pth" "${D}$(python_get_sitedir)/pygtk.pth-2.0"
 	}
 	python_execute_function -s installation
 
@@ -97,6 +98,13 @@ src_install() {
 		doins -r examples
 	fi
 
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# our python expects a bundle
+		mv "${ED}"$(python_get_sitedir)/gtk-2.0/gio/_gio.{so,bundle} || die
+		mv "${ED}"$(python_get_sitedir)/gtk-2.0/gio/unix.{so,bundle} || die
+		mv "${ED}"$(python_get_sitedir)/gtk-2.0/glib/_glib.{so,bundle} || die
+		mv "${ED}"$(python_get_sitedir)/gtk-2.0/gobject/_gobject.{so,bundle} || die
+	fi
 }
 
 pkg_postinst() {
diff --git a/dev-python/pygoogle/ChangeLog b/dev-python/pygoogle/ChangeLog
index 02707164efcb..3bb42ac2aa75 100644
--- a/dev-python/pygoogle/ChangeLog
+++ b/dev-python/pygoogle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pygoogle
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygoogle/ChangeLog,v 1.16 2008/01/17 18:35:50 grobian Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygoogle/ChangeLog,v 1.17 2009/10/11 10:38:46 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pygoogle-0.6.ebuild:
+  Merge from Prefix
 
   17 Jan 2008; Fabian Groffen <grobian@gentoo.org> pygoogle-0.6.ebuild:
   Dropped ppc-macos keyword, see you in prefix
diff --git a/dev-python/pygoogle/pygoogle-0.6.ebuild b/dev-python/pygoogle/pygoogle-0.6.ebuild
index 2519a6d329be..88819960f698 100644
--- a/dev-python/pygoogle/pygoogle-0.6.ebuild
+++ b/dev-python/pygoogle/pygoogle-0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygoogle/pygoogle-0.6.ebuild,v 1.6 2008/01/17 18:35:50 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygoogle/pygoogle-0.6.ebuild,v 1.7 2009/10/11 10:38:46 grobian Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://pygoogle.sourceforge.net/"
 IUSE=""
 SLOT="0"
 LICENSE="PYTHON"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="virtual/python
 	>=dev-python/soappy-0.11.3"
diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index 0abe0ab1d648..e4724961da5f 100644
--- a/dev-python/pygtk/ChangeLog
+++ b/dev-python/pygtk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pygtk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.223 2009/09/09 18:31:08 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.224 2009/10/11 10:42:20 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pygtk-2.16.0-r1.ebuild:
+  Merge from Prefix
 
 *pygtk-2.16.0-r1 (09 Sep 2009)
 
diff --git a/dev-python/pygtk/pygtk-2.16.0-r1.ebuild b/dev-python/pygtk/pygtk-2.16.0-r1.ebuild
index 4608ebe35c1b..cf27ad63043f 100644
--- a/dev-python/pygtk/pygtk-2.16.0-r1.ebuild
+++ b/dev-python/pygtk/pygtk-2.16.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.16.0-r1.ebuild,v 1.1 2009/09/09 18:31:08 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.16.0-r1.ebuild,v 1.2 2009/10/11 10:42:20 grobian Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 
 RDEPEND=">=dev-libs/glib-2.8.0
diff --git a/dev-python/pygtksourceview/ChangeLog b/dev-python/pygtksourceview/ChangeLog
index 96686a33f3dd..3bb3cc8cbf45 100644
--- a/dev-python/pygtksourceview/ChangeLog
+++ b/dev-python/pygtksourceview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pygtksourceview
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtksourceview/ChangeLog,v 1.27 2009/10/08 03:16:38 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtksourceview/ChangeLog,v 1.28 2009/10/11 10:44:15 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org>
+  pygtksourceview-2.6.0.ebuild:
+  Merge from Prefix
 
   08 Oct 2009; Olivier Crête <tester@gentoo.org>
   pygtksourceview-2.6.0.ebuild:
diff --git a/dev-python/pygtksourceview/pygtksourceview-2.6.0.ebuild b/dev-python/pygtksourceview/pygtksourceview-2.6.0.ebuild
index 8f67381242cd..a32f7d081d63 100644
--- a/dev-python/pygtksourceview/pygtksourceview-2.6.0.ebuild
+++ b/dev-python/pygtksourceview/pygtksourceview-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtksourceview/pygtksourceview-2.6.0.ebuild,v 1.2 2009/10/08 03:16:38 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtksourceview/pygtksourceview-2.6.0.ebuild,v 1.3 2009/10/11 10:44:15 grobian Exp $
 
 inherit gnome2 flag-o-matic multilib
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 
 RDEPEND=">=dev-python/pygobject-2.15.2
diff --git a/dev-python/pylint/ChangeLog b/dev-python/pylint/ChangeLog
index eb1127fe6e6a..fd08b6a4f584 100644
--- a/dev-python/pylint/ChangeLog
+++ b/dev-python/pylint/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pylint
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/ChangeLog,v 1.52 2009/09/20 17:58:01 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/ChangeLog,v 1.53 2009/10/11 10:46:42 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pylint-0.18.1-r1.ebuild:
+  Merge from Prefix
 
 *pylint-0.18.1-r1 (20 Sep 2009)
 
diff --git a/dev-python/pylint/pylint-0.18.1-r1.ebuild b/dev-python/pylint/pylint-0.18.1-r1.ebuild
index 24405797baf6..379c0e7a3e6f 100644
--- a/dev-python/pylint/pylint-0.18.1-r1.ebuild
+++ b/dev-python/pylint/pylint-0.18.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/pylint-0.18.1-r1.ebuild,v 1.1 2009/09/20 17:58:01 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/pylint-0.18.1-r1.ebuild,v 1.2 2009/10/11 10:46:42 grobian Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.logilab.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc examples test tk"
 
 DEPEND=">=dev-python/logilab-common-0.38
diff --git a/dev-python/pyopenssl/ChangeLog b/dev-python/pyopenssl/ChangeLog
index 1daf8d938c50..9b953698a432 100644
--- a/dev-python/pyopenssl/ChangeLog
+++ b/dev-python/pyopenssl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyopenssl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.37 2009/10/10 10:00:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.38 2009/10/11 10:48:23 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pyopenssl-0.9-r1.ebuild:
+  Merge from Prefix
 
   10 Oct 2009; Markus Meier <maekke@gentoo.org> pyopenssl-0.9-r1.ebuild:
   amd64/arm/x86 stable, bug #287563
diff --git a/dev-python/pyopenssl/pyopenssl-0.9-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.9-r1.ebuild
index 520474b7d769..9976f7c340e0 100644
--- a/dev-python/pyopenssl/pyopenssl-0.9-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.9-r1.ebuild,v 1.4 2009/10/10 10:00:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.9-r1.ebuild,v 1.5 2009/10/11 10:48:23 grobian Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/pyopenssl/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/openssl-0.9.6g"
diff --git a/dev-python/pyorbit/ChangeLog b/dev-python/pyorbit/ChangeLog
index f13a72cb91cc..7f42e94f9962 100644
--- a/dev-python/pyorbit/ChangeLog
+++ b/dev-python/pyorbit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyorbit
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/ChangeLog,v 1.67 2009/04/28 11:11:29 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/ChangeLog,v 1.68 2009/10/11 10:51:00 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pyorbit-2.24.0.ebuild:
+  Merge from Prefix
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org> pyorbit-2.24.0.ebuild:
   sh stable
diff --git a/dev-python/pyorbit/pyorbit-2.24.0.ebuild b/dev-python/pyorbit/pyorbit-2.24.0.ebuild
index 7855b718da13..015965c806ff 100644
--- a/dev-python/pyorbit/pyorbit-2.24.0.ebuild
+++ b/dev-python/pyorbit/pyorbit-2.24.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/pyorbit-2.24.0.ebuild,v 1.9 2009/04/28 11:11:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/pyorbit-2.24.0.ebuild,v 1.10 2009/10/11 10:51:00 grobian Exp $
 
 inherit python gnome2 multilib
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/python-2.4
@@ -27,14 +27,15 @@ src_unpack() {
 }
 
 src_install() {
+	[[ -z ${ED} ]] && local ED=${D}
 	gnome2_src_install
 
 	python_version
-	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/CORBA.py \
-		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pyorbit_CORBA.py
+	mv "${ED}"/usr/$(get_libdir)/python${PYVER}/site-packages/CORBA.py \
+		"${ED}"/usr/$(get_libdir)/python${PYVER}/site-packages/pyorbit_CORBA.py
 
-	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/PortableServer.py \
-		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pyorbit_PortableServer.py
+	mv "${ED}"/usr/$(get_libdir)/python${PYVER}/site-packages/PortableServer.py \
+		"${ED}"/usr/$(get_libdir)/python${PYVER}/site-packages/pyorbit_PortableServer.py
 }
 
 pkg_postinst() {
diff --git a/dev-python/pyparsing/ChangeLog b/dev-python/pyparsing/ChangeLog
index 12845fb1a3ea..18350b432904 100644
--- a/dev-python/pyparsing/ChangeLog
+++ b/dev-python/pyparsing/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyparsing
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/ChangeLog,v 1.44 2009/10/07 18:08:54 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/ChangeLog,v 1.45 2009/10/11 10:52:47 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pyparsing-1.5.2.ebuild:
+  Merge from Prefix
 
   07 Oct 2009; nixnut <nixnut@gentoo.org> pyparsing-1.5.2.ebuild:
   ppc stable #287627
diff --git a/dev-python/pyparsing/pyparsing-1.5.2.ebuild b/dev-python/pyparsing/pyparsing-1.5.2.ebuild
index 0d9820f264b4..e2dba8bf360b 100644
--- a/dev-python/pyparsing/pyparsing-1.5.2.ebuild
+++ b/dev-python/pyparsing/pyparsing-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.5.2.ebuild,v 1.3 2009/10/07 18:08:54 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.5.2.ebuild,v 1.4 2009/10/11 10:52:47 grobian Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples"
 
 DEPEND=""
diff --git a/dev-python/pyprotocols/ChangeLog b/dev-python/pyprotocols/ChangeLog
index 1de1e2a1e332..67897f550830 100644
--- a/dev-python/pyprotocols/ChangeLog
+++ b/dev-python/pyprotocols/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyprotocols
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyprotocols/ChangeLog,v 1.18 2007/12/31 16:30:53 josejx Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyprotocols/ChangeLog,v 1.19 2009/10/11 10:54:18 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org>
+  pyprotocols-1.0_pre2306.ebuild:
+  Merge from Prefix
 
   31 Dec 2007; Joseph Jezak <josejx@gentoo.org> pyprotocols-0.9.3.ebuild,
   pyprotocols-1.0_pre2306.ebuild:
diff --git a/dev-python/pyprotocols/pyprotocols-1.0_pre2306.ebuild b/dev-python/pyprotocols/pyprotocols-1.0_pre2306.ebuild
index 059b0a134c5c..c15075f69fed 100644
--- a/dev-python/pyprotocols/pyprotocols-1.0_pre2306.ebuild
+++ b/dev-python/pyprotocols/pyprotocols-1.0_pre2306.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyprotocols/pyprotocols-1.0_pre2306.ebuild,v 1.5 2007/12/31 16:30:53 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyprotocols/pyprotocols-1.0_pre2306.ebuild,v 1.6 2009/10/11 10:54:18 grobian Exp $
 
 NEED_PYTHON=2.4
 
@@ -12,7 +12,7 @@ MY_P=${MY_PN}-${PV/_pre/a0dev_r}
 DESCRIPTION="Extends the PEP 246 adapt() function with a new 'declaration API' that lets you easily define your own protocols and adapters, and declare what adapters should be used to adapt what types, objects, or protocols."
 HOMEPAGE="http://peak.telecommunity.com/PyProtocols.html"
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 LICENSE="|| ( PSF-2.4 ZPL )"
 SLOT="0"
 IUSE=""
diff --git a/dev-python/pyrex/ChangeLog b/dev-python/pyrex/ChangeLog
index c9ec054521c3..660a74104b24 100644
--- a/dev-python/pyrex/ChangeLog
+++ b/dev-python/pyrex/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyrex
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/ChangeLog,v 1.75 2009/10/10 09:59:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/ChangeLog,v 1.76 2009/10/11 10:55:46 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pyrex-0.9.8.5-r1.ebuild:
+  Merge from Prefix
 
   10 Oct 2009; Markus Meier <maekke@gentoo.org> pyrex-0.9.8.5-r1.ebuild:
   amd64/arm/x86 stable, bug #287562
diff --git a/dev-python/pyrex/pyrex-0.9.8.5-r1.ebuild b/dev-python/pyrex/pyrex-0.9.8.5-r1.ebuild
index ef22e0603f27..3cb878ac3246 100644
--- a/dev-python/pyrex/pyrex-0.9.8.5-r1.ebuild
+++ b/dev-python/pyrex/pyrex-0.9.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.8.5-r1.ebuild,v 1.3 2009/10/10 09:59:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.8.5-r1.ebuild,v 1.4 2009/10/11 10:55:46 grobian Exp $
 
 EAPI="2"
 NEED_PYTHON=2.3
@@ -15,7 +15,7 @@ SRC_URI="http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="examples"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyro/ChangeLog b/dev-python/pyro/ChangeLog
index 1b6526ee272b..472ebb939f19 100644
--- a/dev-python/pyro/ChangeLog
+++ b/dev-python/pyro/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyro
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/ChangeLog,v 1.21 2009/09/18 23:16:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/ChangeLog,v 1.22 2009/10/11 10:57:21 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pyro-3.9.1.ebuild:
+  Merge from Prefix
 
   18 Sep 2009; Markus Meier <maekke@gentoo.org> pyro-3.9.1.ebuild:
   amd64 stable, bug #284997
diff --git a/dev-python/pyro/pyro-3.9.1.ebuild b/dev-python/pyro/pyro-3.9.1.ebuild
index a86ce57c8e22..01a6fbc46d93 100644
--- a/dev-python/pyro/pyro-3.9.1.ebuild
+++ b/dev-python/pyro/pyro-3.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-3.9.1.ebuild,v 1.4 2009/09/18 23:16:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-3.9.1.ebuild,v 1.5 2009/10/11 10:57:21 grobian Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyro/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc x86"
+KEYWORDS="amd64 ~ia64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 DEPEND=""