Fix bug 304205 and removing old testing

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

4 files changed, 18 insertions, 170 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index dcbea07b7c45..819d49a1d2ab 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.26 2010/02/13 18:36:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.27 2010/02/15 18:04:57 pacho Exp $
+
+  15 Feb 2010; Pacho Ramos <pacho@gentoo.org> -bluez-4.60.ebuild,
+  bluez-4.61.ebuild:
+  Ensure plugdev group is present when needed, thanks to A. Craig West for
+  reporting and Fabio Erculiani (bug 304205). Removing old testing version.
 
 *bluez-4.61 (13 Feb 2010)
 
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 4b23f6ef1ff5..9fb7f617ca59 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -17,21 +17,19 @@ AUX bluez-plugdev.patch 469 RMD160 a70cd0310240491cf14a5a6d7b60e760804e9816 SHA1
 DIST bluez-4.28.tar.gz 956161 RMD160 a8add4666bc19d009132be0118d075da79e8cba2 SHA1 ff992e8665814f8af0568883fa54f9355865b82b SHA256 8a7ecc1a2ad5b8c46414b58dd3a3519f2979a320ffa7d27c88519a7cf8755493
 DIST bluez-4.38.tar.gz 996949 RMD160 5da89c2578d81058a226b780000c5fcbb20a9fbb SHA1 af443f89f2851964dc97fa99d1024f85f37b5b45 SHA256 2841deb43405a7801c819342721bb57397dac05b5d203a773ca61cc340afae4a
 DIST bluez-4.39.tar.gz 998208 RMD160 c1a5e2dbfc44713ade22d4d669f63b98da95c899 SHA1 5fbc3316c8003df47c9fe3a0f577e4518bb18185 SHA256 924dc4b8ae78da2c8f3af9c36ab85d08ee7f8ec0ae4dfe58840ae70041580063
-DIST bluez-4.60.tar.gz 975104 RMD160 54502d5e4b78c47b4b2e481d7d5e674f1f1216b6 SHA1 f724d952cc23dd1b32b255b503b2b438f9cd60aa SHA256 f97d7cc270c83febcafb658ef9e98ae36b1866a01ec719a1ffd53c76fe354904
 DIST bluez-4.61.tar.gz 974210 RMD160 5f596a1ff92aad3987c282d3998bc806a00d6692 SHA1 7c7e180860f2e94541d45668be0d012aa45bbf69 SHA256 dd03c5d70ad0db469b3639126a8a2fde516b61012dd934d5c4d4ea2decf19d0f
 EBUILD bluez-4.28.ebuild 4895 RMD160 42a87e25305690d3c7b3468d7f6e4285139bbe02 SHA1 c48197f5fdbd3b7703748f70a8067210fbc2ddb3 SHA256 176abebed57ea221317e1bb81741d2dca7f5af77e7715ddd28610959bf59d55f
 EBUILD bluez-4.38.ebuild 5057 RMD160 0026396a9aa7a74beaa10b84cc1da104a746bf56 SHA1 97a3a7a522516ddc4e331eace78faa901a5caaa6 SHA256 6adb9e6a9edd46775e353aab12792f81ffc92eb6de327cf150c4899765dc0e8a
 EBUILD bluez-4.39-r1.ebuild 5102 RMD160 706738db0941cd34f413de426fcfac79527707ca SHA1 58d22620bc0f900e5015a92cf184784108fde8c4 SHA256 1669607d81263dec57a5db4a31ed33978b38385641bdee5ec94bc241a5b2594e
 EBUILD bluez-4.39-r2.ebuild 5277 RMD160 3267dafd21c7e6fce90087f7d78b694a41b1e019 SHA1 c9c71ec49d327c4298a7c525780e49aaec1c7986 SHA256 4b4200f63a03577972bf5c5d555a2d939df4ab522fb0c3131cd219f6ac01afbe
 EBUILD bluez-4.39.ebuild 5057 RMD160 54c6c6d5f0a8c07aad48c66dc92e7978137abdb9 SHA1 a9a3720560b9831d3bccd34242aa251f116fead1 SHA256 a77d9a23c52405efc4ed7e862a519e4a0ce733c6ec7a040dd02c225859df4446
