Version bump. Closes bug #333375

Package-Manager: portage-2.2_rc95/cvs/Linux i686

5 files changed, 117 insertions, 2 deletions

diff --git a/dev-db/desktopcouch/ChangeLog b/dev-db/desktopcouch/ChangeLog
index 20fc19b669d0..01ebdcc511f7 100644
--- a/dev-db/desktopcouch/ChangeLog
+++ b/dev-db/desktopcouch/ChangeLog
@@ -1,6 +1,14 @@
 # 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.4 2010/04/27 18:45:43 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/desktopcouch/ChangeLog,v 1.5 2010/12/15 20:17:01 neurogeek Exp $
+
+*desktopcouch-0.6.9_beta (15 Dec 2010)
+
+  15 Dec 2010; Jesus Rivero <neurogeek@gentoo.org>
+  +desktopcouch-0.6.9_beta.ebuild,
+  +files/desktopcouch-0.6.9b-drop_ubuntuone_support.patch,
+  +files/desktopcouch-0.6.9b-setup_hardlinks.patch:
+  Version bump. Closes bug #333375
 
   27 Apr 2010; Jesus Rivero <neurogeek@gentoo.org>
   -desktopcouch-0.6.1-r1.ebuild:
diff --git a/dev-db/desktopcouch/Manifest b/dev-db/desktopcouch/Manifest
index 6cede91b5153..8a79f407d20c 100644
--- a/dev-db/desktopcouch/Manifest
+++ b/dev-db/desktopcouch/Manifest
@@ -1,5 +1,9 @@
 AUX desktopcouch-0.6.4-setup_hardlinks.patch 1408 RMD160 5fe0c417aae3b93bbef71b6ef32991e51761ba68 SHA1 7816aa6cdb2404885b09626a763c43186b9600e0 SHA256 7cad98369889fea3933edd84e6ed80fc3a055e3b9a6d5ec7ef468b416e672953
+AUX desktopcouch-0.6.9b-drop_ubuntuone_support.patch 435 RMD160 b056171542754245d5098d683be531d3b1b841f3 SHA1 1881ae1b9b169a5cc3e1d77351133a5f2e49b9c9 SHA256 bd5b8ee28f58d7c920aa7233d8f797f34a07f79ab1ea6c1aa155fd8f44af627c
+AUX desktopcouch-0.6.9b-setup_hardlinks.patch 1872 RMD160 3c18d26b8a2d395596e9ae60997a0c8ef980b838 SHA1 fec3f220eaf7fb0ac3a76c2bd9be6404e23d2200 SHA256 8a6c747904ddb957be0beb8452ab83d7b160d9e342ade021b53fd489fced0ad4
 DIST desktopcouch-0.6.4.tar.gz 105609 RMD160 1655bf1addf06f183b9ce1cfd5e7492a685482b2 SHA1 c5d122a3d4897bc058962238f3b31ef246abdebd SHA256 e37c89cb9c3c905138b56b0ae62f287e79a527e8d2c6fe64a7fbb94eebd91085
+DIST desktopcouch-0.6.9b.tar.gz 113235 RMD160 a5636affe229686507eb0685a05ef978b28c69a0 SHA1 c03eb44e3c00beaae1b1e02b27e7e09fe70d34a4 SHA256 5f9b8f324cd07dabe8ccb021556774a378dec83895e0450fa9d729716adc5b86
 EBUILD desktopcouch-0.6.4.ebuild 1408 RMD160 d0a7c414c3e2a645ec5472c828e216c173d12464 SHA1 5b79f4e2bd049f531d428f8a6741ed2bb028a4a5 SHA256 b605e7b17cb79fde9a3fa0fa1de6cf53fffc7b658e35e4e3f939296f59065615
