From 407525b571b48cfd65e1ad7a02d250a927c967c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Dec 2017 03:04:39 +0000 Subject: gentoo resync : 01.12.2017 --- kde-apps/kleopatra/Manifest | 7 +-- .../files/kleopatra-4.4.2017.04-gcc-6.3.patch | 36 -------------- kde-apps/kleopatra/kleopatra-17.04.3.ebuild | 50 ------------------- kde-apps/kleopatra/kleopatra-17.08.3.ebuild | 2 +- kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild | 56 ---------------------- 5 files changed, 2 insertions(+), 149 deletions(-) delete mode 100644 kde-apps/kleopatra/files/kleopatra-4.4.2017.04-gcc-6.3.patch delete mode 100644 kde-apps/kleopatra/kleopatra-17.04.3.ebuild delete mode 100644 kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild (limited to 'kde-apps/kleopatra') diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest index c3431e9e246a..d796d3e52d1e 100644 --- a/kde-apps/kleopatra/Manifest +++ b/kde-apps/kleopatra/Manifest @@ -1,8 +1,3 @@ -AUX kleopatra-4.4.2017.04-gcc-6.3.patch 1304 BLAKE2B 87451de8fa499219abde9a10cf3d1cf47dd20d88578d263ecb8aa3ad2d744ca951f1f95e6d646860804a56dc9fb41874587735872f42e0dba76f131442621da9 SHA512 686320c3bd1a412679eaf6e0d8ccf00496354d5dd7a1d24877320a0d71d19a7144276a4e722a4ae6b99cecec24923b6622184d008b78c6c149cb46ffd7dfe641 -DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a -DIST kleopatra-17.04.3.tar.xz 1848408 SHA256 fcfe5ec7c28ba1b67e793fb25db9ee39926208ad04b5acd868c681291b7d6123 SHA512 af7665d9b9933691ddbbbe7c985c3923d8723505cf209381b7c76c1e7680cd30489329bdfbb229fcbe53f0b6a4bf377557075dc3586152b5174aa1566b163d03 WHIRLPOOL 7548a4461c0b01b9eafad90fed3057b162a258127ea74281f680e4e19f1a41b39751f7cf0c055e7504f8d5841ce1743b9384c0c52db3bdfacee38e8e04f229cc DIST kleopatra-17.08.3.tar.xz 1889344 SHA256 a8bb8bc8d6b6352f2d312f79ee2846217ffa699bff419673ebf70cdc1dbcf46d SHA512 b842b71c7394bed7ed3383b037b2258c72056b81d678350f1f6f4cfa2f75e269eafd45b82b78c3f7cdda659dbd9b2dc273a8d3b0ddd5cdc774277355578bbfe9 WHIRLPOOL 31542305ee0bd561a98ad08314aeafeb308f13962086b3d60de6119d40d2603bfc88c0c2d39cd0b4f2cbb889057463f002f081f7c153cde0d8c27c02d3b3d5e6 -EBUILD kleopatra-17.04.3.ebuild 1331 BLAKE2B a5fb7eecc69ee0b1244e75844581823e6b0b835efae3062a844e61bef5c30ced3fd49706e238013052d3a9a793252ba53edef2ffdbffd22fe486255b3f9ea4cb SHA512 3b5d6ff3f386fbff4520eef34e1703512817aa35e027089ae5baa5a32dfbbedfa3eb85e7aa233b4e8d4a033f46f00b69e7457be9ff944cac37e9628af7eb142f -EBUILD kleopatra-17.08.3.ebuild 1267 BLAKE2B 20f3152ba2b7f4509112ff785aca66c42e67323083e6f0997f68021186510bc76df17227d328de39e376e645ac8fcff939688d8329b79002effe90538b762847 SHA512 adf5c86d0789f1f1778e6a03bab8a14c69865eed05a13ea2f1db4bd02ce38fd5c8ab65efc0577756555bf96d2ab6e2ff5d42546c1369a68f232a91f79af3cf1e -EBUILD kleopatra-4.4.2017.04.ebuild 978 BLAKE2B 5f95530a230763cb7e408785884abfb469cba8685501c44a21b3a572c915b3bbd50a2c7b8452a5091c797fc65278e5569062b0b956da9cd6de9e67c48c8d9a69 SHA512 0273f2e2c4b0382a658574e4dafdfc0be2cd9100f6e8d2b77d74618571be9d7ab678d035fd38ba3204287c1f7540f32093e5ac3392a888ed5087b8d937b7c00a +EBUILD kleopatra-17.08.3.ebuild 1265 BLAKE2B e8ef98107b6827256d85b2bcd9ab555d9eb694ef0e72e7f6ba06245a8c3f0ed42777f24a785c19c97c3fbbf54c7b6278aeccdb7ea98fd93baa2340d4a632def7 SHA512 49a52aabc3e6e0d847ab8541776ebe4b6720a3af250f430c8b503aa970204bcfea75be02c4e94d113e77ae5799c46309036cdb657c11824c1fdab2c33ac847d2 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/kleopatra/files/kleopatra-4.4.2017.04-gcc-6.3.patch b/kde-apps/kleopatra/files/kleopatra-4.4.2017.04-gcc-6.3.patch deleted file mode 100644 index 2960166dfb71..000000000000 --- a/kde-apps/kleopatra/files/kleopatra-4.4.2017.04-gcc-6.3.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 0e75bb7dff48261f8754005586e3d1b22ecfc4d2 -Author: Andreas Sturmlechner -Date: Tue May 2 23:41:46 2017 +0200 - - kleopatra: Fix build with GCC 6.3.0 - - Signed-off-by: Andreas Sturmlechner - -diff --git a/kleopatra/utils/stl_util.h b/kleopatra/utils/stl_util.h -index 35024d398f..c02188608e 100644 ---- a/kleopatra/utils/stl_util.h -+++ b/kleopatra/utils/stl_util.h -@@ -347,7 +347,7 @@ namespace kdtools { - template - O copy_if( const I & i, P p ) { - O o; -- copy_if( boost::begin( i ), boost::end( i ), std::back_inserter( o ), p ); -+ kdtools::copy_if( boost::begin( i ), boost::end( i ), std::back_inserter( o ), p ); - return o; - } - -@@ -385,12 +385,12 @@ namespace kdtools { - - template - bool none_of( const C & c ) { -- return none_of( boost::begin( c ), boost::end( c ) ); -+ return kdtools::none_of( boost::begin( c ), boost::end( c ) ); - } - - template - bool none_of( const C & c, P p ) { -- return none_of( boost::begin( c ), boost::end( c ), p ); -+ return kdtools::none_of( boost::begin( c ), boost::end( c ), p ); - } - - template diff --git a/kde-apps/kleopatra/kleopatra-17.04.3.ebuild b/kde-apps/kleopatra/kleopatra-17.04.3.ebuild deleted file mode 100644 index 46af97a7b6db..000000000000 --- a/kde-apps/kleopatra/kleopatra-17.04.3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography" -HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra" -LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" -KEYWORDS="amd64 x86" - -IUSE="" - -# drop qtgui subslot operator when QT_MINIMAL >= 5.7.0 -DEPEND=" - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_kdeapps_dep kmime) - $(add_kdeapps_dep libkleo) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui '' '' '5=') - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtwidgets) - >=app-crypt/gpgme-1.7.1[cxx,qt5] - dev-libs/boost:= - dev-libs/libassuan - dev-libs/libgpg-error -" -RDEPEND="${DEPEND} - !kde-apps/kdepim-l10n - >=app-crypt/gnupg-2.1 - app-crypt/paperkey -" diff --git a/kde-apps/kleopatra/kleopatra-17.08.3.ebuild b/kde-apps/kleopatra/kleopatra-17.08.3.ebuild index 33df52a5d6ee..aa3506075553 100644 --- a/kde-apps/kleopatra/kleopatra-17.08.3.ebuild +++ b/kde-apps/kleopatra/kleopatra-17.08.3.ebuild @@ -11,7 +11,7 @@ inherit kde5 DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography" HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra" LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" diff --git a/kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild b/kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild deleted file mode 100644 index 275e0cc95be3..000000000000 --- a/kde-apps/kleopatra/kleopatra-4.4.2017.04.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 - -KDE_HANDBOOK="optional" -KMNAME="kdepim" -QT3SUPPORT_REQUIRED="true" -inherit kde4-meta - -DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography (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) - app-crypt/gpgme - dev-libs/libassuan - dev-libs/libgpg-error -" -RDEPEND="${DEPEND} - !>kde-apps/kdepimlibs-4.14.11_pre20160211 - app-crypt/gnupg -" - -RESTRICT=test -# bug 399431 - -KMEXTRACTONLY=" - libkleo -" -KMLOADLIBS="libkleo" - -PATCHES=( "${FILESDIR}/${P}-gcc-6.3.patch" ) - -src_unpack() { - if use handbook; then - KMEXTRA=" - doc/kwatchgnupg - " - fi - - kde4-meta_src_unpack -} - -src_configure() { - mycmakeargs=( - -DWITH_QGPGME=ON - ) - - kde4-meta_src_configure -} -- cgit v1.2.3