-EBUILD bluez-4.60.ebuild 4654 RMD160 2136018cd39c19c16f415cc267e1a26dac342233 SHA1 9508655f479a13a3613457497f99bd5956b8d68d SHA256 f69807bbff024ce54cf52ab8a2acca07f1e05a6c0222b5c35fa6eaebfeed182b
-EBUILD bluez-4.61.ebuild 4654 RMD160 d18eca555c9e976810e856311a38c3976f1ac6cb SHA1 5dcf2fcaa9d5240f06606050cac1a3d5f56191b4 SHA256 1b795e61f6acfd4629cc5c27c51d2bd9f3a85e24da953579217399d63dfb0846
-MISC ChangeLog 4751 RMD160 ad65ea901d9ba1b15e67ad732fe7fa11266ea2b5 SHA1 8eb5a8207578521cb72ccd190b794f387b372bbe SHA256 92e02078cf9584963623dfdf054a8cace304223d95a67438b12481b0ec101544
+EBUILD bluez-4.61.ebuild 4722 RMD160 43b9de2c2d8cc75e626608f5d54805142609fe5b SHA1 4df86f8c095dfd60bf761ff719b93fede1a9dd15 SHA256 b6e85fb29e6b93c2ce0ad461024e13f7fa1a38e89a8a18a6f5d94376d10ab701
+MISC ChangeLog 4990 RMD160 4de84faf94b8e0c3677efdec9db62e34da8e9099 SHA1 05385bf5d7f3ea66b444d9640971cbc996e4c551 SHA256 655a1704f0f730d60addba1596408c575630ab214199d88f4c99a04693582558
 MISC metadata.xml 915 RMD160 4d404bfa89b7fed54ee3f7fd1858045ce45b9e09 SHA1 9bc166c659554dc6798ed11cdd80bf47dbdd9bca SHA256 193327f89fa8e03e52f9548abdc600b120016005e4cd220de71e833cad20eea4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt28UEACgkQCaWpQKGI+9TEhACdErWOJodWVqB+nNIiEkwcMAVq
