Convert packages the new template format (a-c range).

srcpkgs/bluez/libbluetooth-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'libbluetooth-devel'.
-#
-depends="libbluetooth-${version}_${revision}"
-short_desc="Development files to use the BlueZ Linux Bluetooth library"
-
-do_install() {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-}

srcpkgs/bluez/libbluetooth.template

@@ -1,11 +0,0 @@
-# Template file for 'libbluetooth'.
-#
-short_desc="Library to use the Bluez Linux Bluetooth Stack"
-long_desc="
- BlueZ is the official Linux Bluetooth Stack. It is an Open Source project
- distributed under GNU General Public License (GPL)."
-
-do_install() {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libbluetooth.so* ${DESTDIR}/usr/lib
-}

srcpkgs/bluez/template

@@ -6,7 +6,6 @@ build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev
  --with-systemdsystemunitdir=/usr/lib/systemd/system
  --enable-pie --enable-threads --enable-library"
-subpackages="libbluetooth libbluetooth-devel"
 hostmakedepends="pkg-config flex"
 makedepends="libglib-devel libudev-devel>=183 dbus-devel
  libusb-compat-devel cups-devel libical-devel readline-devel
@@ -22,3 +21,31 @@ long_desc="
 
  BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
  project distributed under GNU General Public License (GPL)."
+
+libbluetooth_package() {
+	short_desc="Library to use the Bluez Linux Bluetooth Stack"
+	pkg_install() {
+		vmove "usr/lib/libbluetooth.so*"
+	}
+}
+
+libbluetooth-devel_package() {
+	depends="libbluetooth-${version}_${revision}"
+	short_desc="Development files to use the BlueZ Linux Bluetooth library"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+bluez_package() {
+	pkg_install() {
+		vmove etc
+		vmove usr/bin
+		vmove usr/share
+		vmove usr/libexec
+		vmove usr/lib/cups
+		vmove usr/lib/dbus
+		vmove usr/lib/systemd
+	}
+}