Version bump. Dropped old.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 11 insertions, 334 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index aad2759c1410..179b0a503781 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2009/05/04 19:52:57 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.11 2009/05/11 04:22:25 dev-zero Exp $
+
+*bluez-4.39 (11 May 2009)
+
+  11 May 2009; Tiziano Müller <dev-zero@gentoo.org> -bluez-4.21.ebuild,
+  -bluez-4.36.ebuild, -bluez-4.37.ebuild, +bluez-4.39.ebuild:
+  Version bump. Dropped old.
 
 *bluez-4.38 (04 May 2009)
 
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index d63e0eb54f12..0037eee8688a 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -7,15 +7,11 @@ AUX 4.31-as_needed.patch 1129 RMD160 16d12e4466cebbc37183c73791c957655452e17b SH
 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.36.tar.gz 992743 RMD160 17e796b70865148aba9c534c5bc7f5b110b550ba SHA1 c0c2109c79f74f774497def5858e5f26fcdec2e6 SHA256 e08e1445734797b38f61bb83d197f38e2524ae47db97a8bfea3637035dabc59f
-DIST bluez-4.37.tar.gz 995263 RMD160 d17f7c0f1b584b2a89418ba1f048493079fb921a SHA1 8f2f88b1340454d48d1723df2b20f5c7698200e3 SHA256 2bfc5db7703cbcaaa4be2576609136450e1dac5d4782707dd0dc81754e3c2489
 DIST bluez-4.38.tar.gz 996949 RMD160 5da89c2578d81058a226b780000c5fcbb20a9fbb SHA1 af443f89f2851964dc97fa99d1024f85f37b5b45 SHA256 2841deb43405a7801c819342721bb57397dac05b5d203a773ca61cc340afae4a
-EBUILD bluez-4.21.ebuild 4750 RMD160 4f3787153486ce122200afa63e713adc3238e443 SHA1 b1854ea1bb48ae8842c9951453380173c4d5c094 SHA256 c8b64449e15bb89d5ea633009e40644f5962b89d2aa77183ff961cc37bdf3002
+DIST bluez-4.39.tar.gz 998208 RMD160 c1a5e2dbfc44713ade22d4d669f63b98da95c899 SHA1 5fbc3316c8003df47c9fe3a0f577e4518bb18185 SHA256 924dc4b8ae78da2c8f3af9c36ab85d08ee7f8ec0ae4dfe58840ae70041580063
 EBUILD bluez-4.28.ebuild 4885 RMD160 f4c735e9b7e5d1a1859a0efe1ae56acbaeeca66f SHA1 5125ed7037b90b284c8281471c2204935d0ad55d SHA256 cd0ef8500c6c1e53944ff78be03d59300ee595e0a87d840964a7902031cfa9f0
-EBUILD bluez-4.36.ebuild 5047 RMD160 363077e45c054935cbce925414b5c89464aedb6a SHA1 dd253d6869d7321115facca24392692b42e8b623 SHA256 f96e711a991bdf5995b0fc757e6e54e387ea410c80be2ec7fe004b09f613cbdb
-EBUILD bluez-4.37.ebuild 5047 RMD160 a24cb0ef363f6cc1d53a58c24d69f0bace752044 SHA1 0dceb9aea39cda40fe9f3c2687429dc7d10ac61c SHA256 cb94e97dcbfa72cd34850f560f5cb28bf3acd80fd2a064ff7f8732e0f338285b
 EBUILD bluez-4.38.ebuild 5047 RMD160 5ab64c5c688f1f19462cb9bafb87e7150bbe420d SHA1 34db5cf7b7351fcd98e94bb582981bd7482eca6a SHA256 a36f009553a41bc584797ede4a78efae57d54061055f4e9f1902926927edb81b
-MISC ChangeLog 2183 RMD160 95d0d285531d9b0c0c3d6a9f6e6de19562e81df5 SHA1 bfc0d9d1fdb9c1481101a52a92208a83cd2f283a SHA256 36a5d0e0d571319954951e564e86675057aa4b637206db619d799e816f0de3d2
+EBUILD bluez-4.39.ebuild 5047 RMD160 b8cf9067ff8f3e9e1218b8f343cbdc5df5d3fbe5 SHA1 1a0de4816a75895e8ee6e2cdf697d47706fed66c SHA256 a564b2fb182f761512950f77594afdfa65cb72fa8c1b4cb75ba65dd3c4437548
+MISC ChangeLog 2375 RMD160 da3231f73990a7dae9490cba93079cab6cf1b3aa SHA1 452a1c57cc438f52588e2a2c0d8cc12de8ed132e SHA256 45b64a2d0ac341a040c2a5534dfb7f4d49f3825d58ad88ea5fe03a00c524b2e3
 MISC metadata.xml 514 RMD160 89fa06d58b02ddf9cf942c3e8662cbdc70e14587 SHA1 5f91b2a84e74029a5f8eb7362d6412b36518cdec SHA256 03647e723337dcd35c89f4dfcecaeeefba99883d690e6e91320804d5f8a22f9e
diff --git a/net-wireless/bluez/bluez-4.21.ebuild b/net-wireless/bluez/bluez-4.21.ebuild
deleted file mode 100644
index 1535dacb7053..000000000000
--- a/net-wireless/bluez/bluez-4.21.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.21.ebuild,v 1.1 2008/12/04 10:04:22 dev-zero Exp $
-
-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 examples gstreamer old-daemons test-programs usb"
-
-RDEPEND="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
-	!net-wireless/bluez-libs
-	!net-wireless/bluez-utils"
-DEPEND="!<dev-libs/libnl-1.1
-	sys-devel/flex
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use cups; then
-		epatch "${FILESDIR}/4.18/cups-location.patch"
-		eautoreconf
-	fi
-}
-
-src_compile() {
-	# 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
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog README || die
-
-	if use test-programs ; then
-		dobin input/test-input || die
-
-		# a very simple example daemon
-		dobin test/passkey-agent || die
-		dobin test/auth-agent || die
-	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/bluez-4.37.ebuild b/net-wireless/bluez/bluez-4.37.ebuild
deleted file mode 100644
index 4afae290a17f..000000000000
--- a/net-wireless/bluez/bluez-4.37.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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.37.ebuild,v 1.1 2009/04/24 07:30:59 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}/4.34-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/bluez-4.36.ebuild b/net-wireless/bluez/bluez-4.39.ebuild
index ff07be93d56b..6095d2f88671 100644
--- a/net-wireless/bluez/bluez-4.36.ebuild
+++ b/net-wireless/bluez/bluez-4.39.ebuild
@@ -1,6 +1,6 @@
 # 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.36.ebuild,v 1.1 2009/04/19 08:31:17 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.39.ebuild,v 1.1 2009/05/11 04:22:25 dev-zero Exp $
 
 EAPI="2"