Migrate to EAPI 5. Add missing dependency. Replace automagic patch with new CMake option.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 27 insertions, 61 deletions

diff --git a/kde-misc/basket/ChangeLog b/kde-misc/basket/ChangeLog
index 2425b2a661df..f88d419961c2 100644
--- a/kde-misc/basket/ChangeLog
+++ b/kde-misc/basket/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/basket
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/basket/ChangeLog,v 1.13 2011/10/29 00:52:51 abcd Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/basket/ChangeLog,v 1.14 2013/05/27 15:28:01 kensington Exp $
+
+  27 May 2013; Michael Palimaka <kensington@gentoo.org>
+  -files/basket-1.81-crypt.patch, basket-1.81.ebuild:
+  Migrate to EAPI 5. Add missing dependency. Replace automagic patch with new
+  CMake option.
 
   29 Oct 2011; Jonathan Callen <abcd@gentoo.org> basket-1.81.ebuild:
   Bump to EAPI=4
@@ -39,4 +44,3 @@
   +files/basket-1.80-crypt.patch, +metadata.xml:
   Import from kde overlay, bug 310827. Thanks to Scott Stubbs, Maciej Grela
   and Andreas K. Huettel.
-
diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index e3bc9ed286cc..9efb9561c82c 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -1,25 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX basket-1.81-crypt.patch 878 RMD160 e51be1bfc023c285ed2aa53a454a96461b23f3aa SHA1 0e5767518912d01ebe0a88414b562666c4a44543 SHA256 7267d548575a9602821ae74b4b11b87ef7ae452f6c3d6351cac5f134554a5e9e
-DIST basket-1.81.tar.bz2 4108025 RMD160 2531860219d48a047fa887e514d34dae2ae07dd8 SHA1 209d92048523f341259d79510fa56977690e5dfc SHA256 60a3b49af34f1df2b983b1acd321ded256f92f10ce700dc6c7954793fea3fd83
-EBUILD basket-1.81.ebuild 750 RMD160 b3ac88596259ce2426b768674a78199fc015368c SHA1 d8d90ed4bd585c69af291c584f7e42fcdf6863bc SHA256 f51b5d62970eb80c7962ee41486dfd76d365f61a0efcbb489c19aca86174e2ac
-MISC ChangeLog 1416 RMD160 4af964a168d156ddbefcf9a9d0422897c71e415e SHA1 efe5a1830934310caef852ece790db98df366cd2 SHA256 7e4653ca144186d8c6344d5db58cc54db3373f005cd6c815e7a4d77c9f86d8e6
-MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
+DIST basket-1.81.tar.bz2 4108025 SHA256 60a3b49af34f1df2b983b1acd321ded256f92f10ce700dc6c7954793fea3fd83 SHA512 8f26379c6aa3423af8bfa77a211845b9998cb186c8906d16f1cbdc65b70e134f861192eecce4caa8c3d429f89f0c98f301dd58451e5bbfacc15292c779195f09 WHIRLPOOL 140f8676e841be9bf4968b9efb1c36a268098200e2d604367d63bf4ddf143da5831f9f8404074f988ed76d93fe190bbda38247c51f71867ed5264c9ed07af11f
+EBUILD basket-1.81.ebuild 749 SHA256 c60f66cca17529457d4de6beb60af30fd4adcde2af8c3139ada7921211b40ac0 SHA512 4bf03393563daf1191b85b3b23f3f8d1d57786136b9b08b175b9ca9169e3a33e7403d2142631a63f3adfb63d594318e9d055ee30f120099331258efae936eab7 WHIRLPOOL 5c658f2cb2d1a04b085c0c6c184d4bc4059445bec1067aa02cb7b4c1c44ca605abd09f156cda62d1c1ee9812c1ab12b44bbb0708762c919847927d03bbb6fdb7
+MISC ChangeLog 1626 SHA256 8d7411bcec0d57bbb9587cccebf25734b3c40c4b692dca352659fcb5687e352f SHA512 42d89ec7c6367c2b62a392699c634dc8f9046b56599948f6372987af48edc18e4fe4a361f7e58fe9185078bbdde215d6626e7d5dc7eb6720989f33bffa7aabb1 WHIRLPOOL 368fe1f259d198db61046ca21ff281657f3c85fba9f81c67e6b0f8806fb68bd9913d780364479bec07148a7d298b92a28e8c7355478152fb9e94fb2b88dd4226
+MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOq05pAAoJELHSF2kinlg4Ml0QAKfVYljjxbzOnAqVXSlAj8sz
-Wj2zTRTur1m+a7/z79FympkjsPeZ77YqfD4zeZlro+yFbHIHwL+t1w5haH+fgA+Y
-H8FM8gfrfUp1nqG5Ezk1PiGf13zmBHnH4cMbPxWFyOqi/3/Gjs1o9b2NJ1rrZRzG
-OEun8EVCkK22q0xtayNeQXHjkvCJOuLX5msEPrMhCAi0XRiZzOse335emG6IY8qE
-oOxnVwW6HtuiJEQ3h26TvCpKlI7FGSXqGKk/7epJtL/ywLnf3t+bdsMTEqNINiYb
-GVtllGtOdZvUARHueXbXzF1hSujYByT9+dBAMJ7bR64h6T/tvEVfo/Y1Ar0YYmad
-LUGc1YU8W4jnBN2bd+hB9d+pumSHldDNTOk8a2wEzvcolHOu3k/0vJ5sbF3vkBHP
-sQcfgDfHbCxCVpnHkheASSPsETD5qBW3v2Vq6V9r5Z7XuMioWzKgon8vox4omUpN
-7R7iz/MrsZqoThT37bU0jpVqwAPhuioEU+xKu+0x4lpKuuV71GAwwVX43IYFbC5w
-qBQT70B69t13hSCZbfASi3+SJnlEvywILBcreETAiJSq8jKDnuExFH/aEUx7plkB
-qR3nexpen2EAAZkHFg0zOrG6AYIr4XSXCKrnHtopCQIe9J8h6sgAkgBjWXC5C7AB
-9VRExmRO4D/hTpYmepsB
-=uKi5
+iQEcBAEBCAAGBQJRo3s3AAoJEMbwO6tnXQ0spJcH/20WhdMmTRsuQ/9f4m24B3g4
+SiEoob19zpuBh7RAvnvl8T1cwqPnAe/JbAa/gNbE1FwDbAzzuwYrjpPjdUaZ/HgB
+QGDAboC2xsOejUazi58W8To6CqbSSeoYsnBI/nui9vWQikTK7tJm7IQctH2nNcu3
+bFrV7rHTEHJ3ms+/QYuSbc3cKuJkpUVMZbdYyLVI6CPgZC9IAEPqp8yTo22RGhEy
++35YEjbCNm5crJYKLY6clucrESzvB7EJrtvkCrsoGTKed311SRf2k8fNOUJU2Ikx
+BGqNNO3yy2lu69gjAJZW7GMnMPrjt8JAHCmXwhVTruMtH1bj7AJAWGDeiKPqeoY=
+=ssjb
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/basket/basket-1.81.ebuild b/kde-misc/basket/basket-1.81.ebuild
index d91e8a50ec01..224829071abe 100644
--- a/kde-misc/basket/basket-1.81.ebuild
+++ b/kde-misc/basket/basket-1.81.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/basket/basket-1.81.ebuild,v 1.5 2011/10/29 00:52:51 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/basket/basket-1.81.ebuild,v 1.6 2013/05/27 15:28:01 kensington Exp $
 
