From c3711c3b7d98594e2b5d22637cdc58eef53b7fac Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 14 Jan 2010 16:58:55 +0100
Subject: [PATCH] bluez, libdrm, vlc: update after udev -> libudev subpkg.

--HG--
extra : convert_revision : b057d49774e29c3621caa8e7cb61d84bf37ca868
---
 srcpkgs/bluez/template               | 9 ++++++---
 srcpkgs/libdrm/libdrm-devel.template | 3 +++
 srcpkgs/libdrm/template              | 6 ++++--
 srcpkgs/vlc/template                 | 6 +++---
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index ef1107796f7..63801b10bf8 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,6 +1,7 @@
 # Template file for 'bluez'
 pkgname=bluez
 version=4.59
+revision=1
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--localstatedir=/var --libexecdir=/lib --enable-gstreamer
@@ -29,11 +30,10 @@ subpackages="$pkgname-alsa $pkgname-compat $pkgname-gstreamer libbluetooth"
 subpackages="$subpackages libbluetooth-devel"
 
 Add_dependency run glibc
-Add_dependency run dbus
+Add_dependency run dbus-libs
 Add_dependency run glib
 Add_dependency run libnl
 Add_dependency run libusb-compat
-Add_dependency run udev
 Add_dependency run libcap-ng
 Add_dependency run libbluetooth
 Add_dependency build pkg-config
@@ -44,12 +44,12 @@ Add_dependency build dbus-devel
 Add_dependency build glib-devel
 Add_dependency build libnl-devel
 Add_dependency build libusb-compat-devel
-Add_dependency build udev-devel
 Add_dependency build libcap-ng-devel
 
 post_install()
 {
 	cd ${wrksrc} || return 1
+	install -d ${DESTDIR}/lib/udev/rules.d
 	install -m644 network/network.conf input/input.conf audio/audio.conf \
 		${DESTDIR}/etc/bluetooth || return 1
 	install -m755 scripts/bluetooth_serial ${DESTDIR}/lib/udev || return 1
@@ -60,4 +60,7 @@ post_install()
 		${DESTDIR}/etc/init.d/bluetooth || return 1
 	install -m644 ${FILESDIR}/bluetooth.confd \
 		${DESTDIR}/etc/conf.d/bluetooth || return 1
+	mv ${DESTDIR}/etc/udev/rules.d/* \
+		${DESTDIR}/lib/udev/rules.d || return 1
+	rm -rf ${DESTDIR}/etc/udev || return 1
 }	
diff --git a/srcpkgs/libdrm/libdrm-devel.template b/srcpkgs/libdrm/libdrm-devel.template
index 9e32a21bba2..c365cb1c9c2 100644
--- a/srcpkgs/libdrm/libdrm-devel.template
+++ b/srcpkgs/libdrm/libdrm-devel.template
@@ -5,7 +5,10 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 Add_dependency run glibc-devel
+Add_dependency run libudev-devel
 Add_dependency run libdrm
 
 do_install()
diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index 90fa35f67cf..2fda93ba6d4 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -1,6 +1,7 @@
 # Template build file for 'libdrm'.
 pkgname=libdrm
 version=2.4.17
+revision=1
 distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-udev --enable-nouveau-experimental-api
@@ -15,6 +16,7 @@ long_desc="
 
 subpackages="$pkgname-devel"
 Add_dependency run glibc
-Add_dependency run udev
+Add_dependency run libudev
+Add_dependency build pkg-config
 Add_dependency build glibc-devel
-Add_dependency build udev-devel
+Add_dependency build libudev-devel
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 118dace0b13..e75b6c887d4 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=1.0.4
-revision=2
+revision=3
 distfiles="http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-hal --disable-mtp --disable-gme
@@ -55,7 +55,7 @@ Add_dependency run MesaLib
 Add_dependency run libmad
 Add_dependency run liba52
 Add_dependency run libdca
-Add_dependency run udev
+Add_dependency run libudev
 Add_dependency run libdvbpsi
 Add_dependency run libgcrypt
 Add_dependency run libgpg-error
@@ -115,7 +115,7 @@ Add_dependency build MesaLib-devel
 Add_dependency build libmad-devel
 Add_dependency build liba52-devel
 Add_dependency build libdca-devel
-Add_dependency build udev-devel
+Add_dependency build libudev-devel
 Add_dependency build libdvbpsi-devel
 Add_dependency build libgcrypt-devel
 Add_dependency build libgpg-error-devel