reinit the tree, so we can have metadata

3 files changed, 136 insertions, 0 deletions

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..27468c1bba5a
--- /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/files/g-octave-0.4.1-fix-Makefile.patch b/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch
new file mode 100644
index 000000000000..af56b4f75d96
--- /dev/null
+++ b/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch
@@ -0,0 +1,12 @@
+--- g-octave-0.4.1/share/g-octave.eclass	2013-05-30 19:01:07.980521612 +0200
++++ g-octave-0.4.1/share/g-octave.eclass.new	2013-05-30 19:03:38.933514388 +0200
+@@ -48,6 +48,9 @@
+ 	for filename in Makefile configure; do
+ 		cp "${DISTDIR}/g-octave_${filename}" "${S}/${filename}"
+ 	done
++
++	sed -i -e 's@libexec@lib@g' "${S}/Makefile" || die 'sed failed.'
++
+ 	chmod 0755 "${S}/configure"
+ 	if [ -e "${S}"/src/autogen.sh ]; then
+ 		cd "${S}"/src && ./autogen.sh || die 'failed to run autogen.sh'
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch b/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch
new file mode 100644
index 000000000000..2700f3b100dc
--- /dev/null
+++ b/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch
@@ -0,0 +1,36 @@
+--- a/contrib/manage_pkgdb.py
++++ b/contrib/manage_pkgdb.py
+@@ -50,7 +50,7 @@ class SfUpdates:
+     # feed url from 'http://sourceforge.net/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/'
+     feed_url = u'http://sourceforge.net/api/file/index/project-id/2888/mtime/desc/rss?path=%2FOctave%20Forge%20Packages%2FIndividual%20Package%20Releases'
+ 
+-    svnroot_url = u'https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/'
++    svnroot_url = u'http://svn.code.sf.net/p/octave/code/trunk/octave-forge'
+     categories = [u'main', u'extra', u'language', u'nonfree']
+ 
+     _timestamp = None
+--- a/g_octave/description.py
++++ b/g_octave/description.py
+@@ -269,7 +269,7 @@ def __getattr__(self, name):
+ 
+ class SvnDescription(Description):
+     
+-    _url = 'https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge'
++    _url = 'http://svn.code.sf.net/p/octave/code/trunk/octave-forge'
+     
+     def __init__(self, category, package):
+         temp_desc = config_file = tempfile.mkstemp()[1]
+--- a/share/g-octave.eclass
++++ b/share/g-octave.eclass
+@@ -13,7 +13,7 @@
+ G_OCTAVE_CAT="${G_OCTAVE_CAT:-main}"
+ 
+ 
+-REPO_URI="https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge"
++REPO_URI="http://svn.code.sf.net/p/octave/code/trunk/octave-forge"
+ if [[ ${PV} = 9999* ]]; then
+ 	inherit subversion autotools
+ 	ESVN_REPO_URI="${REPO_URI}/${G_OCTAVE_CAT}/${PN}"
+-- 
+1.7.10
+