Add nautilus-python-1.1 with pygobject:3 compatibility. Fix pygobject dependencies in 0.7.3 (slot 2) and 1.0 (needs introspection). 1.0 doesn't need autotools. Add myself to maintainers with pva's permission.

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

5 files changed, 61 insertions, 7 deletions

diff --git a/dev-python/nautilus-python/ChangeLog b/dev-python/nautilus-python/ChangeLog
index 737942329c5d..9cc8d1ddf08a 100644
--- a/dev-python/nautilus-python/ChangeLog
+++ b/dev-python/nautilus-python/ChangeLog
@@ -1,6 +1,15 @@
 # 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.13 2011/10/14 00:40:24 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/ChangeLog,v 1.14 2011/10/19 19:52:40 tetromino Exp $
+
+*nautilus-python-1.1 (19 Oct 2011)
+
+  19 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  nautilus-python-0.7.3.ebuild, nautilus-python-1.0.ebuild,
+  +nautilus-python-1.1.ebuild, metadata.xml:
+  Add nautilus-python-1.1 with pygobject:3 compatibility. Fix pygobject
+  dependencies in 0.7.3 (slot 2) and 1.0 (needs introspection). 1.0
+  doesn't need autotools. Add myself to maintainers with pva's permission.
 
 *nautilus-python-1.0 (14 Oct 2011)
 
diff --git a/dev-python/nautilus-python/metadata.xml b/dev-python/nautilus-python/metadata.xml
index 1f5692de0f1f..f94f315c7330 100644
--- a/dev-python/nautilus-python/metadata.xml
+++ b/dev-python/nautilus-python/metadata.xml
@@ -5,4 +5,8 @@
 		<email>pva@gentoo.org</email>
 		<name>Peter Volkov</name>
 	</maintainer>
+	<maintainer>
+		<email>tetromino@gentoo.org</email>
+		<name>Alexandre Rostovtsev</name>
+	</maintainer>
 </pkgmetadata>
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 4893b1222e03..54cd9798e81a 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
 # 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.3 2011/10/13 21:24:45 phajdan.jr Exp $
+# $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 $
 
 EAPI="3"
 
@@ -20,7 +20,7 @@ DOCS="AUTHORS ChangeLog NEWS"
 G2CONF="--docdir=${EPREFIX}/usr/share/doc/${PF}"
 
 RDEPEND=">=dev-python/pygtk-2.8
-	>=dev-python/pygobject-2.16
+	>=dev-python/pygobject-2.16:2
 	>=gnome-base/nautilus-2.22"
 DEPEND="${RDEPEND}
 	>=dev-python/gconf-python-2.12
diff --git a/dev-python/nautilus-python/nautilus-python-1.0.ebuild b/dev-python/nautilus-python/nautilus-python-1.0.ebuild
index 80c91807299f..65a6fdb835c6 100644
--- a/dev-python/nautilus-python/nautilus-python-1.0.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-1.0.ebuild
@@ -1,12 +1,12 @@
 # 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.1 2011/10/14 00:40:24 pva Exp $
+# $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 autotools
+inherit eutils gnome2 python
 
 DESCRIPTION="Python bindings for the Nautilus file manager"
 HOMEPAGE="http://www.gnome.org/"
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-RDEPEND=">=dev-python/pygobject-2.28.2
-	>=gnome-base/nautilus-2.32"
+RDEPEND=">=dev-python/pygobject-2.28.2:2[introspection]
+	>=gnome-base/nautilus-2.32[introspection]"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 
diff --git a/dev-python/nautilus-python/nautilus-python-1.1.ebuild b/dev-python/nautilus-python/nautilus-python-1.1.ebuild
new file mode 100644
index 000000000000..5f2f67952844
--- /dev/null
+++ b/dev-python/nautilus-python/nautilus-python-1.1.ebuild
@@ -0,0 +1,41 @@
+# 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
+}