-j3EAniAt0RXg/6DALep3FiMz9AhcdrSb
-=TAqB
+iEYEARECAAYFAkt5jNMACgkQCaWpQKGI+9RcaQCeLdFw3PnkWQuQp5gjB70q/BRy
+XL4AoII3F1o6F6yE/lDcoCNanRNVrG/R
+=XTPk
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.60.ebuild b/net-wireless/bluez/bluez-4.60.ebuild
deleted file mode 100644
index c4bbad7b2e00..000000000000
--- a/net-wireless/bluez/bluez-4.60.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.60.ebuild,v 1.1 2010/02/01 19:47:45 pacho Exp $
-
-EAPI="2"
-
-inherit autotools multilib eutils
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://bluez.sourceforge.net/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa caps +consolekit cups debug gstreamer old-daemons pcmcia test-programs usb"
-
-CDEPEND="alsa? (
-		media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
-	)
-	caps? ( >=sys-libs/libcap-ng-0.6.2 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10 )
-	usb? ( dev-libs/libusb )
-	cups? ( net-print/cups )
-	sys-fs/udev
-	dev-libs/glib
-	sys-apps/dbus
-	media-libs/libsndfile
-	>=dev-libs/libnl-1.1
-	!net-wireless/bluez-libs
-	!net-wireless/bluez-utils"
-DEPEND="sys-devel/flex
-	>=dev-util/pkgconfig-0.20
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	consolekit? ( sys-auth/pambase[consolekit] )
-	test-programs? (
-		dev-python/dbus-python
-		dev-python/pygobject )"
-
-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
-		epatch "${FILESDIR}/4.60/cups-location.patch"
-	fi
-
-	# needed for both patches
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable caps capng) \
-		--enable-network \
-		--enable-serial \
-		--enable-input \
-		--enable-audio \
-		--enable-service \
-		$(use_enable gstreamer) \
-		$(use_enable alsa) \
-		$(use_enable usb) \
-		--enable-netlink \
-		--enable-tools \
-		--enable-bccmd \
-		--enable-hid2hci \
-		--enable-dfutool \
-		$(use_enable old-daemons hidd) \
-		$(use_enable old-daemons pand) \
-		$(use_enable old-daemons dund) \
-		$(use_enable cups) \
-		$(use_enable test-programs test) \
-		--enable-udevrules \
-		--enable-configfiles \
-		$(use_enable pcmcia) \
-		$(use_enable debug) \
-		--localstatedir=/var
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog README || die
-
-	if use test-programs ; then
-		cd "${S}/test"
-		dobin simple-agent simple-service monitor-bluetooth
-		newbin list-devices list-bluetooth-devices
-		for b in apitest hsmicro hsplay test-* ; do
-			newbin "${b}" "bluez-${b}"
-		done
-		insinto /usr/share/doc/${PF}/test-services
-		doins service-*
-
-		cd "${S}"
-	fi
-
-	if use old-daemons; then
-		newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die
-		newinitd "${FILESDIR}/4.18/init.d-hidd" hidd || die
-	fi
-
-	insinto /etc/bluetooth
-	doins \
-		input/input.conf \
-		audio/audio.conf \
-		network/network.conf \
-		serial/serial.conf \
-		|| die
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules || die
-	exeinto /$(get_libdir)/udev/
-	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh || die
-
-	newinitd "${FILESDIR}/4.60/bluetooth-init.d" bluetooth || die
-	newconfd "${FILESDIR}/4.60/bluetooth-conf.d" bluetooth || die
-}
-
-pkg_postinst() {
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
-
-	elog
-	elog "To use dial up networking you must install net-dialup/ppp."
-	elog
-	elog "For a password agent, there is for example net-wireless/bluez-gnome"
-	elog "for gnome and net-wireless/kdebluetooth for kde. You can also give a"
-	elog "try to net-wireless/blueman"
-	elog
-	elog "Use the old-daemons use flag to get the old daemons like hidd"
-	elog "installed. Please note that the init script doesn't stop the old"
-	elog "daemons after you update it so it's recommended to run:"
-	elog "  /etc/init.d/bluetooth stop"
-	elog "before updating your configuration files or you can manually kill"
-	elog "the extra daemons you previously enabled in /etc/conf.d/bluetooth."
-
-	if use consolekit; then
-		elog ""
-		elog "If you want to use rfcomm as a normal user, you need to add the user"
-		elog "to the uucp group."
-	else
-		elog ""
-		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."
-	fi
-
-	if use old-daemons; then
-		elog ""
-		elog "The hidd init script was installed because you have the old-daemons"
-		elog "use flag on. It is not started by default via udev so please add it"
-		elog "to the required runlevels using rc-update <runlevel> add hidd. If"
-		elog "you need init scripts for the other daemons, please file requests"
-		elog "to https://bugs.gentoo.org."
-	fi
-}
diff --git a/net-wireless/bluez/bluez-4.61.ebuild b/net-wireless/bluez/bluez-4.61.ebuild
index 6b859cd7294f..e07852f9a555 100644
--- a/net-wireless/bluez/bluez-4.61.ebuild
+++ b/net-wireless/bluez/bluez-4.61.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.61.ebuild,v 1.1 2010/02/13 18:36:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.61.ebuild,v 1.2 2010/02/15 18:04:57 pacho Exp $
 
 EAPI="2"
 
@@ -40,6 +40,12 @@ RDEPEND="${CDEPEND}
 		dev-python/dbus-python
 		dev-python/pygobject )"
 
+pkg_setup() {
+	if ! use consolekit; then
+		enewgroup plugdev
+	fi
+}
+
 src_prepare() {
 	if ! use consolekit; then
 		# No consolekit for at_console etc, so we grant plugdev the rights