Encoding declarations fixed to be Python 2.5 compatible.

Package-Manager: portage-2.1.2.11

6 files changed, 55 insertions, 15 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/Manifest b/x11-wm/plwm/Manifest
index 54a4ee860b43..7e9ca73fa1bf 100644
--- a/x11-wm/plwm/Manifest
+++ b/x11-wm/plwm/Manifest
@@ -2,10 +2,18 @@ AUX plwm-2.5-destdir.patch 1365 RMD160 639542e327918f3c6cb27aab0d1728a4815e7826
 MD5 e5a359b895e133c961b783c7c15b765f files/plwm-2.5-destdir.patch 1365
 RMD160 639542e327918f3c6cb27aab0d1728a4815e7826 files/plwm-2.5-destdir.patch 1365
 SHA256 dad1e7295ec52f8cfb0756929d1a627d74e78d0f1adf16c84f0ddbbb4df4e3b7 files/plwm-2.5-destdir.patch 1365
+AUX plwm-2.5-pep0263.patch 346 RMD160 50120da975a40f69cb471dd0046f7cbb862b66e6 SHA1 218cd8cd961db56dd395cbfda45a0960f09800cd SHA256 dd8af03c90f3f039eef48654e3704a3185147061119d48f6fd0bd244ac26f6f9
+MD5 9882faf914244ceb9f7dd3bbed55be2e files/plwm-2.5-pep0263.patch 346
+RMD160 50120da975a40f69cb471dd0046f7cbb862b66e6 files/plwm-2.5-pep0263.patch 346
+SHA256 dd8af03c90f3f039eef48654e3704a3185147061119d48f6fd0bd244ac26f6f9 files/plwm-2.5-pep0263.patch 346
 AUX plwm-2.5-python2.5.patch 690 RMD160 8b59d9deb79738c8abbe482017a8292b1224b14d SHA1 c9e3e4dd5b116a7944758cb0aafc0b149f587c59 SHA256 da54e4fca516526e94d62c407f3d57b190030f879a1ee96d47666f5d71dfde55
 MD5 04535c62962c4463f30a06b7a60cce8e files/plwm-2.5-python2.5.patch 690
 RMD160 8b59d9deb79738c8abbe482017a8292b1224b14d files/plwm-2.5-python2.5.patch 690
 SHA256 da54e4fca516526e94d62c407f3d57b190030f879a1ee96d47666f5d71dfde55 files/plwm-2.5-python2.5.patch 690
+AUX plwm-2.6_alpha-pep0263.patch 690 RMD160 6aa146eaf0e6a59199f04042cd151453108a4408 SHA1 5365245e0e6d2932926ddba9007e7edc13d71aff SHA256 9b76cbc1dd3dfcd47e2b60815ac35e118e815c7803b1e82069a2398d740c3a19
+MD5 c7c4d115c124c8f6e54099101d0768cc files/plwm-2.6_alpha-pep0263.patch 690
+RMD160 6aa146eaf0e6a59199f04042cd151453108a4408 files/plwm-2.6_alpha-pep0263.patch 690
+SHA256 9b76cbc1dd3dfcd47e2b60815ac35e118e815c7803b1e82069a2398d740c3a19 files/plwm-2.6_alpha-pep0263.patch 690
 AUX plwm-2.6_alpha-python2.5.patch 694 RMD160 10c3a9806aa1037c04da1edec36094519be5f84b SHA1 aa9bf591788de3f74542aa0cdce0ca79522ef683 SHA256 353ec618e4445c09601bcda145b5e4928fd52634254010efb229719333ede289
 MD5 55e0f45fa3cd1e49568759d9d6958858 files/plwm-2.6_alpha-python2.5.patch 694
 RMD160 10c3a9806aa1037c04da1edec36094519be5f84b files/plwm-2.6_alpha-python2.5.patch 694
@@ -16,18 +24,18 @@ RMD160 fa885a02bfaa2636c695a3aa122d87fc36353e42 files/plwm-2.6_alpha.patch 651
 SHA256 d2ac9af5f917b8f660634bdd16fbd8d7bd71e2358b636ecb0fdc5e3a7cc8a68b files/plwm-2.6_alpha.patch 651
 DIST PLWM-2.6a.tar.gz 452944 RMD160 ab6c5f9cbc8e5240535a176b7a1c97d89341aa0d SHA1 cf6de5a14174a16b675e1827b10e7b06a70fcedc SHA256 adf7a01f6717235e6ab872f2bcca3d30b10bab31e48aab2afc0cd4c37644d293
 DIST plwm-2.5.tar.gz 127248 RMD160 a2c17b83f2d73d4b96ab30c8470031dd816d66bc SHA1 818c07454571f5b528b1fcb7025edaaf4889d347 SHA256 c1fc72f3dd7959743655c2fb2025faf598d1c5b0d75812282b4bb548aedd14de
