| 1 |
commit: 77ce1f09bdc38537ee1fd08df0b14fb17c850981 |
| 2 |
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de> |
| 3 |
AuthorDate: Mon Jul 2 06:42:34 2012 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 2 06:42:34 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=77ce1f09 |
| 7 |
|
| 8 |
[kde-base/kdelibs] Add udisks2 useflag also for 4.9.49.9999 and 9999 |
| 9 |
|
| 10 |
--- |
| 11 |
kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild | 15 +++++++++++---- |
| 12 |
kde-base/kdelibs/kdelibs-9999.ebuild | 15 +++++++++++---- |
| 13 |
2 files changed, 22 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild |
| 16 |
index 2737f4f..93d70c7 100644 |
| 17 |
--- a/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild |
| 18 |
+++ b/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild |
| 19 |
@@ -21,10 +21,11 @@ KEYWORDS="" |
| 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/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild |
| 67 |
index 2737f4f..93d70c7 100644 |
| 68 |
--- a/kde-base/kdelibs/kdelibs-9999.ebuild |
| 69 |
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild |
| 70 |
@@ -21,10 +21,11 @@ KEYWORDS="" |
| 71 |
LICENSE="LGPL-2.1" |
| 72 |
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k kerberos lzma |
| 73 |
mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks |
| 74 |
-+upower upnp zeroconf" |
| 75 |
++udisks2 +upower upnp zeroconf" |
| 76 |
|
| 77 |
REQUIRED_USE=" |
| 78 |
udisks? ( udev ) |
| 79 |
+ udisks2? ( udisks ) |
| 80 |
upower? ( udev ) |
| 81 |
" |
| 82 |
|
| 83 |
@@ -99,7 +100,10 @@ RDEPEND="${COMMONDEPEND} |
| 84 |
x11-apps/iceauth |
| 85 |
x11-apps/rgb |
| 86 |
>=x11-misc/xdg-utils-1.0.2-r3 |
| 87 |
- udisks? ( sys-fs/udisks:2 ) |
| 88 |
+ udisks? ( |
| 89 |
+ udisks2? ( sys-fs/udisks:2 ) |
| 90 |
+ !udisks2? ( sys-fs/udisks:0 ) |
| 91 |
+ ) |
| 92 |
upower? ( sys-power/upower ) |
| 93 |
) |
| 94 |
" |
| 95 |
@@ -129,8 +133,6 @@ PATCHES=( |
| 96 |
"${FILESDIR}/${PN}-4.8.1-norpath.patch" |
| 97 |
"${FILESDIR}/${PN}-4.8.2-calculator_key.patch" |
| 98 |
"${FILESDIR}/${PN}-4.8.4-bytecode.patch" |
| 99 |
- "${FILESDIR}/${PN}-4.8.95-udisks2.patch" |
| 100 |
- "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch" |
| 101 |
) |
| 102 |
|
| 103 |
pkg_pretend() { |
| 104 |
@@ -145,6 +147,11 @@ src_prepare() { |
| 105 |
kde4-base_src_prepare |
| 106 |
use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" |
| 107 |
|
| 108 |
+ if use udisks2; then |
| 109 |
+ epatch "${FILESDIR}/${PN}-4.8.95-udisks2.patch" |
| 110 |
+ epatch "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch" |
| 111 |
+ fi |
| 112 |
+ |
| 113 |
# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) |
| 114 |
sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ |
| 115 |
-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
Archives