app-portage/layman: Update non-ASCII backport patch to fix bug #299305

Package-Manager: portage-2.2_rc61/cvs/Linux i686

4 files changed, 115 insertions, 7 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 2926b9df9bf9..68cf1a725f14 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.84 2010/01/02 03:36:48 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.85 2010/01/03 23:59:18 sping Exp $
+
+*layman-1.2.4-r3 (03 Jan 2010)
+
+  03 Jan 2010; Sebastian Pipping <sping@gentoo.org> +layman-1.2.4-r3.ebuild,
+  files/layman-1.2.4-non-ascii-backport.patch:
+  Update non-ASCII backport patch to fix bug #299305
 
 *layman-1.2.4-r2 (02 Jan 2010)
 
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index b207b18ca12d..3e0927a27f18 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,4 +1,4 @@
-AUX layman-1.2.4-non-ascii-backport.patch 1566 RMD160 349ae90bf504c7f6921adbfe311745ab2e9d34bb SHA1 048803cd64ec7c3cd591d9c30e73ea5008ef1208 SHA256 da676c998a15ed3bd70c2df94e2bc54a197564d9e5cd6d6d24a5a65f7d25ea4a
+AUX layman-1.2.4-non-ascii-backport.patch 1654 RMD160 8260a9ca2b0d818e2f623bac6a53aee54f38f518 SHA1 9eea719e0d0f51a073f4fa5795dc4d886553b6fb SHA256 fec4eab473d2824876230267309463a8075fc6fcef2b8d363f1adf85bb3223d5
 AUX layman-1.2.4-peg-backport.patch 927 RMD160 f11d910e2ee20149d0c824929afc920c6facc34a SHA1 438d7da92544f1b09c419eb2cf7524ab91744a18 SHA256 06206de62729f07e8821c31e635ae1b73ccd43a88594ce90cb0bb58a472cf324
 DIST layman-1.1.1.tar.gz 46122 RMD160 ef0277455acef5963780dc83c9dd7a24a828d2dd SHA1 c0f7108463fedd0b2d7b350fb4cebbcff4c505ff SHA256 725cf36a5b728dfde707dad3d9d2045b282586021de53518daeb2a6a67b61f2b
 DIST layman-1.2.3.tar.gz 46673 RMD160 f05e1b2cfdf4a3f47bff59116b947cde53af4a0b SHA1 3e80ddba7af177ca5e4b57fd77af1c4540f15458 SHA256 c00ff923b6d097f335c020bc9ee51bf80b41ab7f95450a7cf57614fa8176622a
@@ -7,7 +7,8 @@ EBUILD layman-1.1.1.ebuild 2200 RMD160 ce68cb7ec297e498e150a2380953f626da65aae2
 EBUILD layman-1.2.3.ebuild 2470 RMD160 2bb40c869f4847df0b8c0d348d12b3b3395fa9f6 SHA1 04d3e0050193559c767e446edfe506e9015f9eab SHA256 db3e6bc2e03057bf6f94790bfaca03ec9335bb557b333292b994e52843e5e53b
 EBUILD layman-1.2.4-r1.ebuild 2537 RMD160 20d0bfe2d700e9a07c7fe5aa4d6d804ccd27ffaa SHA1 918162a008364da380e5a61114e51b7959d6aec1 SHA256 400adcf07f8d944cbf2c7436096d529a6de70e2ad300a443d633ef2b98d2b97e
 EBUILD layman-1.2.4-r2.ebuild 2586 RMD160 c7a74151273d0f215a1ae44e64374dce28754be3 SHA1 2e47567f0b8de44599374667db910e35bf7ee512 SHA256 1f5ef2da13d137b1ca87701fe56e10d989c9f21a619fb674a8c62baa178e12cf
+EBUILD layman-1.2.4-r3.ebuild 2586 RMD160 baba1d5e33f1212a7cfccee468fdedc3f4f4b528 SHA1 471aeb2d111836907fb4540a1ab33d0d9126aea8 SHA256 6825dfa13de09d968f5a307f52a59cc1a7956fcdd1b903e1225686dd4d447ad3
 EBUILD layman-1.2.4.ebuild 2469 RMD160 90a1ce375f906daee72ad761a45a23c064e8d94c SHA1 7815c1d850b99cd570b16b94fb4fcb9edbc26ddc SHA256 944483d8184a656c47948eb9430e4f7e94a70fd09aa0a9db30b8483a6cde7325
 EBUILD layman-9999.ebuild 2545 RMD160 3b7269684ca29df599d28ce751aa11f29d001b2d SHA1 8b2afbc24b9f24c1f164f5d4899e7d10c195e114 SHA256 6104779dfbbe6944272e3f6acf12d49ed54cb70d9044155ddf74addc36591a63
