From 0318d3d2eb91517884c8ff7fa0b8d1bc3b32093b Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 11 Feb 2018 00:16:04 -0600
Subject: main/libxklavier: modernise, add check, fix license

---
 main/libxklavier/APKBUILD | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'main')

diff --git a/main/libxklavier/APKBUILD b/main/libxklavier/APKBUILD
index 0b97e7d6533..783ec82d59f 100644
--- a/main/libxklavier/APKBUILD
+++ b/main/libxklavier/APKBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxklavier
 pkgver=5.4
-pkgrel=2
+pkgrel=3
 pkgdesc="High-level API for X Keyboard Extension"
 url="http://gswitchit.sourceforge.net"
 arch="all"
-license="LGPL"
+license="LGPL-2.0+"
 subpackages="$pkgname-dev $pkgname-doc"
 depends="xkeyboard-config iso-codes"
-depends_dev="libxml2-dev glib-dev gettext-dev libxkbfile-dev"
+depends_dev="gettext-dev libxkbfile-dev"
 makedepends="$depends_dev glib-dev libxi-dev iso-codes-dev gettext-dev
-	gobject-introspection-dev"
+	gobject-introspection-dev python3 libxml2-dev glib-dev"
 
 _v=$pkgver
 case $pkgver in
@@ -20,30 +20,30 @@ esac
 
 source="http://people.freedesktop.org/~svu/libxklavier-$pkgver.tar.bz2"
 
-
-_builddir="$srcdir/$pkgname-$pkgver"
-
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	cd "$builddir"
+	update_config_sub
+	default_prepare
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-xkb-base=/usr/share/X11/xkb \
-		--disable-static \
-		|| return 1
-	make || return 1
+		--disable-static
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 }
-md5sums="13af74dcb6011ecedf1e3ed122bd31fa  libxklavier-5.4.tar.bz2"
-sha256sums="17a34194df5cbcd3b7bfd0f561d95d1f723aa1c87fca56bc2c209514460a9320  libxklavier-5.4.tar.bz2"
 sha512sums="e9342d94f6cd67e900e44d9751ee0d8c75bec8e3a7b30989612bd71a5f890be52ff843465162dbbe0bfc9004da76e1d47158a4671b8f915e51c91f9d82f7baae  libxklavier-5.4.tar.bz2"
-- 
cgit v1.2.3