| 1 |
commit: 13ac618a10b92f2bcb63fa7e612f0b78b9d58eac |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 2 10:48:31 2012 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 2 10:48:31 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=13ac618a |
| 7 |
|
| 8 |
[kde-base/klipper] Fix automagic dependency on media-libs/prison by Michael (kensington) <gentoo <AT> scribeofthenile.com> wrt bug 410443. |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha98/git/Linux i686, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
kde-base/klipper/klipper-4.8.49.9999.ebuild | 11 ++++++++++- |
| 14 |
kde-base/klipper/klipper-9999.ebuild | 11 ++++++++++- |
| 15 |
kde-base/klipper/metadata.xml | 5 ++++- |
| 16 |
3 files changed, 24 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-base/klipper/klipper-4.8.49.9999.ebuild b/kde-base/klipper/klipper-4.8.49.9999.ebuild |
| 19 |
index c7aaf01..1faab6b 100644 |
| 20 |
--- a/kde-base/klipper/klipper-4.8.49.9999.ebuild |
| 21 |
+++ b/kde-base/klipper/klipper-4.8.49.9999.ebuild |
| 22 |
@@ -10,11 +10,20 @@ inherit kde4-meta |
| 23 |
|
| 24 |
DESCRIPTION="Applet for KDE and X clipboard management" |
| 25 |
KEYWORDS="" |
| 26 |
-IUSE="debug" |
| 27 |
+IUSE="debug prison" |
| 28 |
|
| 29 |
DEPEND=" |
| 30 |
$(add_kdebase_dep libkworkspace) |
| 31 |
$(add_kdebase_dep libtaskmanager) |
| 32 |
+ prison? ( media-libs/prison ) |
| 33 |
!aqua? ( x11-libs/libXfixes ) |
| 34 |
" |
| 35 |
RDEPEND="${DEPEND}" |
| 36 |
+ |
| 37 |
+src_configure() { |
| 38 |
+ mycmakeargs=( |
| 39 |
+ $(cmake-utils_use_with prison Prison) |
| 40 |
+ ) |
| 41 |
+ |
| 42 |
+ kde4-meta_src_configure |
| 43 |
+} |
| 44 |
|
| 45 |
diff --git a/kde-base/klipper/klipper-9999.ebuild b/kde-base/klipper/klipper-9999.ebuild |
| 46 |
index c7aaf01..1faab6b 100644 |
| 47 |
--- a/kde-base/klipper/klipper-9999.ebuild |
| 48 |
+++ b/kde-base/klipper/klipper-9999.ebuild |
| 49 |
@@ -10,11 +10,20 @@ inherit kde4-meta |
| 50 |
|
| 51 |
DESCRIPTION="Applet for KDE and X clipboard management" |
| 52 |
KEYWORDS="" |
| 53 |
-IUSE="debug" |
| 54 |
+IUSE="debug prison" |
| 55 |
|
| 56 |
DEPEND=" |
| 57 |
$(add_kdebase_dep libkworkspace) |
| 58 |
$(add_kdebase_dep libtaskmanager) |
| 59 |
+ prison? ( media-libs/prison ) |
| 60 |
!aqua? ( x11-libs/libXfixes ) |
| 61 |
" |
| 62 |
RDEPEND="${DEPEND}" |
| 63 |
+ |
| 64 |
+src_configure() { |
| 65 |
+ mycmakeargs=( |
| 66 |
+ $(cmake-utils_use_with prison Prison) |
| 67 |
+ ) |
| 68 |
+ |
| 69 |
+ kde4-meta_src_configure |
| 70 |
+} |
| 71 |
|
| 72 |
diff --git a/kde-base/klipper/metadata.xml b/kde-base/klipper/metadata.xml |
| 73 |
index 8d1e86a..7231c18 100644 |
| 74 |
--- a/kde-base/klipper/metadata.xml |
| 75 |
+++ b/kde-base/klipper/metadata.xml |
| 76 |
@@ -1,5 +1,8 @@ |
| 77 |
<?xml version="1.0" encoding="UTF-8"?> |
| 78 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 79 |
<pkgmetadata> |
| 80 |
-<herd>kde</herd> |
| 81 |
+ <herd>kde</herd> |
| 82 |
+ <use> |
| 83 |
+ <flag name="prison">Enable support for barcodes/QRcodes</flag> |
| 84 |
+ </use> |
| 85 |
</pkgmetadata> |
Archives