From 4f71e90959e98944b1afc5b9478421365ffb2791 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Wed, 19 Oct 2011 19:52:40 +0000 Subject: [PATCH] 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. Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64 --- dev-python/nautilus-python/ChangeLog | 11 ++++- dev-python/nautilus-python/Manifest | 18 ++++---- dev-python/nautilus-python/metadata.xml | 4 ++ .../nautilus-python-0.7.3.ebuild | 4 +- .../nautilus-python-1.0.ebuild | 8 ++-- .../nautilus-python-1.1.ebuild | 41 +++++++++++++++++++ 6 files changed, 71 insertions(+), 15 deletions(-) create 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 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 + 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/Manifest b/dev-python/nautilus-python/Manifest index 50de22b279a6..35952b85a69e 100644 --- a/dev-python/nautilus-python/Manifest +++ b/dev-python/nautilus-python/Manifest @@ -3,14 +3,16 @@ 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 -EBUILD nautilus-python-0.7.3.ebuild 1194 RMD160 30c1d5603685914b5742d70af41eb181944424a9 SHA1 23777a7283ec562326cce20b5854fc395e250dd8 SHA256 26dfbc0d3ed4a25b33beaf071ca99c4ded5fbaeba62a2eda3ae6a1cf583ba656 -EBUILD nautilus-python-1.0.ebuild 910 RMD160 39defda3404e9cef2e5e7ba5ee0c9643b8b8951a SHA1 ae16c3cd23a07a7f57dbc83c6b7317c4239ba4c5 SHA256 9bb5c6111031a4c73a2754b0debd0e2fa302bcdadce0e382de62c03af273ab3c -MISC ChangeLog 2570 RMD160 a4d897bf885d4f6c77ef3f9fe63825580c28cb90 SHA1 bb920b91c44d73d4c506aa50fd1c9f7c6b1d3c7d SHA256 6845eeb4daf668ce352394a8e14de1258ccda6bdceca6d6aaa7890703a15e597 -MISC metadata.xml 228 RMD160 bcdd76c994501350b97e70c443e09ebf3172df41 SHA1 1a35ed2e9e695b6f228703fce8baf6c3a5ae71d0 SHA256 c1d5f02bf3a5a5a936093a7df8732f0d4ae6cda289d1f24f938651a98e2809cb +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 +MISC metadata.xml 331 RMD160 1c9a1a9569e8559c344170028c9e99f396bc7310 SHA1 a064788ea280f9e5faa9cb64c66c5c06bcdeb82f SHA256 0025d05c25e5a3cd47fb531e12ad7206d97b0fb8b10862ca20729ce98c47f157 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk6XhIwACgkQGrk+8vGYmwf2CgD9HFSPPS0+uBwwWWBItme4Pc+F -oox68mabbn1wQtcTgQ4A+wRrm1g3dfiDCrpQuXZMpH8e62nk/vRBpNcqkkN+7rlI -=JQOo +iF4EAREIAAYFAk6fKo4ACgkQdjK8w9WeBnCFXQD+MVTyXvq9gTgP8hPLcdjJBfKh +90VSIgCRVabwPY0oCDMA/1fWvFoaDYKrioyBJVSpgSqFZVkF3/3IQPX+O1ScowhD +=9nd1 -----END PGP SIGNATURE----- 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 @@ pva@gentoo.org Peter Volkov + + tetromino@gentoo.org + Alexandre Rostovtsev + 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 +} -- 2.26.2