-EAPI=4
+EAPI=5
 
-VIRTUALX_REQUIRED=test
+VIRTUALX_REQUIRED="test"
 inherit kde4-base
 
 DESCRIPTION="A DropDrawers clone. Multiple information organizer"
@@ -19,15 +19,14 @@ IUSE="debug crypt"
 DEPEND="
 	$(add_kdebase_dep kdepimlibs)
 	media-libs/qimageblitz
+	x11-libs/libX11
 	crypt? ( >=app-crypt/gpgme-1.0 )
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-crypt.patch" )
-
 src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable crypt)
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package crypt Gpgme)
 	)
 	kde4-base_src_configure
 }
diff --git a/kde-misc/basket/files/basket-1.81-crypt.patch b/kde-misc/basket/files/basket-1.81-crypt.patch
deleted file mode 100644
index 8394aad0e69d..000000000000
--- a/kde-misc/basket/files/basket-1.81-crypt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ruN basket-1.81.orig/CMakeLists.txt basket-1.81/CMakeLists.txt
---- basket-1.81.orig/CMakeLists.txt	2010-09-26 05:57:18.000000000 +0200
-+++ basket-1.81/CMakeLists.txt	2010-10-21 23:49:18.000000000 +0200
-@@ -1,5 +1,7 @@
- cmake_minimum_required(VERSION 2.4)
- 
-+OPTION(ENABLE_CRYPT "build encryption support" ON)
-+
- find_package(X11 REQUIRED)
- find_package(KDE4 REQUIRED)
- find_package(QImageBlitz REQUIRED)
-@@ -16,13 +18,14 @@
- 
- include(MacroLibrary)
- 
--IF(GPGME_FOUND)
-+IF(GPGME_FOUND AND ENABLE_CRYPT)
-   SET(HAVE_LIBGPGME 1)
-   SET(LARGEFILE_SOURCE_1)
-   ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
--ELSE(GPGME_FOUND)
--  MESSAGE("GPG not found, configuring without")
--ENDIF(GPGME_FOUND)
-+  MESSAGE("Configuring with GPG support")
-+ELSE(GPGME_FOUND AND ENABLE_CRYPT)
-+  MESSAGE("Configuring without GPG support")
-+ENDIF(GPGME_FOUND AND ENABLE_CRYPT)
- 
- #TODO: find meinproc
-