systemd doesn't really fully replace consolekit for bluez, see bug #436180 by Canek Peláez Valdés and Michał Górny. Drop old.

Package-Manager: portage-2.1.11.19/cvs/Linux x86_64

5 files changed, 13 insertions, 359 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 940fc12383e8..cbc7be183c72 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.143 2012/08/22 12:25:16 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.144 2012/09/29 10:33:16 pacho Exp $
+
+  29 Sep 2012; Pacho Ramos <pacho@gentoo.org> -bluez-4.101-r1.ebuild,
+  -bluez-4.101-r2.ebuild, bluez-4.101-r3.ebuild:
+  systemd doesn't really fully replace consolekit for bluez, see bug #436180 by
+  Canek Peláez Valdés and Michał Górny. Drop old.
 
   22 Aug 2012; Michael Weber <xmw@gentoo.org> bluez-4.99.ebuild:
   ppc stable (bug 411015).
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index ad54b183d793..5973a416bf6c 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -27,17 +27,15 @@ DIST bluez-4.99.tar.xz 859756 SHA256 41889a91a5516eec26c4e59095ceea076de158b1ac3
 DIST oui-20120113.txt.xz 541268 SHA256 f65d2096566d88f9c55ce4da9104696cecb262a7d07c2f2ff58332f1ab40ae84 SHA512 b72189f9a49041390d3d5f72c96c604fb801908a6b1f501d9476f0e026ac5196d71097b313030d2af6486b5c9700c01900c087cb75c6fe2a58f27b279044b64f WHIRLPOOL e01f2aafef0ccbeece35ae82321aabd54e6ce003fd8d3f357ee8e2a499e54c4004f93b250b20e28285131fd2516674a0e89c98a29763d2bd5c1de7486cdd962d
 DIST oui-20120308.txt.xz 546720 SHA256 4256ba96a522333a41fd058e1880a04f77566c9ad0a62d3c0d7ac422bf8b9086 SHA512 f749b3ce9b6173760319849f1e4699f02d4f8628de78d0bc39c08b01331567b60a9bd3303a84982ad23bc6cbe7b6d9f27e2e26f699a818dac0e0e8fa6ddb44fa WHIRLPOOL 0797457e3bb54d49b295547a47894258c2c5a9954ca87c44948bdb57781e11c84d2d1be9cf6d3deb0d062e4a98b0b1fb406a1f0fbeb9d0a294da624c2e90f9ee
 DIST oui-20120623.txt.xz 561880 SHA256 94843e51cf957a2da36869e0df1ff95c929694e9624e18416dfbfd10eb0af4e6 SHA512 ca87986c9c9f489ec0ba4f5bcb35260caf3a0b121c1433d57e9f8d564d8775def7215f90de63a7464ed57ce284c7b850451d69712ed151c1965ea3a9bccdfabe WHIRLPOOL 55c8484a723b6ce0e0166a798650c3cf630fda007aadaddb727605306b412cb420a6bb2aef13d3bb05affbda6b98725955706b4f998e6d22d45e4c6074f57421
