Fixed dependency for dev-python/couchdb-python wrt bug #315743. Fixed python ebuild...

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

diff --git a/dev-db/desktopcouch/ChangeLog b/dev-db/desktopcouch/ChangeLog
index 8c82d6f53f2119f7c51ed9e2af76dd42d9129f48..21b38e7928796789ef84d5501d3ba5fffbeb7e41 100644 (file)
--- 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 <neurogeek@gentoo.org>
+  +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/Manifest b/dev-db/desktopcouch/Manifest
index ccf933e7a84d348390d943aee72e52533dce4fd3..284a79a6a8e61fdfa14e29856983a37df2fdd621 100644 (file)
--- a/dev-db/desktopcouch/Manifest
+++ b/dev-db/desktopcouch/Manifest
@@ -1,5 +1,17 @@
-AUX desktopcouch-setup_hardlinks.patch 1360 RMD160 4051264568c40c7c07f68f147abec6ee47e229b4 SHA1 3ce481fc669829bfd93aff466bd6b0799a5bf9fb SHA256 3fc006ea61b26fb7cb100e827cc5fab5ab636f305a6aa7c1e2e57faa4d0f0097
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX desktopcouch-0.6.4-setup_hardlinks.patch 1408 RMD160 5fe0c417aae3b93bbef71b6ef32991e51761ba68 SHA1 7816aa6cdb2404885b09626a763c43186b9600e0 SHA256 7cad98369889fea3933edd84e6ed80fc3a055e3b9a6d5ec7ef468b416e672953
 DIST desktopcouch-0.6.1.tar.gz 96707 RMD160 33e50115e91da1abb3bacca3805bfbd57a0fd967 SHA1 4e5acd3cb19e3f9dafb2a41f16b37b7662c50c7f SHA256 75dbec97475047a02006f0347a4e736188dfc4760136b5d01f9390712113a964
+DIST desktopcouch-0.6.4.tar.gz 105609 RMD160 1655bf1addf06f183b9ce1cfd5e7492a685482b2 SHA1 c5d122a3d4897bc058962238f3b31ef246abdebd SHA256 e37c89cb9c3c905138b56b0ae62f287e79a527e8d2c6fe64a7fbb94eebd91085
 EBUILD desktopcouch-0.6.1-r1.ebuild 1304 RMD160 3a8fc563293dc430e5c4ed161a9283640defa66a SHA1 fbb777a4334121b5ca2263910b416b74114a03a2 SHA256 1dc5de51609a6756c0393bf3d18c88a16210958982214ff192586385f9add74a
-MISC ChangeLog 639 RMD160 2b6874457d19642a9a25a20e23c4b3046462de75 SHA1 e414e885d699bc95ac47a30c24ee981e6023631b SHA256 0126324fa17cc3d76982603b60cda8f6c3b3ffbe42072672a09b932968dd556b
+EBUILD desktopcouch-0.6.4.ebuild 1358 RMD160 cd2e267568218418e812711e589b6c989e878d7e SHA1 9d0d2961e43af0fb71bfc1b849435c3aa563b226 SHA256 0180c6c4b394615207691e27571eb91af10c6623f822fbbfa172568d3b15f03d
+MISC ChangeLog 994 RMD160 5a96a63db7564774a7c9a3d58f3e1535181fc4d7 SHA1 1aa36dd731f601c9227a4bb5a4459c578a316a00 SHA256 fc88ee66ad382e1b65c37a6b2e4acf435b9594f3066dc9f42fa833266d3fa568
 MISC metadata.xml 255 RMD160 b69d2df062aad1158c03b925d5bfdeab02f98db2 SHA1 c94d776662afd93f3be5dc1fea7793b80738dbc5 SHA256 01d09f8eee4532c21a12d462263dfa84fda9e1b421410b13fe9799ed4680ba7b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvXImoACgkQdIssYB9vBoP3xQCdErFROf+GOX3uB2ZwV9vK1f0c
+E74An1pzX67l5zNG0+sNbBDyhwSIEh0g
+=sLhX
+-----END PGP SIGNATURE-----

diff --git a/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild b/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild
new file mode 100644 (file)
index 0000000..18f6e58
--- /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/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"
+
+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-setup_hardlinks.patch b/dev-db/desktopcouch/files/desktopcouch-0.6.4-setup_hardlinks.patch
similarity index 77%
rename from dev-db/desktopcouch/files/desktopcouch-setup_hardlinks.patch
rename to dev-db/desktopcouch/files/desktopcouch-0.6.4-setup_hardlinks.patch
index 40d12b4205d3de3ea6ad229217595a7e0899153e..7810ccc713e4d9961312ed0e851449d79c3c6d93 100644 (file)
--- a/dev-db/desktopcouch/files/desktopcouch-setup_hardlinks.patch
+++ b/dev-db/desktopcouch/files/desktopcouch-0.6.4-setup_hardlinks.patch
@@ -1,23 +1,24 @@
---- 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 @@
+--- 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']),
-+    data_files = [# Be sure all additions are reflected in MANIFEST.in !
-                   ('/etc/xdg/desktop-couch/',
+-                  ('/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']),],
++                  ('/usr/share/dbus-1/services/', ['org.desktopcouch.CouchDB.service'])],
      cmdclass = { "build" : build_extra.build_extra,
                   "build_i18n" :  build_i18n.build_i18n }
  )