diff options
author | Bart Ribbers <bribbers@disroot.org> | 2019-12-07 15:56:40 +0100 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-12-12 13:05:57 +0000 |
commit | eac1b684bdebeeea9a5671f3b223c3cc330aa345 (patch) | |
tree | cb58378089349c63a0ae2c658cc058a7bec3c853 | |
parent | a7126e21b06d836a6dd44cd8e239344bf83e469a (diff) | |
download | aports-eac1b684bdebeeea9a5671f3b223c3cc330aa345.tar.gz aports-eac1b684bdebeeea9a5671f3b223c3cc330aa345.tar.bz2 aports-eac1b684bdebeeea9a5671f3b223c3cc330aa345.tar.xz |
main/pinentry: remove gtk and gnome in favor of pinentry-ui
-rw-r--r-- | main/pinentry/APKBUILD | 34 | ||||
-rw-r--r-- | main/pinentry/pinentry-gnome.post-deinstall | 8 | ||||
-rw-r--r-- | main/pinentry/pinentry-gnome.post-install | 4 | ||||
-rw-r--r-- | main/pinentry/pinentry-gtk.post-deinstall | 8 | ||||
-rw-r--r-- | main/pinentry/pinentry-gtk.post-install | 4 | ||||
-rw-r--r-- | main/pinentry/pinentry.post-deinstall | 6 | ||||
-rw-r--r-- | main/pinentry/pinentry.post-install | 2 |
7 files changed, 9 insertions, 57 deletions
diff --git a/main/pinentry/APKBUILD b/main/pinentry/APKBUILD index 5d36e9eb78..51d14fc0be 100644 --- a/main/pinentry/APKBUILD +++ b/main/pinentry/APKBUILD @@ -2,58 +2,40 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pinentry pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" url="http://www.gnupg.org/aegypten2" arch="all" license="GPL-2.0-or-later" -install="pinentry.post-install pinentry.post-deinstall" -makedepends="ncurses-dev libcap-dev gtk+-dev libgpg-error-dev libassuan-dev - gcr-dev libsecret-dev" -subpackages="$pkgname-doc $pkgname-gtk $pkgname-gnome" +install="pinentry.post-install" +makedepends="ncurses-dev libcap-dev libgpg-error-dev libassuan-dev gcr-dev libsecret-dev" +subpackages="$pkgname-doc" source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2" -builddir="$srcdir"/$pkgname-$pkgver build () { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --disable-pinentry-gtk \ - --enable-pinentry-gtk2 \ + --disable-pinentry-gtk2 \ + --disable-pinentry-gnome3 \ --disable-pinentry-qt \ --enable-pinentry-curses \ --enable-fallback-curses \ - --enable-pinentry-gnome3 \ --enable-libsecret make } check() { - make -C "$builddir" check + make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - # created by post install scripts so we can override with gtk version + # created by post install scripts so we can override with other UI versions rm -f "$pkgdir"/usr/bin/pinentry } -gtk() { - install="pinentry-gtk.post-install pinentry-gtk.post-deinstall" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/pinentry-gtk* \ - "$subpkgdir"/usr/bin/ -} - -gnome() { - install="pinentry-gnome.post-install pinentry-gnome.post-deinstall" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/pinentry-gnome3 \ - "$subpkgdir"/usr/bin/ -} - sha512sums="5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd pinentry-1.1.0.tar.bz2" diff --git a/main/pinentry/pinentry-gnome.post-deinstall b/main/pinentry/pinentry-gnome.post-deinstall deleted file mode 100644 index 887ef798ae..0000000000 --- a/main/pinentry/pinentry-gnome.post-deinstall +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ -f /usr/bin/pinentry-curses ]; then - ln -sf pinentry-curses /usr/bin/pinentry -else - rm -f /usr/bin/pinentry -fi - diff --git a/main/pinentry/pinentry-gnome.post-install b/main/pinentry/pinentry-gnome.post-install deleted file mode 100644 index 291dba7517..0000000000 --- a/main/pinentry/pinentry-gnome.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -ln -sf pinentry-gnome3 /usr/bin/pinentry - diff --git a/main/pinentry/pinentry-gtk.post-deinstall b/main/pinentry/pinentry-gtk.post-deinstall deleted file mode 100644 index 887ef798ae..0000000000 --- a/main/pinentry/pinentry-gtk.post-deinstall +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ -f /usr/bin/pinentry-curses ]; then - ln -sf pinentry-curses /usr/bin/pinentry -else - rm -f /usr/bin/pinentry -fi - diff --git a/main/pinentry/pinentry-gtk.post-install b/main/pinentry/pinentry-gtk.post-install deleted file mode 100644 index 8b51ca005f..0000000000 --- a/main/pinentry/pinentry-gtk.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -ln -sf pinentry-gtk-2 /usr/bin/pinentry - diff --git a/main/pinentry/pinentry.post-deinstall b/main/pinentry/pinentry.post-deinstall deleted file mode 100644 index 38939e5b49..0000000000 --- a/main/pinentry/pinentry.post-deinstall +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if ! [ -f /usr/bin/pinentry-gtk-2 ]; then - rm -f /usr/bin/pinentry -fi - diff --git a/main/pinentry/pinentry.post-install b/main/pinentry/pinentry.post-install index 0dfd31e955..895cdef59f 100644 --- a/main/pinentry/pinentry.post-install +++ b/main/pinentry/pinentry.post-install @@ -1,6 +1,6 @@ #!/bin/sh -if ! [ -f /usr/bin/pinentry-gtk-2 ]; then +if ! [ -f /usr/bin/pinentry-gtk-2 ] && ! [ -f /usr/bin/pinentry-gnome ] && ! [ -f /usr/bin/pinentry-qt ]; then ln -sf pinentry-curses /usr/bin/pinentry fi |