From fe47b28243e6c7ad17518a5f0c016f5ab37a7fd1 Mon Sep 17 00:00:00 2001 From: Jesus Rivero Date: Tue, 27 Apr 2010 18:43:25 +0000 Subject: Fixed dependency for dev-python/couchdb-python wrt bug #315743. Fixed python ebuild related code wrt bug #312135. Removed older versions. (Portage version: 2.2_rc67/cvs/Linux i686) --- dev-db/desktopcouch/ChangeLog | 11 ++++- dev-db/desktopcouch/desktopcouch-0.6.4.ebuild | 51 ++++++++++++++++++++++ .../files/desktopcouch-0.6.4-setup_hardlinks.patch | 24 ++++++++++ .../files/desktopcouch-setup_hardlinks.patch | 23 ---------- 4 files changed, 85 insertions(+), 24 deletions(-) create mode 100644 dev-db/desktopcouch/desktopcouch-0.6.4.ebuild create mode 100644 dev-db/desktopcouch/files/desktopcouch-0.6.4-setup_hardlinks.patch delete mode 100644 dev-db/desktopcouch/files/desktopcouch-setup_hardlinks.patch (limited to 'dev-db/desktopcouch') diff --git a/dev-db/desktopcouch/ChangeLog b/dev-db/desktopcouch/ChangeLog index 8c82d6f53f21..21b38e792879 100644 --- a/dev-db/desktopcouch/ChangeLog +++ b/dev-db/desktopcouch/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-db/desktopcouch # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/desktopcouch/ChangeLog,v 1.2 2010/04/01 02:22:49 neurogeek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/desktopcouch/ChangeLog,v 1.3 2010/04/27 18:43:25 neurogeek Exp $ + +*desktopcouch-0.6.4 (27 Apr 2010) + + 27 Apr 2010; Jesus Rivero + +desktopcouch-0.6.4.ebuild, + +files/desktopcouch-0.6.4-setup_hardlinks.patch, + -files/desktopcouch-setup_hardlinks.patch: + Fixed dependency for dev-python/couchdb-python wrt bug #315743. Fixed + python ebuild related code wrt bug #312135. Removed older versions. *desktopcouch-0.6.1-r1 (01 Apr 2010) diff --git a/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild b/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild new file mode 100644 index 000000000000..18f6e58a28d8 --- /dev/null +++ b/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild,v 1.1 2010/04/27 18:43:25 neurogeek Exp $ + +PYTHONDEPEND="2" +EAPI="2" + +inherit distutils eutils + +DESCRIPTION="Desktop-oriented interface to CouchDB" +HOMEPAGE="https://launchpad.net/desktopcouch" +SRC_URI="http://launchpad.net/desktopcouch/trunk/${PV}/+download/${P}.tar.gz" +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +DEPEND=">=dev-python/python-distutils-extra-2.12" +RDEPEND=">=dev-db/couchdb-0.10.0 + >=dev-python/gnome-keyring-python-2.22.3-r1 + =dev-python/oauth-1.0.1 + >=dev-python/simplejson-2.0.9-r1 + >=dev-python/twisted-8.2.0-r2 + >=net-dns/avahi-0.6.24-r2[python]" +RESTRICT="test" + +src_prepare() { + epatch "${FILESDIR}/${P}-setup_hardlinks.patch" +} + +src_install() { + + python_convert_shebangs -r 2 "bin/" + + distutils_src_install + + exeinto "${ROOT}/usr/lib/${PN}" + doexe "bin/desktopcouch-stop" + doexe "bin/desktopcouch-service" + doexe "bin/desktopcouch-get-port" + + if use doc; then + insinto "${ROOT}/usr/share/doc/${PF}/api" + doins "desktopcouch/records/doc/records.txt" + doins "desktopcouch/records/doc/field_registry.txt" + doins "desktopcouch/contacts/schema.txt" + + doman "docs/man/desktopcouch-pair.1" + fi +} diff --git a/dev-db/desktopcouch/files/desktopcouch-0.6.4-setup_hardlinks.patch b/dev-db/desktopcouch/files/desktopcouch-0.6.4-setup_hardlinks.patch new file mode 100644 index 000000000000..7810ccc713e4 --- /dev/null +++ b/dev-db/desktopcouch/files/desktopcouch-0.6.4-setup_hardlinks.patch @@ -0,0 +1,24 @@ +--- setup.py.orig 2010-04-23 05:19:54.000000000 +0000 ++++ setup.py 2010-04-23 05:32:47.000000000 +0000 +@@ -31,19 +31,10 @@ + test_suite="runtests.get_test_suite", + packages=find_packages(), + scripts=['bin/desktopcouch-pair'], +- data_files = [('/usr/lib/desktopcouch/', ['bin/desktopcouch-service', +- 'bin/desktopcouch-get-port', +- 'bin/desktopcouch-stop']), +- # Be sure all additions are reflected in MANIFEST.in ! +- ('/usr/share/doc/python-desktopcouch-records/api/', +- ['desktopcouch/records/doc/records.txt', +- 'desktopcouch/records/doc/field_registry.txt', +- 'desktopcouch/contacts/schema.txt']), +- ('/etc/xdg/desktop-couch/', ++ data_files = [('/etc/xdg/desktop-couch/', + ['config/desktop-couch/compulsory-auth.ini']), + ('/usr/share/desktopcouch/', ['data/couchdb.tmpl']), +- ('/usr/share/dbus-1/services/', ['org.desktopcouch.CouchDB.service']), +- ('share/man/man1/', ['docs/man/desktopcouch-pair.1'])], ++ ('/usr/share/dbus-1/services/', ['org.desktopcouch.CouchDB.service'])], + cmdclass = { "build" : build_extra.build_extra, + "build_i18n" : build_i18n.build_i18n } + ) diff --git a/dev-db/desktopcouch/files/desktopcouch-setup_hardlinks.patch b/dev-db/desktopcouch/files/desktopcouch-setup_hardlinks.patch deleted file mode 100644 index 40d12b4205d3..000000000000 --- a/dev-db/desktopcouch/files/desktopcouch-setup_hardlinks.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- setup.py.orig 2010-03-12 22:30:22.000000000 +0000 -+++ setup.py 2010-03-12 22:42:57.000000000 +0000 -@@ -31,18 +31,11 @@ - test_suite="runtests.get_test_suite", - packages=find_packages(), - scripts=['bin/desktopcouch-pair'], -- data_files = [('/usr/lib/desktopcouch/', ['bin/desktopcouch-service', -- 'bin/desktopcouch-stop']), -- # Be sure all additions are reflected in MANIFEST.in ! -- ('/usr/share/doc/python-desktopcouch-records/api/', -- ['desktopcouch/records/doc/records.txt', -- 'desktopcouch/records/doc/field_registry.txt', -- 'desktopcouch/contacts/schema.txt']), -+ data_files = [# Be sure all additions are reflected in MANIFEST.in ! - ('/etc/xdg/desktop-couch/', - ['config/desktop-couch/compulsory-auth.ini']), - ('/usr/share/desktopcouch/', ['data/couchdb.tmpl']), -- ('/usr/share/dbus-1/services/', ['org.desktopcouch.CouchDB.service']), -- ('share/man/man1/', ['docs/man/desktopcouch-pair.1'])], -+ ('/usr/share/dbus-1/services/', ['org.desktopcouch.CouchDB.service']),], - cmdclass = { "build" : build_extra.build_extra, - "build_i18n" : build_i18n.build_i18n } - ) -- cgit v1.2.3-65-gdbad