-EBUILD bluez-4.101-r1.ebuild 4482 SHA256 a6a2291d478e3607e926ef23ecd34d7bb5e052e99be6cc123d1bd05f51f1ae38 SHA512 2392bb6746e12e1aa48ee72f1178f98b2d183bca70741ba9022c33ea4aee191ee817cb512dcfc2b47ade720009ffa3d099ebcb7e38f9421ba79efd4d09364848 WHIRLPOOL 4a7ae7019bbef7f9f1fe30c7c65f1f99cfd40a6db0e448b9bb771ec9a77e0b79f7c1266a7ad8d090a1b9bb5e0cccb21815ccf42d70b8bcebc5480d11a0cf4b79
-EBUILD bluez-4.101-r2.ebuild 4486 SHA256 3a2fcf1beb398f2413785d69a1755ee77406e0005f8c54a2d5b3001e344b2824 SHA512 4b516c0f48834450e9f483ebe9cdd8a3b2fdf984a63b2f795fb114672b8093b5bb9dc2cfc5fd6e63c20033abd00c3f0d9e3830361eff1828f6efb61a6c679760 WHIRLPOOL 9701bd0f1001eec6d8350d0133bcf04db5a43994b8808c2b25af6cde2e6ba26270f7999315aadb948f7e2efb21c192e3fb1ff2ab23a6acb8de8c931fddbbfd50
-EBUILD bluez-4.101-r3.ebuild 4560 SHA256 fcea5636e6726099c60500bb6b36eeea4172481e948545b29692fd296d70420d SHA512 d29042388a99c535c7c670feb4a846872b29e4fa52ce1c816086eaa744a0ba2a5513cc3351a094e3870aba7701d5c32e00635d47b3c84729994df0afd140a3fe WHIRLPOOL fd1117937675f95d67f6b1c2d02829fe777ad2fc96b92a32d0324d13fc87eb3f6e44bb7d5e6ef0e401678d554ebfc7ca1a2c6546c96a5b5c4448f072814b9082
+EBUILD bluez-4.101-r3.ebuild 4525 SHA256 b8201de1f90848f3effff9260faa265f79b112d4d323681c69faec752719c3de SHA512 36833b770fdec8980a796e727a447de5cce1bc39c126c3f9898ac088e7e88a8c20d3e7e14d17f1987cd176e0bb1509d4f13b16392b645b60920d8d2226665b52 WHIRLPOOL 472833769c7f6f89f22c8a5857cdaa79aa6dc035b3181f19fb4c5a0d8653ba147866147be748661a0257228b5ff7db27983cffa70515b9dc0bbb4a4bcc8681ae
 EBUILD bluez-4.98-r2.ebuild 4880 SHA256 5133e48830fc8df8c0fdf29cfb6d18d96814192562b7f55d720a95f8f235f642 SHA512 c3a7906988c003ce83caa0fe4c91826a82a74d7501925a36e44cf66cade2fb92400188c4f51c40ef6fff3428ff6208e83789164aeafecad54e19ec979849ad1c WHIRLPOOL 2088d2d138c109f4e5942e4353ff8d65c7a0b20dbe17ce702cf3e876b7f9c76abed111199c226f3490ab7e24bf43be80be80fc0b5bb6beed93684aeb4f34566e
 EBUILD bluez-4.99.ebuild 4674 SHA256 2480cc485f1f88435465e8e05e3d8ebe1b3038056b74f35275fce4d509ed9380 SHA512 9277ded1fc8b602af3134d97ff8289766f8bd5f88c78c1de4d39de181c14f958a64ac64d93e79c14de64f53e18c9fef5b03ce624f82679caf7a3c6ab3fadcf92 WHIRLPOOL 37cf65f0a110c9e1679430845c1399eba6d97e03da7ac7b756e6dbdaf88b0ccbd023fb4600280e67fa0dd22a27b46316adf0bc6d0824d6a749c77555c96028ff
