| 1 |
commit: b8bb161dce309f475e582ec6fd2c56fb581c64f4 |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 2 03:40:56 2012 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 2 03:40:56 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b8bb161d |
| 7 |
|
| 8 |
Move the backported udisks2 support behind the udisks2 use flag. |
| 9 |
|
| 10 |
--- |
| 11 |
kde-base/kdelibs/kdelibs-4.8.95.ebuild | 15 +++++++++++---- |
| 12 |
kde-base/kdelibs/metadata.xml | 1 + |
| 13 |
2 files changed, 12 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/kde-base/kdelibs/kdelibs-4.8.95.ebuild b/kde-base/kdelibs/kdelibs-4.8.95.ebuild |
| 16 |
index 57b1d34..069202c 100644 |
| 17 |
--- a/kde-base/kdelibs/kdelibs-4.8.95.ebuild |
| 18 |
+++ b/kde-base/kdelibs/kdelibs-4.8.95.ebuild |
| 19 |
@@ -21,10 +21,11 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 20 |
LICENSE="LGPL-2.1" |
| 21 |
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k kerberos lzma |
| 22 |
mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks |
| 23 |
-+upower upnp zeroconf" |
| 24 |
++udisks2 +upower upnp zeroconf" |
| 25 |
|
| 26 |
REQUIRED_USE=" |
| 27 |
udisks? ( udev ) |
| 28 |
+ udisks2? ( udisks ) |
| 29 |
upower? ( udev ) |
| 30 |
" |
| 31 |
|
| 32 |
@@ -99,7 +100,10 @@ RDEPEND="${COMMONDEPEND} |
| 33 |
x11-apps/iceauth |
| 34 |
x11-apps/rgb |
| 35 |
>=x11-misc/xdg-utils-1.0.2-r3 |
| 36 |
- udisks? ( sys-fs/udisks:2 ) |
| 37 |
+ udisks? ( |
| 38 |
+ udisks2? ( sys-fs/udisks:2 ) |
| 39 |
+ !udisks2? ( sys-fs/udisks:0 ) |
| 40 |
+ ) |
| 41 |
upower? ( sys-power/upower ) |
| 42 |
) |
| 43 |
" |
| 44 |
@@ -129,8 +133,6 @@ PATCHES=( |
| 45 |
"${FILESDIR}/${PN}-4.8.1-norpath.patch" |
| 46 |
"${FILESDIR}/${PN}-4.8.2-calculator_key.patch" |
| 47 |
"${FILESDIR}/${PN}-4.8.4-bytecode.patch" |
| 48 |
- "${FILESDIR}/${PN}-4.8.95-udisks2.patch" |
| 49 |
- "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch" |
| 50 |
) |
| 51 |
|
| 52 |
pkg_pretend() { |
| 53 |
@@ -145,6 +147,11 @@ src_prepare() { |
| 54 |
kde4-base_src_prepare |
| 55 |
use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" |
| 56 |
|
| 57 |
+ if use udisks2; then |
| 58 |
+ epatch "${FILESDIR}/${PN}-4.8.95-udisks2.patch" |
| 59 |
+ epatch "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch" |
| 60 |
+ fi |
| 61 |
+ |
| 62 |
# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) |
| 63 |
sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ |
| 64 |
-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
| 65 |
|
| 66 |
diff --git a/kde-base/kdelibs/metadata.xml b/kde-base/kdelibs/metadata.xml |
| 67 |
index f9776ea..3392c34 100644 |
| 68 |
--- a/kde-base/kdelibs/metadata.xml |
| 69 |
+++ b/kde-base/kdelibs/metadata.xml |
| 70 |
@@ -5,6 +5,7 @@ |
| 71 |
<use> |
| 72 |
<flag name="opengl">Enable OpenGL support for Plasma (GLApplet)</flag> |
| 73 |
<flag name="udisks">Use udisks for block device access (e.g., automounting)</flag> |
| 74 |
+ <flag name="udisks2">Use the udisks2 support backported from kf5</flag> |
| 75 |
<flag name="upower">Use upower for power management</flag> |
| 76 |
<flag name="upnp">Enable UPnP support</flag> |
| 77 |
</use> |
Archives