Version bump. Remove 1.2* and 1.3* ebuilds.

(Portage version: 2.2.0_alpha45/cvs/Linux x86_64)

5 files changed, 84 insertions, 171 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 16f4a628d53c..4b85efc717ed 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.138 2011/07/09 11:23:47 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.139 2011/07/17 20:52:18 idl0r Exp $
+
+*layman-2.0.0_rc1-r1 (17 Jul 2011)
+
+  17 Jul 2011; Christian Ruppert <idl0r@gentoo.org> -layman-1.2.3.ebuild,
+  -layman-1.3.3.ebuild, -layman-1.3.4.ebuild, +layman-2.0.0_rc1-r1.ebuild,
+  +files/layman-2.0.0_rc1-fix-mistracking-success.patch:
+  Version bump. Remove 1.2* and 1.3* ebuilds.
 
   09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> layman-1.4.1.ebuild:
   ppc64 stable wrt #343309
diff --git a/app-portage/layman/files/layman-2.0.0_rc1-fix-mistracking-success.patch b/app-portage/layman/files/layman-2.0.0_rc1-fix-mistracking-success.patch
new file mode 100644
index 000000000000..7645b56525df
--- /dev/null
+++ b/app-portage/layman/files/layman-2.0.0_rc1-fix-mistracking-success.patch
@@ -0,0 +1,69 @@
+From c5c3121331d8f2f2b39b8f41b91d705d197be250 Mon Sep 17 00:00:00 2001
+From: dol-sen <brian.dolbec@gmail.com>
+Date: Tue, 12 Jul 2011 12:01:43 -0700
+Subject: [PATCH] fix mistracking success adding an overlay.
+
+---
+ layman/api.py |   17 +++++++++--------
+ layman/db.py  |    4 +++-
+ 2 files changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/layman/api.py b/layman/api.py
+index 8e54d7d..a924ead 100644
+--- a/layman/api.py
++++ b/layman/api.py
+@@ -114,14 +114,14 @@ class LaymanAPI(object):
+                 self._error("Repository '"+ovl+"' was not installed")
+                 results.append(False)
+                 continue
++            success = False
+             try:
+-                self._get_installed_db().delete(
++                success = self._get_installed_db().delete(
+                     self._get_installed_db().select(ovl))
+-                results.append(True)
+             except Exception as e:
+                 self._error(
+-                        "Failed to disable repository '"+ovl+"':\n"+str(e))
+-                results.append(False)
++                        "Exception caught disabling repository '"+ovl+"':\n"+str(e))
++            results.append(success)
+             self.get_installed(dbreload=True)
+         if False in results:
+             return False
+@@ -147,12 +147,13 @@ class LaymanAPI(object):
+                 self._error(UnknownOverlayMessage(ovl))
+                 results.append(False)
+                 continue
++            success = False
+             try:
+-                self._get_installed_db().add(self._get_remote_db().select(ovl), quiet=True)
+-                results.append(True)
++                success = self._get_installed_db().add(
++                    self._get_remote_db().select(ovl), quiet=True)
+             except Exception as e:
+-                self._error("Failed to enable repository '"+ovl+"' : "+str(e))
+-                results.append(False)
++                self._error("Exception caught enabling repository '"+ovl+"' : "+str(e))
++            results.append(success)
+             self.get_installed(dbreload=True)
+         if False in results:
+             return False
+diff --git a/layman/db.py b/layman/db.py
+index 3ed5cc6..b1df906 100644
+--- a/layman/db.py
++++ b/layman/db.py
+@@ -206,7 +206,9 @@ class DB(DbBase):
+             self.write(self.path)
+             make_conf.delete(overlay)
+         else:
+-            raise Exception('No local overlay named "' + overlay.name + '"!')
++            self.output.error('No local overlay named "' + overlay.name + '"!')
++            return False
++        return True
+ 
+     def sync(self, overlay_name, quiet = False):
+         '''Synchronize the given overlay.'''
+-- 
+1.7.6
+
diff --git a/app-portage/layman/layman-1.2.3.ebuild b/app-portage/layman/layman-1.2.3.ebuild
deleted file mode 100644
index fbdf8aa16301..000000000000
--- a/app-portage/layman/layman-1.2.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.2.3.ebuild,v 1.17 2011/04/14 20:13:00 darkside Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-
-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-vcs/subversion )"
-RDEPEND="${COMMON_DEPS}
-	git? ( dev-vcs/git )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)"
-
-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
-}
-
-src_test() {
-	einfo "Running layman doctests..."
-	echo
-	if ! PYTHONPATH="." $(PYTHON) layman/tests/dtest.py; then
-		eerror "DocTests failed - please submit a bug report"
-		die "DocTesting failed!"
-	fi
-}
-
-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."
-}
diff --git a/app-portage/layman/layman-1.3.3.ebuild b/app-portage/layman/layman-1.3.3.ebuild
deleted file mode 100644
index 1edae30fb7a4..000000000000
--- a/app-portage/layman/layman-1.3.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.3.3.ebuild,v 1.7 2011/04/14 20:13:00 darkside Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2: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="bazaar cvs darcs git mercurial subversion test"
-
-COMMON_DEPS="dev-lang/python[xml]"
-DEPEND="${COMMON_DEPS}
-	test? ( dev-vcs/subversion )"
-RDEPEND="${COMMON_DEPS}
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-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 /var/lib/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"
-	elog
-	elog  "  layman -a overlay-name"
-	elog
-	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 /var/lib/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."
-	elog
-	ewarn "Please add the 'source' statement to make.conf only AFTER "
-	ewarn "you added your first overlay. Otherwise portage will fail."
-	epause 5
-}
diff --git a/app-portage/layman/layman-1.3.4.ebuild b/app-portage/layman/layman-2.0.0_rc1-r1.ebuild
index 22c69a615f54..8d0c9ea41604 100644
--- a/app-portage/layman/layman-1.3.4.ebuild
+++ b/app-portage/layman/layman-2.0.0_rc1-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.3.4.ebuild,v 1.2 2011/04/14 20:13:00 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0_rc1-r1.ebuild,v 1.1 2011/07/17 20:52:18 idl0r Exp $
 
-EAPI="2"
+EAPI="3"
 PYTHON_DEPEND="2:2.5"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit eutils distutils
 
-DESCRIPTION="Tool to manage Gentoo overlays."
+DESCRIPTION="Tool to manage Gentoo overlays"
 HOMEPAGE="http://layman.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
@@ -34,6 +34,10 @@ RDEPEND="${COMMON_DEPS}
 	)"
 RESTRICT_PYTHON_ABIS="2.4 3.*"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix-mistracking-success.patch"
+}
+
 src_test() {
 	testing() {
 		for suite in layman/tests/{dtest,external}.py ; do