Revision bump, fixes bug #274593, thanks to Karol Szumski

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

3 files changed, 102 insertions, 6 deletions

diff --git a/app-portage/g-octave/ChangeLog b/app-portage/g-octave/ChangeLog
index 3a1f975ddbbd..4450cb8b94af 100644
--- a/app-portage/g-octave/ChangeLog
+++ b/app-portage/g-octave/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/g-octave
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/g-octave/ChangeLog,v 1.3 2010/10/24 01:19:50 rafaelmartins Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-octave/ChangeLog,v 1.4 2011/05/31 05:24:11 rafaelmartins Exp $
+
+*g-octave-0.4.1-r1 (31 May 2011)
+
+  31 May 2011; Rafael G. Martins <rafaelmartins@gentoo.org>
+  -g-octave-0.4.1.ebuild, +g-octave-0.4.1-r1.ebuild,
+  +files/g-octave-0.4.1-add_cave_support.patch:
+  Revision bump, fixes bug #274593, thanks to Karol Szumski
 
   24 Oct 2010; Rafael G. Martins <rafaelmartins@gentoo.org>
   g-octave-0.4.1.ebuild:
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch b/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch
new file mode 100644
index 000000000000..1ef90c9200ed
--- /dev/null
+++ b/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch
@@ -0,0 +1,88 @@
+--- ./g-octave-0.4.1/g_octave/package_manager.py	2010-10-23 23:37:26.000000000 +0200
++++ ./g-octave-0.4.1/g_octave/package_manager.py	2011-05-25 12:52:10.510019006 +0200
+@@ -15,6 +15,7 @@
+     'Portage',
+     'Pkgcore',
+     'Paludis',
++    'Cave',
+ ]
+ 
+ import grp
+@@ -243,3 +244,56 @@
+                 packages.append(line.strip())
+         return packages
+ 
++class Cave(Base):
++    
++    _client = '/usr/bin/cave'
++    _group = 'paludisbuild'
++    
++    post_uninstall = [
++        'You may want to remove the dependencies too, using:',
++        '# cave purge',
++    ]
++    
++    def __init__(self, ask=False, verbose=False, pretend=False, oneshot=False, nocolor=False):
++        self._fullcommand = [self._client]
++        self._cmd = ['-z']
++        oneshot and self._cmd.append('-1')
++        not pretend and self._cmd.append('-x')
++        #if verbose:
++        #    self._fullcommand += [
++        #        '--show-descriptions', 'all',
++        #        '--show-option-descriptions', 'all',
++        #    ]
++        #cave doesn't support '--ask'
++        #cave doesn't support '--no-color'
++    
++    def run_command(self, command):
++        return subprocess.call(self._fullcommand + command + self._cmd)
++    
++    def install_package(self, pkgatom, catpkg):
++        return self.run_command(['resolve'] + [pkgatom])
++
++    def uninstall_package(self, pkgatom, catpkg):
++        return self.run_command(['uninstall'] + [pkgatom])
++    
++    def update_package(self, pkgatom=None, catpkg=None):
++        cmd = ['-1','-K','s','-k','s']
++        if pkgatom is None:
++            pkgatom = self.installed_packages()
++        else:
++            pkgatom = [pkgatom]
++        self.do_ebuilds(pkgatom)
++        return self.run_command(['resolve'] + cmd + pkgatom)
++    
++    def installed_packages(self):
++        packages = []
++        p = subprocess.Popen([
++            'cave',
++            'print-ids',
++            '--matching', 'g-octave/*::installed',
++            '--format', '%c/%p\n',
++        ], stdout=subprocess.PIPE)
++        if p.wait() == os.EX_OK:
++            for line in p.stdout:
++                packages.append(line.strip())
++        return packages
+--- ./g-octave-0.4.1/scripts/g-octave	2011-05-25 12:00:25.740019020 +0200
++++ ./g-octave-0.4.1/scripts/g-octave	2011-05-25 12:00:39.434019008 +0200
+@@ -217,7 +217,7 @@
+             return os.EX_DATAERR
+         return os.EX_OK
+ 
+-    from g_octave.package_manager import Portage, Pkgcore, Paludis
++    from g_octave.package_manager import Portage, Pkgcore, Paludis, Cave
+ 
+     if conf_prefetch.package_manager == 'portage':
+         log.info('Your package manager is: Portage')
+@@ -228,6 +228,9 @@
+     elif conf_prefetch.package_manager == 'paludis':
+         log.info('Your package manager is: Paludis')
+         pkg_manager = Paludis(options.ask, options.verbose, options.pretend, options.oneshot, not options.colors)
++    elif conf_prefetch.package_manager == 'cave':
++        log.info('Your package manager is: Paludis (Cave)')
++        pkg_manager = Cave(options.ask, options.verbose, options.pretend, options.oneshot, not options.colors)
+     else:
+         log.error('Invalid package manager: %s' % conf_prefetch.package_manager)
+         out.eerror('Invalid package manager: %s' % conf_prefetch.package_manager)
diff --git a/app-portage/g-octave/g-octave-0.4.1.ebuild b/app-portage/g-octave/g-octave-0.4.1-r1.ebuild
index 93f39711051e..a74af4c2bcff 100644
--- a/app-portage/g-octave/g-octave-0.4.1.ebuild
+++ b/app-portage/g-octave/g-octave-0.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/g-octave/g-octave-0.4.1.ebuild,v 1.2 2010/10/24 01:19:50 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-octave/g-octave-0.4.1-r1.ebuild,v 1.1 2011/05/31 05:24:11 rafaelmartins Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -9,7 +9,7 @@ PYTHON_DEPEND="*:2.6"
 DB_COMMIT="d66097a24ed9654f350f16ba6f7395f314e9e48f"
 DB_DIR="rafaelmartins-${PN}-db-${DB_COMMIT:0:7}"
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="A tool that generates and installs ebuilds for Octave-Forge"
 HOMEPAGE="http://www.g-octave.org/"
@@ -20,7 +20,7 @@ SRC_URI="http://www.g-octave.org/releases/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0 )"
@@ -30,6 +30,7 @@ PYTHON_MODNAME="g_octave"
 
 src_prepare() {
 	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-add_cave_support.patch"
 	sed -i -e 's/^has_fetch.*$/has_fetch = False/' scripts/g-octave \
 		|| die 'failed to patch the g-octave main script'
 }