Misc fixes.

svn path=/; revision=127

3 files changed, 22 insertions, 15 deletions

diff --git a/sys-kernel/powersave-sources/ChangeLog b/sys-kernel/powersave-sources/ChangeLog
index b86d4e8..fed8385 100644
--- a/sys-kernel/powersave-sources/ChangeLog
+++ b/sys-kernel/powersave-sources/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Jun 2007; Timothy Redaelli <drizzt@gentoo.org>
+  -powersave-sources-2.6.22_rc5.ebuild,
+  +powersave-sources-2.6.22_rc5-r1.ebuild:
+  Misc fixes.
+
   18 Jun 2007; Timothy Redaelli <drizzt@gentoo.org>
   powersave-sources-2.6.22_rc5.ebuild:
   Fix header
diff --git a/sys-kernel/powersave-sources/Manifest b/sys-kernel/powersave-sources/Manifest
index 04dcf34..d5fcffb 100644
--- a/sys-kernel/powersave-sources/Manifest
+++ b/sys-kernel/powersave-sources/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+DIST kernel-2.6.22-rc1.patch 4595 RMD160 316af6e73c7feefce19e3ec6bb859f0a5198f73c SHA1 ec81f22cc6620eefa7ff8183dae3e9ad7a20a210 SHA256 f89bc0c7f69a4b5a2b7b353be602019cc07db46da46769d9c3918550df0a171e
 DIST linux-2.6.21.tar.bz2 43997476 RMD160 b2badf41c61f66b0dda059d99a57c2e2c0ea13f4 SHA1 0d2eb42c8dd5944f1849a020041cd7a4036c798c SHA256 f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942
-DIST patch-2.6.22-rc5-hrt1.patch 212598 RMD160 2d2947f284767d8b1b689f1900dbba7783dd3c57 SHA1 6b5f293b7262925683a994ba2329799dafa68c36 SHA256 b513dfad9f9851e4dcceff1f9e6289fd19bc093c769cc9860ca263a31cef8bdb
+DIST patch-2.6.22-rc5-hrtr1.patch 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 DIST patch-2.6.22-rc5.bz2 6127532 RMD160 cb817164587885072193737b1e92ef881d4e4aba SHA1 23240b8a2d8bd507aff6b5956c99863de9006a50 SHA256 035a0acbf56c30a9fc52343ec705cfde8b8fcf033a23c7b9a743684e75fa16fe
 DIST radeon_vblanks.patch 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 DIST suspend2-2.2.10.1-for-2.6.22-rc4.patch.bz2 94856 RMD160 14a03898fbc0ac6487100489d7ac0c39d69b9458 SHA1 f987341a07f511b0aa5fdd874b0303b6b38fdc37 SHA256 3fe0de7b65209fd0c10427313fa100c34e6a6d591c7abff0c91faca4d484d779
-EBUILD powersave-sources-2.6.22_rc5.ebuild 1520 RMD160 456de22ec38ffab2ae43ee976774b4d4f0647714 SHA1 7ff4efbafc1f83c62496a0aeaada14b93ca4e96b SHA256 f62a907073de1398ebf2aa1a0a7a8533d1e8c6ddbc2d361d6389608f6feeb70a
-MISC ChangeLog 433 RMD160 a4baa9715931a376cdaaf1b524d080f86e07e5f3 SHA1 198791bf7dcf05085f8176fb325667d98e837f65 SHA256 806bc6a46cc935a71e730f7c0df1490b158dcf09a1e60702c1b6f1d9969b0154
+EBUILD powersave-sources-2.6.22_rc5-r1.ebuild 1508 RMD160 4275d29687fb615d8f5cb66e582a3ecbf3ad188c SHA1 1d45405cadbfc6e0e24dddc50d2362b194ed6b2a SHA256 cd041f959c45e9e503fc10c4575b0ce131a8a68869caf78116962cad3d86e97f
+MISC ChangeLog 583 RMD160 963c8dc1d266a6a8b91cfae1e9b2fe19c619791a SHA1 fbae94c7887fd5f1e337afe1141c6f0f4f387a9f SHA256 d3feb9d8c551fbb6f90367c4e727b1909a7ab15c13665aebfdabd69db1583fae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGdn8HjJyKLBkBVroRAsaJAKDUj5WtoqEV3Vp2x4IUnuEXdCkXRgCfa8X4
-YNbDF47rUBR8RYGicIfF0G4=
-=I6kg
+iD8DBQFGd+BMjJyKLBkBVroRAiVUAKDR2U6D/dLLSEm9jMHm3PBiw8nAHQCeJJuP
+pyUBEimkw7FTdknFeDu0xkk=
+=NIn+
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/powersave-sources/powersave-sources-2.6.22_rc5.ebuild b/sys-kernel/powersave-sources/powersave-sources-2.6.22_rc5-r1.ebuild
index 474e655..b9dd5f5 100644
--- a/sys-kernel/powersave-sources/powersave-sources-2.6.22_rc5.ebuild
+++ b/sys-kernel/powersave-sources/powersave-sources-2.6.22_rc5-r1.ebuild
@@ -18,17 +18,22 @@ SUSPEND2_TARGET="2.6.22-rc4"
 SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}"
 SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.patch.bz2"
 
-HRTIMERS_VERSION="1"
+HRTIMERS_VERSION=${PR/-r}
 HRTIMERS_TARGET="2.6.22-rc5"
 HRTIMERS_SRC="patch-${HRTIMERS_TARGET}-hrt${HRTIMERS_VERSION}"
 HRTIMERS_URI="http://www.tglx.de/projects/hrtimers/${HRTIMERS_TARGET}/${HRTIMERS_SRC}.patch"
 
-OTHERS_SRC="radeon_vblanks.patch"
-OTHERS_URI="http://www.minimalblue.com/ftp/public/linux/powersave-patches/radeon_vblanks.patch"
+RADEON_SRC="radeon_vblanks"
+RADEON_URI="http://www.minimalblue.com/ftp/public/linux/powersave-patches/${RADEON_SRC}.patch"
 
-UNIPATCH_LIST="${DISTDIR}/${HRTIMERS_SRC}.patch ${DISTDIR}/${OTHERS_SRC} ${DISTDIR}/${SUSPEND2_SRC}.patch.bz2"
+BGTIMERS_SRC="kernel-2.6.22-rc1"
+BGTIMERS_URI="http://www.linuxpowertop.org/patches/${BGTIMERS_SRC}.patch"
+
+UNIPATCH_LIST="${DISTDIR}/${HRTIMERS_SRC}.patch ${DISTDIR}/${RADEON_SRC}.patch
+	${DISTDIR}/${BGTIMERS_SRC}.patch ${DISTDIR}/${SUSPEND2_SRC}.patch.bz2"
 UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${SUSPEND2_URI} ${HRTIMERS_URI} ${OTHERS_URI}"
+SRC_URI="${KERNEL_URI} ${SUSPEND2_URI} ${HRTIMERS_URI} ${RADEON_URI}
+	${BGTIMERS_URI}"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -36,10 +41,6 @@ RDEPEND="${RDEPEND}
 		>=sys-apps/suspend2-userui-0.7.1
 		>=sys-power/hibernate-script-1.95"
 
-K_EXTRAEINFO="If there are issues with this kernel, please direct any
-queries to the suspend2-users mailing list:
-http://lists.suspend2.net/mailman/listinfo/suspend2-users/"
-
 pkg_postinst() {
 	kernel-2_pkg_postinst
 	einfo "For more info on this patchset, and how to report problems, see:"