From 2a516da789f8d95a00b4848ac8fbd04919a44759 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Sat, 24 Dec 2011 10:26:08 +0000 Subject: [PATCH] Fix python shebangs to python2, bug 383775. Thanks to Ian Delaney for patch Package-Manager: portage-2.1.10.41/cvs/Linux x86_64 --- net-wireless/bluez/ChangeLog | 8 +++++++- net-wireless/bluez/Manifest | 16 ++-------------- ...bluez-4.96-r1.ebuild => bluez-4.96-r2.ebuild} | 10 ++++++++-- 3 files changed, 17 insertions(+), 17 deletions(-) rename net-wireless/bluez/{bluez-4.96-r1.ebuild => bluez-4.96-r2.ebuild} (95%) diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog index 1f199b5be0cc..0377e51c7665 100644 --- a/net-wireless/bluez/ChangeLog +++ b/net-wireless/bluez/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-wireless/bluez # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.107 2011/12/17 15:55:31 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.108 2011/12/24 10:26:08 maksbotan Exp $ + +*bluez-4.96-r2 (24 Dec 2011) + + 24 Dec 2011; Maxim Koltsov -bluez-4.96-r1.ebuild, + +bluez-4.96-r2.ebuild: + Fix python shebangs to python2, bug 383775. Thanks to Ian Delaney for patch 17 Dec 2011; Michał Górny bluez-4.96-r1.ebuild: The consolekit flag can be satisfied by new enough systemd as well. diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index b3d06370214a..914ead75cd73 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX bluetooth-conf.d 181 RMD160 287e1806e25a4f74b4a9f6fc401b78dac31d44ee SHA1 595f897553a6e99000b4a4757f8973b9f39ce11d SHA256 63a96c907996158f637abc3202235b81e7c8a998df487b3e83554062433dd2f8 AUX bluetooth-init.d 767 RMD160 7afb50646e359ed1ede5abdc4e5e01319dc9e3c4 SHA1 3685d4dbbf56802cb03a483dad23825968dc57f8 SHA256 38efb9dffaab70477f7525dd6657dffc725c61e29c05b0649e95c31f589b31ce AUX bluez-4.18-udev.rules 228 RMD160 ab9b4ce8907c62eb9d1f14406cc2ff3f5ec69a19 SHA1 14e652de6cfed28f215727800460e600129007c2 SHA256 7577c2ed295b67f960f17ac65a44889c6536c125b34e33860d6d9f128a59fa82 @@ -12,16 +9,7 @@ AUX init.d-dund 551 RMD160 273a9fb1989b80f12dc9813e9fe9ca42bd010e33 SHA1 51a24ec AUX init.d-hidd 780 RMD160 46a761ad2e151c2e1d997a9455edf4e3e4d61df0 SHA1 7d2d80a91517d5fa2965c1ac6078d8cc4f382198 SHA256 b1878d70112fd8fa1b851aaa4caa5e2b4efb55bf8e2dda02c014b55ce93adedb DIST bluez-4.96.tar.gz 1164913 RMD160 7775a70c5cd86fc418547fae83621dab39196147 SHA1 c9327784cbcf1efc03cc547ceb18de90c8fb4c7c SHA256 c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99 DIST oui-20110801.txt.xz 520980 RMD160 2f7c863825fa8ae35d9beebe6bbd49fddd32f32e SHA1 a210a711e4e8046627676e5adf56132c977b663c SHA256 47be96b0e7b4a3235260f94ad77445fbf5226832ede588d9ea67d61759ff32e3 -EBUILD bluez-4.96-r1.ebuild 4883 RMD160 ef6cf476c7e7fd7d38a4681a59cd08321dbda55d SHA1 c8635a5be3c825770b180352ed691c0de0115192 SHA256 ab5a69de4701dc08cc6bd128f6102c0b6f1e2ea23a3900bef39517c0c45f17f1 +EBUILD bluez-4.96-r2.ebuild 5002 RMD160 79ea17805724b8b064d048d491ccb39d3200b850 SHA1 19e89922c072e2333917ada89c46f4df5d72e78e SHA256 c6ec2fe371ae5589304c22c7c2c93c8f321ce7fb5def9e2914366089a45e9984 EBUILD bluez-4.96.ebuild 4830 RMD160 b16236cc76ee923fe5b263c675540fd6ddd4612e SHA1 3a56c6fbe2911b0b02e69c0b808351af3cf2ce8b SHA256 349ad45c64c56b196554ef31b46980914d5ecfb47badadd4e8d27ab1d04e5ccf -MISC ChangeLog 19802 RMD160 7d76aece105a7da374f7738050e9bca2e2d39dbe SHA1 6ce114901e5500d7333a6662b6104587ca840f9d SHA256 81818188044e2cb16b22824b921d4934d559143cb9df9f808ed6fe07172c7ecd +MISC ChangeLog 20014 RMD160 5148f13fe35f5b306f3cc5f00bfb3554775b6b6c SHA1 9b7a78163952a4c55b6300956a0f9423e5afd266 SHA256 8ad8a2877c1b53608b8a6373c1a524c1c7927b0dd25aa259a98b6e571df86ce3 MISC metadata.xml 1002 RMD160 39cba3b507b69bcf58bb5561d8d6af1fd4a9aef4 SHA1 b7eaf92005d3a6f1a697f179f87a2b31e52cf50e SHA256 eefe2611dfa35dc04b39e2c7b36d9ebdfb3764bf945249bf994bd20606dfdeef ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iJwEAQEIAAYFAk7su7sACgkQfXuS5UK5QB1jMgP/fwxKsnhWBRF4kLS6ta9hulik -kggcF2WOTRItCubIRmTP8hLH3Txct1dwE4iqz5371x7gLhFvLkHEchYRIr1anwPJ -39J8UUtsX7W8xBerkNG+cUU+OYXc0k8iRDaj/GYz99UeHz8cBEJPZl+1iL18GI9p -xGTlxQFK8pk8JhuQOTQ= -=Hom6 ------END PGP SIGNATURE----- diff --git a/net-wireless/bluez/bluez-4.96-r1.ebuild b/net-wireless/bluez/bluez-4.96-r2.ebuild similarity index 95% rename from net-wireless/bluez/bluez-4.96-r1.ebuild rename to net-wireless/bluez/bluez-4.96-r2.ebuild index 839ff0967341..c56ed62cac44 100644 --- a/net-wireless/bluez/bluez-4.96-r1.ebuild +++ b/net-wireless/bluez/bluez-4.96-r2.ebuild @@ -1,10 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.96-r1.ebuild,v 1.2 2011/12/17 15:55:31 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.96-r2.ebuild,v 1.1 2011/12/24 10:26:08 maksbotan Exp $ EAPI="4" -inherit multilib eutils systemd +PYTHON_DEPEND="2" + +inherit multilib eutils systemd python DESCRIPTION="Bluetooth Tools and System Daemons for Linux" HOMEPAGE="http://www.bluez.org/" @@ -60,6 +62,9 @@ pkg_setup() { if ! use consolekit; then enewgroup plugdev fi + if use test-programs; then + python_pkg_setup + fi } src_prepare() { @@ -120,6 +125,7 @@ src_install() { insinto /usr/share/doc/${PF}/test-services doins service-* + python_convert_shebangs -r 2 "${ED}" cd "${S}" fi -- 2.26.2