Version bump

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

4 files changed, 194 insertions, 3 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index f04645800e55..7c80fe674640 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,14 @@
 # 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.44 2010/07/06 22:43:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.45 2010/07/16 09:27:28 pacho Exp $
+
+*bluez-4.69 (16 Jul 2010)
+
+  16 Jul 2010; Pacho Ramos <pacho@gentoo.org> +bluez-4.69.ebuild,
+  metadata.xml:
+  Version bump with lots of bugfixes, new features and addition of maemo6
+  plugin. Also fix elog information when consolekit is disabled per bug
+  #327815 (by Nuno J. Silva).
 
   06 Jul 2010; Markos Chandras <hwoarang@gentoo.org> bluez-4.66-r1.ebuild:
   Stable on amd64 wrt bug #326897
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 36ccfa0bd262..801e9fc01dc9 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
@@ -18,10 +21,19 @@ DIST bluez-4.63.tar.gz 974286 RMD160 f669a16e6bc8ec3d876a68b8e3cc8cad6a100213 SH
 DIST bluez-4.64.tar.gz 987567 RMD160 678f7d067074cd1e345e826e1acb2c702f24e667 SHA1 de759d9ebd8df96d38e955816e4954553366a9f1 SHA256 3007d7f802a67f9087e0c8ab0aee20c5fd7dc8ad24903a550f9b464a6876fa01
 DIST bluez-4.66.tar.gz 990368 RMD160 9b69117652f42e1619ee18dde6801b1297e4803a SHA1 557eed51d542d95f9d5b3d7d58142c045ea4c3b1 SHA256 c223cbb80df0b1f17f6ef4efd0be1fe35ae640bd979f852cfbcc452abc0a7ea5
 DIST bluez-4.67.tar.gz 995252 RMD160 5303ac10dfcc8e67f25f841968d50865a0778ef7 SHA1 d6ca00e67f71cdb47e5d55fafdb5f76b7909d18c SHA256 aa58c6a9462ae08a7c440fad204fd2fe9f428159bd924a5a9160084506169f3a
+DIST bluez-4.69.tar.gz 997733 RMD160 03be499fdb5064e0ec1440eddbcc452f5448566a SHA1 488a70627dd40d8a138477d5363ff1444bce77bd SHA256 10e67a9349bbd7aecc177631c2703e9bd346dffe10a4b70b058c3a1da8b98ec0
 EBUILD bluez-4.39-r2.ebuild 5277 RMD160 3267dafd21c7e6fce90087f7d78b694a41b1e019 SHA1 c9c71ec49d327c4298a7c525780e49aaec1c7986 SHA256 4b4200f63a03577972bf5c5d555a2d939df4ab522fb0c3131cd219f6ac01afbe
 EBUILD bluez-4.63.ebuild 4789 RMD160 bd67936a9ba9c3871ad89d5868c130205f068ebc SHA1 f252253b827de840d4173ed495252acbcdc927f0 SHA256 59524137be107f7b970c184f29e3f9cce25abc857c93109b95b024c97b9af2c2
 EBUILD bluez-4.64.ebuild 4796 RMD160 7e41eeaca33c5843b2ff0db9257b174af1dc644a SHA1 da17b6f18db9b1c6c4645b72eeb3ba88f9c6ba73 SHA256 4eb691a27e868de8079f681e0339459985f4c5d367060915c623cfa4b75bd46b
 EBUILD bluez-4.66-r1.ebuild 4793 RMD160 3635b4019b3fd880c1cb2bdd212157c2bdb08406 SHA1 67ff3c8d751b6b347a658f39db3de655a8145727 SHA256 598a14ada9c82eb048e628645bbb432f9dfecb6bf5f0358f7092e49e33a00049
 EBUILD bluez-4.67.ebuild 4788 RMD160 e650acf8a721f53b83e550ef6ea366f67e01840a SHA1 b74f9bb8ff8ac9bef3efb9ac648fe961e03ebcc2 SHA256 ed648d0e37b2501344314b6d4c352c2c751bd9db10a3840e2cd645d2ee9806a5
