remove layman-9999 it's in the portage tree, add layman-2.0.0_rc1

3 files changed, 79 insertions, 36 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 9b2aa55..e807104 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,13 +1,70 @@
 # 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.125 2011/02/12 12:29:16 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.137 2011/04/28 03:25:03 darkside Exp $
 
-  1 May 2011; Brian Dolbec <brian.dolbec@gmail.com> metadata.xml:
-  update metadata.
+*layman-2.0.0_rc1 (07 Jun 2011)
 
-  13 Feb 2011; Brian Dolbec <brian.dolbec@gmail.com> layman-9999.ebuild,
-  Add g-common use flag and dependency.  Override MaKEOPTS to -j1 to
-  prevent a build failure for the doc's.
+  07 Jun 2011; Brian Dolbec <brian.dolbec@gmail.com> +layman-2.0.0_rc1.ebuild,
+  -layman-9999.ebuild
+
+*layman-1.4.2-r2 (28 Apr 2011)
+
+  28 Apr 2011; Jeremy Olexa <darkside@gentoo.org> -layman-1.4.2-r1.ebuild,
+  +layman-1.4.2-r2.ebuild, files/layman-1.4.2-python-compatbility-fix.patch:
+  Revision bump to fix broken sync function, bug 365123. New patch by Brian
+  Dolbec
+
+*layman-1.4.2-r1 (27 Apr 2011)
+
+  27 Apr 2011; Christian Ruppert <idl0r@gentoo.org> -layman-1.4.2.ebuild,
+  +layman-1.4.2-r1.ebuild, files/layman-1.4.2-python-compatbility-fix.patch:
+  Revision bump. The "python-compatbility-fix.patch" has been extended.
+
+  25 Apr 2011; Christian Ruppert <idl0r@gentoo.org> layman-1.4.2.ebuild,
+  +files/layman-1.4.2-python-compatbility-fix.patch:
+  Add a patch to fix backward compatibility for python <2.6, bug 363797.
+
+  17 Apr 2011; Jeroen Roovers <jer@gentoo.org> layman-1.4.1.ebuild:
+  Stable for HPPA (bug #343309).
+
+  16 Apr 2011; Raúl Porcel <armin76@gentoo.org> layman-1.4.1.ebuild:
+  ia64 stable wrt #343309
+
+  14 Apr 2011; Jeremy Olexa <darkside@gentoo.org> layman-1.2.3.ebuild,
+  layman-1.3.3.ebuild, layman-1.3.4.ebuild, layman-1.4.1.ebuild,
+  layman-1.4.2.ebuild, layman-9999.ebuild:
+  remove pkg_setup noise from all ebuild versions, bug 358649
+
+  12 Apr 2011; Michael Weber <xmw@gentoo.org> layman-1.4.1.ebuild:
+  arm/ppc stable (bug 343309)
+
+  10 Apr 2011; Tobias Klausmann <klausman@gentoo.org> layman-1.4.1.ebuild:
+  Stable on alpha, bug #343309
+
+  06 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  layman-1.2.3.ebuild:
+  Fix deprecation warning.
+
+  20 Feb 2011; Paul Varner <fuzzyray@gentoo.org> metadata.xml:
+  Add to tools-portage herd.
+
+  14 Feb 2011; Christian Ruppert <idl0r@gentoo.org> -layman-1.2.4-r3.ebuild,
+  -files/layman-1.2.4-non-ascii-backport.patch,
+  -files/layman-1.2.4-peg-backport.patch, -layman-1.2.5.ebuild,
+  -layman-1.2.6.ebuild, -layman-1.3.0_rc1-r3.ebuild, -layman-1.3.0.ebuild,
+  -layman-1.3.0-r1.ebuild, -files/layman-1.3.0-cvs-fix.patch,
+  -files/layman-1.3.0_rc1-fix-sync-warnings.patch,
+  -files/layman-1.3.0_rc1-refactoring-fix.patch,
+  -files/layman-1.3.0_rc1-sync-fix.patch, -layman-1.3.1.ebuild,
+  -layman-1.3.2-r1.ebuild, -layman-1.3.2-r2.ebuild,
+  -files/layman-1.3.2-missing-import.patch,
+  -files/layman-1.3.2-missing-text.patch, -layman-1.4.0.ebuild,
+  layman-9999.ebuild:
+  Cleanup. Don't make docs parallel for now.
+
+  12 Feb 2011; Christian Ruppert <idl0r@gentoo.org> layman-1.4.2.ebuild:
+  Remove asciidoc dependency from 1.4.2, it's only required for the live
+  ebuild.
 
   12 Feb 2011; Christian Ruppert <idl0r@gentoo.org> layman-1.4.2.ebuild,
   layman-9999.ebuild:
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 4ead2d3..76e5c55 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,3 +1,4 @@
-EBUILD layman-9999.ebuild 3051 RMD160 9883c974a974419faf0cce4a4e97aefbade6bf40 SHA1 a6921aff1ffd7006af23157cab5f8c19228ae7d7 SHA256 0b63bc99db12c7a1a5ce474a763b57f2fad23b11b64508cb934d8c9fe8549c59
-MISC ChangeLog 18217 RMD160 03a9b1d0e0820a06073fe472f30b7c9a55ce7555 SHA1 4f06e6136081060fc1f76880436c413d2b8b24a6 SHA256 5c05d04757911a06d32f50dc25c13387b8842e3a3b501d28f03e64ee0c2905a2
+DIST layman-2.0.0_rc1.tar.gz 70796 RMD160 d2d377b4930c8c630939bf929bdc609744d9689e SHA1 4fa9ade163d0c2b1c4f7fda3223da4f6c46d067c SHA256 20587f6410d544a70616f24705ea5dbdacc17e929109e307083d14d272dcbb02
+EBUILD layman-2.0.0_rc1.ebuild 2429 RMD160 53722a7bb0bf0d87356464cd322b8820c1dd7c71 SHA1 205f31a8902946c5e0acf10b8312134f2d2b5c33 SHA256 8483fed94ed879f329b587944a9921e584c0d8196523a2fa0937e0f53f547ebd
+MISC ChangeLog 20549 RMD160 53cd6f7501b3d9f0dc8869d1e3b1e61d08b58162 SHA1 cea56acdc983471be1c47d767dc8d15648969998 SHA256 e94ced3ecc339cd9a0b82d161234d4a5a9777bf16d70c69d835bbe748eb00cde
 MISC metadata.xml 912 RMD160 8d63f4e9672a7b15587026626802074a7b0e968b SHA1 00ffdacd3dcbd4e0652517628e9c932f32865a4a SHA256 67a4974996e495ff3f49e3874d9e1d6f4fe251e9e49d92385ef14d4f23550b10
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-2.0.0_rc1.ebuild
index 964cd67..560623f 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-2.0.0_rc1.ebuild
@@ -1,27 +1,25 @@
 # 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-9999.ebuild,v 1.15 2011/02/12 12:29:16 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0_rc1 Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2:2.5"
 SUPPORT_PYTHON_ABIS="1"
 
-inherit eutils distutils git
+inherit eutils distutils
 
-DESCRIPTION="A python script for retrieving gentoo overlays."
-HOMEPAGE="http://layman.sourceforge.net"
-SRC_URI=""
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/layman.git"
+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=""
-IUSE="bazaar cvs darcs git mercurial subversion g-common test"
+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 )
-    app-text/asciidoc"
+    test? ( dev-vcs/subversion )"
 RDEPEND="${COMMON_DEPS}
     bazaar? ( dev-vcs/bzr )
     cvs? ( dev-vcs/cvs )
@@ -33,20 +31,13 @@ RDEPEND="${COMMON_DEPS}
             >=dev-vcs/subversion-1.5.4[webdav-neon]
             >=dev-vcs/subversion-1.5.4[webdav-serf]
         )
-    g-common? ( app-portage/g-cran )
     )"
 RESTRICT_PYTHON_ABIS="2.4 3.*"
 
-pkg_setup() {
-    if ! has_version dev-vcs/subversion; then
-        ewarn "You do not have dev-vcs/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-vcs/subversion. If you do not install it"
-        ewarn "you will be unable to use these overlays."
-        ewarn
-    fi
+
+# Prevent running make
+src_compile() {
+    :
 }
 
 src_test() {
@@ -59,18 +50,12 @@ src_test() {
     python_execute_function testing
 }
 
-src_compile() {
-    distutils_src_compile
-    # override MAKEOPTS to prevent build failure
-    emake -j1 -C doc || die "emake -C doc failed"
-}
-
 src_install() {
     distutils_src_install
 
     dodir /etc/layman
 
-    cp etc/layman.cfg "${D}"/etc/layman/
+    cp etc/* "${D}"/etc/layman/
 
     doman doc/layman.8
     dohtml doc/layman.8.html