community/sphinx: fix license, drop python2 API support

1 files changed, 15 insertions, 39 deletions

diff --git a/community/sphinx/APKBUILD b/community/sphinx/APKBUILD
index e4f374ec9d..0f56d82ca5 100644
--- a/community/sphinx/APKBUILD
+++ b/community/sphinx/APKBUILD
@@ -3,39 +3,27 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=sphinx
 pkgver=2.2.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Free open-source SQL full-text search engine"
 url="http://www.sphinxsearch.com"
 arch="all"
-license="GPL-2.0"
-depends=""
-depends_dev=""
-makedepends="$depends_dev postgresql-dev mariadb-connector-c-dev unixodbc-dev expat-dev
+license="GPL-2.0-only"
+makedepends="postgresql-dev mariadb-connector-c-dev unixodbc-dev expat-dev
 	re2-dev snowball-dev"
-install=""
 pkgusers="$pkgname"
 pkggroups="$pkgname"
-subpackages="$pkgname-doc $pkgname-php::noarch $pkgname-python::noarch"
-source="http://sphinxsearch.com/files/$pkgname-$pkgver-release.tar.gz
+subpackages="$pkgname-doc $pkgname-php::noarch"
+source="http://sphinxsearch.com/files/sphinx-$pkgver-release.tar.gz
 	sphinx.initd
 	sphinx.confd
-	sphinx-pagesize.patch"
+	sphinx-pagesize.patch
+	"
 
-_builddir="$srcdir"/$pkgname-$pkgver-release
-
-prepare() {
-        local i
-        cd "$_builddir"
-        for i in $source; do
-                case $i in
-                *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-                esac
-        done
-}
+builddir="$srcdir"/$pkgname-$pkgver-release
 
 build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--prefix=/usr \
 		--exec-prefix=/usr \
 		--localstatedir=/var/lib/sphinx \
 		--sysconfdir=/etc/sphinx \
@@ -50,16 +38,13 @@ build() {
 		--with-syslog \
 		--with-re2 \
 		--enable-id64
-	make || return 1
+	make
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
-	install -Dm755 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname \
-			|| return 1
-	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname \
-	                || return 1
+	install -Dm755 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	chown -R $pkgusers:$pkggroups "$pkgdir"/var/lib/sphinx
 }
 
@@ -68,25 +53,16 @@ php() {
 	pkgdesc="PHP api for sphinx search engine"
 
 	mkdir -p "$subpkgdir"/usr/share/php/$pkgname/api
-	for i in $(ls $_builddir/api/*.php); do
+	for i in $(ls $builddir/api/*.php); do
 		mv $i "$subpkgdir"/usr/share/php/$pkgname/api ;
 	done
 }
 
 
-python() {
-	pkgdesc="Python api for sphinx search engine"
-
-	mkdir -p "$subpkgdir"/usr/lib/python2.7/site-packages/$pkgname/
-	for i in $(ls $_builddir/api/*.py); do
-		mv $i "$subpkgdir"/usr/lib/python2.7/site-packages/$pkgname/ ;
-	done
-}
-
 doc() {
 	default_doc;
 	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/misc
-	cp -r "$_builddir"/misc/* "$subpkgdir"/usr/share/doc/$pkgname/misc
+	cp -r "$builddir"/misc/* "$subpkgdir"/usr/share/doc/$pkgname/misc
 
 }