gentoo resync : 01.12.2017

6 files changed, 3 insertions, 164 deletions

diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 6f28085112ca..b62cb1b3a894 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,8 +1,3 @@
-AUX kaddressbook-4.4.2017.04-gcc6.patch 892 BLAKE2B 281c77f3d1f346d160a37d61edf092cea3c6a533b31d2a5597bd7da2c5526f7527e02fc5192d2a318fcf626bef697786e4f18439db0f7ed93000182faca38560 SHA512 990331993ef9e9b4dfc0aa32acd6e0f317b98914bf24723356efbf128f4711ba6c69b54a2643bb05b5aa4e4923d75a01b6653ce2a0d857444922af1890b3bb60
-DIST kaddressbook-17.04.3.tar.xz 560068 SHA256 a0898a47fcfbb575a62b0fef88c3a9ca6a81f949e909c41df13841113778233f SHA512 24bf1bd6b1e46a1ea9373a576bbe2b28827ddfc26b1ef91f0337f59d2ae4c3c21967e1082baa62f897bcc89ba4fae450b6c23f7d2d2bda1a0996eab05821d227 WHIRLPOOL fc45b044becdf8196ae988c903c285070fc84c6d5c722334c75707f9abfd9b7ad4d595f06c7c756b7ea1f1b1b40174446c8e4a55c83e28940f245a69272f7263
 DIST kaddressbook-17.08.3.tar.xz 546868 SHA256 a5a401640ae22b895b38c503bfc07a7e08f32f9f4f8b2e582d469fb7f3a303b7 SHA512 baffd3f377dc33cc4bc3402f4f814f630efa1b152e2cfe02698cb0d2237011f7b3fa1c7ceff0eb83b5a10ef2ef038f5fa89a07609db8e009da2df3f080903757 WHIRLPOOL f535ff71b5af8489f843415d40ad8278f7f8c0886d68833518166a8b86cbe20d768f8646ab64eeb6b485702465a3e18a23afa659783004618d30e6b3cb12f488
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
-EBUILD kaddressbook-17.04.3.ebuild 1852 BLAKE2B d2acf7968c06523be37a9cf49daf6908fe6e2ab81b07ee94f9f8939be1d7f3777810239888b30513b5cc4664fd0140b5adfea13b44fa8a4bdd6f0f664a738515 SHA512 3beb74807e87d0855a7f7d7b8e90bf6a499daf94aa9297a80d1412fce0d2216d35b2e9878ae43ad4945ac4aacff870d3c1a617ddc76eb5076afb0dc150dae84c
-EBUILD kaddressbook-17.08.3.ebuild 1719 BLAKE2B d397e3271e62e9e2e1d42f034dd9a70a03040f704016ffc0204b6602a4145b5fd72c762a9f7cfdb54d6a0ba0a8cab7b6365e1a34eb0a7a83af95f37f58ebdf84 SHA512 028cb2993a88f5759b02020bd3975de3e9eb87122b3afce5e7bcfd2a36159b9c9b9f5da70091b68a18e0b54d1476732ddff17f22bfa0531d979b6c460dbbd2f0
-EBUILD kaddressbook-4.4.2017.04.ebuild 1254 BLAKE2B ba5803a55566506f51faa1d319b320e679727b0698ba9462ffc2b310e63fb9150389393f0519d0bb72b06d2bb16d1b8a2162fb59a1cf6d8240809e2b949b743b SHA512 d1d189ed7d69c8c6e52c8ff4aa2d219ad1ec7029cbdc1641aba954bc79bdaba93ceaebafecb19f74d0920c571590917654b7bda2be2b615eba58a41a850160ed
-MISC metadata.xml 332 BLAKE2B ae56c268dc3e6007b3fbf55007b21c5e571b6a77454705df5705a39b938613f08320c990639c8a630dfe4198e1393cc602d7b9e72139cfa15e5a1da354dfe2fc SHA512 710c8736b03ae58d887d1cb9d1163b7dc2a7542594e5ca36640e70f73ab320154ca2297f0ecc00901dfe1f8f87dd3060b590cbf5812e9901cc4213abdd3f89e8
+EBUILD kaddressbook-17.08.3.ebuild 1717 BLAKE2B a760be2a7930bb9f80e7739075b760a012a5605c31fa8334cf1992b03868c07cb66ec7d2fcb2c44c6a23fd56493610a4e513dc6b874d5718842f532d65d1f080 SHA512 6b347d5fa2f00a4876fa6ab3528368c6507894a7718d532edf453dbe582b1e5ab144156bc05b1eeda1ceb31d277f79f5669301c6c540473710917a4cbcf6d73d
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/files/kaddressbook-4.4.2017.04-gcc6.patch b/kde-apps/kaddressbook/files/kaddressbook-4.4.2017.04-gcc6.patch
deleted file mode 100644
index 5c7b55c5283a..000000000000
--- a/kde-apps/kaddressbook/files/kaddressbook-4.4.2017.04-gcc6.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/kaddressbook/views/configurecardviewdialog.cpp
-+++ b/kaddressbook/views/configurecardviewdialog.cpp
-@@ -34,6 +34,7 @@
- #include <kcolorscheme.h>
- #include <kconfig.h>
- #include <kdebug.h>
-+#include <kfontchooser.h>
- #include <kfontdialog.h>
- #include <kglobal.h>
- #include <kiconloader.h>
-@@ -165,14 +166,14 @@
- void CardViewLookNFeelPage::setTextFont()
- {
-   QFont f( lTextFont->font() );
--  if ( KFontDialog::getFont( f, false, this ) == QDialog::Accepted )
-+  if ( KFontDialog::getFont( f, KFontChooser::NoDisplayFlags, this ) == QDialog::Accepted )
-     updateFontLabel( f, lTextFont );
- }
- 
- void CardViewLookNFeelPage::setHeaderFont()
- {
-   QFont f( lHeaderFont->font() );
--  if ( KFontDialog::getFont( f,false, this ) == QDialog::Accepted )
-+  if ( KFontDialog::getFont( f, KFontChooser::NoDisplayFlags, this ) == QDialog::Accepted )
-     updateFontLabel( f, lHeaderFont );
- }
- 
diff --git a/kde-apps/kaddressbook/kaddressbook-17.04.3.ebuild b/kde-apps/kaddressbook/kaddressbook-17.04.3.ebuild
deleted file mode 100644
index 1a991d6df8c7..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-17.04.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-
-IUSE="prison"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-	dev-libs/grantlee:5
-	prison? ( $(add_frameworks_dep prison) )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package prison KF5Prison)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kaddressbook/kaddressbook-17.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-17.08.3.ebuild
index 80a4e488a56a..c1f56e4cbaa2 100644
--- a/kde-apps/kaddressbook/kaddressbook-17.08.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-17.08.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Address book application based on KDE Frameworks"
 HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild b/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild
