diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2013-05-27 15:28:01 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-05-27 15:28:01 +0000 |
| commit | bd2b0c20590169bc85a4bf8b3cd22cab73009978 (patch) | |
| tree | 119c9f9534291bd64f6c8c1b334b5a267cb9f1ec /kde-misc/basket | |
| parent | Stable for AMD64 x86 too. (diff) | |
| download | gentoo-2-bd2b0c20590169bc85a4bf8b3cd22cab73009978.tar.gz gentoo-2-bd2b0c20590169bc85a4bf8b3cd22cab73009978.tar.bz2 gentoo-2-bd2b0c20590169bc85a4bf8b3cd22cab73009978.zip | |
Migrate to EAPI 5. Add missing dependency. Replace automagic patch with new CMake option.
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'kde-misc/basket')
| -rw-r--r-- | kde-misc/basket/ChangeLog | 10 | ||||
| -rw-r--r-- | kde-misc/basket/basket-1.81.ebuild | 15 | ||||
| -rw-r--r-- | kde-misc/basket/files/basket-1.81-crypt.patch | 30 |
3 files changed, 14 insertions, 41 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/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 - |