Version bump, fixed build problems with --disable{alsa,gstreamer}. Bug #260374 has already been solved in an earlier bump.

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

4 files changed, 219 insertions, 2 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 2441ed19e634..b91ba4e939c2 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.6 2009/03/10 21:17:26 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.7 2009/04/07 09:03:39 dev-zero Exp $
+
+*bluez-4.34 (07 Apr 2009)
+
+  07 Apr 2009; Tiziano Müller <dev-zero@gentoo.org>
+  +files/4.34-conditional_libsbc.patch, +bluez-4.34.ebuild:
+  Version bump, fixed build problems with --disable{alsa,gstreamer}. Bug
+  #260374 has already been solved in an earlier bump.
 
   10 Mar 2009; Tiziano Müller <dev-zero@gentoo.org> bluez-4.32.ebuild:
   Added pambase[consolekit] to RDEPEND to get at least the basics ready
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 7fb6ab20bbe1..abe9055768a5 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -4,13 +4,16 @@ AUX 4.18/conf.d-hidd 89 RMD160 31407e00bcb00eb0b9c1adeb7434a922bfb967e9 SHA1 dc6
 AUX 4.18/cups-location.patch 480 RMD160 3da74418b140c2ea05d2c9e0d743eaf004deba5d SHA1 3605b1633c92b2b7eefc7e6b78e98df3e12088a8 SHA256 cede5fed7e4ece7cf4977d40e7fd8f9a22200660b06cca15d39c9c40542ab33d
 AUX 4.18/init.d-hidd 779 RMD160 8dc919f4d0aa2df8464e3326c14b6f5a9f0c360f SHA1 45901988313787db4f1d5a0fdc44009ffa3d650b SHA256 d5816349cc85313a8f7f1b79112918aeda863ff59f298b99462611860605c737
 AUX 4.31-as_needed.patch 1129 RMD160 16d12e4466cebbc37183c73791c957655452e17b SHA1 3f98b061f91b3875c7b7035625f1d7b22c4aa6e5 SHA256 4f59a2f1dfb4567e5d5254720ebc2dbb5cfa7bacdf962801040eb7596922d698
+AUX 4.34-conditional_libsbc.patch 1511 RMD160 c76d7515f8433e6fc73a3043b31a9ee63c5baf97 SHA1 ab58528c58cf3ce6b01758beec488035ea5ad309 SHA256 8202c8d94dc3688072a750fcf287684b1e6ee5f7ac108af604f354cc0ba97707
 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
 DIST bluez-4.21.tar.gz 933080 RMD160 4a451ab0370fab0bfc8ba7750b9298f1b3700308 SHA1 d1eb361a93860b34cea5cc72a449047d6d8a5c63 SHA256 b4ca270ded5d2e9aa77d5c0e5e2bd987122751fe48fae0ebd90de42ab136de37
 DIST bluez-4.28.tar.gz 956161 RMD160 a8add4666bc19d009132be0118d075da79e8cba2 SHA1 ff992e8665814f8af0568883fa54f9355865b82b SHA256 8a7ecc1a2ad5b8c46414b58dd3a3519f2979a320ffa7d27c88519a7cf8755493
 DIST bluez-4.32.tar.gz 964691 RMD160 6cf25614da8dda99a2d56a9354f300eef72fc67a SHA1 93bfbb3be76cad9713e5f0707b50dcbf3cc52a3a SHA256 447debd3f5c7deea91d459cfe28fd417fb66e9871e8f7926cebaab75e94cd207