deleted file mode 100644
index 6811bd094a5d..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-QT3SUPPORT_REQUIRED="true"
-inherit kde4-meta
-
-DESCRIPTION="Address book application (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.14.10_p20160611)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.11_pre20160211
-"
-
-KMEXTRA="
-	plugins/kaddressbook/
-	plugins/ktexteditor/
-"
-KMEXTRACTONLY="
-	libkleo/
-"
-
-KMLOADLIBS="libkdepim"
-
-PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
-
-src_install() {
-	kde4-meta_src_install
-
-	# file collision with kde-apps/kdepimlibs-4.14.9
-	rm -f "${ED}usr/share/kde4/servicetypes/kaddressbookimprotocol.desktop" || die
-
-	# install additional headers needed by kresources
-	insinto "${KDEDIR}"/include/${PN}
-	doins "${CMAKE_BUILD_DIR}"/${PN}/common/*.h
-	doins "${S}"/${PN}/common/*.h
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
-		echo
-	fi
-}
diff --git a/kde-apps/kaddressbook/metadata.xml b/kde-apps/kaddressbook/metadata.xml
index b17398a5cb97..2fdbf33d963d 100644
--- a/kde-apps/kaddressbook/metadata.xml
+++ b/kde-apps/kaddressbook/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="prison">Enable support for QRcodes in contacts</flag>
-	</use>
 </pkgmetadata>