[patch] diff 4.39 -> 4.50

bluez-4.50.ebuild.diff (text/plain), 5.26 KB, created by Davide Pesavento on 2009-08-27 22:27:18 UTC

--- /usr/portage/net-wireless/bluez/bluez-4.39.ebuild	2009-05-11 06:22:25.000000000 +0200
+++ /usr/portage/local/pesa/net-wireless/bluez/bluez-4.50.ebuild	2009-08-27 22:46:48.000000000 +0200
@@ -13,12 +13,13 @@
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
 
-IUSE="alsa cups debug doc gstreamer old-daemons test-programs usb"
+IUSE="alsa consolekit cups debug gstreamer old-daemons pcmcia test-programs usb"
 
 CDEPEND="alsa? ( media-libs/alsa-lib )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10 )
+		>=media-libs/gst-plugins-base-0.10
+	)
 	usb? ( dev-libs/libusb )
 	cups? ( net-print/cups )
 	sys-fs/udev
@@ -28,34 +29,28 @@
 	>=dev-libs/libnl-1.1
 	!net-wireless/bluez-libs
 	!net-wireless/bluez-utils"
-DEPEND="sys-devel/flex
+DEPEND="${CDEPEND}
 	>=dev-util/pkgconfig-0.20
-	doc? ( dev-util/gtk-doc )
-	${CDEPEND}"
+	sys-devel/bison
+	sys-devel/flex"
 RDEPEND="${CDEPEND}
-	sys-auth/pambase[consolekit]"
+	consolekit? ( sys-auth/pambase[consolekit] )
+	test-programs? (
+		dev-python/dbus-python
+		dev-python/pygobject
+	)"
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}/4.31-as_needed.patch" \
-		"${FILESDIR}/4.34-conditional_libsbc.patch"
-
-	if use cups; then
-		epatch "${FILESDIR}/4.18/cups-location.patch"
-	fi
+		"${FILESDIR}/4.50-conditional-libsbc.patch" \
+		"${FILESDIR}/4.50-cups-location.patch"
 
 	# 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 \
@@ -67,6 +62,7 @@
 		--enable-netlink \
 		--enable-tools \
 		--enable-bccmd \
+		$(use_enable pcmcia) \
 		--enable-hid2hci \
 		--enable-dfutool \
 		$(use_enable old-daemons hidd) \
@@ -74,19 +70,19 @@
 		$(use_enable old-daemons dund) \
 		$(use_enable cups) \
 		$(use_enable test-programs test) \
-		--enable-manpages \
+		--enable-udevrules \
 		--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
 
+	# don't install useless .la files
+	find "${D}" -type f -name '*.la' -delete || die "failed to remove .la files"
+
 	if use test-programs ; then
 		cd "${S}/test"
 		dobin simple-agent simple-service monitor-bluetooth
@@ -96,62 +92,42 @@
 		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
+	## TODO: use group uucp in new udev rules?
 
 	insinto /etc/bluetooth
 	doins \
 		input/input.conf \
 		audio/audio.conf \
-		network/network.conf
+		network/network.conf \
+		|| die
 }
 
 pkg_postinst() {
-	udevadm control --reload_rules && udevadm trigger
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
 
-	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
 	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
+	elog "If you want to use rfcomm as a normal user, you need to add the user"
+	elog "to the uucp group."
+	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 ""
+	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"
@@ -162,7 +138,4 @@
 		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."
 }