+DIST bluez-4.34.tar.gz 980050 RMD160 762ce4c970d865eb3067538b67a1e5133319df8c SHA1 d3abcf3cbae9bbced9f255f89f72435b920e09d6 SHA256 1c46b6e219aec9bbd3286e9366de7e6dd05f68ed33b7487fbd211397c890fc40
 EBUILD bluez-4.21.ebuild 4750 RMD160 4f3787153486ce122200afa63e713adc3238e443 SHA1 b1854ea1bb48ae8842c9951453380173c4d5c094 SHA256 c8b64449e15bb89d5ea633009e40644f5962b89d2aa77183ff961cc37bdf3002
 EBUILD bluez-4.28.ebuild 4885 RMD160 f4c735e9b7e5d1a1859a0efe1ae56acbaeeca66f SHA1 5125ed7037b90b284c8281471c2204935d0ad55d SHA256 cd0ef8500c6c1e53944ff78be03d59300ee595e0a87d840964a7902031cfa9f0
 EBUILD bluez-4.32.ebuild 4988 RMD160 59a1f1f05d5f533ac9d0dcbe0e9431af01fe2e8b SHA1 b80e22a3317f3b86a08e1aa8d01d59e49f147e78 SHA256 2d2148eb9973142039cce310d802f95ee42e6f00379d14a52da59b5c87c69cba
-MISC ChangeLog 1472 RMD160 395bc91154f49a792a029e34831e6d99bf8653b5 SHA1 2860ff9c26e269b87c2cc99d96e44bbdcb55a21b SHA256 bc22cf773dc55e4d26c6ca7c01f2c158fa04a16cf07d721044198bb430721a01
+EBUILD bluez-4.34.ebuild 5048 RMD160 db69cf43125240a5215270b4e0eb9f297171a83d SHA1 81ffcfe152bd8512e2f4d5d8d367de70369cfdb9 SHA256 0aef2c0f7d641c5a7b19300873d9867186d3dcff4f4d3f065785316e9d0a6b86
+MISC ChangeLog 1740 RMD160 a68fdd7c8a3b10210ad378d9d03ffe756223df6a SHA1 4895177babf93ba28839b9403687bdd106d00361 SHA256 3bd5f7ce64a8078bd7c9a048d44205e8b6ae36d08ac665662038f63da6478cf7
 MISC metadata.xml 514 RMD160 89fa06d58b02ddf9cf942c3e8662cbdc70e14587 SHA1 5f91b2a84e74029a5f8eb7362d6412b36518cdec SHA256 03647e723337dcd35c89f4dfcecaeeefba99883d690e6e91320804d5f8a22f9e
