|
Line 0
Link Here
|
|
|
1 |
--- solid/solid/CMakeLists.txt.org 2013-02-07 09:04:57.838999597 +0100 |
|
Line 0
Link Here
|
|
|
1 |
--- solid/solid/backends/udisks2/udisksdevice.cpp.org 2013-02-07 09:12:48.071999541 +0100 |
|
Lines 18-27
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
Link Here
|
| 18 |
LICENSE="LGPL-2.1" |
18 |
LICENSE="LGPL-2.1" |
| 19 |
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma |
19 |
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma |
| 20 |
mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev |
20 |
mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev |
| 21 |
udisks2 +upower upnp zeroconf" |
21 |
udisks udisks2 +upower upnp zeroconf" |
| 22 |
|
22 |
|
| 23 |
REQUIRED_USE=" |
23 |
REQUIRED_USE=" |
| 24 |
upower? ( udev ) |
24 |
upower? ( udev ) |
|
|
25 |
udisks? ( udev ) |
| 26 |
udisks2? ( udisks ) |
| 25 |
" |
27 |
" |
| 26 |
|
28 |
|
| 27 |
# needs the kate regression testsuite from svn |
29 |
# needs the kate regression testsuite from svn |
|
Lines 101-108
RDEPEND="${COMMONDEPEND}
Link Here
|
| 101 |
x11-apps/iceauth |
103 |
x11-apps/iceauth |
| 102 |
x11-apps/rgb |
104 |
x11-apps/rgb |
| 103 |
>=x11-misc/xdg-utils-1.0.2-r3 |
105 |
>=x11-misc/xdg-utils-1.0.2-r3 |
| 104 |
udisks2? ( sys-fs/udisks:2 ) |
106 |
udisks? ( |
| 105 |
!udisks2? ( sys-fs/udisks:0 ) |
107 |
!udisks2? ( sys-fs/udisks:0 ) |
|
|
108 |
udisks2? ( sys-fs/udisks:2 ) |
| 109 |
) |
| 106 |
upower? ( sys-power/upower ) |
110 |
upower? ( sys-power/upower ) |
| 107 |
) |
111 |
) |
| 108 |
udev? ( app-misc/media-player-info ) |
112 |
udev? ( app-misc/media-player-info ) |
|
Lines 139-144
PATCHES=(
Link Here
|
| 139 |
"${FILESDIR}/${PN}-4.8.1-norpath.patch" |
143 |
"${FILESDIR}/${PN}-4.8.1-norpath.patch" |
| 140 |
"${FILESDIR}/${PN}-4.9.3-werror.patch" |
144 |
"${FILESDIR}/${PN}-4.9.3-werror.patch" |
| 141 |
) |
145 |
) |
|
|
146 |
if ! use udisks; then |
| 147 |
PATCHES+=( |
| 148 |
"${FILESDIR}/${PN}-4.10.0-udisks2_opticaldisc_spinup.patch" |
| 149 |
"${FILESDIR}/${PN}-4.10.0-no_udisks1.patch" |
| 150 |
) |
| 151 |
fi |
| 142 |
|
152 |
|
| 143 |
pkg_pretend() { |
153 |
pkg_pretend() { |
| 144 |
if [[ ${MERGE_TYPE} != binary ]]; then |
154 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 145 |
- |
|
|
