Apply patch to 4.4.2 version as well

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/kde-base/powerdevil/ChangeLog b/kde-base/powerdevil/ChangeLog
index 8886b6c9c3285253cb4fd1cff3b5a1979bff822f..30844cad2bc9e48e72961d9de3a0c0ad04e77dab 100644 (file)
--- a/kde-base/powerdevil/ChangeLog
+++ b/kde-base/powerdevil/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/powerdevil
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.48 2010/05/29 06:25:59 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.49 2010/05/31 10:42:33 reavertm Exp $
+
+*powerdevil-4.4.2-r1 (31 May 2010)
+
+  31 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -powerdevil-4.4.2.ebuild, +powerdevil-4.4.2-r1.ebuild,
+  -powerdevil-4.4.3.ebuild, powerdevil-4.4.3-r1.ebuild:
+  Apply patch to 4.4.2 version as well
 
 *powerdevil-4.4.3-r1 (29 May 2010)
 

diff --git a/kde-base/powerdevil/Manifest b/kde-base/powerdevil/Manifest
index c4c08bf2b3237be107217d4ed1b1a437cb17e664..93a706a4ca01855f713cf5f8fd10e0ea7dc71679 100644 (file)
--- a/kde-base/powerdevil/Manifest
+++ b/kde-base/powerdevil/Manifest
@@ -5,8 +5,7 @@ DIST kdebase-workspace-4.4.2.tar.bz2 77039701 RMD160 0558ff2102cb380127667a94b69
 DIST kdebase-workspace-4.4.3.tar.bz2 77035367 RMD160 df3d9ceaab33d08ea27cd1206c33b3ead9266a42 SHA1 efd427dfe8b7beebdfe162006689871c61991336 SHA256 7f56b2b12f2ca78deea31981bc47de2862d409d99b7bcda90054715d97999239
 EBUILD powerdevil-4.3.3.ebuild 837 RMD160 8ffc68da52e9fbba9872cc8f9c041f574aa7105f SHA1 4b858c641d40bb5f77faef83a295ebec82080383 SHA256 6e096084022d4818bdc9d2f56ef8465376414922b42741977a6102ef5e9a4125
 EBUILD powerdevil-4.3.5.ebuild 893 RMD160 64677ff681ea0fa6e35dfc514853238750d6718f SHA1 b304eb8d2b99837cc19de7cfc907901635cb5585 SHA256 1d27d8ffb2bbbb9d7fed6db3d2bf41543dc81edb383c9c91375027a2b3d6b1e0
-EBUILD powerdevil-4.4.2.ebuild 895 RMD160 83add22f69d6122cf853692819e5126b414e6a2c SHA1 ebef8c03bf97d22f91f15aa7c8ca517f737dd061 SHA256 1030a831748a5efa0320d7d1a4c9fca8d73b4411c50dc6762bc54e6091966f31
-EBUILD powerdevil-4.4.3-r1.ebuild 953 RMD160 7f3b3501569bbb4a10efe34573b91840682e24e7 SHA1 afbbe3e68ed2b29723630cca48ff4a63a9da739a SHA256 7a2d31d3f4521a8310f95d179bbc3ec4741dfd24e55e35a7d4d15ade9aa7535b
-EBUILD powerdevil-4.4.3.ebuild 896 RMD160 dc1a4c8474d26d277e8585c8871e49132c213f4e SHA1 daa31fcc95ffbb86a94fdcbd26e357663672e025 SHA256 0bfe5b85814e4af65a1fcb7971b81bbe1bc98a1bd48f27b2ce10390cd4bd2a9e
-MISC ChangeLog 6215 RMD160 411ed9f1787f65c99a9d342587d62115da238962 SHA1 9c2a76156e56e3056ebabf843e35c50e05d3a4fa SHA256 825756992af95d44bd0b4ad32de248d537857ceb046c94b8e639a4ed48a60d0a
+EBUILD powerdevil-4.4.2-r1.ebuild 964 RMD160 d37b9b5015562d566bb443692d0e9105f62a1e80 SHA1 f49049032e5578e2e6a701f872908e29a4f8fe55 SHA256 d0ace28c4d41a092eed834567dd48f2f083a0b90196d30ff7c74584e5de3adef
+EBUILD powerdevil-4.4.3-r1.ebuild 964 RMD160 19e0e93c52c5211794ed849dfcd301175e549925 SHA1 5a40da545d19985bc8c50d84e6ecff87186be967 SHA256 de62d116920263ed308ca1329ca8d30dece18bea1f484116edfe094f3455ee93
+MISC ChangeLog 6461 RMD160 e4298a01ee68722df27ae329f0931ba834d4e36f SHA1 1f2006ab069f0a8aa3ce7fe581ebbb527578aac0 SHA256 0b2eaf185f21efcde54e238da1c87dbff5fd103a775520287b0790a659a1ff3d
 MISC metadata.xml 281 RMD160 81ae5951c6f8387eb7c87bf07d7c136d4c3f7589 SHA1 e1e397b43276333f8c5a5f1300977fca84c39920 SHA256 f42f84b6cbe3862afd6839a2da268b563bbac43ed8d39f127db2bd1ad5b53c88

