From 462b13cea0c7efc1873e0da02da1ad0a8ac34a1c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 10 Apr 2013 23:34:42 +0200
Subject: [PATCH] bzip2: convert to the new template format.

---
 srcpkgs/bzip2/bzip2-devel.template | 16 ----------------
 srcpkgs/bzip2/template             | 19 ++++++++++++++++---
 2 files changed, 16 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/bzip2/bzip2-devel.template

diff --git a/srcpkgs/bzip2/bzip2-devel.template b/srcpkgs/bzip2/bzip2-devel.template
deleted file mode 100644
index f0b8d673431..00000000000
--- a/srcpkgs/bzip2/bzip2-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'bzip2-devel'.
-#
-depends="glibc-devel bzip2"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/libbz2.*a ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/bzip2/template b/srcpkgs/bzip2/template
index 58734bb218a..f87bdb64060 100644
--- a/srcpkgs/bzip2/template
+++ b/srcpkgs/bzip2/template
@@ -9,9 +9,6 @@ license="BSD"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
 
-subpackages="bzip2-devel"
-conflicts="chroot-bzip2>=0"
-
 do_build() {
 	make ${makejobs} -f Makefile-libbz2_so
 	make ${makejobs} bzip2recover libbz2.a
@@ -39,3 +36,19 @@ do_install() {
 
 	vinstall LICENSE 644 usr/share/licenses/bzip2
 }
+
+bzip2-devel_package() {
+	depends="bzip2>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}
+
+bzip2_package() {
+	conflicts="chroot-bzip2>=0"
+	pkg_install() {
+		vmove usr
+	}
+}