summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2007-12-25 20:27:53 +0000
committerStefan Schweizer <genstef@gentoo.org>2007-12-25 20:27:53 +0000
commit5556aa1e45c18a51764919743ecfec8d896e455f (patch)
treedc4ff696d7512484f24e7f3c136045e02faa1bf9 /net-dialup
parentMarking Cache-Memcached-1.24 ppc64 for bug 202730 (diff)
downloadhistorical-5556aa1e45c18a51764919743ecfec8d896e455f.tar.gz
historical-5556aa1e45c18a51764919743ecfec8d896e455f.tar.bz2
historical-5556aa1e45c18a51764919743ecfec8d896e455f.zip
fix patch ordering
Package-Manager: portage-2.1.4_rc11
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/fcdsl/ChangeLog5
-rw-r--r--net-dialup/fcdsl/Manifest16
-rw-r--r--net-dialup/fcdsl/fcdsl-2.6.37.ebuild6
3 files changed, 16 insertions, 11 deletions
diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index 85f6c2a751fe..1f9fb2086857 100644
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-dialup/fcdsl
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.32 2007/12/25 18:05:51 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.33 2007/12/25 20:27:53 genstef Exp $
+
+ 25 Dec 2007; Stefan Schweizer <genstef@gentoo.org> fcdsl-2.6.37.ebuild:
+ fix patch ordering
25 Dec 2007; Stefan Schweizer <genstef@gentoo.org>
+files/fcdsl-2.6.23.diff, -files/fcdsl-2.6.24.diff, fcdsl-2.6.37.ebuild:
diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest
index 5a9c16b6e304..18cb3cd5d818 100644
--- a/net-dialup/fcdsl/Manifest
+++ b/net-dialup/fcdsl/Manifest
@@ -34,14 +34,14 @@ DIST avm_fcdsl-2.6-37.i586.rpm 1059204 RMD160 3ab3bb6a8006167004c93c5348f07d4fc6
DIST avm_fcdsl-2.6-37.x86_64.rpm 1064850 RMD160 f0a76d19f0ed2221f872e42dbc38cba874d31137 SHA1 a4527480201060bcfd6b4ce8c60033fa30b67be1 SHA256 b9498312286e7d3f8c3bd7ac202e7bd75245fd93dc9aa8f2c784ace90a955757
DIST km_fcdsl-2.6-37.i586.rpm 2447670 RMD160 a8372219af67b1a9d5c27d0c382f30b5c05a2e7e SHA1 13a63e79a78f5a17d3aabb8b240ea4aada417a70 SHA256 8d767da36061ed4a0a9ee84b989d1810bcde0dab0474087b7e85e2bbc0751e4e
DIST km_fcdsl-2.6-37.x86_64.rpm 1792580 RMD160 8484ee301a6d603a7d9d0e1c97bc8d542e31833c SHA1 d40520e4a2464f42d870041456790e989fe7b809 SHA256 0412b03faa8b4f0e0b90e915e9492ae345fe7a797270b682de64b65ed9d20d33
-EBUILD fcdsl-2.6.37.ebuild 8417 RMD160 21b3313cd7103d53f7aacb3497de2fecb08b3193 SHA1 9570059dc67fa80ccd1529f9005021af98ca797d SHA256 ecf805ef7fd23d994eec3ab7a5657ade7e614d7ae14cc9026a3c9e8abbee2e48
-MD5 fe2adee34959dd5fe9276ff638ee07ce fcdsl-2.6.37.ebuild 8417
-RMD160 21b3313cd7103d53f7aacb3497de2fecb08b3193 fcdsl-2.6.37.ebuild 8417
-SHA256 ecf805ef7fd23d994eec3ab7a5657ade7e614d7ae14cc9026a3c9e8abbee2e48 fcdsl-2.6.37.ebuild 8417
-MISC ChangeLog 5651 RMD160 6a4b22595a724fddfc93d9bdd44adf2529d76188 SHA1 b7fc7437f571cbe07ce8a1173a10773dac7bebf8 SHA256 171058fc089aec364fd98b70dc5e460dacb1299005bcba250680de6cad01ec96
-MD5 937d9ec5cf28549404447bc7eaa358a5 ChangeLog 5651
-RMD160 6a4b22595a724fddfc93d9bdd44adf2529d76188 ChangeLog 5651
-SHA256 171058fc089aec364fd98b70dc5e460dacb1299005bcba250680de6cad01ec96 ChangeLog 5651
+EBUILD fcdsl-2.6.37.ebuild 8465 RMD160 6fbd0883ba347c041af25a07f133983fea1d8455 SHA1 e583a1687a7e9c8137a0bb4c2aba05ce5f3716cb SHA256 6d85f02633bb85a0752ce602d438cccf99e568f1a01ee3526ce64f668882881e
+MD5 d5de4788eff37fc660e50ea24e5db5bc fcdsl-2.6.37.ebuild 8465
+RMD160 6fbd0883ba347c041af25a07f133983fea1d8455 fcdsl-2.6.37.ebuild 8465
+SHA256 6d85f02633bb85a0752ce602d438cccf99e568f1a01ee3526ce64f668882881e fcdsl-2.6.37.ebuild 8465
+MISC ChangeLog 5747 RMD160 9da1370fdd0feccbdaf6f48179bce5fbc3d40f7d SHA1 b87f9539a98a90cc5683b8147752360621e42399 SHA256 8ba0ebf1310fa8a12bef45ce94a16a5d131fafe648f3d558964ac9689ac31288
+MD5 83e10cfe49b40badc8997733581929a4 ChangeLog 5747
+RMD160 9da1370fdd0feccbdaf6f48179bce5fbc3d40f7d ChangeLog 5747
+SHA256 8ba0ebf1310fa8a12bef45ce94a16a5d131fafe648f3d558964ac9689ac31288 ChangeLog 5747
MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
diff --git a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild b/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
index 988a697967a6..8f927d475272 100644
--- a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
+++ b/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.37.ebuild,v 1.10 2007/12/25 18:05:51 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.37.ebuild,v 1.11 2007/12/25 20:27:53 genstef Exp $
inherit linux-mod eutils rpm
@@ -84,7 +84,6 @@ src_unpack() {
patch -p0 -f < ${FILESDIR}/fcdslslusb-2.6.20.diff
cd usr/src/kernel-modules/fcdsl/src
kernel_is ge 2 6 20 && patch -p1 -f < ${FILESDIR}/usb-2.6.20.diff
- kernel_is ge 2 6 23 && patch -p0 -f < ${FILESDIR}/fcdsl-2.6.23.diff
cd "${S}"
if use x86; then
@@ -94,6 +93,9 @@ src_unpack() {
cd "${S}"
done
fi
+ cd usr/src/kernel-modules/fcdsl/src
+ kernel_is ge 2 6 23 && patch -p0 -f < ${FILESDIR}/fcdsl-2.6.23.diff
+ cd "${S}"
# convert docs from latin1 to UTF-8
if use unicode; then