-MISC ChangeLog 27936 SHA256 f71094551acaa6567c0081de9b485023ced9692084223ae921d824fc1b9bef01 SHA512 538b4a40ac6c1ccf32a1f2e08ccf9192811a27d3607c38cb44a9570d02eee6efa629483d4912cbb28cd54bfb338ee7cc37164b360dda16e33a55bf92afc7800c WHIRLPOOL 7ed0166ac3d0014240ea1ee3bd171b1a936671a2cc017fed2d1a32135110b069d79b6059b792d0c1c2a8280341a4e9023dade2bf062ed2d1dd17708b2c76f4c1
+MISC ChangeLog 28192 SHA256 64026154a56db2165164c4896e350ddb9ffb31a430a36836eb56b31f0bc90f53 SHA512 7dacbe594ad035784dfbac2f5520bfbbd946a695954d99a58a2b97f76fff9a584ac8bd2dc44123f2837f9489d74f256f4011c2159926c3905698445828170f45 WHIRLPOOL d3073bc63ff02f89e0ab35c22779ab02bf79c3c9c54a49a8efd4c4be2dbc748da2886f683c447f48e8fd24c58b26de98db4c973f2c01e3d5779b4457839b3c55
 MISC metadata.xml 709 SHA256 52aaf883d4e036328b559eb5c09e51401573cc8ad95c4e7cef659a8152af420b SHA512 e000db32d1255e399114b425278761109fa954c4712e13176c8bbab2750d7ef9813703118fcff03fbfcfcd25c189f73b436bd8aa50b3e9c2da02d31a30a7d079 WHIRLPOOL ae5ea0cf34cc19463f4eb6bf997a52f89bf48df962b6c5e4546120b0854ef7791f9bc85827424461ab1764b8d54b71ad025314c2413318c4e6d90de819179f98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlA0z8YACgkQknrdDGLu8JDIXQD7Barmo7uvMicYBsvyEWWZIirZ
