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 1SlaKw-0003hT-Ur for garchives@archives.gentoo.org; Mon, 02 Jul 2012 06:42:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37B14E0676; Mon, 2 Jul 2012 06:42:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E3C7BE0676 for ; Mon, 2 Jul 2012 06:42:10 +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 020401B40CF for ; Mon, 2 Jul 2012 06:42:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B4B90E5436 for ; Mon, 2 Jul 2012 06:42:08 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1341211354.77ce1f09bdc38537ee1fd08df0b14fb17c850981.dilfridge@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.9.49.9999.ebuild kde-base/kdelibs/kdelibs-9999.ebuild X-VCS-Directories: kde-base/kdelibs/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 77ce1f09bdc38537ee1fd08df0b14fb17c850981 X-VCS-Branch: master Date: Mon, 2 Jul 2012 06:42:08 +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: 44527748-6b09-4eed-8135-f3985dc1707d X-Archives-Hash: 600e08b166883a59dd5df1d516414a40 commit: 77ce1f09bdc38537ee1fd08df0b14fb17c850981 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Mon Jul 2 06:42:34 2012 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Mon Jul 2 06:42:34 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D77ce1f09 [kde-base/kdelibs] Add udisks2 useflag also for 4.9.49.9999 and 9999 --- kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild | 15 +++++++++++---- kde-base/kdelibs/kdelibs-9999.ebuild | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild b/kde-base/kdeli= bs/kdelibs-4.9.49.9999.ebuild index 2737f4f..93d70c7 100644 --- a/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild @@ -21,10 +21,11 @@ KEYWORDS=3D"" 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/kdelibs-9999.ebuild b/kde-base/kdelibs/kdel= ibs-9999.ebuild index 2737f4f..93d70c7 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -21,10 +21,11 @@ KEYWORDS=3D"" 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."