gentoo resync : 31.01.2018

3 files changed, 28 insertions, 58 deletions

diff --git a/sys-auth/yubikey-personalization-gui/Manifest b/sys-auth/yubikey-personalization-gui/Manifest
index 92b1037f4d0d..f16c38a3aed4 100644
--- a/sys-auth/yubikey-personalization-gui/Manifest
+++ b/sys-auth/yubikey-personalization-gui/Manifest
@@ -1,5 +1,3 @@
-DIST yubikey-personalization-gui-3.1.23.tar.gz 1450340 BLAKE2B fb183d939334b13faf1464dc65a0a03180a2b402ae628f556dba7211e66e89628718e797a86189f654ca88225c3b834df67b497e7a94d0e210edc433bfff49b8 SHA512 912bcbcac5cad285c43995f646de6aa68cc99a4d047b7632786cd93e38c031e2fb8dcc4f57f45647ba3e276de03aaea6ed9757f72ec2c42a43780c19edcca51b
-DIST yubikey-personalization-gui-3.1.24.tar.gz 947135 BLAKE2B 846fa6792c71b57ffb99c548efe6780571c1d52061393805f0f9a76a7e7722b3fc2851ead913b09028d7798ae7bab4670260cae63a98ef0c0d1b176266fa4338 SHA512 149237a719277a6571916473d31e6099c3f3a2003fcb2893c2becee80788102496dbbc8e424f75fe1f1dd3ac87122bd35b6908cf784458635069d89e7e706cfa
-EBUILD yubikey-personalization-gui-3.1.23.ebuild 962 BLAKE2B 68cfa79fe91cf4bac7496088f3a827539d265d54ecc13d9059cc47cc9e6a894e4ebb5e446001818dda315fd014fa7267bae080873c44298f369da3c2959353de SHA512 4fd6c55a5b145fc94db852da55d43c2f407bf5132f7a4b326831645138c8a6e61b37b5c76b648de540c279213e71b3048ec0464d0292e6e0c7ad487271340b84
-EBUILD yubikey-personalization-gui-3.1.24.ebuild 962 BLAKE2B fb8c2df8960de0fd74527e7cdbdd908f36adcb4901f5bf3b7528c95c51c1de137fd33c9695a0d96e6077cec030423dbe3b82b2fd88b048f9b093b92d625bfac0 SHA512 9b505329e8ff92e42cc9dfe11d9c90ce270442670dc131ef975d04288b438387ec9a1244e6fbc73b57f48c770e7955c1bd3947aa102d4f924c1518e8915c9059
+DIST yubikey-personalization-gui-3.1.25.tar.gz 942121 BLAKE2B edc581824f917b50664dd758a0447fa9a61c85844cd220d82661c9e1f1bbabc1bda77545c1eda2e56a43b8176479c1b161f8e9ad5feb3d61cdc37d301ebde9fc SHA512 6d45c2a9e9c452a44fba5ff3830150ce65e968899215c59fd7b412317143015c466ac706dcfa49def2c4304a01866a3674ba7cc37e47dff4e8c6acb8166fcf45
+EBUILD yubikey-personalization-gui-3.1.25.ebuild 1200 BLAKE2B 0eb335368f59ef82af5e429b75d9bc7b17d54d156c0583b67810a2131458f4a2e16a8239ee20ee3bdb9267e8f0fb9ae3716b2032d45e5c2b3d20ee0e6c26ef4a SHA512 bf8fc0315874c105117e1167ca0d9e2a7cc3156b6ab1a5febf3e8d1df35abaf007edac5ff8486535bcc17a9d8695b793c54b2b802f315644cc2ec2f6a5276d24
 MISC metadata.xml 404 BLAKE2B 2e7d7a0725118ddda15c0f1135febdbe12395a686eda48ce921c4beacd0e5479c75cd6eaa29c252047e827623e6cb81327ef2402e81c78376d1d5f93b0463c1a SHA512 bbd668995dcf6b8e44b498dc152349ccc9c534047fd46e6364cce6ca0f0689e396064466c9f49cc170e832b8681f98f096f43bb5da423e1065cfd019da3c1b12
diff --git a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.24.ebuild b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.24.ebuild
deleted file mode 100644
index 3e2afce422b9..000000000000
--- a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.24.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils
-
-DESCRIPTION="GUI for personalization of Yubico's YubiKey"
-SRC_URI="http://yubico.github.io/yubikey-personalization-gui/releases/${P}.tar.gz"
-HOMEPAGE="https://github.com/Yubico/yubikey-personalization-gui"
-
-KEYWORDS="~amd64"
-SLOT="0"
-LICENSE="BSD-2"
-IUSE="debug"
-
-RDEPEND="
-	>=sys-auth/ykpers-1.14.0
-	>=sys-auth/libyubikey-1.6
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qttest:4
-	dev-libs/glib:2
-	virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( NEWS README )
-
-src_configure() {
-	eqmake4 YKPersonalization.pro
-}
-
-src_install() {
-	dobin build/release/yubikey-personalization-gui
-	doman resources/lin/yubikey-personalization-gui.1
-	domenu resources/lin/yubikey-personalization-gui.desktop
-	doicon resources/lin/yubikey-personalization-gui.xpm
-	doicon -s 128 resources/lin/yubikey-personalization-gui.png
-}
diff --git a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.23.ebuild b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.25.ebuild
index 9f4e92b51485..e3c1da150af0 100644
--- a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.23.ebuild
+++ b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.25.ebuild
@@ -1,34 +1,46 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils qmake-utils
+inherit desktop flag-o-matic qmake-utils
 
 DESCRIPTION="GUI for personalization of Yubico's YubiKey"
-SRC_URI="http://yubico.github.io/yubikey-personalization-gui/releases/${P}.tar.gz"
+SRC_URI="https://github.com/Yubico/yubikey-personalization-gui/archive/${P}.tar.gz"
 HOMEPAGE="https://github.com/Yubico/yubikey-personalization-gui"
 
 KEYWORDS="~amd64"
 SLOT="0"
 LICENSE="BSD-2"
-IUSE="debug"
+IUSE="debug test"
 
 RDEPEND="
-	>=sys-auth/ykpers-1.14.0
-	>=sys-auth/libyubikey-1.6
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qttest:4
 	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=sys-auth/libyubikey-1.6
+	>=sys-auth/ykpers-1.14.0
 	virtual/libusb:1"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( NEWS README )
+	virtual/pkgconfig
+	test? ( dev-qt/qttest:5 )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+	if ! use test ; then
+		sed -i YKPersonalization.pro \
+			-e 's/src \\/src/' \
+			-e '/tests/d' || die
+	fi
+}
 
 src_configure() {
-	eqmake4 YKPersonalization.pro
+	append-cxxflags -std=c++11
+
+	eqmake5 "CONFIG+=nosilent" YKPersonalization.pro
 }
 
 src_install() {