gentoo resync : 21.12.2017

3 files changed, 0 insertions, 173 deletions

diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 549e6f10ded2..75e167fd0e18 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,10 +1,7 @@
 AUX pinentry-0.8.2-ncurses.patch 824 BLAKE2B 922bb9a7079d4a3bc307a441f3f884f764f78819a16b57cde3dcb000ae7a23b592b390f53c528358818087c2c313716289b829c307f07dbee3c9580bd174cd0d SHA512 415ad55fd7a4ab66e87e5db76b1314b00f5a86552804f1f431a533ba1e7ec3f2c7136096106688b572639ceb637fdf0c3e25d96aa2e07fd1f6f295d39e1d4901
-AUX pinentry-0.9.7-require-CPP11-for-qt-5-7.patches 1415 BLAKE2B 5413a96f4bd4b792b22f4899be83af45fcd627bc5f35a355ce1fe29e9f9165d28a6f0d6bd1d66fe3b2d2dd052c52cc3feed0dcbb992c4c3a775b45826ffab552 SHA512 1191ec7aa71042e4c770ea2793aac73f5501e83f0f93e9ae5440cbf84e4796c258156af7da9d0aaa7603e690c6bfa97d921c7721b3519d7ba33bd0f0def0baf4
 AUX pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch 1571 BLAKE2B 08d4b7b3db26112b2165511eaebb3664f692ea99d0999096c17b11164a222c072ff79aaa9d8d2bf7d6be94644fc2697bcbf114019d18a255bd573ce4375c01b9 SHA512 e5fce39467221865d5a40b54053745c4d7c63bfd07ae763f9e76779dd7e77252acf7627f5768e729e09c49762479692bc2f3e6474878765d80a1132193c87361
 AUX pinentry-1.0.0-build.patch 6634 BLAKE2B f5bd7f10e62ea603add875e14a69f30fbc6a2f8df463fa5c70531dd3f425a9219e36198380fcdd0906b670692bba49fb157807fae1c05a7be6f420b27e7426c0 SHA512 cd71552db3c4ab3bd7dd34d5009ad332e5a430ae1e909085cac6a04e63801086cac18916af65a37c110c2b667054c356f38dcc8af43468a23b1b562bf6dbafec
 AUX pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch 1900 BLAKE2B b9e7aa8f87615d4780af3361dd85907bf249891c108d51c001b44a5b55c697573c314e20fa2d8ec3df95c71b3aabfd2099e4efce4a0fdc3265fc483e785c3c23 SHA512 0b35900e4641c72c6b28b19bd252ffcabe14669e037c710a1057157fac0b65c709711a5667b66fd07afb433fc1c67509ec84eaddb822213d3ddc4ff7b549967e
-DIST pinentry-0.9.7.tar.bz2 432978 BLAKE2B fffeaa5548a4f4fc60a2adef51d1b8c74be910e0c377afd223aeb1de00f59cf84b376562d0a8e5b8d59a144ac3cdab0a260c5b15cacf1a7d9d5508d8b413ce3e SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0
 DIST pinentry-1.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7ff3c2ccc5fc554155b7621fddf9df957aa92063eb1a06c6964826a296bf60a4cc46cf2886552e37703a62042f35a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62
-EBUILD pinentry-0.9.7-r1.ebuild 3246 BLAKE2B a82540aa54cf9d543d38e6cd666dd835c24f93ba4b13d861085fdc0f67f44b6d61abce4b872538e309e599207afcce26d9638b0c80107fed4f89e8947c410875 SHA512 78e797ea8a8f806fbac7a161b82ada7941e80b69dc1a3051d20655abca27dcab40888d6a08d913203c8e2d14308d8e6164249f6ec915ed2c991a763d66d0e8af
 EBUILD pinentry-1.0.0-r2.ebuild 2888 BLAKE2B aa1c9770945d000d5ae644a23d8c3b5f32c2cee171b3fef8f63aef60aa27b55fb4a4d0a7a58773749680ce8700e0b894e538608072c3c8cf50ac5d178d38f06f SHA512 046581b037bfe95b7da1653a580833028c95db2b8c312f6e0fa4c3b9e30da327b419c8d6b9856fe77b8cb817316c0fc485486b9b95e46128a70eab94df8f0253
 MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0