-MISC ChangeLog 1101 RMD160 6d522dceccc60a12892134c7a8a1992b1a0259de SHA1 88a72b879fac9c061ac923271ed8e8739497b571 SHA256 5144b7719b66a3b07264502ff7f3f98f05689e0190d01e7ac88bd426ec1633bd
+EBUILD desktopcouch-0.6.9_beta.ebuild 1546 RMD160 90903662c49b7a94e6445e3dfb7e6312c7bea7ab SHA1 bd3a93fb503d61d7ed82e870eca53cbd0cc1c861 SHA256 976cd9800c5eabad535a6915aa8731c3f7cde0f3415c31dac7e7fb6cc56674db
+MISC ChangeLog 1374 RMD160 f39fc04f02e8d045a56ef1e923ee821e342eb7b7 SHA1 d86be2af2c41c716ea22594c2a84ccc5b606071b SHA256 828e2e7156c37aca101a2aacf576c02115b6ff06d2dd310bb29ca32bf06e3c91
 MISC metadata.xml 255 RMD160 b69d2df062aad1158c03b925d5bfdeab02f98db2 SHA1 c94d776662afd93f3be5dc1fea7793b80738dbc5 SHA256 01d09f8eee4532c21a12d462263dfa84fda9e1b421410b13fe9799ed4680ba7b
diff --git a/dev-db/desktopcouch/desktopcouch-0.6.9_beta.ebuild b/dev-db/desktopcouch/desktopcouch-0.6.9_beta.ebuild
new file mode 100644
index 000000000000..5fe8ba7c8220
--- /dev/null
+++ b/dev-db/desktopcouch/desktopcouch-0.6.9_beta.ebuild
@@ -0,0 +1,59 @@
+# 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.9_beta.ebuild,v 1.1 2010/12/15 20:17:01 neurogeek Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+inherit distutils eutils multilib
+
+DESCRIPTION="Desktop-oriented interface to CouchDB"
+HOMEPAGE="https://launchpad.net/desktopcouch"
+SRC_URI="http://launchpad.net/desktopcouch/trunk/${MY_PV}/+download/${MY_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/couchdb-python-0.7
+	>=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"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${MY_P}-setup_hardlinks.patch"
+	epatch "${FILESDIR}/${MY_P}-drop_ubuntuone_support.patch"
+}
+
+src_install() {
+	python_convert_shebangs -r 2 "bin/"
+
+	distutils_src_install
+
+	exeinto "/usr/$(get_libdir)/${PN}"
+	doexe "bin/desktopcouch-stop"
+	doexe "bin/desktopcouch-service"
+	doexe "bin/desktopcouch-get-port"
+
+	if use doc; then
+		insinto "/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.9b-drop_ubuntuone_support.patch b/dev-db/desktopcouch/files/desktopcouch-0.6.9b-drop_ubuntuone_support.patch
new file mode 100644
index 000000000000..3f0b9a239fb4
--- /dev/null
+++ b/dev-db/desktopcouch/files/desktopcouch-0.6.9b-drop_ubuntuone_support.patch
@@ -0,0 +1,12 @@
+#We dont have ubuntu_sso package in the tree. Maybe this patch
+#can be dropped later on.
+#Jesus Rivero <neurogeek> 
+#Dec. 15, 2010
+--- desktopcouch/replication_services/__init__.py.orig	2010-12-15 09:31:29.000000000 -0500
++++ desktopcouch/replication_services/__init__.py	2010-12-15 09:30:53.000000000 -0500
+@@ -1,4 +1,4 @@
+ """Modules imported here are available as services."""
+ 
+-import ubuntuone
++#import ubuntuone
+ import example
diff --git a/dev-db/desktopcouch/files/desktopcouch-0.6.9b-setup_hardlinks.patch b/dev-db/desktopcouch/files/desktopcouch-0.6.9b-setup_hardlinks.patch
new file mode 100644
index 000000000000..ed90ec0c32ca
--- /dev/null
+++ b/dev-db/desktopcouch/files/desktopcouch-0.6.9b-setup_hardlinks.patch
@@ -0,0 +1,32 @@
+--- setup.py.orig	2010-12-15 08:55:27.000000000 -0500
++++ setup.py	2010-12-15 09:05:32.000000000 -0500
+@@ -31,19 +31,21 @@
+     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']),
++    data_files = [
++#    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']),
++#                  ('/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/',
+                       ['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'])],
++#                  ('share/man/man1/', ['docs/man/desktopcouch-pair.1'])],
++    ],
+     cmdclass = { "build" : build_extra.build_extra,
+                  "build_i18n" :  build_i18n.build_i18n }
+ )