diff --git a/net-wireless/bluez/bluez-4.34.ebuild b/net-wireless/bluez/bluez-4.34.ebuild
new file mode 100644
index 000000000000..4f0ca64adba9
--- /dev/null
+++ b/net-wireless/bluez/bluez-4.34.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.34.ebuild,v 1.1 2009/04/07 09:03:39 dev-zero 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 ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+IUSE="alsa cups debug doc gstreamer old-daemons test-programs usb"
+
+CDEPEND="alsa? ( media-libs/alsa-lib )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10
+		>=media-libs/gst-plugins-base-0.10 )
+	usb? ( dev-libs/libusb )
+	cups? ( net-print/cups )
+	sys-fs/udev
+	dev-libs/glib
+	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
+	doc? ( dev-util/gtk-doc )
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	sys-auth/pambase[consolekit]"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/4.31-as_needed.patch" \
+		"${FILESDIR}/${PV}-conditional_libsbc.patch"
+
+	if use cups; then
+		epatch "${FILESDIR}/4.18/cups-location.patch"
+	fi
+
+	# needed for both patches
+	eautoreconf
+}
+
+src_configure() {
+	# the order is the same as ./configure --help
+
+	# we don't need the other daemons either with the new
+	# service architechture
+
+	econf \
+		$(use_enable doc gtk-doc) \
+		--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-hid2hci \
+		--enable-dfutool \
+		$(use_enable old-daemons hidd) \
+		$(use_enable old-daemons pand) \
+		$(use_enable old-daemons dund) \
+		$(use_enable cups) \
+		$(use_enable test-programs test) \
+		--enable-manpages \
+		--enable-configfiles \
+		--disable-initscripts \
+		--disable-pcmciarules \
+		$(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
+
+	newinitd "${FILESDIR}/4.18/bluetooth-init.d" bluetooth || die
+	newconfd "${FILESDIR}/4.18/bluetooth-conf.d" bluetooth || die
+
+	if use old-daemons; then
+		newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die
+		newinitd "${FILESDIR}/4.18/init.d-hidd" hidd || die
+	fi
+
+	# bug #84431
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules || die
+	newins "${S}/scripts/bluetooth.rules" 70-bluetooth-pcmcia.rules || die
+
+	exeinto /$(get_libdir)/udev/
+	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh || die
+	doexe  "${S}/scripts/bluetooth_serial" || die
+
+	insinto /etc/bluetooth
+	doins \
+		input/input.conf \
+		audio/audio.conf \
+		network/network.conf
+}
+
+pkg_postinst() {
+	udevadm control --reload_rules && udevadm trigger
+
+	elog
+	elog "To use dial up networking you must install net-dialup/ppp."
+	elog ""
+	elog "Since 3.0 bluez has changed the passkey handling to use a dbus based"
+	elog "API so please remember to update your /etc/bluetooth/hcid.conf."
+	elog "For a password agent, there is for example net-wireless/bluez-gnome"
+	elog "for gnome and net-wireless/kdebluetooth for kde."
+	elog ""
+	elog "Since 3.10.1 we don't install the old style daemons any more but rely"
+	elog "on the new service architechture:"
+	elog "	http://wiki.bluez.org/wiki/Services"
+	elog ""
+	elog "3.15 adds support for the audio service. See"
+	elog "http://wiki.bluez.org/wiki/HOWTO/AudioDevices for configuration help."
+	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."
+	elog ""
+	elog "If you want to use rfcomm as a normal user, you need to add the user"
+	elog "to the uucp group."
+	elog ""
+	if use old-daemons; then
+		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 runleves 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."
+	else
+		elog "The bluetooth service should be started automatically by udev"
+		elog "when the required hardware is inserted next time."
+	fi
+	elog
+	ewarn "On first install you need to run /etc/init.d/dbus reload or hcid"
+	ewarn "will fail to start."
+}
diff --git a/net-wireless/bluez/files/4.34-conditional_libsbc.patch b/net-wireless/bluez/files/4.34-conditional_libsbc.patch
new file mode 100644
index 000000000000..e4924c79be87
--- /dev/null
+++ b/net-wireless/bluez/files/4.34-conditional_libsbc.patch
@@ -0,0 +1,39 @@
+The configure stuff is a inconsequent:
+- even if neither alsa nor gstreamer support is enabled, SBC_LIBS gets substituted by libsbc.la
+  which doesn't get build without alsa or gstreamer. Making this conditional helps.
+- ipctest needs both libipc.la and libsbc.la and fails if SBC_LIBS/SBC_CFLAGS are empty,
+  making the build conditional helps again.
+--- acinclude.m4.orig	2009-04-06 16:26:14.570780241 +0200
++++ acinclude.m4	2009-04-06 16:26:59.540779148 +0200
+@@ -330,8 +330,10 @@
+ 	AC_SUBST([GDBUS_CFLAGS], ['-I$(top_srcdir)/gdbus'])
+ 	AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la'])
+ 
+-	AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc'])
+-	AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la'])
++	if (test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes"); then
++		AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc'])
++		AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la'])
++	fi
+ 
+ 	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
+ 	AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")
+--- audio/Makefile.am.orig	2009-04-06 16:47:21.240681272 +0200
++++ audio/Makefile.am	2009-04-06 17:42:27.240597715 +0200
+@@ -60,10 +60,16 @@
+ 
+ libipc_la_SOURCES = ipc.h ipc.c
+ 
++if AUDIOPLUGIN
++if SBC
++
+ noinst_PROGRAMS = ipctest
+ 
+ ipctest_LDADD= libipc.la @SBC_LIBS@ @GLIB_LIBS@
+ 
++endif
++endif
++
+ AM_CFLAGS = -fvisibility=hidden @SBC_CFLAGS@ \
+ 		@BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
+