summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-05-31 10:42:33 +0000
committerMaciej Mrozowski <reavertm@gentoo.org>2010-05-31 10:42:33 +0000
commitd85c103a96af9883134e0de0d506a15e366885ab (patch)
treed8a01787560b2f26f230cf07d759ed3d15105e14 /kde-base/powerdevil
parentx86 stable wrt bug #319629 (diff)
downloadgentoo-2-d85c103a96af9883134e0de0d506a15e366885ab.tar.gz
gentoo-2-d85c103a96af9883134e0de0d506a15e366885ab.tar.bz2
gentoo-2-d85c103a96af9883134e0de0d506a15e366885ab.zip
Apply patch to 4.4.2 version as well
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/powerdevil')
-rw-r--r--kde-base/powerdevil/ChangeLog9
-rw-r--r--kde-base/powerdevil/powerdevil-4.4.2-r1.ebuild (renamed from kde-base/powerdevil/powerdevil-4.4.2.ebuild)6
-rw-r--r--kde-base/powerdevil/powerdevil-4.4.3-r1.ebuild6
-rw-r--r--kde-base/powerdevil/powerdevil-4.4.3.ebuild33
4 files changed, 17 insertions, 37 deletions
diff --git a/kde-base/powerdevil/ChangeLog b/kde-base/powerdevil/ChangeLog
index 8886b6c9c328..30844cad2bc9 100644
--- 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/powerdevil-4.4.2.ebuild b/kde-base/powerdevil/powerdevil-4.4.2-r1.ebuild
index 0811a72d106f..02e70dbfcc1d 100644
--- 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 c6fc3bc624c5..c8918a6fee0d 100644
--- 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
index f59dbb592172..000000000000
--- 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
-"