From 3ceb6479bb834612529826c2778132588865bdf7 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Date: Thu, 29 Apr 2010 00:49:24 +0000
Subject: [PATCH] Don't use ROOT in src_install(). Package-Manager:
 portage-HEAD/cvs/Linux x86_64

---
 dev-db/desktopcouch/Manifest                  | 12 +-----------
 dev-db/desktopcouch/desktopcouch-0.6.4.ebuild | 15 +++++++++------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/dev-db/desktopcouch/Manifest b/dev-db/desktopcouch/Manifest
index 5717153f2ee1..6cede91b5153 100644
--- a/dev-db/desktopcouch/Manifest
+++ b/dev-db/desktopcouch/Manifest
@@ -1,15 +1,5 @@
------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.4.tar.gz 105609 RMD160 1655bf1addf06f183b9ce1cfd5e7492a685482b2 SHA1 c5d122a3d4897bc058962238f3b31ef246abdebd SHA256 e37c89cb9c3c905138b56b0ae62f287e79a527e8d2c6fe64a7fbb94eebd91085
-EBUILD desktopcouch-0.6.4.ebuild 1358 RMD160 cd2e267568218418e812711e589b6c989e878d7e SHA1 9d0d2961e43af0fb71bfc1b849435c3aa563b226 SHA256 0180c6c4b394615207691e27571eb91af10c6623f822fbbfa172568d3b15f03d
+EBUILD desktopcouch-0.6.4.ebuild 1408 RMD160 d0a7c414c3e2a645ec5472c828e216c173d12464 SHA1 5b79f4e2bd049f531d428f8a6741ed2bb028a4a5 SHA256 b605e7b17cb79fde9a3fa0fa1de6cf53fffc7b658e35e4e3f939296f59065615
 MISC ChangeLog 1101 RMD160 6d522dceccc60a12892134c7a8a1992b1a0259de SHA1 88a72b879fac9c061ac923271ed8e8739497b571 SHA256 5144b7719b66a3b07264502ff7f3f98f05689e0190d01e7ac88bd426ec1633bd
 MISC metadata.xml 255 RMD160 b69d2df062aad1158c03b925d5bfdeab02f98db2 SHA1 c94d776662afd93f3be5dc1fea7793b80738dbc5 SHA256 01d09f8eee4532c21a12d462263dfa84fda9e1b421410b13fe9799ed4680ba7b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvXIvAACgkQdIssYB9vBoOosACfa4bR92XKmCEhu3dV6bnJQpdZ
-ZU4AniCTUgieaXvvVW4BwK9ecXORB1++
-=ua2x
------END PGP SIGNATURE-----
diff --git a/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild b/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild
index 18f6e58a28d8..b6bfbdb5b509 100644
--- a/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild
+++ b/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild
@@ -1,11 +1,11 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild,v 1.2 2010/04/29 00:49:24 arfrever Exp $
 
-PYTHONDEPEND="2"
 EAPI="2"
+PYTHON_DEPEND="2"
 
-inherit distutils eutils
+inherit distutils eutils multilib
 
 DESCRIPTION="Desktop-oriented interface to CouchDB"
 HOMEPAGE="https://launchpad.net/desktopcouch"
@@ -25,23 +25,26 @@ RDEPEND=">=dev-db/couchdb-0.10.0
 	>=net-dns/avahi-0.6.24-r2[python]"
 RESTRICT="test"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	epatch "${FILESDIR}/${P}-setup_hardlinks.patch"
 }
 
 src_install() {
-
 	python_convert_shebangs -r 2 "bin/"
 
 	distutils_src_install
 
-	exeinto "${ROOT}/usr/lib/${PN}"
+	exeinto "/usr/$(get_libdir)/${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"
+		insinto "/usr/share/doc/${PF}/api"
 		doins "desktopcouch/records/doc/records.txt"
 		doins "desktopcouch/records/doc/field_registry.txt"
 		doins "desktopcouch/contacts/schema.txt"
-- 
2.26.2