main/samba: fix deps

we try avoid linking to libpython if possible

1 files changed, 24 insertions, 2 deletions

diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index ccbaa316c4..503cbdcfcb 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
 pkgver=4.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
 arch="all"
@@ -12,7 +12,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-common $pkgname-initscript
 	$pkgname-winbind libwbclient $pkgname-winbind-clients:_winbind_clients
 	$pkgname-winbind-krb5-locator:_winbind_krb5_locator
 	$pkgname-pidl py-$pkgname:_py $pkgname-test:_test
-	$pkgname-libs"
+	$pkgname-libs-py:_libs_py $pkgname-libs"
 depends="$pkgname-initscript $pkgname-client"
 # note that heimdal is required (over mit krb5) for AD DC functionality
 makedepends="popt-dev ncurses-dev openldap-dev heimdal-dev e2fsprogs-dev
@@ -110,6 +110,19 @@ common() {
 	install -d -m 700 "$subpkgdir"/var/lib/samba/private
 }
 
+# common-libs is an attempt to avoid libpython dependency for libsmbclient
+_libs_py() {
+	pkgdesc="Libraries that require libpython"
+	replaces="samba-libs"
+	depends=
+	cd "$pkgdir"
+	_mv_files \
+		usr/lib/samba/libsamba-net.so \
+		usr/lib/samba/libsamba_python.so \
+		|| return 1
+	return 0
+}
+
 libsmbclient() {
 	pkgdesc="The SMB client library"
 	replaces="samba"
@@ -154,6 +167,7 @@ client() {
 
 dc() {
 	pkgdesc="Samba AD Domain Controller"
+	depends=
 	cd "$pkgdir"
 	_mv_files \
 		usr/bin/samba-tool \
@@ -169,6 +183,7 @@ dc() {
 
 _dc_libs() {
 	pkgdesc="Samba AD Domain Controller libraries"
+	depends=
 	cd "$pkgdir"
 	_mv_files \
 		usr/lib/samba/bind9/dlz_bind9_9.so \
@@ -201,6 +216,7 @@ winbind() {
 
 libwbclient() {
 	pkgdesc="Samba winbind client libraries"
+	depends=
 	# we have moved libwbclient from samba-common
 	replaces="samba-common winbind"
 	cd "$pkgdir"
@@ -213,6 +229,7 @@ libwbclient() {
 _winbind_clients() {
 	pkgdesc="Samba winbind clients"
 	replaces="winbind"
+	depends=
 	cd "$pkgdir"
 	_mv_files \
 		usr/bin/ntlm_auth \
@@ -224,6 +241,7 @@ _winbind_clients() {
 
 _winbind_krb5_locator() {
 	pkgdesc="Samba winbind krb5 locator"
+	depends=
 	cd "$pkgdir"
 	_mv_files \
 		usr/lib/winbind_krb5_locator.so \
@@ -232,18 +250,21 @@ _winbind_krb5_locator() {
 
 pidl() {
 	pkgdesc="Perl IDL compiler"
+	depends=
 	mkdir -p "$subpkgdir"/usr/share
 	mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/
 }
 
 _py() {
 	pkgdesc="Samba python libraries"
+	depends=
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
 }
 
 _test() {
 	pkgdesc="Samba server and client testing tools"
+	depends=
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib/samba
 	mv "$pkgdir"/usr/bin/*test \
 		"$pkgdir"/usr/bin/ndrdump \
@@ -257,6 +278,7 @@ _test() {
 
 libs() {
 	pkgdesc="Samba libraries"
+	depends=
 	cd "$pkgdir"
 	_mv_files \
 		usr/lib/lib*.so.* \