gentoo resync : 29.05.2018

5 files changed, 2 insertions, 289 deletions

diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 528bc9c6b9e9..644facf944cf 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,9 +1,4 @@
 AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38fce6781dcd86b926e03b245de05b148d8df9034f5c7470dcf5823bd4a080cbb011a1a32fc0b96d8a8a5d950d SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163
-AUX xca-1.3.2-build.patch 5871 BLAKE2B 5870a5b5a6331f33f43b303703ab4346bfc150af0bf3a5cd11a357ca48311abb35ba6d426a12f393a61b29e0edd53702856e7b986ac83b25741cd3ffdc08737b SHA512 1007fa6aa54273e1d279965ea41945063288eff72622325bb61086b288234fcba45f962ced77ddc037f1a64838204614b1a15b1b47d8d7a7b7699374bd54938e
-DIST xca-1.3.2.tar.gz 897947 BLAKE2B b12cc95c908187d78304ce93111c89bb8e0dc01ecab37e0ad1bd78f84a90ed9f44afa4ac35d22185b7018e238b476e496fca3c2b3a240bf654d2e5160e784b11 SHA512 f0a9c4d47f0c20632f44364cc55293a7d2152772a746a72bc4a46622da4e48ae612bafe918c098a71c29cdfca8e6c03c27cf85a862ca0f356eddf061414c89b2
-DIST xca-1.4.0.tar.gz 940245 BLAKE2B 1f0c9d72b647fa803c2b6b6019b0b9828f37b1d38d89838ac6102d560b1c930c0f962e9064d984540b0c8e14d7546529af978673955555283afa1f089af7ce7c SHA512 b220adc7551cf853037c4f5ef0cdd8eef1dda44d0fde634cfde35605396b988452bdbc97a60459911f663d6d6977d426f27f47a46a482d1a30331ac06862c1c9
 DIST xca-1.4.1.tar.gz 959107 BLAKE2B 7437cdbaa5277998de200e9a5ad3a7d44aed9ae8af8fd926d7ed1917d49bec79562455ca2e82557149d748840f299ffd66edfc7f265be7d5bdcd6e4fe8dbaf9b SHA512 8294669c4887ba7a9060c3c2c06014b8a1807898569842ed61c066e8a864de014fba51a2ff867b579048083fdd4934cc7f97c92268de4944bf4aafea9c2e7b42
-EBUILD xca-1.3.2-r2.ebuild 1107 BLAKE2B 40eaa44f511936f3be91eda8632bafba91511e9596e0fffdca6f53acf75e2fe11d6725e136cdc8c5d1fcd1bc4ec467dbb26f5c29ed9763185447c5ebbf59a6d5 SHA512 9379423c902b218ba5b7d60de2d8074c05e7a65a2223e723429ae47f4ef491b215ab3c68d2204f80b9d88a16207b4b30c993735e73d0ff2f5ed38b4588190de4
-EBUILD xca-1.4.0.ebuild 948 BLAKE2B d1cb112f8b1214c346f612d4c63bbc1a456a29f2a5bb57d8f86148fcad51ee4e74ad8871263f45618ee4bc1b894926d4a0576abe4d3c7b20269fc3d1e761e6b1 SHA512 31929fba97fa0a3c4c74849ecd23cfa56786cbd64af748cf4e521f534fb4a613013016dd271e81d6f2632464987359ed6f026be2d1f01f53ddc531cf225968e1
-EBUILD xca-1.4.1.ebuild 1181 BLAKE2B e28006d2140f54762b7207b3d440600319968c6a511c4c66f084ac11a7ff5eeb82881b32b35dd0402192691ca9299eec52f683ff6a9f5eb004d2b1271ee6afea SHA512 996eb26155821bf9a2c15fcf7e95a8e1ca660c08c2bf8d8a1db26003f1044aed372d39028b75c0e5d5077bb7a222bb7f43fdef00fb3b89fa94d680b744a60d9f
+EBUILD xca-1.4.1.ebuild 1180 BLAKE2B f865e4def8314ca7effeb87b6a38c30a3ce2a5f96fff87fc25280459e1224bdfce0623a5d3f6e21b435ba0c2dc0abe1e69e34e2c085b7a10d082d884ef9d33a2 SHA512 35e94c1323c4664cca88e396a45a6d06c50d98535349d28311edd774907aaa5d7815b93018d9ac6872815e39b763652188a953d4d8865b5f8197a5192fd8e693
 MISC metadata.xml 313 BLAKE2B 6e1376d870ee5ab083ed80dcc19c1acd60d487e285e9bdba7b92c13e97cb05a3a6fa8bc4c6107d5d54470e6ca93889fca15c1a2f7e690a169ca7aff64bd2499e SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1
