Encoding declarations fixed to be Python 2.5 compatible.

(Portage version: 2.1.2.11)

5 files changed, 35 insertions, 3 deletions

diff --git a/x11-wm/plwm/ChangeLog b/x11-wm/plwm/ChangeLog
index 37465ccb0246..9a9bb17013bb 100644
--- a/x11-wm/plwm/ChangeLog
+++ b/x11-wm/plwm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/plwm
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/ChangeLog,v 1.12 2007/07/01 21:45:32 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/ChangeLog,v 1.13 2007/08/27 13:44:50 coldwind Exp $
+
+  27 Aug 2007; Santiago M. Mola <coldwind@gentoo.org>
+  +files/plwm-2.5-pep0263.patch, +files/plwm-2.6_alpha-pep0263.patch,
+  plwm-2.5-r1.ebuild, plwm-2.6_alpha-r1.ebuild:
+  Encoding declarations fixed to be Python 2.5 compatible.
 
   01 Jul 2007; Santiago M. Mola <coldwind@gentoo.org> -plwm-2.5.ebuild,
   -plwm-2.6_alpha.ebuild:
diff --git a/x11-wm/plwm/files/plwm-2.5-pep0263.patch b/x11-wm/plwm/files/plwm-2.5-pep0263.patch
new file mode 100644
index 000000000000..ae4562d42073
--- /dev/null
+++ b/x11-wm/plwm/files/plwm-2.5-pep0263.patch
@@ -0,0 +1,8 @@
+diff -ur plwm-2.5.orig/plwm/mw_apm.py plwm-2.5/plwm/mw_apm.py
+--- plwm-2.5.orig/plwm/mw_apm.py	2007-08-27 15:02:46.000000000 +0200
++++ plwm-2.5/plwm/mw_apm.py	2007-08-27 15:04:01.000000000 +0200
+@@ -1,3 +1,4 @@
++# -*- coding: utf-8 -*-
+ # $Id: mw_apm.py,v 1.4 2001/10/18 09:36:52 petli Exp $
+ #
+ # mw_apm.py -- display APM status in a modewindow
diff --git a/x11-wm/plwm/files/plwm-2.6_alpha-pep0263.patch b/x11-wm/plwm/files/plwm-2.6_alpha-pep0263.patch
new file mode 100644
index 000000000000..62d04e7d0fd9
--- /dev/null
+++ b/x11-wm/plwm/files/plwm-2.6_alpha-pep0263.patch
@@ -0,0 +1,17 @@
+diff -ur PLWM-2.6a.orig/examples/hrwwm.py PLWM-2.6a/examples/hrwwm.py
+--- PLWM-2.6a.orig/examples/hrwwm.py	2007-08-27 15:06:29.000000000 +0200
++++ PLWM-2.6a/examples/hrwwm.py	2007-08-27 15:07:33.000000000 +0200
+@@ -1,4 +1,5 @@
+ #!/usr/bin/env python
++# -*- coding: utf-8 -*-
+ #
+ # hrwwm.py -- Example PLWM window manager "configuration"
+ #
+diff -ur PLWM-2.6a.orig/plwm/mw_apm.py PLWM-2.6a/plwm/mw_apm.py
+--- PLWM-2.6a.orig/plwm/mw_apm.py	2007-08-27 15:06:29.000000000 +0200
++++ PLWM-2.6a/plwm/mw_apm.py	2007-08-27 15:07:00.000000000 +0200
+@@ -1,3 +1,4 @@
++# -*- coding: utf-8 -*-
+ # $Id: mw_apm.py,v 1.4 2001/10/18 09:36:52 petli Exp $
+ #
+ # mw_apm.py -- display APM status in a modewindow
diff --git a/x11-wm/plwm/plwm-2.5-r1.ebuild b/x11-wm/plwm/plwm-2.5-r1.ebuild
index c0afb606975d..9bb07c23dfd9 100644
--- a/x11-wm/plwm/plwm-2.5-r1.ebuild
+++ b/x11-wm/plwm/plwm-2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/plwm-2.5-r1.ebuild,v 1.4 2007/07/01 21:34:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/plwm-2.5-r1.ebuild,v 1.5 2007/08/27 13:44:50 coldwind Exp $
 
 NEED_PYTHON="2.2"
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-destdir.patch"
 	epatch "${FILESDIR}/${P}-python2.5.patch"
+	epatch "${FILESDIR}/${P}-pep0263.patch"
 }
 
 src_compile() {
diff --git a/x11-wm/plwm/plwm-2.6_alpha-r1.ebuild b/x11-wm/plwm/plwm-2.6_alpha-r1.ebuild
index 316b61e57e29..8e194ea3fc83 100644
--- a/x11-wm/plwm/plwm-2.6_alpha-r1.ebuild
+++ b/x11-wm/plwm/plwm-2.6_alpha-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/plwm-2.6_alpha-r1.ebuild,v 1.1 2007/06/29 13:53:58 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/plwm-2.6_alpha-r1.ebuild,v 1.2 2007/08/27 13:44:50 coldwind Exp $
 
 NEED_PYTHON="2.2"
 
@@ -28,6 +28,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}.patch"
 
 	epatch "${FILESDIR}/${P}-python2.5.patch"
+	epatch "${FILESDIR}/${P}-pep0263.patch"
 }
 
 src_install() {