testing/sems: drop py2

2 files changed, 40 insertions, 56 deletions

diff --git a/testing/sems/APKBUILD b/testing/sems/APKBUILD
index 122052ce7e..f5f8a65fb5 100644
--- a/testing/sems/APKBUILD
+++ b/testing/sems/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Simon Frankenberger <simon-alpine@fraho.eu>
 pkgname=sems
 pkgver=1.6.0
-pkgrel=9
+pkgrel=10
 pkgdesc="SIP Express Media Server, an extensible SIP media server"
 url="https://github.com/sems-server/sems/"
 arch="all"
@@ -12,13 +12,12 @@ options="!check"
 pkgusers="sems"
 pkggroups="sems"
 install="$pkgname.pre-install"
-makedepends="python2-dev cmake bash openssl-dev linux-headers
+makedepends="cmake bash openssl-dev linux-headers
 	libsamplerate-dev spandsp-dev flite-dev gsm-dev speex-dev
 	libevent-dev libev-dev lame-dev tiff-dev"
-subpackages="$pkgname-doc $pkgname-conf_auth:conf_auth:noarch $pkgname-conference
-	$pkgname-diameter_client $pkgname-dsm $pkgname-early_announce
-	$pkgname-g722 $pkgname-gsm $pkgname-ivr $pkgname-mailbox:mailbox:noarch $pkgname-mp3
-	$pkgname-pin_collect:pin_collect:noarch $pkgname-speex $pkgname-xmlrpc2di
+subpackages="$pkgname-doc $pkgname-conference
+	$pkgname-diameter_client $pkgname-early_announce
+	$pkgname-g722 $pkgname-gsm $pkgname-mp3 $pkgname-speex $pkgname-xmlrpc2di
 	$pkgname-webconference $pkgname-voicebox $pkgname-voicemail
 	$pkgname-annrecorder $pkgname-jsonrpc $pkgname-registrar $pkgname-openrc"
 
@@ -33,6 +32,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/sems-server/sems/archive/$pk
 	sems-0013-Fix-for-C-11.patch
 	Fix-find-openssl.patch
 	Fix-openssl-1.1.patch
+	remove-dsm.patch
 
 	sems.initd
 	"
@@ -46,16 +46,20 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/sems-server/sems/archive/$pk
 #	sems-0007-Fix-gateway-module-s-version-passing-in-CMake.patch
 #	sems-0010-Move-CMake-defines.patch
 
