BGTIMERS patch is in DOS format, I need to convert it to UNIX before apply (to make <sys-devel/patch-2.5.9-r1 happy).

svn path=/; revision=133

4 files changed, 23 insertions, 58 deletions

diff --git a/sys-kernel/powersave-sources/ChangeLog b/sys-kernel/powersave-sources/ChangeLog
index 1380d0e..4acb587 100644
--- a/sys-kernel/powersave-sources/ChangeLog
+++ b/sys-kernel/powersave-sources/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Jul 2007; Timothy Redaelli <drizzt@gentoo.org>
+  -powersave-sources-2.6.22_rc6-r1.ebuild,
+  powersave-sources-2.6.22-r1.ebuild:
+  BGTIMERS patch is in DOS format, I need to convert it to UNIX before apply
+  (to make <sys-devel/patch-2.5.9-r1 happy).
+
+  11 Jul 2007; Timothy Redaelli <drizzt@gentoo.org>
+  powersave-sources-2.6.22-r1.ebuild:
+  BGTIMERS patch is in DOS format, I need to convert it to UNIX before apply
+  (to make <sys-devel/patch-2.5.9-r1 happy).
+
   10 Jul 2007; Timothy Redaelli <drizzt@gentoo.org>
   +powersave-sources-2.6.22-r1.ebuild:
   Version bump
diff --git a/sys-kernel/powersave-sources/Manifest b/sys-kernel/powersave-sources/Manifest
index 8ac70c1..719def4 100644
--- a/sys-kernel/powersave-sources/Manifest
+++ b/sys-kernel/powersave-sources/Manifest
@@ -2,20 +2,16 @@
 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 linux-2.6.22.tar.bz2 45119878 RMD160 c4b2ca5ee8e71c0f8f1c95f3c9c5f261f2785912 SHA1 39401f195a618f397312d6d84ff9aebe28d99381 SHA256 73c10604c53f1a6ee65ef805293d23903696f8cef864f42d7de9506f0d2ba4c7
 DIST patch-2.6.22-hrt1.patch 211822 RMD160 e4aa1f6fa3967ff93308a2a922c9cfe0a2198fb9 SHA1 9e1cd00a44372a649ca052ab2b9976b247921dd1 SHA256 b8d25b293a99f5aa8b55e3802b661bc939fa0182ac1e8908d0562c805a76d5e2
-DIST patch-2.6.22-rc6-hrt1.patch 212627 RMD160 83fe47ea0cc2d73ebb97cb74900ad67ee98b576b SHA1 5568dc65ed2171d854f0074436854029fe03cc79 SHA256 8eb9fbd827fc526e9e1ceb4afa47d838e0e9f40d28b17a91f735f4e72be8b930
-DIST patch-2.6.22-rc6.bz2 6155599 RMD160 0f4b289697384258e143330e8fcd776a15928580 SHA1 4adcd0df52875bda2043276b2afd7c4710a57a40 SHA256 66f82e066e7a872711b33ef536dd2fc295f9504f526cc441606c660f5b60c632
 DIST radeon_vblanks.patch 1188 RMD160 1a46e0d14d5fa99472739e3275c5adda7412babf SHA1 36c6483df693a3c5f8496b5366775b8b88845afd SHA256 5cff3206b834ce04f7d133d7359d0ff706f88044bfedfcfbb4aaf13d44e74621
 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-r1.ebuild 1508 RMD160 11d450c6ee18208113d4ae88d1c6bba01193d4ce SHA1 81ca6567580810c515dd3441407550febb2cce0b SHA256 c205744c1300aacab0f2b48c6bdf7a42a3d9a66703d5d7aafead4119aa768a43
