From fd3c0c336f1bdadfa6d186d758435eeb13ddb9e5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 11 Dec 2014 07:09:40 +0100
Subject: [PATCH] wvstreams: merge uniconf subpkg.

- it's required by wvdial anyway.
- it was wrongly splitted with some missing parts in wvstreams.
---
 common/shlibs              |  2 +-
 srcpkgs/uniconf            |  1 -
 srcpkgs/wvstreams/template | 16 ++++------------
 3 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 120000 srcpkgs/uniconf

diff --git a/common/shlibs b/common/shlibs
index 0b3900adf2..d6c920a970 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1856,7 +1856,7 @@ libopencv_stitching.so.2.4 libopencv-2.4.10_1
 libopencv_photo.so.2.4 libopencv-2.4.10_1
 libopencv_legacy.so.2.4 libopencv-2.4.10_1
 libcgmanager.so.0 libcgmanager-0.33_1
-libuniconf.so.4.6 uniconf-4.6.1_1
+libuniconf.so.4.6 wvstreams-4.6.1_2
 libwvbase.so.4.6 wvstreams-4.6.1_1
 libwvutils.so.4.6 wvstreams-4.6.1_1
 libwvstreams.so.4.6 wvstreams-4.6.1_1
diff --git a/srcpkgs/uniconf b/srcpkgs/uniconf
deleted file mode 120000
index a5eb58f232..0000000000
--- a/srcpkgs/uniconf
+++ /dev/null
@@ -1 +0,0 @@
-wvstreams
\ No newline at end of file
diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 4dcf033bb9..1bc3c26469 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,7 +1,7 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=1
+revision=2
 build_style=gnu-configure
 maintainer="Enno Boland <eb@s01.de>"
 license="GPL-2"
@@ -13,8 +13,10 @@ checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"
 
+replaces="uniconf>=0"
+
 wvstreams-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} uniconf>=${version}_${revision} $makedepends"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -23,13 +25,3 @@ wvstreams-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-uniconf_package() {
-	short_desc="UniConf configuration system"
-	pkg_install() {
-		vmove usr/bin
-		vmove usr/sbin
-		vmove usr/share
-		vmove "usr/lib/libuniconf.so.*"
-	}
-}