From dea771a3c2ff69f37fe2c480dc4a4012a3e7e46a Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Mon, 8 Dec 2014 23:20:02 +0000 Subject: [PATCH] Fix shebangs to match compatible python version (bug #532004). Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- x11-misc/icewmcp/ChangeLog | 10 ++++- x11-misc/icewmcp/Manifest | 18 ++++---- ...cp-3.2-r3.ebuild => icewmcp-3.2-r4.ebuild} | 41 +++++++------------ 3 files changed, 32 insertions(+), 37 deletions(-) rename x11-misc/icewmcp/{icewmcp-3.2-r3.ebuild => icewmcp-3.2-r4.ebuild} (64%) diff --git a/x11-misc/icewmcp/ChangeLog b/x11-misc/icewmcp/ChangeLog index a82f30d08b38..9056164c07ab 100644 --- a/x11-misc/icewmcp/ChangeLog +++ b/x11-misc/icewmcp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/icewmcp -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/icewmcp/ChangeLog,v 1.15 2011/10/01 06:20:23 vapier Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/icewmcp/ChangeLog,v 1.16 2014/12/08 23:20:01 jer Exp $ + +*icewmcp-3.2-r4 (08 Dec 2014) + + 08 Dec 2014; Jeroen Roovers -icewmcp-3.2-r3.ebuild, + +icewmcp-3.2-r4.ebuild: + Fix shebangs to match compatible python version (bug #532004). *icewmcp-3.2-r3 (01 Oct 2011) diff --git a/x11-misc/icewmcp/Manifest b/x11-misc/icewmcp/Manifest index 362bc99efa03..fac931e6e551 100644 --- a/x11-misc/icewmcp/Manifest +++ b/x11-misc/icewmcp/Manifest @@ -1,15 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST IceWMControlPanel-3.2.tar.bz2 586044 RMD160 8637ae5f4b28c2a7a8187dd9f02e6317c6ff925f SHA1 13dcea63146123342cf8c384675fce37a161a184 SHA256 6259d27b5de151049b245cac17606ba77d055766ef1706363dc301085c925af9 -EBUILD icewmcp-3.2-r2.ebuild 2542 RMD160 3ab5121cb02c56eea8e91b53087b5f91afef5b45 SHA1 531de6b0273c4722538310b8ed9490c4bee64200 SHA256 9e1bb0fdba9810206f118c30b8817c8b84446eafc96d1c9aabf99128f6477b2b -EBUILD icewmcp-3.2-r3.ebuild 1800 RMD160 9032e7ebdafc2603e7f9ee31b4565c30d6bd98b2 SHA1 a5c39d31bf02b2c53ad0a4110d2e06224aa9e259 SHA256 a310cca445e10a60778d1eaa67c7bd46df7f9ea4a87dbcafd18d3f0f266b85f4 -MISC ChangeLog 2056 RMD160 92c3f71d05bdec1806e5d80eb8e54d65d4a27bf8 SHA1 4b0e2b04d7f85addc018eab4825c63251e463d20 SHA256 69767af72232bd48c58125ebe114cac283269a4272a2e996b18ec351c678c91c -MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 +DIST IceWMControlPanel-3.2.tar.bz2 586044 SHA256 6259d27b5de151049b245cac17606ba77d055766ef1706363dc301085c925af9 SHA512 017b257bb30c49eb0b13a9570df70f6f8ccb55087121440cd1331f8364ddc6c23fae26c98bae1bd831f2a9fc52bef531cab9313f3e2ea209ce26d776ee64c47e WHIRLPOOL f133b4998528c10071c39bab3187705ac7f5c6ee87bd2b73de395a88b0953df217b9e4cc2216ca9bf14ac70b190c30879f04eba2f4a1d342b30e994952a4e17a +EBUILD icewmcp-3.2-r2.ebuild 2542 SHA256 9e1bb0fdba9810206f118c30b8817c8b84446eafc96d1c9aabf99128f6477b2b SHA512 d065d464c0bbe23fa9d462372373df16de8efc7991de06a54f6921868e8538564fece8e07cdf55d041178f352c7d1f00a2111d708d752337737cd7db3302a804 WHIRLPOOL dfd9ab007a71c28c088e9b478d550f7099c16a69f7e738eebb51205dc9b7166b96646dec7c6b1b49427550a49aec3729240f3ab0212455baccaa64cb198c335c +EBUILD icewmcp-3.2-r4.ebuild 1539 SHA256 eb406f559a2a34b31bcc6f5ee962cf6f210f3fd2386e1f0a73ed9718bd2ff71b SHA512 f0c4e614b4b118ce79492e164d6539dede752aafbedd2bc103b28d41d6541abc5592f699163a18cb1a16c515ab8d462274173d9628a55182b406d27244ef15d1 WHIRLPOOL ac9e131dcfef17a1455992adfb697ff7e6479cd5127570f82ffe3bf0bde3fb347963129a5a4b50f4c61e445145b31c7d15581c08234a89337fb2257402c727c4 +MISC ChangeLog 2247 SHA256 15d5156ff860200f656c36b8a71a3c83df353d5913a81f4e20af83044ab379cb SHA512 6ed597489551d00f8cbd5b974b6f1c6fd7b27e80dd415e663a9f4c2ca16f08847406c91bf5d257522030d73c60a7eeedeb30f1e280788db31db6881ab9003084 WHIRLPOOL 522682155578cb7cc227b64628d6e40432fb31563d869062b6ba94f186416551549c939ad82fa18afe1809b846e8fb2186ba52d59515a1ede132df7568afe566 +MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2 -iF4EAREIAAYFAk6GsS8ACgkQaC/OocHi7JaIegD/VuDvhDU9LQ2/g4s1qQJxAk7X -4VHFCHCbFGtLnbG5zhUA/jU7VQp2KreYjzfzjuPdiLJ6mutlD6R2Zuk3o/Tj2rMe -=L9T5 +iEUEAREIAAYFAlSGMiIACgkQVWmRsqeSphPeXgCY/ZpSzH9tcwNlrE7FkgaRp5X+ +MgCfUyjPCH8i9ZUZoFq0ZhFJpFTEn0w= +=jWWF -----END PGP SIGNATURE----- diff --git a/x11-misc/icewmcp/icewmcp-3.2-r3.ebuild b/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild similarity index 64% rename from x11-misc/icewmcp/icewmcp-3.2-r3.ebuild rename to x11-misc/icewmcp/icewmcp-3.2-r4.ebuild index 5ff0a01a3b93..6ad76a47dac3 100644 --- a/x11-misc/icewmcp/icewmcp-3.2-r3.ebuild +++ b/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/icewmcp/icewmcp-3.2-r3.ebuild,v 1.1 2011/10/01 06:20:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild,v 1.1 2014/12/08 23:20:01 jer Exp $ -EAPI="2" -PYTHON_DEPEND="2" - -inherit python multilib +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +inherit multilib python-single-r1 MY_PN=IceWMControlPanel DESCRIPTION="A complete control panel for IceWM using gtk & python" @@ -15,33 +14,25 @@ SRC_URI="mirror://sourceforge/icesoundmanager/${MY_PN}-${PV}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -DEPEND="x11-wm/icewm +DEPEND=" dev-python/pygtk:2 - x11-libs/gtk+:2" + x11-libs/gtk+:2 + x11-wm/icewm +" RDEPEND="${DEPEND}" S=${WORKDIR}/INSTALL-IceWMCP -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { rm -rf licenses mv doc .. || die } src_install() { local dest="/usr/$(get_libdir)/${P}" - dodoc ../doc/*.txt || die - dohtml ../doc/*.html || die insinto ${dest} - doins -r * || die + doins -r * local w wraps=( "IceWMCP.py IceWMCP" @@ -61,13 +52,11 @@ src_install() { ) for w in "${wraps[@]}" ; do set -- ${w} - printf '#!/bin/sh\nexec python %s/%s\n' "${dest}" "$1" > "${T}"/$2 + printf '#!/bin/sh\nexec %s %s/%s\n' "${EPYTHON}" "${dest}" "$1" > "${T}"/$2 dobin "${T}"/$2 || die done -} -pkg_postinst() { - einfo "Some of the icons displayed by IceWMCP may be pointing to" - einfo "programs which are not on your system! You can hide them" - einfo "using the Configuration window (Ctrl+C)." + dodoc ../doc/*.txt + dohtml ../doc/*.html + python_optimize "${D}/${dest}" } -- 2.26.2