[arch-commits] Commit in pinentry/trunk (PKGBUILD install pinentry.install)

[Gaetan Bisson]

    Date: Saturday, December 5, 2015 @ 05:14:31
  Author: bisson
Revision: 252366

implement FS#45001 and FS#47267

Added:
  pinentry/trunk/install
    (from rev 252365, pinentry/trunk/pinentry.install)
Modified:
  pinentry/trunk/PKGBUILD
Deleted:
  pinentry/trunk/pinentry.install

------------------+
 PKGBUILD         |   47 +++++++++++++++++++++++++----------------------
 install          |   20 ++++++++++++++++++++
 pinentry.install |   20 --------------------
 3 files changed, 45 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-05 03:36:29 UTC (rev 252365)
+++ PKGBUILD	2015-12-05 04:14:31 UTC (rev 252366)
@@ -1,40 +1,43 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
 pkgname=pinentry
 pkgver=0.9.6
-pkgrel=1
+pkgrel=2
 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://gnupg.org/related_software/pinentry/"
 depends=('ncurses' 'libcap>=2.16' 'libassuan')
-makedepends=('gtk2' 'qt4')
-optdepends=('gtk2: for gtk2 backend'
-            'qt4: for qt4 backend')
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2{,.sig})
-install=pinentry.install
-sha1sums=('296992d7b26ba2a517b093ccae26bc00b88b3bb5'
-          'SKIP')
+makedepends=('gtk2' 'qt5-base' 'gcr')
+optdepends=('gtk2: gtk2 backend'
+            'qt5-base: qt backend'
+            'gcr: gnome3 backend')
+source=("ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig})
+sha1sums=('296992d7b26ba2a517b093ccae26bc00b88b3bb5' 'SKIP')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6') # Werner Koch
 
+install=install
+
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  #for file in qt4/*.moc; do
-  #     moc-qt4 ${file/.moc/.h} > ${file}
-  # done
+	cd $srcdir/$pkgname-$pkgver
 
-  # https://bugs.gnupg.org/gnupg/issue1961
-  CXXFLAGS+=' -std=c++11'
+	# https://bugs.gnupg.org/gnupg/issue1961
+	CXXFLAGS+=' -std=c++11'
 
-  ./configure --prefix=/usr \
-	--enable-pinentry-curses \
-	--enable-pinentry-gtk2 \
-        --enable-pinentry-qt4 \
-	--enable-fallback-curses
-  make
+	./configure --prefix=/usr \
+		--enable-pinentry-curses \
+		--enable-fallback-curses \
+		--enable-pinentry-tty \
+		--enable-pinentry-emacs \
+		--enable-pinentry-gtk2 \
+		--enable-pinentry-gnome3 \
+		--enable-pinentry-qt \
+
+	make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
+	cd $srcdir/$pkgname-$pkgver
+	make DESTDIR=${pkgdir} install
 }

Copied: pinentry/trunk/install (from rev 252365, pinentry/trunk/pinentry.install)
===================================================================
--- install	                        (rev 0)
+++ install	2015-12-05 04:14:31 UTC (rev 252366)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(pinentry.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}

Deleted: pinentry.install
===================================================================
--- pinentry.install	2015-12-05 03:36:29 UTC (rev 252365)
+++ pinentry.install	2015-12-05 04:14:31 UTC (rev 252366)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(pinentry.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}