For nautilus-python-1.1-r1, always depend on pygobject:3 (both for sanity and because it's automagic), create /usr/share/nautilus-python/extensions for systemwide extensions, and properly install API documentation in a location where dev-util/devhelp expects to load it. Add python_need_rebuild (see nautilus_python_init_python()). Update to EAPI4. Drop old/broken. Update homepage. Make sure that 0.7.x does not pull in nautilus-3.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

5 files changed, 69 insertions, 84 deletions

diff --git a/dev-python/nautilus-python/ChangeLog b/dev-python/nautilus-python/ChangeLog
index 9cc8d1ddf08a..06c975ddf775 100644
--- a/dev-python/nautilus-python/ChangeLog
+++ b/dev-python/nautilus-python/ChangeLog
@@ -1,6 +1,18 @@
 # 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.14 2011/10/19 19:52:40 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/ChangeLog,v 1.15 2012/01/14 08:14:55 tetromino Exp $
+
+*nautilus-python-1.1-r1 (14 Jan 2012)
+
+  14 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  nautilus-python-0.7.3.ebuild, -nautilus-python-1.0.ebuild,
+  -nautilus-python-1.1.ebuild, +nautilus-python-1.1-r1.ebuild:
+  For nautilus-python-1.1-r1, always depend on pygobject:3 (both for sanity and
+  because it's automagic), create /usr/share/nautilus-python/extensions for
+  systemwide extensions, and properly install API documentation in a location
+  where dev-util/devhelp expects to load it. Add python_need_rebuild (see
+  nautilus_python_init_python()). Update to EAPI4. Drop old/broken. Update
+  homepage. Make sure that 0.7.x does not pull in nautilus-3.
 
 *nautilus-python-1.1 (19 Oct 2011)
 
diff --git a/dev-python/nautilus-python/nautilus-python-0.7.3.ebuild b/dev-python/nautilus-python/nautilus-python-0.7.3.ebuild
index 54cd9798e81a..21b6df3c372f 100644
--- a/dev-python/nautilus-python/nautilus-python-0.7.3.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-0.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.3.ebuild,v 1.4 2011/10/19 19:52:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/nautilus-python-0.7.3.ebuild,v 1.5 2012/01/14 08:14:55 tetromino Exp $
 
 EAPI="3"
 
@@ -9,7 +9,7 @@ GCONF_DEBUG="no"
 inherit eutils gnome2 python autotools
 
 DESCRIPTION="Python bindings for the Nautilus file manager"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="http://projects.gnome.org/nautilus-python/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,7 +21,8 @@ G2CONF="--docdir=${EPREFIX}/usr/share/doc/${PF}"
 
 RDEPEND=">=dev-python/pygtk-2.8
 	>=dev-python/pygobject-2.16:2
-	>=gnome-base/nautilus-2.22"
+	>=gnome-base/nautilus-2.22
+	<gnome-base/nautilus-2.90"
 DEPEND="${RDEPEND}
 	>=dev-python/gconf-python-2.12
 	doc? ( >=dev-util/gtk-doc-1.9 )"
diff --git a/dev-python/nautilus-python/nautilus-python-1.0.ebuild b/dev-python/nautilus-python/nautilus-python-1.0.ebuild
deleted file mode 100644
index 65a6fdb835c6..000000000000
--- a/dev-python/nautilus-python/nautilus-python-1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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-1.0.ebuild,v 1.2 2011/10/19 19:52:40 tetromino Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-GCONF_DEBUG="no"
-inherit eutils gnome2 python
-
-DESCRIPTION="Python bindings for the Nautilus file manager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-python/pygobject-2.28.2:2[introspection]
-	>=gnome-base/nautilus-2.32[introspection]"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-G2CONF="--docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-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 {} +
-}
diff --git a/dev-python/nautilus-python/nautilus-python-1.1-r1.ebuild b/dev-python/nautilus-python/nautilus-python-1.1-r1.ebuild
new file mode 100644
index 000000000000..eb7286be743b
--- /dev/null
+++ b/dev-python/nautilus-python/nautilus-python-1.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/nautilus-python-1.1-r1.ebuild,v 1.1 2012/01/14 08:14:55 tetromino Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="2"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 python
+
+DESCRIPTION="Python bindings for the Nautilus file manager"
+HOMEPAGE="http://projects.gnome.org/nautilus-python/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+# Depend on pygobject:3 for sanity, and because it's automagic
+RDEPEND="dev-python/pygobject:3
+	>=gnome-base/nautilus-2.32[introspection]"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gtk-doc-1.9 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_install() {
+	gnome2_src_install
+	# Directory for systemwide extensions
+	keepdir /usr/share/nautilus-python/extensions/
+	# Doesn't get installed by "make install" for some reason
+	if use doc; then
+		insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
+		doins -r docs/html/*
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_need_rebuild
+}
diff --git a/dev-python/nautilus-python/nautilus-python-1.1.ebuild b/dev-python/nautilus-python/nautilus-python-1.1.ebuild
deleted file mode 100644
index 5f2f67952844..000000000000
--- a/dev-python/nautilus-python/nautilus-python-1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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-1.1.ebuild,v 1.1 2011/10/19 19:52:40 tetromino Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="xz"
-GNOME2_LA_PUNT="yes"
-inherit eutils gnome2 python
-
-DESCRIPTION="Python bindings for the Nautilus file manager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="|| ( dev-python/pygobject:3
-		>=dev-python/pygobject-2.28.2:2[introspection] )
-	>=gnome-base/nautilus-2.32[introspection]"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-G2CONF="--docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_install() {
-	gnome2_src_install
-	if [[ "${P}" != "${PF}" ]]; then
-		mv "${D}"/usr/share/doc/{${P}/*,${PF}} || die
-		rm -rf "${D}"/usr/share/doc/${P}
-	fi
-}