From 7abf1cc78b9fe54f353d2225fa996f375fef7139 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 6 Jun 2010 06:39:09 +0000 Subject: [PATCH] Force Python 2.x wrt #317013. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- x11-misc/gdevilspie/ChangeLog | 8 ++++++-- x11-misc/gdevilspie/Manifest | 4 ++-- x11-misc/gdevilspie/gdevilspie-0.31.ebuild | 20 ++++++++++++-------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/x11-misc/gdevilspie/ChangeLog b/x11-misc/gdevilspie/ChangeLog index f9067769aebe..ba2a26638565 100644 --- a/x11-misc/gdevilspie/ChangeLog +++ b/x11-misc/gdevilspie/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/gdevilspie -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/gdevilspie/ChangeLog,v 1.3 2009/12/23 15:51:51 ssuominen Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/gdevilspie/ChangeLog,v 1.4 2010/06/06 06:39:09 ssuominen Exp $ + + 06 Jun 2010; Samuli Suominen + gdevilspie-0.31.ebuild: + Force Python 2.x wrt #317013. 23 Dec 2009; Samuli Suominen gdevilspie-0.31.ebuild: diff --git a/x11-misc/gdevilspie/Manifest b/x11-misc/gdevilspie/Manifest index 351ad60af696..8c5a76fd4d1a 100644 --- a/x11-misc/gdevilspie/Manifest +++ b/x11-misc/gdevilspie/Manifest @@ -1,4 +1,4 @@ DIST gdevilspie-0.31.tar.bz2 25666 RMD160 626a1944e3281433b3c95f8bfe94e6a8a02c6c1b SHA1 aa42dc9caf3053df91f5e320b4c3c6344d8f3920 SHA256 1e677b41a6f3f256f759a48f92c613e68dafc3c5a2586230c61591481faf76b2 -EBUILD gdevilspie-0.31.ebuild 755 RMD160 4de350a5a44d69dd1f76bc5506e90e3b991b16fc SHA1 f347e52b44a06b9ac66741e28f4af7e24671a424 SHA256 7f45b1893b952efe1f4d791dd729ffc7d9540b36b5df49fe2eddde915976125f -MISC ChangeLog 585 RMD160 0fa93a8495702547bc35cb09d2c67436871ea992 SHA1 4d99c04d0b090661b2930160d021e1473e37b942 SHA256 d530136c64c08343fa94ca028758f3408f6f34b6a20332134a5dda25f4edf90d +EBUILD gdevilspie-0.31.ebuild 791 RMD160 bb64b1d826f98752d16b259b56d1db571836bc08 SHA1 a45c4bce5d6064128999da626ae2256f7c53f59e SHA256 5fb5b7a11b5c7d8a6ba66d65b93e797b356af519576a48f365a4069468f575f0 +MISC ChangeLog 698 RMD160 8d489c8320c343affdd9e757783fe430e334a082 SHA1 772786a7022557bc15e3ec45891325df4573b777 SHA256 bb990b6f7ae738bdee1c3faddbd5c928131972a27ccc85a2971cfce3640dc0fb MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 diff --git a/x11-misc/gdevilspie/gdevilspie-0.31.ebuild b/x11-misc/gdevilspie/gdevilspie-0.31.ebuild index ce56eefd1774..fa43d4835610 100644 --- a/x11-misc/gdevilspie/gdevilspie-0.31.ebuild +++ b/x11-misc/gdevilspie/gdevilspie-0.31.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/gdevilspie/gdevilspie-0.31.ebuild,v 1.3 2009/12/23 15:51:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/gdevilspie/gdevilspie-0.31.ebuild,v 1.4 2010/06/06 06:39:09 ssuominen Exp $ +EAPI=2 +PYTHON_DEPEND="2" inherit distutils DESCRIPTION="A user friendly interface to the devilspie window matching daemon, to create rules easily." @@ -13,15 +15,17 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=dev-python/pygtk-2 +DEPEND=">=dev-python/pygtk-2 dev-python/libwnck-python x11-misc/devilspie" -DEPEND="${RDEPEND}" PYTHON_MODNAME="gDevilspie" -src_unpack() { - unpack ${A} - cd "${S}" - sed -i -e "s:doc/gdevilspie:doc/${PF}:" setup.py || die "sed failed." +pkg_setup() { + python_set_active_version 2 +} + +src_prepare() { + sed -i -e "s:doc/gdevilspie:doc/${PF}:" setup.py || die + distutils_src_prepare } -- 2.26.2