-W0k4IVc/Jx5hatIaciMA/2NvuoVemtYwpX4pD1o/0YKZ0JJYakJCK+gOckM7n6ur
-=4v3A
+iEYEAREIAAYFAlBmznIACgkQCaWpQKGI+9R7RgCfVIKnI5q47DfgLArvvIpdh5fO
+04cAn0aB6HZ1nUHdyNM/jJoZeYMgg/L+
+=IIPW
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.101-r1.ebuild b/net-wireless/bluez/bluez-4.101-r1.ebuild
deleted file mode 100644
index 56d7a955c81f..000000000000
--- a/net-wireless/bluez/bluez-4.101-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r1.ebuild,v 1.2 2012/07/23 15:40:24 swift Exp $
-
-EAPI="4"
-PYTHON_DEPEND="test-programs? 2"
-
-inherit multilib eutils systemd python user
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org/"
-
-# Because of oui.txt changing from time to time without noticement, we need to supply it
-# ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly.
-# See bugs #345263 and #349473 for reference.
-OUIDATE="20120623"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz
-	http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="alsa +consolekit cups debug gstreamer selinux pcmcia test-programs usb readline"
-
-CDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1.4
-	>=sys-fs/udev-169
-	alsa? (
-		media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)]
-		media-libs/libsndfile
-	)
-	cups? ( net-print/cups )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10
-	)
-	selinux? ( sec-policy/selinux-bluetooth )
-	usb? ( virtual/libusb:0 )
-	readline? ( sys-libs/readline )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	test-programs? ( >=dev-libs/check-0.9.6 )
-"
-RDEPEND="${CDEPEND}
-	!net-wireless/bluez-libs
-	!net-wireless/bluez-utils
-	consolekit? (
-		|| ( sys-auth/consolekit
-			>=sys-apps/systemd-37 )
-	)
-	test-programs? (
-		dev-python/dbus-python
-		dev-python/pygobject:2
-	)
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-pkg_setup() {
-	if ! use consolekit; then
-		enewgroup plugdev
-	fi
-
-	if use test-programs; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	if ! use consolekit; then
-		# No consolekit for at_console etc, so we grant plugdev the rights
-		epatch	"${FILESDIR}/bluez-plugdev.patch"
-	fi
-
-	if use cups; then
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
-			Makefile.tools Makefile.in || die
-	fi
-}
-
-src_configure() {
-	use readline || export ac_cv_header_readline_readline_h=no
-
-	econf \
-		--enable-hid2hci \
-		--enable-audio \
-		--enable-bccmd \
-		--enable-datafiles \
-		--enable-dfutool \
-		--enable-input \
-		--enable-network \
-		--enable-serial \
-		--enable-service \
-		--enable-tools \
-		--disable-hal \
-		--localstatedir=/var \
-		--with-systemdunitdir="$(systemd_get_unitdir)" \
-		$(use_enable alsa) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable gstreamer) \
-		$(use_enable pcmcia) \
-		$(use_enable test-programs test) \
-		$(use_enable usb) \
-		--enable-health \
-		--enable-maemo6 \
-		--enable-pnat \
-		--enable-wiimote
-}
-
-src_install() {
-	default
-
-	if use test-programs ; then
-		cd "${S}/test"
-		dobin simple-agent simple-service monitor-bluetooth
-		newbin list-devices list-bluetooth-devices
-		rm test-textfile.{c,o} || die # bug #356529
-		for b in hsmicro hsplay test-* ; do
-			newbin "${b}" "bluez-${b}"
-		done
-		insinto /usr/share/doc/${PF}/test-services
-		doins service-*
-
-		python_convert_shebangs -r 2 "${ED}"
-		cd "${S}"
-	fi
-
-	insinto /etc/bluetooth
-	doins \
-		input/input.conf \
-		audio/audio.conf \
-		network/network.conf \
-		serial/serial.conf
-
-	newinitd "${FILESDIR}/bluetooth-init.d-r2" bluetooth
-	newinitd "${FILESDIR}/rfcomm-init.d" rfcomm
-	newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm
-
-	# Install oui.txt as requested in bug #283791 and approved by upstream
-	insinto /var/lib/misc
-	newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	udevadm control --reload-rules
-
-	if ! has_version "net-dialup/ppp"; then
-		elog "To use dial up networking you must install net-dialup/ppp."
-	fi
-
-	if use consolekit; then
-		elog "If you want to use rfcomm as a normal user, you need to add the user"
-		elog "to the uucp group."
-	else
-		elog "Since you have the consolekit use flag disabled, you will only be able to run"
-		elog "bluetooth clients as root. If you want to be able to run bluetooth clientes as "
-		elog "a regular user, you need to enable the consolekit use flag for this package or"
-		elog "to add the user to the plugdev group."
-	fi
-
-	if [ "$(rc-config list default | grep bluetooth)" = "" ] ; then
-		elog "You will need to add bluetooth service to default runlevel"
-		elog "for getting your devices detected. For that please run:"
-		elog "'rc-update add bluetooth default'"
-	fi
-}
diff --git a/net-wireless/bluez/bluez-4.101-r2.ebuild b/net-wireless/bluez/bluez-4.101-r2.ebuild
deleted file mode 100644
index 0f5716e8be91..000000000000
--- a/net-wireless/bluez/bluez-4.101-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r2.ebuild,v 1.1 2012/08/10 08:48:24 ssuominen Exp $
-
-EAPI="4"
-PYTHON_DEPEND="test-programs? 2"
-
-inherit multilib eutils systemd python user
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org/"
-
-# Because of oui.txt changing from time to time without noticement, we need to supply it
-# ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly.
-# See bugs #345263 and #349473 for reference.
-OUIDATE="20120623"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz
-	http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="alsa +consolekit cups debug gstreamer selinux pcmcia test-programs usb readline"
-
-CDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1.4
-	>=sys-fs/udev-169
-	alsa? (
-		media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)]
-		media-libs/libsndfile
-	)
-	cups? ( net-print/cups )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10
-	)
-	selinux? ( sec-policy/selinux-bluetooth )
-	usb? ( virtual/libusb:0 )
-	readline? ( sys-libs/readline )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	test-programs? ( >=dev-libs/check-0.9.6 )
-"
-RDEPEND="${CDEPEND}
-	!net-wireless/bluez-libs
-	!net-wireless/bluez-utils
-	consolekit? (
-		|| ( sys-auth/consolekit
-			>=sys-apps/systemd-37 )
-	)
-	test-programs? (
-		dev-python/dbus-python
-		dev-python/pygobject:2
-	)
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-pkg_setup() {
-	if ! use consolekit; then
-		enewgroup plugdev
-	fi
-
-	if use test-programs; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	if ! use consolekit; then
-		# No consolekit for at_console etc, so we grant plugdev the rights
-		epatch	"${FILESDIR}/bluez-plugdev.patch"
-	fi
-
-	if use cups; then
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
-			Makefile.tools Makefile.in || die
-	fi
-}
-
-src_configure() {
-	use readline || export ac_cv_header_readline_readline_h=no
-
-	econf \
-		--enable-hid2hci \
-		--enable-audio \
-		--enable-bccmd \
-		--enable-datafiles \
-		--enable-dfutool \
-		--enable-input \
-		--enable-network \
-		--enable-serial \
-		--enable-service \
-		--enable-tools \
-		--disable-hal \
-		--localstatedir=/var \
-		--with-systemdunitdir="$(systemd_get_unitdir)" \
-		$(use_enable alsa) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable gstreamer) \
-		$(use_enable pcmcia) \
-		$(use_enable test-programs test) \
-		$(use_enable usb) \
-		--enable-health \
-		--enable-maemo6 \
-		--enable-pnat \
-		--enable-wiimote
-}
-
-src_install() {
-	default
-
-	if use test-programs ; then
-		cd "${S}/test"
-		dobin simple-agent simple-service monitor-bluetooth
-		newbin list-devices list-bluetooth-devices
-		rm test-textfile.{c,o} || die # bug #356529
-		for b in hsmicro hsplay test-* ; do
-			newbin "${b}" "bluez-${b}"
-		done
-		insinto /usr/share/doc/${PF}/test-services
-		doins service-*
-
-		python_convert_shebangs -r 2 "${ED}"
-		cd "${S}"
-	fi
-
-	insinto /etc/bluetooth
-	doins \
-		input/input.conf \
-		audio/audio.conf \
-		network/network.conf \
-		serial/serial.conf
-
-	newinitd "${FILESDIR}/bluetooth-init.d-r2" bluetooth
-	newinitd "${FILESDIR}/rfcomm-init.d" rfcomm
-	newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm
-
-	# Install oui.txt as requested in bug #283791 and approved by upstream
-	insinto /var/lib/misc
-	newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	udevadm control --reload-rules
-
-	if ! has_version "net-dialup/ppp"; then
-		elog "To use dial up networking you must install net-dialup/ppp."
-	fi
-
-	if use consolekit; then
-		elog "If you want to use rfcomm as a normal user, you need to add the user"
-		elog "to the uucp group."
-	else
-		elog "Since you have the consolekit use flag disabled, you will only be able to run"
-		elog "bluetooth clients as root. If you want to be able to run bluetooth clientes as "
-		elog "a regular user, you need to enable the consolekit use flag for this package or"
-		elog "to add the user to the plugdev group."
-	fi
-
-	if [ "$(rc-config list default | grep bluetooth)" = "" ] ; then
-		elog "You will need to add bluetooth service to default runlevel"
-		elog "for getting your devices detected. For that please run:"
-		elog "'rc-update add bluetooth default'"
-	fi
-}
diff --git a/net-wireless/bluez/bluez-4.101-r3.ebuild b/net-wireless/bluez/bluez-4.101-r3.ebuild
index f1437f20f2f2..2d2baf5847c5 100644
--- a/net-wireless/bluez/bluez-4.101-r3.ebuild
+++ b/net-wireless/bluez/bluez-4.101-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r3.ebuild,v 1.1 2012/08/21 13:04:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r3.ebuild,v 1.2 2012/09/29 10:33:16 pacho Exp $
 
 EAPI="4"
 PYTHON_DEPEND="test-programs? 2"
@@ -47,10 +47,7 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	!net-wireless/bluez-libs
 	!net-wireless/bluez-utils
-	consolekit? (
-		|| ( sys-auth/consolekit
-			>=sys-apps/systemd-37 )
-	)
+	consolekit? ( sys-auth/consolekit )
 	test-programs? (
 		dev-python/dbus-python
 		dev-python/pygobject:2