main/xmlrpc-c: split out client libs and fix circular deps

1 files changed, 22 insertions, 3 deletions

diff --git a/main/xmlrpc-c/APKBUILD b/main/xmlrpc-c/APKBUILD
index 75d7b5786e..262b540097 100644
--- a/main/xmlrpc-c/APKBUILD
+++ b/main/xmlrpc-c/APKBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xmlrpc-c
 pkgver=1.16.44
-pkgrel=0
+pkgrel=1
 pkgdesc="This library provides a modular implementation of XML-RPC for C and C++"
 url="http://xmlrpc-c.sourceforge.net/"
 arch="all"
 license="custom:xmlrpc-c"
 depends=
 makedepends="libtool curl-dev libxml2-dev zlib-dev"
-subpackages="$pkgname-dev $pkgname-doc xmlrpc-c++:cxx"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-client
+	$pkgname-client++:clientxx xmlrpc-c++:cxx"
 source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tgz
 	xmlrpc-c-curl.patch"
 
@@ -46,10 +47,28 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
+client() {
+	pkgdesc="C client libraries for xmlrpc-c"
+	replaces="$pkgname"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libxmlrpc_client.so.* "$subpkgdir"/usr/lib/
+}
+
+clientxx() {
+	replaces="libxml-c++"
+	pkgdesc="C++ client libraries for xmlrpc-c"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libxmlrpc_client++.so.* "$subpkgdir"/usr/lib/
+}
+
 cxx() {
 	pkgdesc="This library provides a modular implementation of XML-RPC for C++"
+	replaces="$pkgname"
 	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*++* "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/*++* \
+		"$pkgdir"/usr/lib/libxmlrpc_packetsocket.so.* \
+		"$pkgdir"/usr/lib/libxmlrpc_cpp.so.* \
+		"$subpkgdir"/usr/lib/
 }
 
 md5sums="de3197ef5e1a6dc3265ad407fb1651c6  xmlrpc-c-1.16.44.tgz