summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-04-02 10:41:28 +0000
committerJohannes Huber <johu@gentoo.org>2012-04-02 10:41:28 +0000
commit328d08468173557b8720ccf9b2f684aa9fbb92cd (patch)
tree36eccde7a0e905dcf8cd7d6076ef2c39f220f667 /kde-base/klipper
parentMask wayland (diff)
downloadgentoo-2-328d08468173557b8720ccf9b2f684aa9fbb92cd.tar.gz
gentoo-2-328d08468173557b8720ccf9b2f684aa9fbb92cd.tar.bz2
gentoo-2-328d08468173557b8720ccf9b2f684aa9fbb92cd.zip
Fix automagic dependency on media-libs/prison by Michael (kensington) <gentoo@scribeofthenile.com> wrt bug #410443.
(Portage version: 2.2.0_alpha98/cvs/Linux i686)
Diffstat (limited to 'kde-base/klipper')
-rw-r--r--kde-base/klipper/ChangeLog7
-rw-r--r--kde-base/klipper/klipper-4.8.1.ebuild13
-rw-r--r--kde-base/klipper/metadata.xml5
3 files changed, 21 insertions, 4 deletions
diff --git a/kde-base/klipper/ChangeLog b/kde-base/klipper/ChangeLog
index 9607b4f5738a..ed71bf6a7e6b 100644
--- a/kde-base/klipper/ChangeLog
+++ b/kde-base/klipper/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/klipper
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/ChangeLog,v 1.208 2012/03/31 16:59:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/ChangeLog,v 1.209 2012/04/02 10:41:28 johu Exp $
+
+ 02 Apr 2012; Johannes Huber <johu@gentoo.org> klipper-4.8.1.ebuild,
+ metadata.xml:
+ Fix automagic dependency on media-libs/prison by Michael (kensington)
+ <gentoo@scribeofthenile.com> wrt bug #410443.
31 Mar 2012; Markus Meier <maekke@gentoo.org> klipper-4.8.1.ebuild:
add ~arm, bug #402989
diff --git a/kde-base/klipper/klipper-4.8.1.ebuild b/kde-base/klipper/klipper-4.8.1.ebuild
index 829c7623ec4b..17563116173c 100644
--- a/kde-base/klipper/klipper-4.8.1.ebuild
+++ b/kde-base/klipper/klipper-4.8.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.8.1.ebuild,v 1.2 2012/03/31 16:59:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.8.1.ebuild,v 1.3 2012/04/02 10:41:28 johu Exp $
EAPI=4
@@ -10,11 +10,20 @@ inherit kde4-meta
DESCRIPTION="Applet for KDE and X clipboard management"
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
+IUSE="debug prison"
DEPEND="
$(add_kdebase_dep libkworkspace)
$(add_kdebase_dep libtaskmanager)
+ prison? ( media-libs/prison )
!aqua? ( x11-libs/libXfixes )
"
RDEPEND="${DEPEND}"
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_with prison Prison)
+ )
+
+ kde4-meta_src_configure
+}
diff --git a/kde-base/klipper/metadata.xml b/kde-base/klipper/metadata.xml
index 8d1e86a9cefb..7231c188b9c4 100644
--- a/kde-base/klipper/metadata.xml
+++ b/kde-base/klipper/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kde</herd>
+ <herd>kde</herd>
+ <use>
+ <flag name="prison">Enable support for barcodes/QRcodes</flag>
+ </use>
</pkgmetadata>