-builddir="$srcdir/$pkgname-$pkgver"
+replaces="
+	$pkgname-ivr
+	$pkgname-mailbox
+	$pkgname-conf_auth
+	$pkgname-pin_collect
+	$pkgname-dsm
+	" # Removed in 1.6.0-r10 (python2)
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	rm -rf core/plug-in/gsm/gsm-1.0-pl10/
 }
 
 build() {
-	cd "$builddir"
 	# force cmake to use relative paths. It helps us avoid having the
 	# full file path in the logs
 	cmake \
@@ -78,7 +82,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make install DESTDIR="$pkgdir"
 	install -m755 -D "$srcdir"/$pkgname.initd \
 		"$pkgdir"/etc/init.d/$pkgname
@@ -97,13 +100,6 @@ _mv_sub() {
 	done
 }
 
-conf_auth() {
-	pkgdesc="Conference with authorization for SEMS"
-	depends="sems sems-ivr"
-	cd "$pkgdir"
-	_mv_sub usr/lib/sems/ivr/conf_auth*
-}
-
 conference() {
 	pkgdesc="Conferencing application for SEMS"
 	depends="sems"
@@ -120,15 +116,6 @@ diameter_client() {
 	_mv_sub usr/lib/sems/plug-in/diameter_client.so
 }
 
-dsm() {
-	pkgdesc="The state machine interpreter for SEMS"
-	depends="sems"
-	cd "$pkgdir"
-	_mv_sub etc/sems/etc/dsm* \
-		usr/lib/sems/plug-in/dsm.so \
-		usr/lib/sems/dsm
-}
-
 early_announce() {
 	pkgdesc="Early announce application for SEMS"
 	depends="sems"
@@ -154,37 +141,10 @@ gsm() {
 	_mv_sub usr/lib/sems/plug-in/gsm.so
 }
 
-ivr() {
-	pkgdesc="IVR (python) functionallity for SEMS"
-	depends="sems python2"
-	cd "$pkgdir"
-	_mv_sub etc/sems/etc/ivr.conf \
-		usr/lib/sems/plug-in/ivr.so \
-		usr/lib/sems/ivr/log.*
-}
-
-mailbox() {
-	pkgdesc="Mailbox application for SEMS"
-	depends="sems sems-ivr"
-	cd "$pkgdir"
-	_mv_sub etc/sems/etc/mailbox*.conf \
-		usr/share/sems/audio/mailbox \
-		usr/lib/sems/ivr/*mailbox*
-}
-
 mp3() {
-    pkgdesc="MP3 support for SEMS"
-    depends="sems"
-    _mv_sub usr/lib/sems/plug-in/mp3.so
-}
-
-pin_collect() {
-	pkgdesc="Collects a PIN for SEMS"
-	depends="sems sems-ivr"
-	cd "$pkgdir"
-	_mv_sub etc/sems/etc/pin_collect.conf \
-		usr/share/sems/audio/pin_collect \
-		usr/lib/sems/ivr/pin_collect*
+	pkgdesc="MP3 support for SEMS"
+	depends="sems"
+	_mv_sub usr/lib/sems/plug-in/mp3.so
 }
 
 webconference() {
@@ -274,4 +234,5 @@ d616448e70d1cdfc7016f7ff3cab3615063a65f551b4b03cd004ced60b7a24681e85a871788ef2bf
 d21eb55ebcbf3d20703dcb3843415b9f7e8d4fa029396738b843d8ece80abf87475e7d06794f86c75e8c3205273c013e99da4772d169bf127d7985522230265a  sems-0013-Fix-for-C-11.patch
 5d8493a7323af5e48a862e6f54e606a0eb0c778115922822a450e226b6f55051797b645595de068307b3d624c1aa9958fee16c838b49508352b336138783e210  Fix-find-openssl.patch
 b9b00accd7b69cf531f22df43e3334ef099d24aa0bb164c860a8a87ec2cc12520a1c83217ec10357d101b5394d00559a669cd6fa12e1d9cbe05c6cde2afc5cc6  Fix-openssl-1.1.patch
+f354d2ddc8bc96792faef75417e10cc86b56de115114688a438b6019345406a5454ac71f50a424613bbdaea3a79e5d8299ca95c511c1791f25e0f7ced766cdb5  remove-dsm.patch
 5be93b6444a9592daa6c883c78e5906e9e662891e1daa850d872bdaa657eb756f1bc0879732033479b279b75c2fd42ef79aa530ebf3b1692e7fb222d484f804b  sems.initd"
diff --git a/testing/sems/remove-dsm.patch b/testing/sems/remove-dsm.patch
new file mode 100644
index 0000000000..6669a83d8a
--- /dev/null
+++ b/testing/sems/remove-dsm.patch
@@ -0,0 +1,23 @@
+Requires python2
+
+diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
+index e2668eb..c8cc2d2 100644
+--- a/apps/CMakeLists.txt
++++ b/apps/CMakeLists.txt
+@@ -6,6 +6,7 @@ ADD_SUBDIRECTORY(callback)
+ ADD_SUBDIRECTORY(click2dial)
+ IF(PYTHONLIBS_FOUND)
+ 	ADD_SUBDIRECTORY(conf_auth)
++	ADD_SUBDIRECTORY(dsm)
+ ENDIF(PYTHONLIBS_FOUND)
+ ADD_SUBDIRECTORY(conference)
+ IF(MYSQLPP_FOUND)
+@@ -14,7 +15,6 @@ ENDIF(MYSQLPP_FOUND)
+ IF(OPENSSL_FOUND)
+ 	ADD_SUBDIRECTORY(diameter_client)
+ ENDIF(OPENSSL_FOUND)
+-ADD_SUBDIRECTORY(dsm)
+ ADD_SUBDIRECTORY(early_announce)
+ #ADD_SUBDIRECTORY(examples)
+ IF(MISDN_FOUND)
+