summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@gentoo.org>2010-03-03 19:55:23 +0000
committerFabio Erculiani <lxnay@gentoo.org>2010-03-03 19:55:23 +0000
commitbc6eee6037148f4fd485f555de82dfd361b6fd97 (patch)
tree38aed7109d01f56c0a25dfe319bef6fb36f54793 /net-wireless/bluez
parentalpha/arm/ia64/s390/sh/sparc stable wrt #301548 (diff)
downloadgentoo-2-bc6eee6037148f4fd485f555de82dfd361b6fd97.tar.gz
gentoo-2-bc6eee6037148f4fd485f555de82dfd361b6fd97.tar.bz2
gentoo-2-bc6eee6037148f4fd485f555de82dfd361b6fd97.zip
fix alsa bluetooth.conf install path (from /etc/alsa to /usr/share/alsa -- former is invalid)
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless/bluez')
-rw-r--r--net-wireless/bluez/ChangeLog9
-rw-r--r--net-wireless/bluez/bluez-4.61-r1.ebuild (renamed from net-wireless/bluez/bluez-4.61.ebuild)13
2 files changed, 20 insertions, 2 deletions
diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 819d49a1d2ab..e190820d1416 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,13 @@
# 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.27 2010/02/15 18:04:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.28 2010/03/03 19:55:23 lxnay Exp $
+
+*bluez-4.61-r1 (03 Mar 2010)
+
+ 03 Mar 2010; Fabio Erculiani <lxnay@gentoo.org> -bluez-4.61.ebuild,
+ +bluez-4.61-r1.ebuild:
+ fix alsa bluetooth.conf install path (from /etc/alsa to /usr/share/alsa --
+ former is invalid)
15 Feb 2010; Pacho Ramos <pacho@gentoo.org> -bluez-4.60.ebuild,
bluez-4.61.ebuild:
diff --git a/net-wireless/bluez/bluez-4.61.ebuild b/net-wireless/bluez/bluez-4.61-r1.ebuild
index e07852f9a555..0b3d6a91b116 100644
--- a/net-wireless/bluez/bluez-4.61.ebuild
+++ b/net-wireless/bluez/bluez-4.61-r1.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.2 2010/02/15 18:04:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.61-r1.ebuild,v 1.1 2010/03/03 19:55:23 lxnay Exp $
EAPI="2"
@@ -126,6 +126,17 @@ src_install() {
newinitd "${FILESDIR}/4.60/bluetooth-init.d" bluetooth || die
newconfd "${FILESDIR}/4.60/bluetooth-conf.d" bluetooth || die
+
+ if use alsa; then
+ # ALSA config directory in Gentoo is the default one: /usr/share/alsa
+ # so bluetooth.conf must be moved there.
+ # Upstream should be contacted about this.
+ dodir /usr/share/alsa
+ mv "${D}"/etc/alsa/bluetooth.conf "${D}"/usr/share/alsa || \
+ die "cannot move bluetooth.conf to /usr/share/alsa"
+ rmdir "${D}"/etc/alsa || die "/etc/alsa not empty"
+ fi
+
}
pkg_postinst() {