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
commit95324b52f9851a09e818481cb388292938159eae (patch)
tree6c9ae7e2f41b9180cac4e0b1d60735507a19b984 /net-wireless
parentalpha/arm/ia64/s390/sh/sparc stable wrt #301548 (diff)
downloadhistorical-95324b52f9851a09e818481cb388292938159eae.tar.gz
historical-95324b52f9851a09e818481cb388292938159eae.tar.bz2
historical-95324b52f9851a09e818481cb388292938159eae.zip
fix alsa bluetooth.conf install path (from /etc/alsa to /usr/share/alsa -- former is invalid)
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/bluez/ChangeLog9
-rw-r--r--net-wireless/bluez/Manifest14
-rw-r--r--net-wireless/bluez/bluez-4.61-r1.ebuild (renamed from net-wireless/bluez/bluez-4.61.ebuild)13
3 files changed, 22 insertions, 14 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/Manifest b/net-wireless/bluez/Manifest
index 9fb7f617ca59..28e0d8d203bf 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 4.18/bluetooth-conf.d 257 RMD160 d3a6cd6e9fb77f6bc0c6aac4833b15c60b781c52 SHA1 c1088c509e2182a3b5987148da03393ab2053101 SHA256 73427f2c46e7be41c24e4c536107ecf8845e0125b34997d74934b92d40f79ee4
AUX 4.18/bluetooth-init.d 1171 RMD160 6ef1d5dc53200f282ccd02aacd5ff50d78484d78 SHA1 ef39d708cf433d9ec2d8e59b1bd3729586895449 SHA256 e314970474e19b33598272c0539bb540b45fd6e65a2d1d165648f50d54308b6e
AUX 4.18/conf.d-hidd 89 RMD160 31407e00bcb00eb0b9c1adeb7434a922bfb967e9 SHA1 dc6831fa817c8bd2378830e13bc96d3ff3fdffa2 SHA256 8fc50b8c644e0bc69eacef2a9555118b2f4758aafcb42e8ea3ca1293e8f3a211
@@ -23,13 +20,6 @@ EBUILD bluez-4.38.ebuild 5057 RMD160 0026396a9aa7a74beaa10b84cc1da104a746bf56 SH
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.61.ebuild 4722 RMD160 43b9de2c2d8cc75e626608f5d54805142609fe5b SHA1 4df86f8c095dfd60bf761ff719b93fede1a9dd15 SHA256 b6e85fb29e6b93c2ce0ad461024e13f7fa1a38e89a8a18a6f5d94376d10ab701
-MISC ChangeLog 4990 RMD160 4de84faf94b8e0c3677efdec9db62e34da8e9099 SHA1 05385bf5d7f3ea66b444d9640971cbc996e4c551 SHA256 655a1704f0f730d60addba1596408c575630ab214199d88f4c99a04693582558
+EBUILD bluez-4.61-r1.ebuild 5105 RMD160 30faf45f55474db5652e291592c0b4e6ace17112 SHA1 9cc73c93c764b53f3e98914131944aaf326685c6 SHA256 bc8a7e1a84d5031c993a0e8058f53888a67c29c1670b63798f4caf655a7c5291
+MISC ChangeLog 5214 RMD160 287ab9acb5dffa06d57bdfd8a824375c74f815a8 SHA1 e33f9681086d8a4fc1867111acc4bb9293b05221 SHA256 8ba705961aabebe55a4a3e3696234f28d4e194adad4261786429e9799da73d85
MISC metadata.xml 915 RMD160 4d404bfa89b7fed54ee3f7fd1858045ce45b9e09 SHA1 9bc166c659554dc6798ed11cdd80bf47dbdd9bca SHA256 193327f89fa8e03e52f9548abdc600b120016005e4cd220de71e833cad20eea4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkt5jNMACgkQCaWpQKGI+9RcaQCeLdFw3PnkWQuQp5gjB70q/BRy
-XL4AoII3F1o6F6yE/lDcoCNanRNVrG/R
-=XTPk
------END PGP SIGNATURE-----
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() {