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

(Portage version: 2.2_rc61/cvs/Linux i686)

3 files changed, 112 insertions, 5 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/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
+}