Use splitted gnome-python-base deps, bug #352920, thank Pacho Ramos for report. Use python eclass, bug 344733, thank Arfrever Frehtes Taifersar Arahesis for report. Dropped .la files

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

3 files changed, 28 insertions, 11 deletions

diff --git a/dev-python/nautilus-python/ChangeLog b/dev-python/nautilus-python/ChangeLog
index 96530c7aedcc..feee8932f65d 100644
--- a/dev-python/nautilus-python/ChangeLog
+++ b/dev-python/nautilus-python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/nautilus-python
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/ChangeLog,v 1.7 2011/02/03 07:37:09 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/ChangeLog,v 1.8 2011/04/19 06:00:36 pva Exp $
+
+  19 Apr 2011; Peter Volkov <pva@gentoo.org> nautilus-python-0.7.0.ebuild:
+  Use splitted gnome-python-base deps, bug #352920, thank Pacho Ramos for
+  report. Use python eclass, bug 344733, thank Arfrever Frehtes Taifersar
+  Arahesis for report. Dropped .la files
 
 *nautilus-python-0.7.0 (03 Feb 2011)
 
diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
index d3398fa03ba5..3a6d80ba89b2 100644
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -1,6 +1,6 @@
 DIST nautilus-python-0.6.1.tar.bz2 243352 RMD160 e8f37b7fbe571b57032332db4c4689c8b42391b5 SHA1 bb981f346a45f484aa25a21aadbd047dad3be306 SHA256 b80c814c4f08daa92369077625e2cbf4865cb5423a4151b1e61f12cbbe148f2b
 DIST nautilus-python-0.7.0.tar.bz2 259900 RMD160 3813fa4fbaaabd5f86bf76abbbd0113194518b05 SHA1 1585e90dfe2e2a891b467d7940cf761bb6267753 SHA256 6353f21cbbc7bfa6c6a7d088c2e05b25445d58a468afa1290d8d3d6c5437dd21
 EBUILD nautilus-python-0.6.1.ebuild 670 RMD160 03c391c533ddd773d426f58dec52a4aa6871e440 SHA1 307182da2a1d498046357e6c014b99601e1d4775 SHA256 10af3fc00c242308f3844d63ce936ece317e472cbf7406f6ecd4c82b5e9c47c1
-EBUILD nautilus-python-0.7.0.ebuild 915 RMD160 d741075bc45a30472d4c6b340a5d1aa523dbaaca SHA1 d79cd8d23765c467ef24ba2a714395f2ececd770 SHA256 62b883474ff3a1624f6544a718025f23d4c025e5705eae91aa0271ad055970b1
-MISC ChangeLog 1564 RMD160 42c386b0405acbdebb26eacfab55d68579ecb2b8 SHA1 f53f28a0bb4e1a00b5f10c5fc593d64973090bba SHA256 e8bdfb11183a42e7cf6acd2334116b814e4da06a4d7c80930856c45d2815b2ce
+EBUILD nautilus-python-0.7.0.ebuild 1172 RMD160 85ad6e70a362356c95a0044371461080a417df54 SHA1 50e3535905c14c6077e860c948dc975a5e5922ff SHA256 de58eb7a1416311be708e133d50fd25b8602a72701a5c832cddbb4e95405fb0d
+MISC ChangeLog 1829 RMD160 3d76632e61c36d5df7ddda75af3eb88e20865323 SHA1 1d2b36c21c67e4c34c152712608415e5f0daa045 SHA256 2bcf96fbec50cb467e3d2f881fdfafd3c66a65d4db584fd335f28fcfd78959d6
 MISC metadata.xml 250 RMD160 f27bc8272125f15d03c2bfc87e961842bdb303ae SHA1 c4991bbfca89085d81f56ed53f8b0c827a35a4f1 SHA256 68999dde540491efec63a8f47366dbc2d5f2c9f2c1211709d92366a56b6cd27d
diff --git a/dev-python/nautilus-python/nautilus-python-0.7.0.ebuild b/dev-python/nautilus-python/nautilus-python-0.7.0.ebuild
index c6aaf70271bd..8d3082d7ca7c 100644
--- a/dev-python/nautilus-python/nautilus-python-0.7.0.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-0.7.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/nautilus-python-0.7.0.ebuild,v 1.1 2011/02/03 07:37:09 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/nautilus-python-0.7.0.ebuild,v 1.2 2011/04/19 06:00:36 pva Exp $
 
 EAPI="3"
 
-inherit eutils gnome2
+PYTHON_DEPEND="2"
+inherit eutils gnome2 python autotools
 
 DESCRIPTION="Python bindings for the Nautilus file manager"
 HOMEPAGE="http://www.gnome.org/"
@@ -17,18 +18,29 @@ IUSE="doc"
 DOCS="AUTHORS ChangeLog NEWS"
 G2CONF="--docdir=${EPREFIX}/usr/share/doc/${PF}"
 
-# FIXME: dev-python/gnome-python-base is not required actually, but configure script
-# checks for it for some unknown reason
-RDEPEND="dev-python/pygtk
-	dev-python/pygobject
-	gnome-base/nautilus"
+RDEPEND=">=dev-python/pygtk-2.8
+	>=dev-python/pygobject-2.16
+	>=gnome-base/nautilus-2.22"
 DEPEND="${RDEPEND}
-	dev-python/gnome-python-base
+	>=dev-python/gconf-python-2.12
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# dev-python/gnome-python-base is not required actually, but configure script
+	# checks for it for some unknown reason
+	sed -e '/gnome-python-2.0/d' -i configure.in || die
+	AT_M4DIR=m4 eautoreconf
+}
+
 src_install() {
 	gnome2_src_install
 	mv "${D}"/usr/share/doc/{${PN}/*,${PF}} || die
 	rm -rf "${D}"/usr/share/doc/${PN}
+	find "${ED}" -name '*.la' -exec rm -f {} +
 	prepalldocs
 }