zbar: less terrible subpackage handling

srcpkgs/zbar/template

@@ -24,6 +24,12 @@ esac
 
 CFLAGS="-DNDEBUG"
 
+subpackages="libzbar libzbar-devel"
+
+if [ "$build_option_qt" ]; then
+	subpackages+=" libzbar-qt"
+fi
+
 pre_configure() {
 	export PYTHON_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7"
 	autoreconf -fi
@@ -37,15 +43,13 @@ libzbar_package() {
 	}
 }
 
-if [ "$build_option_qt" ]; then
+libzbar-qt_package() {
-	libzbar-qt_package() {
+	conflicts="libzbar<0.10_10"
-		conflicts="libzbar<0.10_10"
+	short_desc+=" - Qt bindings"
-		short_desc+=" - Qt bindings"
+	pkg_install() {
-		pkg_install() {
+		vmove "usr/lib/libzbarqt.so.*"
-			vmove "usr/lib/libzbarqt.so.*"
-		}
 	}
-fi
+}
 
 libzbar-devel_package() {
 	short_desc+=" - development files"