diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-09-16 13:17:51 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-09-16 13:18:53 +0200 |
commit | 78e59c2bc8d97863ec635674d6d41bd2e3d84d19 (patch) | |
tree | e319bda82d6a488ca1bdd73a5f2d781201e6b0ae /kde-apps/kwalletd | |
parent | app-crypt/gnupg: Cleanup 2.1.23 (diff) | |
download | gentoo-78e59c2bc8d97863ec635674d6d41bd2e3d84d19.tar.gz gentoo-78e59c2bc8d97863ec635674d6d41bd2e3d84d19.tar.bz2 gentoo-78e59c2bc8d97863ec635674d6d41bd2e3d84d19.zip |
kde-apps: Remove last-rited packages
Diffstat (limited to 'kde-apps/kwalletd')
-rw-r--r-- | kde-apps/kwalletd/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/kwalletd/files/kwalletd-16.04.3-gpgmepp.patch | 133 | ||||
-rw-r--r-- | kde-apps/kwalletd/kwalletd-16.04.3-r1.ebuild | 42 | ||||
-rw-r--r-- | kde-apps/kwalletd/metadata.xml | 11 |
4 files changed, 0 insertions, 187 deletions
diff --git a/kde-apps/kwalletd/Manifest b/kde-apps/kwalletd/Manifest deleted file mode 100644 index 4e5805cb5808..000000000000 --- a/kde-apps/kwalletd/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kde-runtime-16.04.3.tar.xz 7903920 SHA256 690e0f848b305b8a2491dbcd01b6e511d64c98d991226cd8a1dc35f23372505d SHA512 df52cd4c423030d3457bb907eb0bef0cdd3c8bce283d9f181b7ae6b7b4ce9c59a34f874f9ac6d2bd59597647a3c6315d772b2551c739423378186d4debbb53ae WHIRLPOOL e4a4a6c3ab315517f757dce952db14e154d4674cf555e1315f018f10cc2a443deede74cf3d370f0c92ab839b35bce8bd360a958cd7edf1ae56720c5ec7d029b5 diff --git a/kde-apps/kwalletd/files/kwalletd-16.04.3-gpgmepp.patch b/kde-apps/kwalletd/files/kwalletd-16.04.3-gpgmepp.patch deleted file mode 100644 index e730a58d1dec..000000000000 --- a/kde-apps/kwalletd/files/kwalletd-16.04.3-gpgmepp.patch +++ /dev/null @@ -1,133 +0,0 @@ -commit 1b80d1d0b961f8e28186928ede2b87af292c3de4 -Author: Antonio Rojas <arojas@archlinux.org> -Date: Thu Nov 10 16:58:10 2016 +0100 - - Allow building kwalletd against gpgme++ from gpgme 1.7 - - REVIEW: 129339 - -diff --git a/kwalletd/CMakeLists.txt b/kwalletd/CMakeLists.txt -index 73aec82..ae8c745 100644 ---- a/kwalletd/CMakeLists.txt -+++ b/kwalletd/CMakeLists.txt -@@ -5,11 +5,18 @@ find_package(Gpgme) # Called by FindQGpgme, but since we call some gpgme - # functions ourselves we need to link against it directly. - find_package(QGpgme) # provided by kdepimlibs - --if (GPGME_FOUND AND QGPGME_FOUND) -+if (NOT QGPGME_FOUND) -+find_package(Gpgmepp) # provided by gpgme 1.7 -+endif (NOT QGPGME_FOUND) -+ -+if ((GPGME_FOUND AND QGPGME_FOUND) OR Gpgmepp_FOUND) - add_definitions(-DHAVE_QGPGME) -- include_directories(${GPGME_INCLUDES} ${QGPGME_INCLUDE_DIR}) -+ include_directories(${GPGME_INCLUDES}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") --endif(GPGME_FOUND AND QGPGME_FOUND) -+endif((GPGME_FOUND AND QGPGME_FOUND) OR Gpgmepp_FOUND) -+if (GPGME_FOUND AND QGPGME_FOUND) -+ include_directories(${QGPGME_INCLUDE_DIR}) -+endif (GPGME_FOUND AND QGPGME_FOUND) - - ########### build backends ######### - add_subdirectory(backend) -@@ -37,7 +44,7 @@ kde4_add_ui_files(kwalletd_KDEINIT_SRCS - kwalletwizardpagepassword.ui - ) - --if (GPGME_FOUND AND QGPGME_FOUND) -+if ((GPGME_FOUND AND QGPGME_FOUND) OR Gpgmepp_FOUND) - set(kwalletd_KDEINIT_SRCS - ${kwalletd_KDEINIT_SRCS} - knewwalletdialog.cpp -@@ -48,7 +55,7 @@ if (GPGME_FOUND AND QGPGME_FOUND) - knewwalletdialogintro.ui - knewwalletdialoggpg.ui - ) --endif(GPGME_FOUND AND QGPGME_FOUND) -+endif((GPGME_FOUND AND QGPGME_FOUND) OR Gpgmepp_FOUND) - - find_file(kwallet_xml org.kde.KWallet.xml HINTS ${KDE4_DBUS_INTERFACES_DIR} ) - -@@ -57,8 +64,12 @@ qt4_add_dbus_adaptor( kwalletd_KDEINIT_SRCS ${kwallet_xml} kwalletd.h KWalletD ) - kde4_add_kdeinit_executable( kwalletd NOGUI ${kwalletd_KDEINIT_SRCS} ) - - target_link_libraries(kdeinit_kwalletd ${KDE4_KDEUI_LIBS} kwalletbackend ) --if (GPGME_FOUND AND QGPGME_FOUND) -- target_link_libraries(kdeinit_kwalletd ${QGPGME_LIBRARIES} ) -+if(GPGME_FOUND AND QGPGME_FOUND) -+target_link_libraries(kdeinit_kwalletd ${QGPGME_LIBRARIES} ) -+else(GPGME_FOUND AND QGPGME_FOUND) -+if(Gpgmepp_FOUND) -+target_link_libraries(kdeinit_kwalletd Gpgmepp) -+endif(Gpgmepp_FOUND) - endif(GPGME_FOUND AND QGPGME_FOUND) - - install(TARGETS kdeinit_kwalletd ${INSTALL_TARGETS_DEFAULT_ARGS}) -@@ -73,4 +84,4 @@ install( FILES kwalletd.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kwalletd ) - install( FILES kwallet-4.13.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update) - - add_subdirectory(tests) --add_subdirectory(autotests) -\ No newline at end of file -+add_subdirectory(autotests) -diff --git a/kwalletd/backend/CMakeLists.txt b/kwalletd/backend/CMakeLists.txt -index 4db348f..7347b12 100644 ---- a/kwalletd/backend/CMakeLists.txt -+++ b/kwalletd/backend/CMakeLists.txt -@@ -22,6 +22,10 @@ kde4_add_library(kwalletbackend SHARED ${kwalletbackend_LIB_SRCS}) - target_link_libraries(kwalletbackend ${KDE4_KDEUI_LIBS} ${LIBGCRYPT_LIBRARIES}) - if(QGPGME_FOUND) - target_link_libraries(kwalletbackend ${QGPGME_LIBRARIES} ) -+else(QGPGME_FOUND) -+if(Gpgmepp_FOUND) -+target_link_libraries(kwalletbackend Gpgmepp) -+endif(Gpgmepp_FOUND) - endif(QGPGME_FOUND) - - # link with advapi32 on windows -diff --git a/kwalletd/backend/backendpersisthandler.cpp b/kwalletd/backend/backendpersisthandler.cpp -index b7f63f8..9608af0 100644 ---- a/kwalletd/backend/backendpersisthandler.cpp -+++ b/kwalletd/backend/backendpersisthandler.cpp -@@ -33,6 +33,7 @@ - #include <gpgme++/data.h> - #include <gpgme++/encryptionresult.h> - #include <gpgme++/decryptionresult.h> -+#include <boost/shared_ptr.hpp> - #endif - #include "backendpersisthandler.h" - #include "kwalletbackend.h" -diff --git a/kwalletd/kwalletwizard.cpp b/kwalletd/kwalletwizard.cpp -index 78de78d..821b666 100644 ---- a/kwalletd/kwalletwizard.cpp -+++ b/kwalletd/kwalletwizard.cpp -@@ -40,6 +40,7 @@ - #include <kdebug.h> - #include <kmessagebox.h> - #include <gpgme.h> -+#include <boost/shared_ptr.hpp> - #endif - - class PageIntro : public QWizardPage -commit cf28801cd34730da07a2c01704ca3114630f4fe7 -Author: Antonio Rojas <arojas@archlinux.org> -Date: Thu Nov 10 18:54:41 2016 +0100 - - Compiling against gmgpe 1.7 requires c++11 - -diff --git a/kwalletd/CMakeLists.txt b/kwalletd/CMakeLists.txt -index ae8c745..88d944e 100644 ---- a/kwalletd/CMakeLists.txt -+++ b/kwalletd/CMakeLists.txt -@@ -17,6 +17,9 @@ endif((GPGME_FOUND AND QGPGME_FOUND) OR Gpgmepp_FOUND) - if (GPGME_FOUND AND QGPGME_FOUND) - include_directories(${QGPGME_INCLUDE_DIR}) - endif (GPGME_FOUND AND QGPGME_FOUND) -+if (Gpgmepp_FOUND) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -+endif (Gpgmepp_FOUND) - - ########### build backends ######### - add_subdirectory(backend) diff --git a/kde-apps/kwalletd/kwalletd-16.04.3-r1.ebuild b/kde-apps/kwalletd/kwalletd-16.04.3-r1.ebuild deleted file mode 100644 index c56a22e1743e..000000000000 --- a/kde-apps/kwalletd/kwalletd-16.04.3-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KMNAME="kde-runtime" -inherit kde4-meta flag-o-matic - -DESCRIPTION="KDE Password Server" -KEYWORDS="amd64 x86" -IUSE="debug gpg" - -RDEPEND=" - dev-libs/libgcrypt:0= - gpg? ( app-crypt/gpgme[cxx] ) -" -DEPEND="${RDEPEND} - gpg? ( dev-libs/boost ) -" - -RESTRICT="test" -# testpamopen crashes with a buffer overflow (__fortify_fail) - -PATCHES=( "${FILESDIR}/${P}-gpgmepp.patch" ) - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_QGpgme=ON - $(cmake-utils_use_find_package gpg Gpgmepp) - ) - - kde4-base_src_configure -} - -pkg_postinst() { - if ! has_version "kde-plasma/kwallet-pam[oldwallet]" || ! has_version "kde-apps/kwalletmanager:4" ; then - elog - elog "Install kde-plasma/kwallet-pam[oldwallet] for auto-unlocking after account login." - elog "Install kde-apps/kwalletmanager:4 to manage your kwallet." - elog - fi -} diff --git a/kde-apps/kwalletd/metadata.xml b/kde-apps/kwalletd/metadata.xml deleted file mode 100644 index 19f537d3d2e8..000000000000 --- a/kde-apps/kwalletd/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <use> - <flag name="gpg">Support wallets with GnuPG encryption additionally to default blowfish-encrypted file</flag> - </use> -</pkgmetadata> |