4 files changed, 10 insertions, 69 deletions
diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index 1b9b721f5c8..978f0d5c9aa 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -1,4 +1,2 @@
-AUX basket-1.80-crypt.patch 878 RMD160 28873c7d93f53a8a775cc92705f8141c14d8baa6 SHA1 df119c18f39830cb42b2f0c8ba1ae77009800c4e SHA256 fede246f73c51eccc72347f652e9bf52b6de14126663844d21c96f51bc363d8f
-AUX basket-9999-crypt.patch 878 RMD160 28873c7d93f53a8a775cc92705f8141c14d8baa6 SHA1 df119c18f39830cb42b2f0c8ba1ae77009800c4e SHA256 fede246f73c51eccc72347f652e9bf52b6de14126663844d21c96f51bc363d8f
-EBUILD basket-9999.ebuild 540 RMD160 0566b7c1d07eb9ef9bcb34aa8f3b31f5c255458d SHA1 470f7a546b1e2a2b57a893149f82193d1871ff14 SHA256 799e379819f495d18a32d8f632213fa888da806a49b6fe7bf6a269c086ff227e
+EBUILD basket-9999.ebuild 617 RMD160 e328d293f76268803d9cf8a760ea2a8878c03426 SHA1 0b463bf7c564e351061747411b2058e65e2da904 SHA256 12dacdc4d4ae6c2a23dfc2043d8c5b5d59689e47716237fa4f1e383b6688d4b8
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/basket/basket-9999.ebuild b/kde-misc/basket/basket-9999.ebuild
index 57a3eb5c4b0..5ffb1855ac1 100644
--- a/kde-misc/basket/basket-9999.ebuild
+++ b/kde-misc/basket/basket-9999.ebuild
@@ -4,7 +4,9 @@
 
 EAPI=3
 
-inherit git kde4-base
+VIRTUALX_REQUIRED=tests
+KDE_SCM="git"
+inherit kde4-base
 
 DESCRIPTION="A DropDrawers clone. Multiple information organizer"
 HOMEPAGE="http://basket.kde.org/"
@@ -16,11 +18,12 @@ SLOT="4"
 
 IUSE="debug crypt"
 
-PATCHES=( "${FILESDIR}/${P}-crypt.patch" )
-
-src_unpack() {
-	git_src_unpack
-}
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	media-libs/qimageblitz
+	crypt? ( >=app-crypt/gpgme-1.0 )
+"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/kde-misc/basket/files/basket-1.80-crypt.patch b/kde-misc/basket/files/basket-1.80-crypt.patch
deleted file mode 100644
index dc8aa68b440..00000000000
--- a/kde-misc/basket/files/basket-1.80-crypt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -r -u basket-1.80-vanilla/CMakeLists.txt basket-1.80/CMakeLists.txt
---- basket-1.80-vanilla/CMakeLists.txt	2010-03-20 21:20:57.000000000 +0100
-+++ basket-1.80/CMakeLists.txt	2010-03-28 22:04:43.000000000 +0200
-@@ -1,5 +1,7 @@
- cmake_minimum_required(VERSION 2.4)
- 
-+OPTION(ENABLE_CRYPT "build encryption support" ON)
-+
- find_package(KDE4 REQUIRED)
- find_package(QImageBlitz REQUIRED)
- find_package(Gpgme)
-@@ -15,13 +17,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
- 
diff --git a/kde-misc/basket/files/basket-9999-crypt.patch b/kde-misc/basket/files/basket-9999-crypt.patch
deleted file mode 100644
index dc8aa68b440..00000000000
--- a/kde-misc/basket/files/basket-9999-crypt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -r -u basket-1.80-vanilla/CMakeLists.txt basket-1.80/CMakeLists.txt
---- basket-1.80-vanilla/CMakeLists.txt	2010-03-20 21:20:57.000000000 +0100
-+++ basket-1.80/CMakeLists.txt	2010-03-28 22:04:43.000000000 +0200
-@@ -1,5 +1,7 @@
- cmake_minimum_required(VERSION 2.4)
- 
-+OPTION(ENABLE_CRYPT "build encryption support" ON)
-+
- find_package(KDE4 REQUIRED)
- find_package(QImageBlitz REQUIRED)
- find_package(Gpgme)
-@@ -15,13 +17,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
-