app-portage/layman: Integrate patch to bug #301327 for 1.3.0_rc1-r3

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

3 files changed, 172 insertions, 1 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 0c16507d1f14..b01ec830f7e9 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,13 @@
 # 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.91 2010/01/17 16:11:44 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.92 2010/01/18 01:51:31 sping Exp $
+
+*layman-1.3.0_rc1-r3 (18 Jan 2010)
+
+  18 Jan 2010; Sebastian Pipping <sping@gentoo.org>
+  +layman-1.3.0_rc1-r3.ebuild,
+  +files/layman-1.3.0_rc1-fix-sync-warnings.patch:
+  Integrate patch to bug #301327 for 1.3.0_rc1-r3
 
 *layman-1.3.0_rc1-r2 (17 Jan 2010)
 
diff --git a/app-portage/layman/files/layman-1.3.0_rc1-fix-sync-warnings.patch b/app-portage/layman/files/layman-1.3.0_rc1-fix-sync-warnings.patch
new file mode 100644
index 000000000000..fd83f62b9e81
--- /dev/null
+++ b/app-portage/layman/files/layman-1.3.0_rc1-fix-sync-warnings.patch
@@ -0,0 +1,63 @@
+From 8467497542c0b41e5361a9741d914a0ea2f42c39 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 18 Jan 2010 02:38:45 +0100
+Subject: [PATCH] No longer treat sync warnings like errors
+
+---
+ CHANGES          |    2 ++
+ layman/action.py |   10 ++++++++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/CHANGES b/CHANGES
+index 1a9473c..b4f24b9 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -7,6 +7,8 @@ Version TODO
+  - Syncing failed for overlays that no longer exist in the remote
+    lists with no need to (bug #301174)
+ 
++ - No longer treat sync warnings like errors (bug #301327)
++
+  - Fix faults introduced at refactoring (bug #301253)
+ 
+ 
+diff --git a/layman/action.py b/layman/action.py
+index 02ba1ce..d058e9c 100644
+--- a/layman/action.py
++++ b/layman/action.py
+@@ -108,6 +108,7 @@ class Sync:
+ 
+         OUT.debug('Updating selected overlays', 6)
+ 
++        fatals = []
+         warnings = []
+         success  = []
+         for i in self.selection:
+@@ -151,7 +152,7 @@ class Sync:
+                 self.db.sync(i, self.quiet)
+                 success.append('Successfully synchronized overlay "' + i + '".')
+             except Exception, error:
+-                warnings.append(
++                fatals.append(
+                     'Failed to sync overlay "' + i + '".\nError was: '
+                     + str(error))
+ 
+@@ -161,9 +162,14 @@ class Sync:
+                 OUT.info(i, 3)
+                 
+         if warnings:
+-            OUT.warn('\nErrors:\n------\n', 2)
++            OUT.warn('\nWarnings:\n------\n', 2)
+             for i in warnings:
+                 OUT.warn(i + '\n', 2)
++
++        if fatals:
++            OUT.error('\nErrors:\n------\n')
++            for i in fatals:
++                OUT.error(i + '\n')
+             return 1
+ 
+         return 0
+-- 
+1.6.6
+
diff --git a/app-portage/layman/layman-1.3.0_rc1-r3.ebuild b/app-portage/layman/layman-1.3.0_rc1-r3.ebuild
new file mode 100644
index 000000000000..2746096ad84c
--- /dev/null
+++ b/app-portage/layman/layman-1.3.0_rc1-r3.ebuild
@@ -0,0 +1,101 @@
+# 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.3.0_rc1-r3.ebuild,v 1.1 2010/01/18 01:51:31 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]"
+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.*"
+
+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_prepare() {
+	epatch "${FILESDIR}"/${P}-sync-fix.patch \
+			"${FILESDIR}"/${P}-refactoring-fix.patch \
+			"${FILESDIR}"/${P}-fix-sync-warnings.patch
+}
+
+src_test() {
+	testing() {
+		for suite in layman/tests/{dtest,external}.py ; do
+			PYTHONPATH="." "$(PYTHON)" ${suite} \
+					|| die "test suite '${suite}' failed"
+		done
+	}
+	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
+}