-MISC ChangeLog 11054 RMD160 eb99c9154173fe87553a6963cc75520825163b5e SHA1 52dd50cefdcf8a3aa32f2e4a9b915824d55f7d7d SHA256 7c8b125de07733e34a5a996809f673194bfea176a71cca7265b94c5137395926
+MISC ChangeLog 11264 RMD160 f6fd51b944d5ddc71c1dbed63430186bbd3df744 SHA1 daf85d6ff51986b9ba6e542c6d14f07db7156f2e SHA256 6492a5372afbc4aba8db1c967006839775d65311311aa23a0a881d9443c73c68
 MISC metadata.xml 388 RMD160 5d00579513ad8a693b8bb9e84f459b647ac8d545 SHA1 78297c6f26ac4c74aef97db811f2552c29d1b350 SHA256 ff9ee64362f690ab423236d4535f268b9639c1ba64f4b8005f2b46d82829e2f1
diff --git a/app-portage/layman/files/layman-1.2.4-non-ascii-backport.patch b/app-portage/layman/files/layman-1.2.4-non-ascii-backport.patch
index 8bb8b0066c81..55728d560fa2 100644
--- a/app-portage/layman/files/layman-1.2.4-non-ascii-backport.patch
+++ b/app-portage/layman/files/layman-1.2.4-non-ascii-backport.patch
@@ -2,22 +2,24 @@ diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py
 index e10f562..99aadad 100644
 --- a/layman/overlays/overlay.py
 +++ b/layman/overlays/overlay.py
-@@ -29,5 +29,6 @@ __version__ = "$Id: layman-1.2.4-non-ascii-backport.patch,v 1.1 2010/01/02 03:36:47 sping Exp $"
+@@ -29,5 +29,7 @@ __version__ = "$Id: layman-1.2.4-non-ascii-backport.patch,v 1.2 2010/01/03 23:59:17 sping Exp $"
  #-------------------------------------------------------------------------------
  
  import sys, types, re, os, os.path, shutil, subprocess
 +import codecs
++import locale
  
  from   layman.utils             import node_to_dict, dict_to_node, path
-@@ -226,6 +227,15 @@ class Overlay:
+@@ -226,6 +227,16 @@ class Overlay:
              result = cmd.wait()
              return result
  
 +    def _get_encoding(self):
-+        if hasattr(sys.stdout, 'encoding'):
++        if hasattr(sys.stdout, 'encoding') \
++                and sys.stdout.encoding != None:
 +            return sys.stdout.encoding
 +        else:
-+            return 'ascii'
++            return locale.getpreferredencoding()
 +
 +    def _encode(self, unicode_text):
 +        return codecs.encode(unicode_text, self._get_encoding(), 'replace')
diff --git a/app-portage/layman/layman-1.2.4-r3.ebuild b/app-portage/layman/layman-1.2.4-r3.ebuild
new file mode 100644
index 000000000000..714e550e9243
--- /dev/null
+++ b/app-portage/layman/layman-1.2.4-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.2.4-r3.ebuild,v 1.1 2010/01/03 23:59:18 sping Exp $
+
+EAPI="2"
+NEED_PYTHON=2.5
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils distutils
+
+DESCRIPTION="A python script for retrieving gentoo overlays."
+HOMEPAGE="http://layman.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="git subversion test"
+
+COMMON_DEPS="|| (
+	dev-lang/python[xml]
+	( dev-lang/python dev-python/pyxml ) )"
+DEPEND="${COMMON_DEPS}
+	test? ( dev-util/subversion )"
+RDEPEND="${COMMON_DEPS}
+	git? ( dev-util/git )
+	subversion? (
+		|| (
+			>=dev-util/subversion-1.5.4[webdav-neon]
+			>=dev-util/subversion-1.5.4[webdav-serf]
+		)
+	)"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-peg-backport.patch \
+			"${FILESDIR}"/${P}-non-ascii-backport.patch
+}
+
+pkg_setup() {
+	if ! has_version dev-util/subversion; then
+		ewarn "You do not have dev-util/subversion installed!"
+		ewarn "While layman does not exactly depend on this"
+		ewarn "version control system you should note that"
+		ewarn "most available overlays are offered via"
+		ewarn "dev-util/subversion. If you do not install it"
+		ewarn "you will be unable to use these overlays."
+		ewarn
+	fi
+}
+
+src_test() {
+	testing() {
+		PYTHONPATH="." "$(PYTHON)" layman/tests/dtest.py
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	dodir /etc/layman
+
+	cp etc/* "${D}"/etc/layman/
+
+	doman doc/layman.8
+	dohtml doc/layman.8.html
+
+	keepdir /usr/local/portage/layman
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	einfo "You are now ready to add overlays into your system."
+	einfo
+	einfo "layman -L"
+	einfo
+	einfo "will display a list of available overlays."
+	einfo
+	elog  "Select an overlay and add it using"
+	einfo
+	elog  "layman -a overlay-name"
+	einfo
+	elog  "If this is the very first overlay you add with layman,"
+	elog  "you need to append the following statement to your"
+	elog  "/etc/make.conf file:"
+	elog
+	elog  "source /usr/local/portage/layman/make.conf"
+	elog
+	elog  "If you modify the 'storage' parameter in the layman"
+	elog  "configuration file (/etc/layman/layman.cfg) you will"
+	elog  "need to adapt the path given above to the new storage"
+	elog  "directory."
+	einfo
+	ewarn "Please add the 'source' statement to make.conf only AFTER "
+	ewarn "you added your first overlay. Otherwise portage will fail."
+	epause 5
+}