From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SlXZG-0002Ci-Ax for garchives@archives.gentoo.org; Mon, 02 Jul 2012 03:44:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D55FE0511; Mon, 2 Jul 2012 03:44:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5C5EEE0511 for ; Mon, 2 Jul 2012 03:44:45 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BEDA41B40F8 for ; Mon, 2 Jul 2012 03:44:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 35A4EE5436 for ; Mon, 2 Jul 2012 03:44:43 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <1341200456.b8bb161dce309f475e582ec6fd2c56fb581c64f4.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdelibs/kdelibs-4.8.95.ebuild kde-base/kdelibs/metadata.xml X-VCS-Directories: kde-base/kdelibs/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: b8bb161dce309f475e582ec6fd2c56fb581c64f4 X-VCS-Branch: master Date: Mon, 2 Jul 2012 03:44:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: fd127188-3271-47f4-8f0e-f2247995b8e1 X-Archives-Hash: bc2969e21ef147c0167ff28a5e91a2a7 commit: b8bb161dce309f475e582ec6fd2c56fb581c64f4 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Mon Jul 2 03:40:56 2012 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Mon Jul 2 03:40:56 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Db8bb161d Move the backported udisks2 support behind the udisks2 use flag. --- kde-base/kdelibs/kdelibs-4.8.95.ebuild | 15 +++++++++++---- kde-base/kdelibs/metadata.xml | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/kde-base/kdelibs/kdelibs-4.8.95.ebuild b/kde-base/kdelibs/kd= elibs-4.8.95.ebuild index 57b1d34..069202c 100644 --- a/kde-base/kdelibs/kdelibs-4.8.95.ebuild +++ b/kde-base/kdelibs/kdelibs-4.8.95.ebuild @@ -21,10 +21,11 @@ KEYWORDS=3D"~amd64 ~x86 ~amd64-linux ~x86-linux" LICENSE=3D"LGPL-2.1" IUSE=3D"3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k ker= beros lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +ud= isks -+upower upnp zeroconf" ++udisks2 +upower upnp zeroconf" =20 REQUIRED_USE=3D" udisks? ( udev ) + udisks2? ( udisks ) upower? ( udev ) " =20 @@ -99,7 +100,10 @@ RDEPEND=3D"${COMMONDEPEND} x11-apps/iceauth x11-apps/rgb >=3Dx11-misc/xdg-utils-1.0.2-r3 - udisks? ( sys-fs/udisks:2 ) + udisks? ( + udisks2? ( sys-fs/udisks:2 ) + !udisks2? ( sys-fs/udisks:0 ) + ) upower? ( sys-power/upower ) ) " @@ -129,8 +133,6 @@ PATCHES=3D( "${FILESDIR}/${PN}-4.8.1-norpath.patch" "${FILESDIR}/${PN}-4.8.2-calculator_key.patch" "${FILESDIR}/${PN}-4.8.4-bytecode.patch" - "${FILESDIR}/${PN}-4.8.95-udisks2.patch" - "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch" ) =20 pkg_pretend() { @@ -145,6 +147,11 @@ src_prepare() { kde4-base_src_prepare use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" =20 + if use udisks2; then + epatch "${FILESDIR}/${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 REN= AME kde-4-applications.menu|g' \ -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.= menu failed." diff --git a/kde-base/kdelibs/metadata.xml b/kde-base/kdelibs/metadata.xm= l index f9776ea..3392c34 100644 --- a/kde-base/kdelibs/metadata.xml +++ b/kde-base/kdelibs/metadata.xml @@ -5,6 +5,7 @@ Enable OpenGL support for Plasma (GLApplet) Use udisks for block device access (e.g., automou= nting) + Use the udisks2 support backported from kf5 Use upower for power management Enable UPnP support