diff --git a/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches b/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches
deleted file mode 100644
index 406571cdd3a0..000000000000
--- a/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7384e2a575dde2809784d9f182fd1d247064c8a2 Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Thu, 11 Aug 2016 14:44:37 +0200
-Subject: [PATCH] Qt: Append -std=c++11 if building against Qt 5.7
-
- * m4/qt.m4: Append -std=c++11 to CFLAGS if building against Qt 5.7
-
---
-Qt 5.7 enables C++11 for Qt modules, and any app relying on it require to be
-compiled with at least this standard.
-
-This patch adds detection for Qt 5.7 and make sure -std=c++11 is passed if
-building against Qt 5.7 or higher.
----
- m4/qt.m4 | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/m4/qt.m4 b/m4/qt.m4
-index 093f428..90c4a6e 100644
---- a/m4/qt.m4
-+++ b/m4/qt.m4
-@@ -35,6 +35,7 @@ AC_DEFUN([FIND_QT],
-                 enable_pinentry_qt5="try")
- 
-   have_qt5_libs="no";
-+  require_qt_cpp11="no";
- 
-   if test "$enable_pinentry_qt5" != "no"; then
-     PKG_CHECK_MODULES(PINENTRY_QT,
-@@ -47,6 +48,15 @@ AC_DEFUN([FIND_QT],
-     fi
-   fi
-   if test "$have_qt5_libs" = "yes"; then
-+    PKG_CHECK_MODULES(PINENTRY_QT_REQUIRE_CPP11,
-+                      Qt5Core >= 5.7.0,
-+                      [require_qt_cpp11="yes"],
-+                      [require_qt_cpp11="no"])
-+
-+    if test "${require_qt_cpp11}" = "yes"; then
-+      PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -std=c++11"
-+    fi
-+
-     AC_CHECK_TOOL(MOC, moc)
-     AC_MSG_CHECKING([moc version])
-     mocversion=`$MOC -v 2>&1`
--- 
-2.7.3
-
diff --git a/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild b/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
deleted file mode 100644
index 82a509210995..000000000000
--- a/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="http://gnupg.org/aegypten2/index.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static"
-
-CDEPEND="
-	>=dev-libs/libgpg-error-1.17
-	>=dev-libs/libassuan-2.1
-	>=dev-libs/libgcrypt-1.6.3
-	ncurses? ( sys-libs/ncurses:0= )
-	gtk? ( x11-libs/gtk+:2 )
-	qt4? (
-		>=dev-qt/qtgui-4.4.1:4
-	     )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	     )
-	caps? ( sys-libs/libcap )
-	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
-	app-eselect/eselect-pinentry
-	gnome-keyring? ( app-crypt/libsecret )
-"
-
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-RDEPEND="
-	${CDEPEND}
-	gnome-keyring? ( app-crypt/gcr )
-"
-
-REQUIRED_USE="
-	|| ( ncurses gtk qt4 qt5 )
-	gtk? ( !static )
-	qt4? ( !static )
-	qt5? ( !static )
-	static? ( ncurses )
-	?? ( qt4 qt5 )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"\
-		   "${FILESDIR}/${P}-require-CPP11-for-qt-5-7.patches"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	use static && append-ldflags -static
-	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
-
-	QT_MOC=""
-	if use qt4; then
-		myconf+=( --enable-pinentry-qt
-			  --disable-pinentry-qt5
-			)
-		QT_MOC="$(qt4_get_bindir)"/moc
-		# Issues finding qt on multilib systems
-		export QTLIB="$(qt4_get_libdir)"
-	elif use qt5; then
-		myconf+=( --enable-pinentry-qt )
-		QT_MOC="$(qt5_get_bindir)"/moc
-		export QTLIB="$(qt5_get_libdir)"
-	else
-		myconf+=( --disable-pinentry-qt )
-	fi
-
-	econf \
-		--enable-pinentry-tty \
-		$(use_enable emacs pinentry-emacs) \
-		$(use_enable gtk pinentry-gtk2) \
-		$(use_enable ncurses pinentry-curses) \
-		$(use_enable ncurses fallback-curses) \
-		$(use_with caps libcap) \
-		$(use_enable gnome-keyring libsecret) \
-		$(use_enable gnome-keyring pinentry-gnome3) \
-		"${myconf[@]}" \
-		MOC="${QT_MOC}"
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/bin/pinentry || die
-
-	if use qt4 || use qt5; then
-		dosym pinentry-qt /usr/bin/pinentry-qt4
-	fi
-}
-
-pkg_postinst() {
-	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
-		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
-		elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
-		elog "The soft resource limit for memory locking specifies the limit an"
-		elog "unprivileged process may lock into memory. You can also use POSIX"
-		elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
-		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
-		elog "your users."
-	fi
-
-	eselect pinentry update ifunset
-}
-
-pkg_postrm() {
-	eselect pinentry update ifunset
-}