-EBUILD powersave-sources-2.6.22_rc6-r1.ebuild 1508 RMD160 11d450c6ee18208113d4ae88d1c6bba01193d4ce SHA1 81ca6567580810c515dd3441407550febb2cce0b SHA256 c205744c1300aacab0f2b48c6bdf7a42a3d9a66703d5d7aafead4119aa768a43
-MISC ChangeLog 907 RMD160 78e80eae018efee3e68881f4429cf83bed56a273 SHA1 c4728185f41857ca112f7421af5e64d33fb6d9af SHA256 312aab7388a4e06adbf93e533b13d0d1f0bf683abf75cc24e0068de6a1fc8248
+EBUILD powersave-sources-2.6.22-r1.ebuild 1661 RMD160 24cfa8b42e866096dda07556635295cdb1b9b893 SHA1 2eb69b4d5182f904672f0180fd950be100ba956a SHA256 343016257236ba7b5b81b206718bb15eae379f251858e65af4b4a8146acc6ab2
+MISC ChangeLog 1376 RMD160 f8b4fb685feeb168911604ef7ee13659bdfd537c SHA1 3db5d243249cf379d2c7f1e9e700c608107d321f SHA256 09a3d6e9edf1bdf9fe648172994cb7040f518928912a8c19ef146401b9b72feb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGk7ZajJyKLBkBVroRAlfdAJ4x8tzDqMnyvj1IRR38oGjkIWMDtgCeNOQX
-ccMOnYbnY4ztdzZ7UHSUsz4=
-=cziT
+iD8DBQFGlUPojJyKLBkBVroRAnTvAKCy2xoWq7drjzIoZkZ4zzowtbnh8wCghSZg
+q8S0j6sgRkzmEc++hQqMSac=
+=JH1c
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/powersave-sources/powersave-sources-2.6.22-r1.ebuild b/sys-kernel/powersave-sources/powersave-sources-2.6.22-r1.ebuild
index ff13367..2c898bc 100644
--- a/sys-kernel/powersave-sources/powersave-sources-2.6.22-r1.ebuild
+++ b/sys-kernel/powersave-sources/powersave-sources-2.6.22-r1.ebuild
@@ -30,7 +30,7 @@ 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"
+	${T}/${BGTIMERS_SRC}.patch ${DISTDIR}/${SUSPEND2_SRC}.patch.bz2"
 UNIPATCH_STRICTORDER="yes"
 SRC_URI="${KERNEL_URI} ${SUSPEND2_URI} ${HRTIMERS_URI} ${RADEON_URI}
 	${BGTIMERS_URI}"
@@ -46,3 +46,9 @@ pkg_postinst() {
 	einfo "For more info on this patchset, and how to report problems, see:"
 	einfo "${HOMEPAGE}"
 }
+
+pkg_setup() {
+	ebegin "Apply a dos2unix to ${BGTIMERS_SRC}.patch"
+	sed 's/\r$//' "${DISTDIR}"/${BGTIMERS_SRC}.patch > "${T}"/${BGTIMERS_SRC}.patch
+	eend $?
+}
diff --git a/sys-kernel/powersave-sources/powersave-sources-2.6.22_rc6-r1.ebuild b/sys-kernel/powersave-sources/powersave-sources-2.6.22_rc6-r1.ebuild
deleted file mode 100644
index ff13367..0000000
--- a/sys-kernel/powersave-sources/powersave-sources-2.6.22_rc6-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:$
-
-ETYPE="sources"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="Software Suspend 2 + HRTimers"
-HOMEPAGE="http://forums.gentoo.org/viewtopic-t-564588.html"
-
-SUSPEND2_VERSION="2.2.10.1"
-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=${PR:1}
-HRTIMERS_TARGET=${PV/_rc/-rc}
-HRTIMERS_SRC="patch-${HRTIMERS_TARGET}-hrt${HRTIMERS_VERSION}"
-HRTIMERS_URI="http://www.tglx.de/projects/hrtimers/${HRTIMERS_TARGET}/${HRTIMERS_SRC}.patch"
-
-RADEON_SRC="radeon_vblanks"
-RADEON_URI="http://www.minimalblue.com/ftp/public/linux/powersave-patches/${RADEON_SRC}.patch"
-
-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} ${RADEON_URI}
-	${BGTIMERS_URI}"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${RDEPEND}
-		>=sys-apps/suspend2-userui-0.7.1
-		>=sys-power/hibernate-script-1.95"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}