Version bump, drop old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 9 insertions, 305 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index e1f9ffa59d4a..673b1ac3b517 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.206 2014/06/18 20:43:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.207 2014/06/26 14:44:33 pacho Exp $
+
+*bluez-5.20 (26 Jun 2014)
+
+  26 Jun 2014; Pacho Ramos <pacho@gentoo.org> +bluez-5.20.ebuild,
+  -bluez-5.15.ebuild, -bluez-5.17.ebuild, -bluez-5.18-r1.ebuild:
+  Version bump, drop old
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> bluez-4.101-r9.ebuild:
   Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/net-wireless/bluez/bluez-5.15.ebuild b/net-wireless/bluez/bluez-5.15.ebuild
deleted file mode 100644
index 12d3e1eeb458..000000000000
--- a/net-wireless/bluez/bluez-5.15.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.15.ebuild,v 1.4 2014/03/28 02:31:02 jer Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit eutils multilib python-any-r1 readme.gentoo systemd udev user
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86"
-IUSE="cups debug +obex readline selinux systemd test"
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1.6:=
-	>=sys-apps/hwids-20121202.2
-	>=virtual/udev-171
-	cups? ( net-print/cups:= )
-	obex? ( dev-libs/libical )
-	readline? ( sys-libs/readline:= )
-	selinux? ( sec-policy/selinux-bluetooth )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		>=dev-python/dbus-python-1
-		dev-python/pygobject:2
-		dev-python/pygobject:3
-	)
-"
-
-DOC_CONTENTS="
-	If you want to use rfcomm as a normal user, you need to add the user
-	to the uucp group.
-"
-
-pkg_setup() {
-	enewgroup plugdev
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
-	epatch "${FILESDIR}"/bluez-plugdev.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	epatch "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	epatch "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg41264.html
-	epatch "${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch
-
-	# ???
-	epatch "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
-
-	# Ubuntu workaround for bug #501120
-	epatch "${FILESDIR}"/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
-
-	if use cups; then
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
-			Makefile.{in,tools} || die
-	fi
-}
-
-src_configure() {
-	# readline is automagic when client is enabled
-	export ac_cv_header_readline_readline_h=$(usex readline)
-
-	# Missing flags: experimental (sap, nfc, ...)
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--enable-experimental \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		$(use_enable test) \
-		--enable-tools \
-		--enable-monitor \
-		--enable-udev \
-		$(use_enable cups) \
-		$(use_enable obex) \
-		--enable-client \
-		$(use_enable systemd) \
-		$(systemd_with_unitdir) \
-		--enable-sixaxis
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-
-	keepdir /var/lib/bluetooth
-
-	# Unittests are not that useful once installed
-	if use test ; then
-		rm -r "${ED}"/usr/$(get_libdir)/bluez/test || die
-	fi
-
-	insinto /etc/bluetooth
-	local d
-	for d in input network proximity; do
-		doins profiles/${d}/${d}.conf
-	done
-
-	doins src/main.conf
-	doins src/bluetooth.conf
-
-	insinto /usr/share/dbus-1/system-services
-	doins src/org.bluez.service
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth
-	newinitd "${FILESDIR}"/rfcomm-init.d rfcomm
-	newconfd "${FILESDIR}"/rfcomm-conf.d rfcomm
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	udev_reload
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
-
-	if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
-		elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will only"
-		elog "be able to run 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
-}
diff --git a/net-wireless/bluez/bluez-5.17.ebuild b/net-wireless/bluez/bluez-5.17.ebuild
deleted file mode 100644
index f2335b7ae23e..000000000000
--- a/net-wireless/bluez/bluez-5.17.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.17.ebuild,v 1.1 2014/03/30 08:19:46 pacho Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit eutils multilib python-any-r1 readme.gentoo systemd udev user
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="cups debug +obex +readline selinux systemd test +udev"
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1.6:=
-	>=sys-apps/hwids-20121202.2
-	cups? ( net-print/cups:= )
-	obex? ( dev-libs/libical )
-	readline? ( sys-libs/readline:= )
-	selinux? ( sec-policy/selinux-bluetooth )
-	systemd? ( sys-apps/systemd )
-	udev? ( >=virtual/udev-171 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		>=dev-python/dbus-python-1
-		dev-python/pygobject:2
-		dev-python/pygobject:3
-	)
-"
-
-DOC_CONTENTS="
-	If you want to use rfcomm as a normal user, you need to add the user
-	to the uucp group.
-"
-
-pkg_setup() {
-	enewgroup plugdev
-	use test && python-any-r1_pkg_setup
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
-	epatch "${FILESDIR}"/bluez-plugdev.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	epatch "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	epatch "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg41264.html
-	epatch "${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch
-
-	# ???
-	epatch "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
-
-	# Ubuntu workaround for bug #501120
-	epatch "${FILESDIR}"/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
-
-	if use cups; then
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
-			Makefile.{in,tools} || die
-	fi
-}
-
-src_configure() {
-	# readline is automagic when client is enabled
-	# --enable-client always needs readline, bug #504038
-	export ac_cv_header_readline_readline_h=$(usex readline)
-
-	# Missing flags: experimental (sap, nfc, ...)
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--enable-experimental \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		$(use_enable test) \
-		--enable-tools \
-		--enable-monitor \
-		$(use_enable cups) \
-		$(use_enable obex) \
-		$(use_enable readline client) \
-		$(use_enable systemd) \
-		$(systemd_with_unitdir) \
-		$(use_enable udev) \
-		$(use_enable udev sixaxis)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-
-	keepdir /var/lib/bluetooth
-
-	# Unittests are not that useful once installed
-	if use test ; then
-		rm -r "${ED}"/usr/$(get_libdir)/bluez/test || die
-	fi
-
-	insinto /etc/bluetooth
-	local d
-	for d in input network proximity; do
-		doins profiles/${d}/${d}.conf
-	done
-
-	doins src/main.conf
-	doins src/bluetooth.conf
-
-	insinto /usr/share/dbus-1/system-services
-	doins src/org.bluez.service
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth
-	newinitd "${FILESDIR}"/rfcomm-init.d-r1 rfcomm
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	use udev && udev_reload
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
-
-	if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
-		elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will only"
-		elog "be able to run 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
-}
diff --git a/net-wireless/bluez/bluez-5.18-r1.ebuild b/net-wireless/bluez/bluez-5.20.ebuild
index 1646000a5ce1..72ebfa71bc8e 100644
--- a/net-wireless/bluez/bluez-5.18-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.18-r1.ebuild,v 1.1 2014/05/09 13:59:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.20.ebuild,v 1.1 2014/06/26 14:44:33 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -27,7 +27,7 @@ RDEPEND="
 	readline? ( sys-libs/readline:= )
 	selinux? ( sec-policy/selinux-bluetooth )
 	systemd? ( sys-apps/systemd )
-	udev? ( >=virtual/udev-171 )
+	udev? ( >=virtual/udev-172 )
 	abi_x86_32? (
 		!<app-emulation/emul-linux-x86-soundlibs-20140406-r1
 		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]