-MISC ChangeLog 8423 RMD160 9bcec65d384f38b841f2427f43497c37905c20cc SHA1 7558e449f896af25037a33feea9f6cbbb7edb75d SHA256 dfa9d1f9039784149ca89fca66ed512e452d46068aff0b4d5181a396f20429c9
-MISC metadata.xml 915 RMD160 4d404bfa89b7fed54ee3f7fd1858045ce45b9e09 SHA1 9bc166c659554dc6798ed11cdd80bf47dbdd9bca SHA256 193327f89fa8e03e52f9548abdc600b120016005e4cd220de71e833cad20eea4
+EBUILD bluez-4.69.ebuild 4869 RMD160 85c0e087b1f79f0c7437e28984b01259894d3fd5 SHA1 098f8ff5957d7b07240456a8942ae1f30cd68b81 SHA256 169cbef30d6268f7ad43902274db90510957d5bac0d2d7f9f64c644fc6a51031
+MISC ChangeLog 8706 RMD160 e7d00b87b48a519efc64fea6e2028f0b0477f366 SHA1 b5ee91e47aee6197b73cc956eb9c25243e102cba SHA256 d981e947dfff42d60ed479886d18b0e31cf30a07dd5df0087a06ccc998fc127f
+MISC metadata.xml 971 RMD160 e04cce6e52324c5ca47a6c851c9a1d5ef0a55633 SHA1 575867c6d8f51b65da48e11eb9bc970c7e58e0d7 SHA256 e06177a526d0ca3c20250ac7ca7f5d67f7d2563a0b8fddc6a68f208531ec4e75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEUEARECAAYFAkxAJggACgkQCaWpQKGI+9R2MwCWP7PFbbliW/Vych7JQnr6rffj
+GgCfXhhpWoSv8tUrIpEe2NfFIcuJP/k=
+=43Is
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.69.ebuild b/net-wireless/bluez/bluez-4.69.ebuild
new file mode 100644
index 000000000000..795317c2bbec
--- /dev/null
+++ b/net-wireless/bluez/bluez-4.69.ebuild
@@ -0,0 +1,170 @@
+# 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.69.ebuild,v 1.1 2010/07/16 09:27:28 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 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="alsa caps +consolekit cups debug gstreamer maemo6 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-146[extras]
+	>=dev-libs/glib-2.14
+	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 )"
+
+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
+		epatch	"${FILESDIR}/bluez-plugdev.patch"
+	fi
+
+	if use cups; then
+		epatch "${FILESDIR}/4.60/cups-location.patch"
+	fi
+
+	# Fix alsa files location
+	epatch "${FILESDIR}/${PN}-alsa_location.patch"
+
+	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-dfutool \
+		$(use_enable old-daemons hidd) \
+		$(use_enable old-daemons pand) \
+		$(use_enable old-daemons dund) \
+		$(use_enable maemo6) \
+		$(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 or"
+		elog "to add the user to the plugdev group."
+	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/metadata.xml b/net-wireless/bluez/metadata.xml
index a9fb95ffdbd2..3156f1ce1652 100644
--- a/net-wireless/bluez/metadata.xml
+++ b/net-wireless/bluez/metadata.xml
@@ -20,6 +20,7 @@
 		<flag name='consolekit'>Use <pkg>sys-auth/pambase[consolekit]</pkg> to
 			determine access to bluetooth devices based on whether a user is
 			logged in locally or remotely</flag>
+		<flag name='maemo6'>Compile with maemo6 plugin</flag>
 		<flag name='old-daemons'>Install old daemons like hidd and sdpd that are
 			deprecated by the new Service framework</flag>
 		<flag name='test-programs'>Install tools for testing of