diff --git a/kde-base/powerdevil/powerdevil-4.4.2.ebuild b/kde-base/powerdevil/powerdevil-4.4.2-r1.ebuild
similarity index 87%
rename from kde-base/powerdevil/powerdevil-4.4.2.ebuild
rename to kde-base/powerdevil/powerdevil-4.4.2-r1.ebuild
index 0811a72d106fdad858a86fa9105658a79acb1ff5..02e70dbfcc1d33f8455acf3c3e393ac89bf9e381 100644 (file)
--- a/kde-base/powerdevil/powerdevil-4.4.2.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.4.2.ebuild,v 1.1 2010/03/30 22:02:56 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.4.2-r1.ebuild,v 1.1 2010/05/31 10:42:33 reavertm Exp $
 
 EAPI="3"
 
@@ -27,6 +27,10 @@ RDEPEND="${COMMONDEPEND}
        pm-utils? ( sys-power/pm-utils )
 "
 
+PATCHES=(
+       "${FILESDIR}/${PN}-4.4.3-fix-sleep-205453.patch"
+)
+
 KMEXTRACTONLY="
        krunner/
        ksmserver/org.kde.KSMServerInterface.xml

diff --git a/kde-base/powerdevil/powerdevil-4.4.3-r1.ebuild b/kde-base/powerdevil/powerdevil-4.4.3-r1.ebuild
index c6fc3bc624c5e0f8621dea505ba32353ee0ae1a1..c8918a6fee0d8f8043e95b34e1ccbac339ef1ed0 100644 (file)
--- a/kde-base/powerdevil/powerdevil-4.4.3-r1.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.4.3-r1.ebuild,v 1.1 2010/05/29 06:25:59 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.4.3-r1.ebuild,v 1.2 2010/05/31 10:42:33 reavertm Exp $
 
 EAPI="3"
 
@@ -27,7 +27,9 @@ RDEPEND="${COMMONDEPEND}
        pm-utils? ( sys-power/pm-utils )
 "
 
-PATCHES=( "${FILESDIR}/${P}-fix-sleep-205453.patch" )
+PATCHES=(
+       "${FILESDIR}/${PN}-4.4.3-fix-sleep-205453.patch"
+)
 
 KMEXTRACTONLY="
        krunner/

diff --git a/kde-base/powerdevil/powerdevil-4.4.3.ebuild b/kde-base/powerdevil/powerdevil-4.4.3.ebuild
deleted file mode 100644 (file)
index f59dbb5..0000000
--- a/kde-base/powerdevil/powerdevil-4.4.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.4.3.ebuild,v 1.1 2010/05/03 21:44:20 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-inherit kde4-meta
-
-DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement."
-HOMEPAGE="http://www.kde-apps.org/content/show.php/PowerDevil?content=85078"
-LICENSE="GPL-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +pm-utils"
-
-COMMONDEPEND="
-       $(add_kdebase_dep libkworkspace)
-       $(add_kdebase_dep solid)
-       !aqua? ( x11-libs/libXScrnSaver )
-"
-DEPEND="${COMMONDEPEND}
-       !aqua? ( x11-proto/scrnsaverproto )
-"
-RDEPEND="${COMMONDEPEND}
-       !sys-power/powerdevil
-       pm-utils? ( sys-power/pm-utils )
-"
-
-KMEXTRACTONLY="
-       krunner/
-       ksmserver/org.kde.KSMServerInterface.xml
-"