-EBUILD plwm-2.5-r1.ebuild 1046 RMD160 a7435819c6b5bf7b7ace131327fa5ad6249f800e SHA1 89d13c75e1ba0ea1f94ade1a0fdcec97ee731773 SHA256 b531ebaf098e04a7aa99b8d6a624fbb4d2afda4ff6173ccdcf1f59935801ec7d
-MD5 b84c8d979e5d1c7da779587701939acb plwm-2.5-r1.ebuild 1046
-RMD160 a7435819c6b5bf7b7ace131327fa5ad6249f800e plwm-2.5-r1.ebuild 1046
-SHA256 b531ebaf098e04a7aa99b8d6a624fbb4d2afda4ff6173ccdcf1f59935801ec7d plwm-2.5-r1.ebuild 1046
-EBUILD plwm-2.6_alpha-r1.ebuild 1322 RMD160 2d3b5d886b929c1d8677fe102341474dd341c076 SHA1 a854e5dba62e7246edc0227e2b28de51859f9089 SHA256 25ef977c69eefa3ab48004cc5110242794e37269a17c4259a03f1ba1af4d739e
-MD5 6f737fb79c399c692283c8ca8bc75928 plwm-2.6_alpha-r1.ebuild 1322
-RMD160 2d3b5d886b929c1d8677fe102341474dd341c076 plwm-2.6_alpha-r1.ebuild 1322
-SHA256 25ef977c69eefa3ab48004cc5110242794e37269a17c4259a03f1ba1af4d739e plwm-2.6_alpha-r1.ebuild 1322
-MISC ChangeLog 1617 RMD160 e8d79547229a8394d9cb87884e2d8089b56fe9e2 SHA1 a6f0059fd9ee525e36232689935e6a572270d4d3 SHA256 fd2f1794eace745fb6649083b1c1b5724c6ae94da9517312c8c1d61a7819ccbc
-MD5 b8433f91833988508b061110d246e366 ChangeLog 1617
-RMD160 e8d79547229a8394d9cb87884e2d8089b56fe9e2 ChangeLog 1617
-SHA256 fd2f1794eace745fb6649083b1c1b5724c6ae94da9517312c8c1d61a7819ccbc ChangeLog 1617
+EBUILD plwm-2.5-r1.ebuild 1088 RMD160 74ac3a2ea11bab8b768fcc0c5324ed4d737c5ebe SHA1 b1a01519339c847dcf2b63b717abdea77a147657 SHA256 f6b591eb2a5a955b9ab03656ead6b5e48e9f0630e26ba56dafea8db9be3bf1f3
+MD5 ad8fea1534c19912b0302e84c3c9d43b plwm-2.5-r1.ebuild 1088
+RMD160 74ac3a2ea11bab8b768fcc0c5324ed4d737c5ebe plwm-2.5-r1.ebuild 1088
+SHA256 f6b591eb2a5a955b9ab03656ead6b5e48e9f0630e26ba56dafea8db9be3bf1f3 plwm-2.5-r1.ebuild 1088
+EBUILD plwm-2.6_alpha-r1.ebuild 1363 RMD160 bde9e5961b5d4cc1c64f126e7e491b96d88cb5e5 SHA1 0bb1a1acab35bc3d088ccd9c96955e302d02a76b SHA256 d427e6f622a8792aa5d6aedccbaed334c173686cb52bf3ad8a4cd0ef59f5b090
+MD5 0f0ebd9df18c41f40a4110c068fc9f01 plwm-2.6_alpha-r1.ebuild 1363
+RMD160 bde9e5961b5d4cc1c64f126e7e491b96d88cb5e5 plwm-2.6_alpha-r1.ebuild 1363
+SHA256 d427e6f622a8792aa5d6aedccbaed334c173686cb52bf3ad8a4cd0ef59f5b090 plwm-2.6_alpha-r1.ebuild 1363
+MISC ChangeLog 1849 RMD160 8e6cb09d3e98c0a588cf41d232694d32d5c867d4 SHA1 adca987cf1970f37d8591105070ef637bfffde14 SHA256 f106b07d9ceb2059293eec7151a95f1c4aea92f6a4c5af89a755e4608df6fe48
+MD5 61ad522571a50dc7ef7fe553f3a00d92 ChangeLog 1849
+RMD160 8e6cb09d3e98c0a588cf41d232694d32d5c867d4 ChangeLog 1849
+SHA256 f106b07d9ceb2059293eec7151a95f1c4aea92f6a4c5af89a755e4608df6fe48 ChangeLog 1849
 MISC metadata.xml 359 RMD160 ab601f50159a35eea1d6da34b8b625db7f155086 SHA1 1ef235e3a3678b7d5e8e678f3dd42a701ba55cd6 SHA256 dc8084c9b3bccf5993bc0c5415548dedee0f748ee05882d987c136eaf986314b
 MD5 5f29a1d40e647d7d78f8c53d4cb6445f metadata.xml 359
 RMD160 ab601f50159a35eea1d6da34b8b625db7f155086 metadata.xml 359
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() {