version bump layman to 2.0.0_rc2

4 files changed, 49 insertions, 94 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index e807104..8672a08 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,11 +1,42 @@
 # 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.137 2011/04/28 03:25:03 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.144 2011/08/08 16:28:35 darkside Exp $
 
-*layman-2.0.0_rc1 (07 Jun 2011)
+*layman-2.0.0_rc2 (09 Aug 2011)
 
-  07 Jun 2011; Brian Dolbec <brian.dolbec@gmail.com> +layman-2.0.0_rc1.ebuild,
-  -layman-9999.ebuild
+  09 Aug 2011; Brian Dolbec <brian.dolbec@gmail.com>
+  -layman-2.0.0_rc1-r1.ebuild, +layman-2.0.0_rc2.ebuild,
+  -files/layman-2.0.0_rc1-fix-mistracking-success.patch:
+  version bump.
+
+  08 Aug 2011; Jeremy Olexa <darkside@gentoo.org> layman-2.0.0_rc1-r1.ebuild:
+  add ~amd64-linux kw as well
+
+  05 Aug 2011; Jeremy Olexa <darkside@gentoo.org> layman-2.0.0_rc1-r1.ebuild:
+  Import Gentoo Prefix mods. Add KEYWORDS, small fix to etc file, call
+  eprefixify
+
+  18 Jul 2011; Christian Ruppert <idl0r@gentoo.org> layman-2.0.0_rc1-r1.ebuild,
+  layman-9999.ebuild:
+  Remove useless epause.
+
+  18 Jul 2011; Christian Ruppert <idl0r@gentoo.org> layman-2.0.0_rc1-r1.ebuild,
+  layman-9999.ebuild:
+  Fix python dependencies.
+
+  17 Jul 2011; Christian Ruppert <idl0r@gentoo.org> layman-2.0.0_rc1-r1.ebuild,
+  layman-9999.ebuild:
+  Update layman-9999, use git-2 eclass. Use insinto/doins instead of dodir/cp.
+
+*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
 
 *layman-1.4.2-r2 (28 Apr 2011)
 
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 44976b6..a209487 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,5 +1,4 @@
-AUX layman-2.0.0_rc1-fix-mistracking-success.patch 2698 RMD160 90003540b90f66de32e62ab3b8c82ed226643369 SHA1 ba08b23a7f51978b33ba02acff97cf8c0c86b78d SHA256 723dcd1c8574e9c1cfbb098c4b866f41d7e42833202202adfd9e6bee3efda156
-DIST layman-2.0.0_rc1.tar.gz 70796 RMD160 d2d377b4930c8c630939bf929bdc609744d9689e SHA1 4fa9ade163d0c2b1c4f7fda3223da4f6c46d067c SHA256 20587f6410d544a70616f24705ea5dbdacc17e929109e307083d14d272dcbb02
-EBUILD layman-2.0.0_rc1-r1.ebuild 2504 RMD160 c61902e90dc529f3000c9f0cc798ca0e79c869bf SHA1 9a9acb7777fe0302dfaf81a8ec82fa75e45769cf SHA256 ed50b37d03ac639e06844f124bbf7c81a8aa13a43ea040aee91698010ad5030b
-MISC ChangeLog 20549 RMD160 53cd6f7501b3d9f0dc8869d1e3b1e61d08b58162 SHA1 cea56acdc983471be1c47d767dc8d15648969998 SHA256 e94ced3ecc339cd9a0b82d161234d4a5a9777bf16d70c69d835bbe748eb00cde
+DIST layman-2.0.0_rc2.tar.gz 74058 RMD160 7bf368821fd7f14740975bab5c62cf9f08d10216 SHA1 f366415d05ea6f4bb86620ffbc7da0017a90a654 SHA256 b7857df4df6239d268b7fa3e0386ba915459dc6a4667d760c74323b781d7a1eb
+EBUILD layman-2.0.0_rc2.ebuild 2632 RMD160 014f076d570d0210cc30e22fbd9e231ace8d2dc1 SHA1 38242f05217d7967fa79c10b102d7a5074470a7d SHA256 fcc24292b581e2adc983bc1e1250d2812489da789102fa8babb679990c1fdc5e
+MISC ChangeLog 21735 RMD160 6f45f4b4b7c68912b39d657880156a03987fa9e7 SHA1 b86cc6bd5c6ffa174d07ea128a71a342703ff7ae SHA256 42d88b531525f258ac0586a31d7ece4fd95b73d642bd952a64cbf0c6082fa47f
 MISC metadata.xml 912 RMD160 8d63f4e9672a7b15587026626802074a7b0e968b SHA1 00ffdacd3dcbd4e0652517628e9c932f32865a4a SHA256 67a4974996e495ff3f49e3874d9e1d6f4fe251e9e49d92385ef14d4f23550b10
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
deleted file mode 100644
index 7645b56..0000000
--- a/app-portage/layman/files/layman-2.0.0_rc1-fix-mistracking-success.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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-2.0.0_rc1-r1.ebuild b/app-portage/layman/layman-2.0.0_rc2.ebuild
index 9e5755c..23e8007 100644
--- a/app-portage/layman/layman-2.0.0_rc1-r1.ebuild
+++ b/app-portage/layman/layman-2.0.0_rc2.ebuild
@@ -1,20 +1,21 @@
 # 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-2.0.0_rc1 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0_rc1-r1.ebuild,v 1.6 2011/08/08 16:28:35 darkside Exp $
 
-EAPI="2"
-PYTHON_DEPEND="2:2.5"
+EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.6"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
 
-inherit eutils distutils
+inherit eutils distutils prefix
 
-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"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bazaar cvs darcs git mercurial subversion test"
 
 COMMON_DEPS="dev-lang/python[xml]"
@@ -32,15 +33,10 @@ RDEPEND="${COMMON_DEPS}
             >=dev-vcs/subversion-1.5.4[webdav-serf]
         )
     )"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-mistracking-success.patch"
-}
 
-# Prevent running make
-src_compile() {
-    :
+src_prepare() {
+    eprefixify etc/layman.cfg layman/config.py
 }
 
 src_test() {
@@ -56,9 +52,8 @@ src_test() {
 src_install() {
     distutils_src_install
 
-    dodir /etc/layman
-
-    cp etc/* "${D}"/etc/layman/
+    insinto /etc/layman
+    doins etc/layman.cfg || die
 
     doman doc/layman.8
     dohtml doc/layman.8.html
@@ -92,5 +87,4 @@ pkg_postinst() {
     elog
     ewarn "Please add the 'source' statement to make.conf only AFTER "
     ewarn "you added your first overlay. Otherwise portage will fail."
-    epause 5
 }