Version bump

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

4 files changed, 42 insertions, 17 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index e190820d1416..826472319fe3 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.28 2010/03/03 19:55:23 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.29 2010/03/08 14:35:09 pacho Exp $
+
+*bluez-4.62 (08 Mar 2010)
+
+  08 Mar 2010; Pacho Ramos <pacho@gentoo.org> -bluez-4.61-r1.ebuild,
+  +bluez-4.62.ebuild, +files/bluez-alsa_location.patch:
+  Version bump, fixes important bugs like symbol breakage introduced in 4.61
+  that was causing bug 308081. Thanks to David Watzke for reporting.
 
 *bluez-4.61-r1 (03 Mar 2010)
 
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 28e0d8d203bf..1f125113ed30 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -10,16 +13,24 @@ AUX 4.60/bluetooth-init.d 731 RMD160 d3415b987e5fce10ea90d93c91bbb99e47e34c5d SH
 AUX 4.60/cups-location.patch 311 RMD160 25260d0d4c0b28def0ca29dbe4579d582c632a06 SHA1 0e5218280082a2121c7553e79aba9cbb703c9fe0 SHA256 2240f0ce509f323f0b657049140a75fda3d83242b02546d81eeaa1bb3f7c26ec
 AUX bluez-4.18-udev.rules 228 RMD160 ab9b4ce8907c62eb9d1f14406cc2ff3f5ec69a19 SHA1 14e652de6cfed28f215727800460e600129007c2 SHA256 7577c2ed295b67f960f17ac65a44889c6536c125b34e33860d6d9f128a59fa82
 AUX bluez-4.18-udev.script 752 RMD160 d8f60749dbe497bef7362a4c3f56b2b83ca079cb SHA1 0c39b4b4f4c57fb334daa793f89c0ffac046b956 SHA256 cb41a4eeea5137fb27d82d74f34e5e7dd725ddf8442c39ea623afe0d3c041fcf
+AUX bluez-alsa_location.patch 539 RMD160 d4ecae8267e78d0e81a38d8ba72a8311c724a7e9 SHA1 9422e3c95fdc5e46d714d00563fcd016da6b2f24 SHA256 85d21fdd51bffb29cc45e0ab5050dd7d85ed8fa652551789bb7f5c48d7f77b44
 AUX bluez-plugdev.patch 469 RMD160 a70cd0310240491cf14a5a6d7b60e760804e9816 SHA1 b273aac740e7c19aebc441c6c77e0ba8d32f3480 SHA256 ec3f06f24f530574edf5eef308afcf16bb7e0a88336a454a0b24698d2491f5f2
 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.61.tar.gz 974210 RMD160 5f596a1ff92aad3987c282d3998bc806a00d6692 SHA1 7c7e180860f2e94541d45668be0d012aa45bbf69 SHA256 dd03c5d70ad0db469b3639126a8a2fde516b61012dd934d5c4d4ea2decf19d0f
+DIST bluez-4.62.tar.gz 974796 RMD160 64518ccc246ddaefa596815eaec2e0d6abbe7b3a SHA1 ed3074464994360ea858789175d0e7440567d97c SHA256 f63203cbbd5be7d9986d5df42c7a96c3edb7442d99539fbe9c7964243b286792
 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.61-r1.ebuild 5105 RMD160 30faf45f55474db5652e291592c0b4e6ace17112 SHA1 9cc73c93c764b53f3e98914131944aaf326685c6 SHA256 bc8a7e1a84d5031c993a0e8058f53888a67c29c1670b63798f4caf655a7c5291
-MISC ChangeLog 5214 RMD160 287ab9acb5dffa06d57bdfd8a824375c74f815a8 SHA1 e33f9681086d8a4fc1867111acc4bb9293b05221 SHA256 8ba705961aabebe55a4a3e3696234f28d4e194adad4261786429e9799da73d85
+EBUILD bluez-4.62.ebuild 4771 RMD160 db22818a302a2768acc1ac2a94f281a313646ef0 SHA1 c879181b318ce1fc25c16edb46d34366ccc079b5 SHA256 78660fbe1bdaa4eda2c962167bf0dd23e2925bf52b9a3f1bb3fa561fcb98e155
+MISC ChangeLog 5513 RMD160 d794af37ac3697d8f32f6a38838feea9ccb2eda1 SHA1 06a8b7e6679525f41c087e4020c5a1c4b25af4c2 SHA256 2fd79af5c01f9f604690302ff5bce0fc8c73c8b190336b7d8607fbc6f7b3159b
 MISC metadata.xml 915 RMD160 4d404bfa89b7fed54ee3f7fd1858045ce45b9e09 SHA1 9bc166c659554dc6798ed11cdd80bf47dbdd9bca SHA256 193327f89fa8e03e52f9548abdc600b120016005e4cd220de71e833cad20eea4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuVCyYACgkQCaWpQKGI+9QfawCfXAN8B8zwct+ub+UGebPiRWob
+/20AnA5vSxVF4QoHIN8XTLgg0cJlNkYx
+=lQU3
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.61-r1.ebuild b/net-wireless/bluez/bluez-4.62.ebuild
index 0b3d6a91b116..5afb0e850034 100644
--- a/net-wireless/bluez/bluez-4.61-r1.ebuild
+++ b/net-wireless/bluez/bluez-4.62.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-r1.ebuild,v 1.1 2010/03/03 19:55:23 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.62.ebuild,v 1.1 2010/03/08 14:35:09 pacho Exp $
 
 EAPI="2"
 
@@ -56,7 +56,9 @@ src_prepare() {
 		epatch "${FILESDIR}/4.60/cups-location.patch"
 	fi
 
-	# needed for both patches
+	# Fix alsa files location
+	epatch "${FILESDIR}/${PN}-alsa_location.patch"
+
 	eautoreconf
 }
 
@@ -126,17 +128,6 @@ 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() {
diff --git a/net-wireless/bluez/files/bluez-alsa_location.patch b/net-wireless/bluez/files/bluez-alsa_location.patch
new file mode 100644
index 000000000000..4d0712c67141
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-alsa_location.patch
@@ -0,0 +1,16 @@
+bluez installs stuff into /etc/alsa, which is wrong since the
+correct location (also stated in alsa-lib configure.in) is
+/usr/share/alsa instead
+Upstream report: 
+http://permalink.gmane.org/gmane.linux.bluez.kernel/4739
+--- Makefile.am~	2010-02-12 20:26:48.000000000 +0100
++++ Makefile.am	2010-03-05 10:17:15.000000000 +0100
+@@ -241,7 +241,7 @@
+ audio_libasound_module_ctl_bluetooth_la_CFLAGS = @ALSA_CFLAGS@
+ 
+ if CONFIGFILES
+-alsaconfdir = $(sysconfdir)/alsa
++alsaconfdir = $(datadir)/alsa
+ 
+ alsaconf_DATA = audio/bluetooth.conf
+ endif