[gentoo-commits] gentoo-x86 commit in dev-db/desktopcouch: desktopcouch-0.6.4.ebuild

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    10/04/29 00:49:24

  Modified:             desktopcouch-0.6.4.ebuild
  Log:
  Don't use ROOT in src_install().
  (Portage version: HEAD/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-db/desktopcouch/desktopcouch-0.6.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild?r1=1.1&r2=1.2

Index: desktopcouch-0.6.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/desktopcouch/desktopcouch-0.6.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- desktopcouch-0.6.4.ebuild	27 Apr 2010 18:43:25 -0000	1.1
+++ desktopcouch-0.6.4.ebuild	29 Apr 2010 00:49:24 -0000	1.2
@@ -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 @@
 	>=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"