diff --git a/app-crypt/xca/files/xca-1.3.2-build.patch b/app-crypt/xca/files/xca-1.3.2-build.patch
deleted file mode 100644
index 9ca8a670da33..000000000000
--- a/app-crypt/xca/files/xca-1.3.2-build.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From 476aa73644e6b3d353a1ed1cf3982e7114875088 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 3 Jun 2016 23:15:29 +0300
-Subject: [PATCH 1/2] build: add --with-qt-version to force specific qt linkage
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 43 ++++++++++++++++++++++++++++---------------
- 1 file changed, 28 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 32ba42b..8490a88 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -90,18 +90,28 @@ if test -n "${_QTDIR}" && test -d "${_QTDIR}"; then
-   DYLD_LIBRARY_PATH="${_QTDIR}/lib:${DYLD_LIBRARY_PATH}"
- fi
- 
--PKG_CHECK_MODULES(Qt5, [Qt5Core >= 5.0, Qt5Widgets >= 5.0], [
--  _QT_HOST_BINS="`pkg-config --variable=host_bins Qt5Core`"
--  QT_MOC="${_QT_HOST_BINS}/moc"
--  QT_UIC="${_QT_HOST_BINS}/uic"
--  if test -n "$DARWIN"; then
--    FRAMEDIR=`pkg-config --variable=libdir Qt5Core`
--    Qt5_CFLAGS="$Qt5_CFLAGS -F${FRAMEDIR} -I${FRAMEDIR}/QtCore.framework/Headers -I${FRAMEDIR}/QtGui.framework/Headers -I${FRAMEDIR}/QtWdgets.framework/Headers"
--  fi
--  QT_VERSION=5
--  QT_CFLAGS="${Qt5_CFLAGS} -fPIC"
--  QT_LIBS="${Qt5_LIBS}"
--], [
-+AC_ARG_WITH([qt-version],
-+  AS_HELP_STRING([--with-qt-version], [Select the Qt version]),
-+  [WANT_QT_VERSION="$withval"],
-+  [WANT_QT_VERSION=detect])
-+
-+if test "${WANT_QT_VERSION}" = detect -o "${WANT_QT_VERSION}" = 5; then
-+  PKG_CHECK_MODULES(Qt5, [Qt5Core >= 5.0, Qt5Widgets >= 5.0], [
-+    _QT_HOST_BINS="`pkg-config --variable=host_bins Qt5Core`"
-+    QT_MOC="${_QT_HOST_BINS}/moc"
-+    QT_UIC="${_QT_HOST_BINS}/uic"
-+    if test -n "$DARWIN"; then
-+      FRAMEDIR=`pkg-config --variable=libdir Qt5Core`
-+      Qt5_CFLAGS="$Qt5_CFLAGS -F${FRAMEDIR} -I${FRAMEDIR}/QtCore.framework/Headers -I${FRAMEDIR}/QtGui.framework/Headers -I${FRAMEDIR}/QtWdgets.framework/Headers"
-+    fi
-+    WANT_QT_VERSION=5
-+    QT_VERSION=5
-+    QT_CFLAGS="${Qt5_CFLAGS} -fPIC"
-+    QT_LIBS="${Qt5_LIBS}"
-+])
-+fi
-+
-+if test "${WANT_QT_VERSION}" = detect -o "${WANT_QT_VERSION}" = 4; then
-   PKG_CHECK_MODULES(Qt4, [QtCore >= 4.6, QtCore < 5.0, QtGui >= 4.6, QtGui < 5.0], [
-     QT_MOC="`pkg-config --variable=moc_location QtCore`"
-     QT_UIC="`pkg-config --variable=uic_location QtCore`"
-@@ -112,18 +122,21 @@ PKG_CHECK_MODULES(Qt5, [Qt5Core >= 5.0, Qt5Widgets >= 5.0], [
-       FRAMEDIR=`pkg-config --variable=libdir QtCore`
-       Qt4_CFLAGS="$Qt4_CFLAGS -F${FRAMEDIR} -I${FRAMEDIR}/QtCore.framework/Headers -I${FRAMEDIR}/QtGui.framework/Headers"
-     fi
-+    WANT_QT_VERSION=4
-     QT_VERSION=4
-     QT_CFLAGS="${Qt4_CFLAGS}"
-     QT_LIBS="${Qt4_LIBS}"
--  ], [
-+  ])
-+fi
-+
-+if test -z "${QT_VERSION}"; then
-     if test -z "$DARWIN"; then
-       QT_LIBS=" -lQtCore -lQtGui "
-     else
-       QT_LIBS=" -framework QtGui -framework QtCore "
-     fi
-     AC_MSG_WARN([Qt pkg-config failed, using fallback defaults (${QT_LIBS})]);
--  ])
--])
-+fi
- 
- AC_SUBST([QT_CFLAGS])
- AC_SUBST([QT_LIBS])
--- 
-2.7.3
-
-From 7112df9532f71cb3a150fef61b2d7e5d9899634c Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 3 Jun 2016 23:58:01 +0300
-Subject: [PATCH 2/2] build: add --disable-doc to disable doc installation
-
----
- Local.mak.in |  1 +
- configure.ac | 37 +++++++++++++++++++++++--------------
- doc/Makefile | 10 +++++-----
- 3 files changed, 29 insertions(+), 19 deletions(-)
-
-diff --git a/Local.mak.in b/Local.mak.in
-index cd5ebfc..d993b8b 100644
---- a/Local.mak.in
-+++ b/Local.mak.in
-@@ -19,6 +19,7 @@ STRIP=@STRIP@
- DOCTOOL=@DOCTOOL@
- MACDEPLOYQT=@MACDEPLOYQT@
- DARWIN=@DARWIN@
-+ENABLE_DOC=@ENABLE_DOC@
- 
- PACKAGE_TARNAME=@PACKAGE_TARNAME@
- HOST=linux
-diff --git a/configure.ac b/configure.ac
-index 8490a88..03d729e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -202,20 +202,29 @@ AX_CHECK_GNU_MAKE()
- 
- # linuxdoc application detection
- ##################################
--AC_CHECK_PROGS([DOCTOOL], [linuxdoc sgml2html], [":"])
--AC_SUBST([DOCTOOL])
--
--case "$DOCTOOL" in
-- linuxdoc) DOCTOOL="linuxdoc -B html";;
-- sgml2html) DOCTOOL="sgml2html -s 1";;
-- :)
--  if test "${srcdir}" != "."; then
--    mkdir -p doc
--    cp ${srcdir}/doc/xca-doc.tgz doc/
--  fi
--  AC_MSG_WARN(['linuxdoc' or 'sgml2html' not found, using pre-compiled documentation])
--  ;;
--esac
-+AC_ARG_ENABLE([doc],
-+  AS_HELP_STRING([--disable-doc], [Disable documentation installation]),
-+  ,
-+  [enable_doc=yes])
-+test "${enable_doc}" = "yes" && ENABLE_DOC= || ENABLE_DOC='\#'
-+AC_SUBST([ENABLE_DOC])
-+
-+if test "${enable_doc}"; then
-+  AC_CHECK_PROGS([DOCTOOL], [linuxdoc sgml2html], [":"])
-+  AC_SUBST([DOCTOOL])
-+
-+  case "$DOCTOOL" in
-+   linuxdoc) DOCTOOL="linuxdoc -B html";;
-+   sgml2html) DOCTOOL="sgml2html -s 1";;
-+   :)
-+    if test "${srcdir}" != "."; then
-+      mkdir -p doc
-+      cp ${srcdir}/doc/xca-doc.tgz doc/
-+    fi
-+    AC_MSG_WARN(['linuxdoc' or 'sgml2html' not found, using pre-compiled documentation])
-+    ;;
-+  esac
-+fi
- 
- # Setup done. Write local.h and Local.mak
- ############################################
-diff --git a/doc/Makefile b/doc/Makefile
-index fce4acf..7bf802f 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -17,13 +17,13 @@ xca.html: xca.sgml
- 	echo 'The documentation for XCA can be viewed online at: <a href="http://xca.sourceforge.net/">http://xca.sourceforge.net/</a>.' > $@
- 	test ! -f xca-doc.tgz || tar zxf xca-doc.tgz
- 	@$(PRINT) "  DOC    [$(BASENAME)] $@"
--	$(DOCTOOL) $< >/dev/null
-+	$(ENABLE_DOC)$(DOCTOOL) $< >/dev/null
- 
- install: $(doc)
--	install -m 755 -d $(destdir)$(htmldir) \
--		$(destdir)$(mandir)/man1
--	install -m 644 xca*.html $(destdir)$(htmldir)
--	install *.1.gz $(destdir)/$(mandir)/man1
-+	$(ENABLE_DOC)install -m 755 -d $(destdir)$(htmldir)
-+	$(ENABLE_DOC)install -m 644 xca*.html $(destdir)$(htmldir)
-+	install -m 755 -d $(destdir)$(mandir)/man1
-+	install -m 644 *.1.gz $(destdir)/$(mandir)/man1
- 
- app: xca.html
- 	mkdir -p $(APPDIR)/Resources
--- 
-2.7.3
-
diff --git a/app-crypt/xca/xca-1.3.2-r2.ebuild b/app-crypt/xca/xca-1.3.2-r2.ebuild
deleted file mode 100644
index c0ef3a8d4f8c..000000000000
--- a/app-crypt/xca/xca-1.3.2-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic autotools
-
-DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="http://xca.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="bindist doc libressl"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
-	libressl? ( dev-libs/libressl:0= )
-	doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
-	"${FILESDIR}/${P}-build.patch"
-)
-
-src_prepare() {
-	default
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	# bug #595440
-	append-cxxflags -std=c++11
-	econf \
-		--with-qt-version=5 \
-		$(use_enable doc) \
-		STRIP=true
-}
-
-src_compile() {
-	# enforce all to avoid the automatic silent rules
-	emake all
-}
-
-src_install() {
-	# non standard destdir
-	emake install destdir="${ED}"
-	einstalldocs
-
-	insinto /etc/xca
-	doins misc/*.txt
-}
diff --git a/app-crypt/xca/xca-1.4.0.ebuild b/app-crypt/xca/xca-1.4.0.ebuild
deleted file mode 100644
index dfa838fead8d..000000000000
--- a/app-crypt/xca/xca-1.4.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="http://xca.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="bindist doc libressl"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
-	libressl? ( dev-libs/libressl:0= )
-	doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
-)
-
-src_configure() {
-	econf \
-		--with-qt-version=5 \
-		$(use_enable doc) \
-		STRIP=true
-}
-
-src_compile() {
-	# enforce all to avoid the automatic silent rules
-	emake all
-}
-
-src_install() {
-	# non standard destdir
-	emake install destdir="${ED}"
-	einstalldocs
-
-	insinto /etc/xca
-	doins misc/*.txt
-}
diff --git a/app-crypt/xca/xca-1.4.1.ebuild b/app-crypt/xca/xca-1.4.1.ebuild
index dc23da6b0000..06f30c351d9c 100644
--- a/app-crypt/xca/xca-1.4.1.ebuild
+++ b/app-crypt/xca/xca-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bindist doc libressl"
 
 RDEPEND="