From f9da1f8a3e807965fc82a0f5898e5e57546346a6 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sat, 14 Jan 2012 08:14:55 +0000
Subject: [PATCH] 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.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
---
 dev-python/nautilus-python/ChangeLog          | 16 +++++-
 dev-python/nautilus-python/Manifest           | 14 +++---
 .../nautilus-python-0.7.3.ebuild              |  9 ++--
 .../nautilus-python-1.0.ebuild                | 37 --------------
 .../nautilus-python-1.1-r1.ebuild             | 50 +++++++++++++++++++
 .../nautilus-python-1.1.ebuild                | 41 ---------------
 6 files changed, 75 insertions(+), 92 deletions(-)
 delete mode 100644 dev-python/nautilus-python/nautilus-python-1.0.ebuild
 create mode 100644 dev-python/nautilus-python/nautilus-python-1.1-r1.ebuild
 delete mode 100644 dev-python/nautilus-python/nautilus-python-1.1.ebuild

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/Manifest b/dev-python/nautilus-python/Manifest
index 35952b85a69e..78dada9fbfe2 100644
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST nautilus-python-0.7.3.tar.bz2 253967 RMD160 7284ee189643f5700e0e3193ab9e90772ce6422d SHA1 c50fe82afe2ba59a5122d38d193f1167eb360df5 SHA256 d7971d71f1e91752c692d2ab4e99b7a71c042c6ede9f28a64a2f668fcb5cb3eb
-DIST nautilus-python-1.0.tar.bz2 250389 RMD160 56784902c67e64aba2348670ed6469e384841b3d SHA1 8ca728134e055516381b34458faba4ae8db16f8f SHA256 5ff4a2601ef2df06e31b4fe388cd18bcff400b42ea4ac56f45fbe8e9948c9cad
 DIST nautilus-python-1.1.tar.xz 239392 RMD160 ca26d92af427fc63b9ef81211d52f42e99d6258e SHA1 b918fc7307ca7a52d9bf8fecdf8540948cd4ee9a SHA256 7825e08ada8e131f829d0e7d4144dcfac9fad7bfd7c0600bf3985349c20c496b
-EBUILD nautilus-python-0.7.3.ebuild 1195 RMD160 f97a4af382b31dd552aae9c0f1c196dcb1b54d20 SHA1 8e7d8d612d7755dec0fbe73517d2deffb3475fd8 SHA256 9aafcd79e9ba59fc5545a5bfe3a09a257dfc50a29096f1cd307f9a3d9793d942
-EBUILD nautilus-python-1.0.ebuild 938 RMD160 a173d18d58578a3a1a9bad8638ab398ca867b251 SHA1 e38a994da06984446c4d8c244790727e2dfc88ce SHA256 ca4fe89dff72bcf3c0cda771a55589e7e234aa27dd6fc725e90a4e312bbb133f
-EBUILD nautilus-python-1.1.ebuild 1011 RMD160 6b88176d85320422968bd8fed8818ff4db12d1a7 SHA1 afbf254483098ed3cb7f8c78cf43caddd4888565 SHA256 363c478285cadcb7302695fe0a2fb10c88292dae5cbfc3532f7d63b75cd25681
-MISC ChangeLog 2992 RMD160 66d76e7c1ece2463bee1dcfa3172b84c68df0096 SHA1 0546b3f502b5e54f3b35cbef4301cbd902f51504 SHA256 8b3fa5e0fb464315fd42649e972a8e2be8e81a2e79e71b377a762bac79d0e9d9
+EBUILD nautilus-python-0.7.3.ebuild 1243 RMD160 b007abfaef1024002493c5c326b52fcff91ce52d SHA1 045d191350810dbe1e328d5238a7e6b8b1a11c6b SHA256 5fd4b2ff3a0d924fdcd6784dbb5d75cb82c7a34d82253aaa2a5a7b0da4b61672
+EBUILD nautilus-python-1.1-r1.ebuild 1208 RMD160 cc60f944186c87fe08925f49b528a3c03be07da1 SHA1 8e9fb4dc74816cfc911d0f6f0796ad255f4ce502 SHA256 3a2ec8d9782bd43586ef9d04042553f88722643c950812cc198e40332c3a6f26
+MISC ChangeLog 3660 RMD160 bbcb00b7f079a3812e16ad1ef3d75ec1e0e3b73b SHA1 4909e37bdad0a9c7d3a8bc640f50896e1de7749d SHA256 fa675c2680e34c3a4422c657fe09e976685a70369ab16b6559a3c84f7d5f9fab
 MISC metadata.xml 331 RMD160 1c9a1a9569e8559c344170028c9e99f396bc7310 SHA1 a064788ea280f9e5faa9cb64c66c5c06bcdeb82f SHA256 0025d05c25e5a3cd47fb531e12ad7206d97b0fb8b10862ca20729ce98c47f157
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6fKo4ACgkQdjK8w9WeBnCFXQD+MVTyXvq9gTgP8hPLcdjJBfKh
-90VSIgCRVabwPY0oCDMA/1fWvFoaDYKrioyBJVSpgSqFZVkF3/3IQPX+O1ScowhD
-=9nd1
+iF4EAREIAAYFAk8ROYUACgkQdjK8w9WeBnArEQEAsx2yctgMneiRCAHMzj1RPFYu
+GGegwHk08hWueay8p9QA/1e5c8RUlOSmrxC1BaocVBn88vOWYbXeJYzV4rrLzmhi
+=lGvk
 -----END PGP SIGNATURE-----
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
-}
-- 
2.26.2