diff options
author | Michael Palimaka <kensington@gentoo.org> | 2013-02-01 01:17:37 +1100 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2013-02-01 01:17:37 +1100 |
commit | 590f914e42ae092e1a5ef628c0092a16a1a1393d (patch) | |
tree | 830feb316d839c68c457e6bd2c8b02db33352f73 | |
parent | [kde-4.10.0] Untested version bump. Happy compiling. (diff) | |
download | kde-590f914e42ae092e1a5ef628c0092a16a1a1393d.tar.gz kde-590f914e42ae092e1a5ef628c0092a16a1a1393d.tar.bz2 kde-590f914e42ae092e1a5ef628c0092a16a1a1393d.zip |
[kde-base/kdelibs] UDisks2 support is now integrated.
Package-Manager: portage-2.1.11.50
-rw-r--r-- | kde-base/kdelibs/kdelibs-4.10.0.ebuild | 15 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild | 17 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-4.9.98.ebuild | 15 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-9999.ebuild | 15 |
4 files changed, 12 insertions, 50 deletions
diff --git a/kde-base/kdelibs/kdelibs-4.10.0.ebuild b/kde-base/kdelibs/kdelibs-4.10.0.ebuild index 9439e85a19..2790679544 100644 --- a/kde-base/kdelibs/kdelibs-4.10.0.ebuild +++ b/kde-base/kdelibs/kdelibs-4.10.0.ebuild @@ -15,17 +15,15 @@ inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic EGIT_BRANCH="KDE/4.10" DESCRIPTION="KDE libraries needed by all KDE programs." -SRC_URI+=" http://dev.gentoo.org/~johu/distfiles/${PN}-4.8.95-udisks2.patch.xz" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" LICENSE="LGPL-2.1" IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks -udisks2 +upower upnp zeroconf" ++upower upnp zeroconf" REQUIRED_USE=" udisks? ( udev ) - udisks2? ( udisks ) upower? ( udev ) " @@ -106,10 +104,7 @@ RDEPEND="${COMMONDEPEND} x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 - udisks? ( - udisks2? ( sys-fs/udisks:2 ) - !udisks2? ( sys-fs/udisks:0 ) - ) + udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower ) ) udev? ( app-misc/media-player-info ) @@ -159,11 +154,6 @@ src_prepare() { kde4-base_src_prepare use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" - if use udisks2; then - epatch "${WORKDIR}/${PN}-4.8.95-udisks2.patch" - epatch "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch" - fi - # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." @@ -229,6 +219,7 @@ src_configure() { $(cmake-utils_use_with spell ENCHANT) $(cmake-utils_use_with ssl OpenSSL) $(cmake-utils_use_with udev UDev) + $(cmake-utils_use_with udisks SOLID_UDISKS2) $(cmake-utils_use_with upnp HUpnp) $(cmake-utils_use_with zeroconf Avahi) ) diff --git a/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild index 05d9717769..7b71d77ae1 100644 --- a/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild @@ -10,22 +10,18 @@ OPENGL_REQUIRED="optional" KDE_HANDBOOK="optional" inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic -# The "master" branch is out of date, so use KDE/4.10 per upstream's -# recommendation. EGIT_BRANCH="KDE/4.10" DESCRIPTION="KDE libraries needed by all KDE programs." -SRC_URI+=" http://dev.gentoo.org/~johu/distfiles/${PN}-4.8.95-udisks2.patch.xz" KEYWORDS="" LICENSE="LGPL-2.1" IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks -udisks2 +upower upnp zeroconf" ++upower upnp zeroconf" REQUIRED_USE=" udisks? ( udev ) - udisks2? ( udisks ) upower? ( udev ) " @@ -106,10 +102,7 @@ RDEPEND="${COMMONDEPEND} x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 - udisks? ( - udisks2? ( sys-fs/udisks:2 ) - !udisks2? ( sys-fs/udisks:0 ) - ) + udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower ) ) udev? ( app-misc/media-player-info ) @@ -159,11 +152,6 @@ src_prepare() { kde4-base_src_prepare use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" - if use udisks2; then - epatch "${WORKDIR}/${PN}-4.8.95-udisks2.patch" - epatch "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch" - fi - # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." @@ -229,6 +217,7 @@ src_configure() { $(cmake-utils_use_with spell ENCHANT) $(cmake-utils_use_with ssl OpenSSL) $(cmake-utils_use_with udev UDev) + $(cmake-utils_use_with udisks SOLID_UDISKS2) $(cmake-utils_use_with upnp HUpnp) $(cmake-utils_use_with zeroconf Avahi) ) diff --git a/kde-base/kdelibs/kdelibs-4.9.98.ebuild b/kde-base/kdelibs/kdelibs-4.9.98.ebuild index 9439e85a19..2790679544 100644 --- a/kde-base/kdelibs/kdelibs-4.9.98.ebuild +++ b/kde-base/kdelibs/kdelibs-4.9.98.ebuild @@ -15,17 +15,15 @@ inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic EGIT_BRANCH="KDE/4.10" DESCRIPTION="KDE libraries needed by all KDE programs." -SRC_URI+=" http://dev.gentoo.org/~johu/distfiles/${PN}-4.8.95-udisks2.patch.xz" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" LICENSE="LGPL-2.1" IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks -udisks2 +upower upnp zeroconf" ++upower upnp zeroconf" REQUIRED_USE=" udisks? ( udev ) - udisks2? ( udisks ) upower? ( udev ) " @@ -106,10 +104,7 @@ RDEPEND="${COMMONDEPEND} x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 - udisks? ( - udisks2? ( sys-fs/udisks:2 ) - !udisks2? ( sys-fs/udisks:0 ) - ) + udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower ) ) udev? ( app-misc/media-player-info ) @@ -159,11 +154,6 @@ src_prepare() { kde4-base_src_prepare use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" - if use udisks2; then - epatch "${WORKDIR}/${PN}-4.8.95-udisks2.patch" - epatch "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch" - fi - # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." @@ -229,6 +219,7 @@ src_configure() { $(cmake-utils_use_with spell ENCHANT) $(cmake-utils_use_with ssl OpenSSL) $(cmake-utils_use_with udev UDev) + $(cmake-utils_use_with udisks SOLID_UDISKS2) $(cmake-utils_use_with upnp HUpnp) $(cmake-utils_use_with zeroconf Avahi) ) diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild index cfcb8a2075..965898e4b2 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -13,17 +13,15 @@ inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic EGIT_BRANCH="master" DESCRIPTION="KDE libraries needed by all KDE programs." -SRC_URI+=" http://dev.gentoo.org/~johu/distfiles/${PN}-4.8.95-udisks2.patch.xz" KEYWORDS="" LICENSE="LGPL-2.1" IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks -udisks2 +upower upnp zeroconf" ++upower upnp zeroconf" REQUIRED_USE=" udisks? ( udev ) - udisks2? ( udisks ) upower? ( udev ) " @@ -104,10 +102,7 @@ RDEPEND="${COMMONDEPEND} x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 - udisks? ( - udisks2? ( sys-fs/udisks:2 ) - !udisks2? ( sys-fs/udisks:0 ) - ) + udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower ) ) udev? ( app-misc/media-player-info ) @@ -157,11 +152,6 @@ src_prepare() { kde4-base_src_prepare use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" - if use udisks2; then - epatch "${WORKDIR}/${PN}-4.8.95-udisks2.patch" - epatch "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch" - fi - # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." @@ -227,6 +217,7 @@ src_configure() { $(cmake-utils_use_with spell ENCHANT) $(cmake-utils_use_with ssl OpenSSL) $(cmake-utils_use_with udev UDev) + $(cmake-utils_use_with udisks SOLID_UDISKS2) $(cmake-utils_use_with upnp HUpnp) $(cmake-utils_use_with zeroconf Avahi) ) |