diff --git a/srcpkgs/pinentry/INSTALL b/srcpkgs/pinentry/INSTALL deleted file mode 100644 index 76418ee5dce..00000000000 --- a/srcpkgs/pinentry/INSTALL +++ /dev/null @@ -1,5 +0,0 @@ -case ${ACTION} in -post) - ln -sf pinentry-curses usr/bin/pinentry - ;; -esac diff --git a/srcpkgs/pinentry/REMOVE b/srcpkgs/pinentry/REMOVE deleted file mode 100644 index f2cbad58024..00000000000 --- a/srcpkgs/pinentry/REMOVE +++ /dev/null @@ -1,5 +0,0 @@ -case ${ACTION} in -purge) - rm -f usr/bin/pinentry - ;; -esac diff --git a/srcpkgs/pinentry/pinentry-gtk.INSTALL b/srcpkgs/pinentry/pinentry-gtk.INSTALL deleted file mode 100644 index b6b6458aaf6..00000000000 --- a/srcpkgs/pinentry/pinentry-gtk.INSTALL +++ /dev/null @@ -1,5 +0,0 @@ -case ${ACTION} in -post) - ln -sf pinentry-gtk-2 usr/bin/pinentry - ;; -esac diff --git a/srcpkgs/pinentry/pinentry-gtk.REMOVE b/srcpkgs/pinentry/pinentry-gtk.REMOVE deleted file mode 100644 index 21fe61014c3..00000000000 --- a/srcpkgs/pinentry/pinentry-gtk.REMOVE +++ /dev/null @@ -1,6 +0,0 @@ -case ${ACTION} in -purge) - rm -f usr/bin/pinentry - [ -f usr/bin/pinentry-curses ] && ln -sf pinentry-curses usr/bin/pinentry - ;; -esac diff --git a/srcpkgs/pinentry/template b/srcpkgs/pinentry/template index 4cbefdc24e1..bc98d8a4110 100644 --- a/srcpkgs/pinentry/template +++ b/srcpkgs/pinentry/template @@ -1,7 +1,7 @@ # Template file for 'pinentry' pkgname=pinentry version=1.1.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-rpath --without-libcap --disable-pinentry-gtk --enable-pinentry-curses --enable-fallback-curses --enable-pinentry-gtk2 @@ -13,9 +13,11 @@ short_desc="PIN or passphrase entry dialogs for GnuPG" maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://www.gnupg.org/related_software/pinentry/index.html" -distfiles="ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2" +distfiles="https://gnupg.org/ftp/gcrypt/pinentry/pinentry-${version}.tar.bz2" checksum=68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570 +alternatives="pinentry:pinentry:/usr/bin/pinentry-curses" + if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools" fi @@ -31,6 +33,7 @@ post_install() { pinentry-tty_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" for dumb terminals" + alternatives="pinentry:pinentry:/usr/bin/pinentry-tty" pkg_install() { vmove usr/bin/pinentry-tty } @@ -39,6 +42,7 @@ pinentry-tty_package() { pinentry-qt_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" based on Qt" + alternatives="pinentry:pinentry:/usr/bin/pinentry-qt" pkg_install() { vmove usr/bin/pinentry-qt } @@ -47,6 +51,7 @@ pinentry-qt_package() { pinentry-gtk_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" based on GTK+" + alternatives="pinentry:pinentry:/usr/bin/pinentry-gtk-2" pkg_install() { vmove usr/bin/pinentry-gtk-2 } @@ -55,6 +60,7 @@ pinentry-gtk_package() { pinentry-emacs_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - Emacs interface" + alternatives="pinentry:pinentry:/usr/bin/pinentry-emacs" pkg_install() { vmove usr/bin/pinentry-emacs } @@ -63,6 +69,7 @@ pinentry-emacs_package() { pinentry-gnome_package() { depends="libgnome-keyring ${sourcepkg}>=${version}_${revision}" short_desc+=" for the GNOME desktop" + alternatives="pinentry:pinentry:/usr/bin/pinentry-gnome3" pkg_install() { vmove usr/bin/pinentry-gnome3 }