diff options
Diffstat (limited to 'app-portage')
20 files changed, 20 insertions, 1520 deletions
diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog index 1b8c51e7860b..3fcff29b6b2c 100644 --- a/app-portage/layman/ChangeLog +++ b/app-portage/layman/ChangeLog @@ -1,6 +1,20 @@ # 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.126 2011/02/12 19:57:50 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.127 2011/02/14 16:48:58 idl0r Exp $ + + 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 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 deleted file mode 100644 index 55728d560fa2..000000000000 --- a/app-portage/layman/files/layman-1.2.4-non-ascii-backport.patch +++ /dev/null @@ -1,47 +0,0 @@ -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,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,16 @@ class Overlay: - result = cmd.wait() - return result - -+ def _get_encoding(self): -+ if hasattr(sys.stdout, 'encoding') \ -+ and sys.stdout.encoding != None: -+ return sys.stdout.encoding -+ else: -+ return locale.getpreferredencoding() -+ -+ def _encode(self, unicode_text): -+ return codecs.encode(unicode_text, self._get_encoding(), 'replace') -+ - def __str__(self): - ''' - >>> here = os.path.dirname(os.path.realpath(__file__)) -@@ -272,7 +282,7 @@ class Overlay: - result += u'\n '.join((u'\n' + link).split(u'\n')) - result += u'\n' - -- return result -+ return self._encode(result) - - def short_list(self, width = 0): - ''' -@@ -321,7 +331,7 @@ class Overlay: - source = source.replace("overlays.gentoo.org", "o.g.o") - source = ' (' + pad(source, srclen) + ')' - -- return name + mtype + source -+ return self._encode(name + mtype + source) - - def supported(self, binaries = []): - '''Is the overlay type supported?''' diff --git a/app-portage/layman/files/layman-1.2.4-peg-backport.patch b/app-portage/layman/files/layman-1.2.4-peg-backport.patch deleted file mode 100644 index 5912dac105d3..000000000000 --- a/app-portage/layman/files/layman-1.2.4-peg-backport.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- layman/overlays/svn.py -+++ layman/overlays/svn.py -@@ -55,8 +55,8 @@ class SvnOverlay(Overlay): - else: - quiet_option = '' - -- return self.cmd(self.binary + ' co ' + quiet_option + '"' + self.src + '/" "' + -- path([base, self.name]) + '"') -+ return self.cmd(self.binary + ' co ' + quiet_option + -+ '"' + self.src + '/@" "' + path([base, self.name]) + '"') - - def sync(self, base, quiet = False): - '''Sync overlay.''' -@@ -68,8 +68,8 @@ class SvnOverlay(Overlay): - else: - quiet_option = '' - -- return self.cmd(self.binary + ' up ' + quiet_option + '"' + path([base, self.name]) + -- '"') -+ return self.cmd(self.binary + ' up ' + quiet_option + -+ '"' + path([base, self.name + '@']) + '"') - - def supported(self): - '''Overlay type supported?''' diff --git a/app-portage/layman/files/layman-1.3.0-cvs-fix.patch b/app-portage/layman/files/layman-1.3.0-cvs-fix.patch deleted file mode 100644 index 5d5ec61c41dc..000000000000 --- a/app-portage/layman/files/layman-1.3.0-cvs-fix.patch +++ /dev/null @@ -1,72 +0,0 @@ -From a223dc2c467cc05932aa5e42bdd905dd6aa83037 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sun, 24 Jan 2010 00:22:56 +0100 -Subject: [PATCH] Fix handling of CVS overlays - ---- - CHANGES | 7 +++++++ - doc/layman.8.xml | 2 +- - layman/overlays/cvs.py | 2 +- - layman/version.py | 2 +- - 4 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/CHANGES b/CHANGES -index 5af4a25..a9995f4 100644 ---- a/CHANGES -+++ b/CHANGES -@@ -1,6 +1,13 @@ - CHANGES - ------- - -+Version TODO -+=================================== -+ -+ - Fix handling of CVS overlays (bug #301689) -+ Thanks for the patch to Dmitry Karasik! -+ -+ - Version 1.3.0 - Released 2010/01/19 - =================================== - -diff --git a/doc/layman.8.xml b/doc/layman.8.xml -index ff44349..6a4f566 100644 ---- a/doc/layman.8.xml -+++ b/doc/layman.8.xml -@@ -197,7 +197,7 @@ - <title>layman</title> - <date>January 2010</date> - <productname>layman</productname> -- <productnumber>1.3.0</productnumber> -+ <productnumber>1.3.1_rc1</productnumber> - <copyright> - <year>2005-2009</year> - <holder>Gunnar Wrobel</holder> -diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py -index c949f0e..54aae5e 100644 ---- a/layman/overlays/cvs.py -+++ b/layman/overlays/cvs.py -@@ -43,7 +43,7 @@ class CvsOverlay(OverlaySource): - - def __init__(self, parent, xml, config, _location, ignore = 0, quiet = False): - -- super(CvsOverlay, self).__init__(xml, parent, config, _location, ignore, quiet) -+ super(CvsOverlay, self).__init__(parent, xml, config, _location, ignore, quiet) - - _subpath = xml.find('subpath') - if _subpath != None: -diff --git a/layman/version.py b/layman/version.py -index 5ee7d50..932d1b5 100644 ---- a/layman/version.py -+++ b/layman/version.py -@@ -20,7 +20,7 @@ - __version__ = "$Id: layman-1.3.0-cvs-fix.patch,v 1.1 2010/01/23 23:29:20 sping Exp $" - - --VERSION = '1.3.0' -+VERSION = '1.3.1_rc1' - - if __name__ == '__main__': - print VERSION --- -1.6.6 - 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 deleted file mode 100644 index fd83f62b9e81..000000000000 --- a/app-portage/layman/files/layman-1.3.0_rc1-fix-sync-warnings.patch +++ /dev/null @@ -1,63 +0,0 @@ -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/files/layman-1.3.0_rc1-refactoring-fix.patch b/app-portage/layman/files/layman-1.3.0_rc1-refactoring-fix.patch deleted file mode 100644 index efa6cc905dea..000000000000 --- a/app-portage/layman/files/layman-1.3.0_rc1-refactoring-fix.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 35b801214aabd8d4a06bcd501a21601827ea2256 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sun, 17 Jan 2010 17:02:02 +0100 -Subject: [PATCH] Fix refactoring faults - ---- - CHANGES | 2 ++ - layman/overlays/mercurial.py | 4 ++-- - layman/overlays/overlay.py | 2 -- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CHANGES b/CHANGES -index 5ef7dd0..1a9473c 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) - -+ - Fix faults introduced at refactoring (bug #301253) -+ - - Version 1.3.0_rc1 - Released 2010/01/15 - ======================================= -diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py -index add5136..2bda112 100644 ---- a/layman/overlays/mercurial.py -+++ b/layman/overlays/mercurial.py -@@ -50,14 +50,14 @@ class MercurialOverlay(OverlaySource): - self.supported() - - return self.cmd(self.command() + ' clone "' + self.src + '/" "' + -- path([base, self.name]) + '"') -+ path([base, self.parent.name]) + '"') - - def sync(self, base, quiet = False): - '''Sync overlay.''' - - self.supported() - -- return self.cmd('cd "' + path([base, self.name]) + '" && ' + -+ return self.cmd('cd "' + path([base, self.parent.name]) + '" && ' + - self.command() + ' pull -u "' + self.src + '"') - - def supported(self): -diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py -index 30d0966..f4ec63d 100644 ---- a/layman/overlays/overlay.py -+++ b/layman/overlays/overlay.py -@@ -99,8 +99,6 @@ class Overlay(object): - >>> b.is_official() - False - ''' -- self.config = config -- self.quiet = quiet - - _name = xml.find('name') - if _name != None: --- -1.6.6 - diff --git a/app-portage/layman/files/layman-1.3.0_rc1-sync-fix.patch b/app-portage/layman/files/layman-1.3.0_rc1-sync-fix.patch deleted file mode 100644 index 487975ee967f..000000000000 --- a/app-portage/layman/files/layman-1.3.0_rc1-sync-fix.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 6c7d833b16fbe0c4d39af665e76fa47811edcad2 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sat, 16 Jan 2010 18:21:25 +0100 -Subject: [PATCH] Fix syncing of overlays gone from remote lists - ---- - CHANGES | 7 +++++++ - layman/action.py | 46 +++++++++++++++++++++++++++++++++++----------- - layman/overlay.py | 5 +++-- - 3 files changed, 45 insertions(+), 13 deletions(-) - -diff --git a/CHANGES b/CHANGES -index 51ab56f..5ef7dd0 100644 ---- a/CHANGES -+++ b/CHANGES -@@ -1,6 +1,13 @@ - CHANGES - ------- - -+Version TODO -+======================================= -+ -+ - Syncing failed for overlays that no longer exist in the remote -+ lists with no need to (bug #301174) -+ -+ - Version 1.3.0_rc1 - Released 2010/01/15 - ======================================= - -diff --git a/layman/action.py b/layman/action.py -index 2701030..02ba1ce 100644 ---- a/layman/action.py -+++ b/layman/action.py -@@ -111,17 +111,41 @@ class Sync: - warnings = [] - success = [] - for i in self.selection: -- ordb = self.rdb.select(i) -- odb = self.db.select(i) -- current_src = odb.sources[0].src -- available_srcs = set(e.src for e in ordb.sources) -- if ordb and odb and not current_src in available_srcs: -- warnings.append( -- 'The source of the overlay "' + i + '" seems to have c' -- 'hanged. You currently sync from "' + current_src + '" whi' -- 'le the global layman list reports "' + '" and "'.join(available_srcs) + '" ' -- 'as correct location(s). Please consider removing and rea' -- 'dding the overlay!') -+ try: -+ ordb = self.rdb.select(i) -+ except: -+ warnings.append(\ -+ 'Overlay "%s" could not be found in the remote lists.\n' -+ 'Please check if it has been renamed and re-add if necessary.' % i) -+ else: -+ odb = self.db.select(i) -+ current_src = odb.sources[0].src -+ available_srcs = set(e.src for e in ordb.sources) -+ if ordb and odb and not current_src in available_srcs: -+ if len(available_srcs) == 1: -+ plural = '' -+ candidates = ' %s' % tuple(available_srcs)[0] -+ else: -+ plural = 's' -+ candidates = '\n'.join((' %d. %s' % (i + 1, v)) for i, v in enumerate(available_srcs)) -+ -+ warnings.append( -+ 'The source of the overlay "%(repo_name)s" seems to have changed.\n' -+ 'You currently sync from\n' -+ '\n' -+ ' %(current_src)s\n' -+ '\n' -+ 'while the remote lists report\n' -+ '\n' -+ '%(candidates)s\n' -+ '\n' -+ 'as correct location%(plural)s.\n' -+ 'Please consider removing and re-adding the overlay.' % { -+ 'repo_name':i, -+ 'current_src':current_src, -+ 'candidates':candidates, -+ 'plural':plural, -+ }) - - try: - self.db.sync(i, self.quiet) -diff --git a/layman/overlay.py b/layman/overlay.py -index 0ea11f0..1058723 100644 ---- a/layman/overlay.py -+++ b/layman/overlay.py -@@ -149,8 +149,9 @@ class Overlays: - >>> list(a.select('wrobel-stable').source_uris()) - [u'rsync://gunnarwrobel.de/wrobel-stable'] - ''' -- if overlay in self.overlays.keys(): -- return self.overlays[overlay] -+ if not overlay in self.overlays.keys(): -+ raise Exception('No overlay "%s" in database' % overlay) -+ return self.overlays[overlay] - - def list(self, verbose = False, width = 0): - ''' --- -1.6.6 - diff --git a/app-portage/layman/files/layman-1.3.2-missing-import.patch b/app-portage/layman/files/layman-1.3.2-missing-import.patch deleted file mode 100644 index f192dfd1e1aa..000000000000 --- a/app-portage/layman/files/layman-1.3.2-missing-import.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 806b99591eaab8f398988dfc4f2a2452738dd622 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sun, 21 Feb 2010 17:02:24 +0100 -Subject: [PATCH] Fix missing import - ---- - doc/layman.8.xml | 2 +- - layman/makeconf.py | 2 ++ - layman/version.py | 2 +- - 3 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/doc/layman.8.xml b/doc/layman.8.xml -index 246c83d..dc9cc38 100644 ---- a/doc/layman.8.xml -+++ b/doc/layman.8.xml -@@ -197,7 +197,7 @@ - <title>layman</title> - <date>January 2010</date> - <productname>layman</productname> -- <productnumber>1.3.2</productnumber> -+ <productnumber>1.3.2_p1</productnumber> - <copyright> - <year>2005-2009</year> - <holder>Gunnar Wrobel</holder> -diff --git a/layman/makeconf.py b/layman/makeconf.py -index 4bb70b5..fdd10c4 100644 ---- a/layman/makeconf.py -+++ b/layman/makeconf.py -@@ -19,6 +19,8 @@ import os - import codecs - import re - -+from layman.utils import path -+ - #=============================================================================== - # - # Helper class MakeConf -diff --git a/layman/version.py b/layman/version.py -index 631ffcc..c42c7f9 100644 ---- a/layman/version.py -+++ b/layman/version.py -@@ -20,7 +20,7 @@ - __version__ = "$Id: layman-1.3.2-missing-import.patch,v 1.1 2010/02/21 16:10:00 sping Exp $" - - --VERSION = '1.3.2' -+VERSION = '1.3.2_p1' - - if __name__ == '__main__': - print VERSION --- -1.6.6 - diff --git a/app-portage/layman/files/layman-1.3.2-missing-text.patch b/app-portage/layman/files/layman-1.3.2-missing-text.patch deleted file mode 100644 index 1272347e8500..000000000000 --- a/app-portage/layman/files/layman-1.3.2-missing-text.patch +++ /dev/null @@ -1,95 +0,0 @@ -From b3d326a19454ddd00b9f5fc8400f926123bd13db Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Mon, 15 Mar 2010 23:21:22 +0100 -Subject: [PATCH 1/2] Fix handling of empty XML entities (bug #309617) - ---- - layman/overlays/overlay.py | 22 ++++++++++++++-------- - layman/version.py | 2 +- - 2 files changed, 15 insertions(+), 9 deletions(-) - -diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py -index d2144f1..2333d72 100644 ---- a/layman/overlays/overlay.py -+++ b/layman/overlays/overlay.py -@@ -100,9 +100,15 @@ class Overlay(object): - False - ''' - -+ def strip_text(node): -+ res = node.text -+ if res is None: -+ return '' -+ return res.strip() -+ - _name = xml.find('name') - if _name != None: -- self.name = ensure_unicode(_name.text.strip()) -+ self.name = ensure_unicode(strip_text(_name)) - elif 'name' in xml.attrib: - self.name = ensure_unicode(xml.attrib['name']) - else: -@@ -127,7 +133,7 @@ class Overlay(object): - _class = OVERLAY_TYPES[_type] - except KeyError: - raise Exception('Unknown overlay type "%s"!' % _type) -- _location = ensure_unicode(source_elem.text.strip()) -+ _location = ensure_unicode(strip_text(source_elem)) - return _class(self, xml, config, _location, ignore, quiet) - - self.sources = [create_overlay_source(e) for e in _sources] -@@ -139,10 +145,10 @@ class Overlay(object): - else: - _email = _owner.find('email') - if _owner != None and _email != None: -- self.owner_email = ensure_unicode(_email.text.strip()) -+ self.owner_email = ensure_unicode(strip_text(_email)) - _name = _owner.find('name') - if _name != None: -- self.owner_name = ensure_unicode(_name.text.strip()) -+ self.owner_name = ensure_unicode(strip_text(_name)) - else: - self.owner_name = None - elif 'contact' in xml.attrib: -@@ -161,7 +167,7 @@ class Overlay(object): - - _desc = xml.find('description') - if _desc != None: -- d = WHITESPACE_REGEX.sub(' ', _desc.text.strip()) -+ d = WHITESPACE_REGEX.sub(' ', strip_text(_desc)) - self.description = ensure_unicode(d) - del d - else: -@@ -191,13 +197,13 @@ class Overlay(object): - h = xml.find('homepage') - l = xml.find('link') - if h != None: -- self.homepage = ensure_unicode(h.text.strip()) -+ self.homepage = ensure_unicode(strip_text(h)) - elif l != None: -- self.homepage = ensure_unicode(l.text.strip()) -+ self.homepage = ensure_unicode(strip_text(l)) - else: - self.homepage = None - -- self.feeds = [ensure_unicode(e.text.strip()) for e in xml.findall('feed')] -+ self.feeds = [ensure_unicode(strip_text(e)) for e in xml.findall('feed')] - - - def __eq__(self, other): -diff --git a/layman/version.py b/layman/version.py -index c42c7f9..1cb47d4 100644 ---- a/layman/version.py -+++ b/layman/version.py -@@ -20,7 +20,7 @@ - __version__ = "$Id: layman-1.3.2-missing-text.patch,v 1.1 2010/03/15 22:41:07 sping Exp $" - - --VERSION = '1.3.2_p1' -+VERSION = '1.3.2_p2' - - if __name__ == '__main__': - print VERSION --- -1.7.0.1.61.gdc05d.dirty - diff --git a/app-portage/layman/layman-1.2.4-r3.ebuild b/app-portage/layman/layman-1.2.4-r3.ebuild deleted file mode 100644 index 3ad649be4b90..000000000000 --- a/app-portage/layman/layman-1.2.4-r3.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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.4 2010/07/06 18:12:40 arfrever 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="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] - ) - )" -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-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 -} - -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 -} diff --git a/app-portage/layman/layman-1.2.5.ebuild b/app-portage/layman/layman-1.2.5.ebuild deleted file mode 100644 index 804e349352e4..000000000000 --- a/app-portage/layman/layman-1.2.5.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# 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.5.ebuild,v 1.4 2010/07/06 18:12:40 arfrever 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="git subversion test" - -COMMON_DEPS="dev-lang/python[xml]" -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] - ) - )" -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 -} - -src_test() { - testing() { - # external.py missing in 1.2.5 release tarball .. - for suite in layman/tests/dtest.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 -} diff --git a/app-portage/layman/layman-1.2.6.ebuild b/app-portage/layman/layman-1.2.6.ebuild deleted file mode 100644 index b4e59b79dac8..000000000000 --- a/app-portage/layman/layman-1.2.6.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# 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.6.ebuild,v 1.4 2010/07/06 18:12:40 arfrever 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="git subversion test" - -COMMON_DEPS="dev-lang/python[xml]" -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] - ) - )" -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 -} - -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 -} diff --git a/app-portage/layman/layman-1.3.0-r1.ebuild b/app-portage/layman/layman-1.3.0-r1.ebuild deleted file mode 100644 index 6dd2328558a7..000000000000 --- a/app-portage/layman/layman-1.3.0-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# 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-r1.ebuild,v 1.9 2010/07/06 18:12:40 arfrever 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.*" - -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 -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-cvs-fix.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 /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.0.ebuild b/app-portage/layman/layman-1.3.0.ebuild deleted file mode 100644 index 8eec418d4b1d..000000000000 --- a/app-portage/layman/layman-1.3.0.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# 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.ebuild,v 1.5 2010/07/06 18:12:40 arfrever 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="git subversion test" - -COMMON_DEPS="dev-lang/python[xml]" -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] - ) - )" -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 -} - -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.0_rc1-r3.ebuild b/app-portage/layman/layman-1.3.0_rc1-r3.ebuild deleted file mode 100644 index 0f46a4e9cbd0..000000000000 --- a/app-portage/layman/layman-1.3.0_rc1-r3.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# 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.4 2010/07/06 18:12:40 arfrever 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="git subversion test" - -COMMON_DEPS="dev-lang/python[xml]" -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] - ) - )" -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 -} - -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 -} diff --git a/app-portage/layman/layman-1.3.1.ebuild b/app-portage/layman/layman-1.3.1.ebuild deleted file mode 100644 index 81824f27c06f..000000000000 --- a/app-portage/layman/layman-1.3.1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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.1.ebuild,v 1.9 2010/07/06 18:12:40 arfrever 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.*" - -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 -} - -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.2-r1.ebuild b/app-portage/layman/layman-1.3.2-r1.ebuild deleted file mode 100644 index 57592da928d3..000000000000 --- a/app-portage/layman/layman-1.3.2-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# 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.2-r1.ebuild,v 1.8 2010/07/06 18:12:40 arfrever 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_prepare() { - epatch "${FILESDIR}"/${P}-missing-import.patch -} - -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 -} - -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.2-r2.ebuild b/app-portage/layman/layman-1.3.2-r2.ebuild deleted file mode 100644 index 5606ffd18fb6..000000000000 --- a/app-portage/layman/layman-1.3.2-r2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# 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.2-r2.ebuild,v 1.5 2010/06/22 18:32:50 arfrever 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_prepare() { - epatch "${FILESDIR}"/${P}-missing-import.patch - epatch "${FILESDIR}"/${P}-missing-text.patch -} - -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 -} - -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.4.0.ebuild b/app-portage/layman/layman-1.4.0.ebuild deleted file mode 100644 index 3298c48c9b5e..000000000000 --- a/app-portage/layman/layman-1.4.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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.4.0.ebuild,v 1.1 2010/07/08 11:27:51 sping Exp $ - -EAPI="2" -PYTHON_DEPEND="2:2.5" -SUPPORT_PYTHON_ABIS="1" - -inherit eutils distutils - -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" -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.*" - -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 -} - -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-9999.ebuild b/app-portage/layman/layman-9999.ebuild index d5e83779abb8..8d528a3783d5 100644 --- a/app-portage/layman/layman-9999.ebuild +++ b/app-portage/layman/layman-9999.ebuild @@ -1,6 +1,6 @@ # 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-9999.ebuild,v 1.16 2011/02/14 16:48:58 idl0r Exp $ EAPI="2" PYTHON_DEPEND="2:2.5" @@ -60,15 +60,15 @@ src_test() { src_compile() { distutils_src_compile - emake -C doc || die "emake -C doc failed" + # 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/ + insinto /etc/layman + doins etc/layman.cfg || die doman doc/layman.8 dohtml doc/layman.8.html |