From: Mike Frysinger Date: Wed, 21 Jun 2006 20:52:33 +0000 (+0000) Subject: ugh, just fix the patch, dont patch it X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=866392006a7bb3626b437df5b323253daf8c2d1a;p=gentoo.git ugh, just fix the patch, dont patch it Package-Manager: portage-2.1.1_pre1-r1 --- diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest index 4781e718ad8b..3a1855a33737 100644 --- a/sys-apps/pciutils/Manifest +++ b/sys-apps/pciutils/Manifest @@ -5,14 +5,14 @@ AUX 2.1.11-scan.patch 277 RMD160 4ebb68ee6f34367cd7da31dca4947c07516a0410 SHA1 9 MD5 60d79fbf53038186b939f83841d5f318 files/2.1.11-scan.patch 277 RMD160 4ebb68ee6f34367cd7da31dca4947c07516a0410 files/2.1.11-scan.patch 277 SHA256 1072171abf68b6ff4f0ca66d17c9fc01238aca9b929da93ca880f0c0482911ba files/2.1.11-scan.patch 277 -AUX pcimodules-pciutils-2.1.11.diff 11026 RMD160 729b0042dfdf16b810b5c8fda71948dc1cf7c9d5 SHA1 bc74cc63d5040ee29dfe6d39e9ce8bce25fd28a1 SHA256 6c0df36e1c8de2ff06e981968f17c8701ca77cbba5bbd2d6d0ecadee7a183950 -MD5 c6135ce795940ebf3777592d4e6f8049 files/pcimodules-pciutils-2.1.11.diff 11026 -RMD160 729b0042dfdf16b810b5c8fda71948dc1cf7c9d5 files/pcimodules-pciutils-2.1.11.diff 11026 -SHA256 6c0df36e1c8de2ff06e981968f17c8701ca77cbba5bbd2d6d0ecadee7a183950 files/pcimodules-pciutils-2.1.11.diff 11026 -AUX pcimodules-pciutils-2.2.0.patch 10872 RMD160 bd0afa31c5f3bd21613bba02facc236f9148ce9a SHA1 2a5654b8c5d2084c9fe94851b29c1cd815e620a0 SHA256 8033133b947511a7083fa40038e14b20a02746122b67dd3ffab7b8a46f35b674 -MD5 d3c7e97420324c1d5d1dc032fc39006e files/pcimodules-pciutils-2.2.0.patch 10872 -RMD160 bd0afa31c5f3bd21613bba02facc236f9148ce9a files/pcimodules-pciutils-2.2.0.patch 10872 -SHA256 8033133b947511a7083fa40038e14b20a02746122b67dd3ffab7b8a46f35b674 files/pcimodules-pciutils-2.2.0.patch 10872 +AUX pcimodules-pciutils-2.1.11.diff 11005 RMD160 61cba7e1a3f571249b447ad0903efdc7d8db0235 SHA1 21f7701e7e139eaa1d5936a3c9f734873b815a18 SHA256 3689e310c28b7317eece9ce120077606d321c835062dd12bc15f0246b6c3bd58 +MD5 96cd1ebcf3aef8efd8f5fc672044e288 files/pcimodules-pciutils-2.1.11.diff 11005 +RMD160 61cba7e1a3f571249b447ad0903efdc7d8db0235 files/pcimodules-pciutils-2.1.11.diff 11005 +SHA256 3689e310c28b7317eece9ce120077606d321c835062dd12bc15f0246b6c3bd58 files/pcimodules-pciutils-2.1.11.diff 11005 +AUX pcimodules-pciutils-2.2.0.patch 10851 RMD160 59877f3745a201bb89146bd81f74b6b2d0b41afe SHA1 67859e44551ec8050645c1444c842d13ec277b12 SHA256 828b0e086017363e39509258b29b9b51e1f6c20cf18fc033c99c75b13ab838b8 +MD5 e0efe0164d13807ab70843adcc393df7 files/pcimodules-pciutils-2.2.0.patch 10851 +RMD160 59877f3745a201bb89146bd81f74b6b2d0b41afe files/pcimodules-pciutils-2.2.0.patch 10851 +SHA256 828b0e086017363e39509258b29b9b51e1f6c20cf18fc033c99c75b13ab838b8 files/pcimodules-pciutils-2.2.0.patch 10851 AUX pciutils-2.1.11-bsd.patch 921 RMD160 f9f14c67db5abdaa1e1b11d7fd7616367e91911b SHA1 bd5321a5abccdfad905dbff04df7f031161c56cf SHA256 ba0088e82e6c121025ceafdd97dc9ee7828dbe37ce4016a151bf1f404f89138e MD5 05277cd33401a99ed9fe18fe614231d0 files/pciutils-2.1.11-bsd.patch 921 RMD160 f9f14c67db5abdaa1e1b11d7fd7616367e91911b files/pciutils-2.1.11-bsd.patch 921 @@ -21,10 +21,6 @@ AUX pciutils-2.1.11-gentoo-paths.patch 521 RMD160 10e5d785a268dbc3e80be3b0644996 MD5 6a0ae94d528195517f54f66653f8322e files/pciutils-2.1.11-gentoo-paths.patch 521 RMD160 10e5d785a268dbc3e80be3b06449961bca5dadbf files/pciutils-2.1.11-gentoo-paths.patch 521 SHA256 3e6de9c6232566793c5e4845ea4fed33ced34be52e4d93f6cd216159fb0b6f7f files/pciutils-2.1.11-gentoo-paths.patch 521 -AUX pciutils-2.1.11-malloc.patch 272 RMD160 c497a409922d21f57e92cea27a17a7aa7c620034 SHA1 fa9ec462b29ee0e8d593b96737fd8321f8a25973 SHA256 bfd1be19d9dcf7040d604486c20a7fe08f974d0145cf246b719c3da95eff75ef -MD5 d4b9ca6816f7e4310f2ed629531361fe files/pciutils-2.1.11-malloc.patch 272 -RMD160 c497a409922d21f57e92cea27a17a7aa7c620034 files/pciutils-2.1.11-malloc.patch 272 -SHA256 bfd1be19d9dcf7040d604486c20a7fe08f974d0145cf246b719c3da95eff75ef files/pciutils-2.1.11-malloc.patch 272 AUX pciutils-2.1.11-sysfs.patch 10374 RMD160 137e92ffc404ce4842aeda44e8aaf842124a4cdd SHA1 3e4d23f82b1bd548cf187a42ae1e9258c02d2893 SHA256 fabe657681a39d63ab56cc206767f8761f1b0b3b8ddc65f093fb9a97f1c69fa3 MD5 f4d220c568a00c1ceafe6dc129ae6e95 files/pciutils-2.1.11-sysfs.patch 10374 RMD160 137e92ffc404ce4842aeda44e8aaf842124a4cdd files/pciutils-2.1.11-sysfs.patch 10374 @@ -39,18 +35,18 @@ DIST pci.ids-20060608.bz2 108285 RMD160 0768e2232a6003711de498ef8e7df805d4c880c7 DIST pciutils-2.1.11.tar.gz 120948 DIST pciutils-2.2.0.tar.gz 194290 DIST pciutils-2.2.3.tar.gz 1121334 RMD160 429b3b21f4cb079c2f3620a4c4d14c6dc610a098 SHA1 114b811d176c125ebdd3d10b6e7bf6d09686b780 SHA256 e501df7734738d0625a3765498e1c4625a2fbaf408c86599eca2070c57bc4d4b -EBUILD pciutils-2.1.11-r5.ebuild 2298 RMD160 5e312a470476c1bdbe2a8fc77b1a740229dde593 SHA1 794cc663e37aa25ac57ec509bb6663bf1b95bc05 SHA256 752135de20bc99a4eeec8a78962d3194a934290df2391a47bbbeee5df8e2545d -MD5 61778080ed55196416ece68570ba885a pciutils-2.1.11-r5.ebuild 2298 -RMD160 5e312a470476c1bdbe2a8fc77b1a740229dde593 pciutils-2.1.11-r5.ebuild 2298 -SHA256 752135de20bc99a4eeec8a78962d3194a934290df2391a47bbbeee5df8e2545d pciutils-2.1.11-r5.ebuild 2298 -EBUILD pciutils-2.2.0-r1.ebuild 1791 RMD160 a5b5bd0aa1f2cd54b2ee42af4cdabc18cd1c9aca SHA1 7305a5983a6e0d8466af21ca4ea8690cd34210ec SHA256 e00eb100eec93035a32b8f81881f88ad7a2593752a96c3b7ccea371732bd75a5 -MD5 6a6fb40695c9a06bad1c4265c8ed512c pciutils-2.2.0-r1.ebuild 1791 -RMD160 a5b5bd0aa1f2cd54b2ee42af4cdabc18cd1c9aca pciutils-2.2.0-r1.ebuild 1791 -SHA256 e00eb100eec93035a32b8f81881f88ad7a2593752a96c3b7ccea371732bd75a5 pciutils-2.2.0-r1.ebuild 1791 -EBUILD pciutils-2.2.3.ebuild 1811 RMD160 a7f8ff44bd93cb40dd3ec2cad2ad82c46e9a3ba9 SHA1 714b3d9845c00bbd7056f17c3476e1dc580ac96c SHA256 b3510e4e471369aa2bba274537f19ea1a36702f1a5ed214f2e6994aef0b9bbf2 -MD5 8da704770e96f91c2d09d741a4945470 pciutils-2.2.3.ebuild 1811 -RMD160 a7f8ff44bd93cb40dd3ec2cad2ad82c46e9a3ba9 pciutils-2.2.3.ebuild 1811 -SHA256 b3510e4e471369aa2bba274537f19ea1a36702f1a5ed214f2e6994aef0b9bbf2 pciutils-2.2.3.ebuild 1811 +EBUILD pciutils-2.1.11-r5.ebuild 2255 RMD160 ba8c2e2298790661a9cabda150da0bfa7832fb0a SHA1 d3350a6394a2b7e3db2c8099ea44a5517d81ab20 SHA256 5ed17357d3db931e0a2164c4c24998dc6c8c6387388257017c125da67f0223df +MD5 4a1acfd21bc4c848638d7a437ea3b074 pciutils-2.1.11-r5.ebuild 2255 +RMD160 ba8c2e2298790661a9cabda150da0bfa7832fb0a pciutils-2.1.11-r5.ebuild 2255 +SHA256 5ed17357d3db931e0a2164c4c24998dc6c8c6387388257017c125da67f0223df pciutils-2.1.11-r5.ebuild 2255 +EBUILD pciutils-2.2.0-r1.ebuild 1740 RMD160 4e7f6358227393ef1d8dbf2237bfb7df35d45475 SHA1 f93d9e5115453697a5f78bc6098af19fa83ce48a SHA256 984927b59613bf0672e011a79bb13b979c385a66dad1f6a1946e373a3abd441d +MD5 c2f1bae899506b304ed34399f0d74c8c pciutils-2.2.0-r1.ebuild 1740 +RMD160 4e7f6358227393ef1d8dbf2237bfb7df35d45475 pciutils-2.2.0-r1.ebuild 1740 +SHA256 984927b59613bf0672e011a79bb13b979c385a66dad1f6a1946e373a3abd441d pciutils-2.2.0-r1.ebuild 1740 +EBUILD pciutils-2.2.3.ebuild 1763 RMD160 90ae55db96e8c7fa3608dd384b56cde237a8b0b2 SHA1 26806e4307b5f39a13747c8d316f490bbd18edd3 SHA256 75dc1151321b998140723c4abb726d8dde5cc43855edb2f7aba26304bc368ea6 +MD5 944b99c85d87df3c2cbd8d1f78629915 pciutils-2.2.3.ebuild 1763 +RMD160 90ae55db96e8c7fa3608dd384b56cde237a8b0b2 pciutils-2.2.3.ebuild 1763 +SHA256 75dc1151321b998140723c4abb726d8dde5cc43855edb2f7aba26304bc368ea6 pciutils-2.2.3.ebuild 1763 MISC ChangeLog 9654 RMD160 5255cde44995ae7a6843d5243737d4ff000a19d5 SHA1 c3becb45f4312b123087de07d6dcffd84de1d235 SHA256 c7fdede0e314c8ce18968872e778a0156305d3fb901145f1d6157ffc40468292 MD5 dc66dc9262aebee80c082fcb10f1a4df ChangeLog 9654 RMD160 5255cde44995ae7a6843d5243737d4ff000a19d5 ChangeLog 9654 @@ -71,7 +67,7 @@ SHA256 9245c7a384f17782114ee6bcd739fded1c8c250cec9c5ebc560960bf817ffa33 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEh/0w2+ySkm8kpY0RAh5SAJ9wQSLcZq58Ya+2U5tvPxI45MumlgCfdjsf -uvP5aFZt8of0qXtBPDT/7gw= -=Xa7O +iD8DBQFEmbK/amhnQswr0vIRAvWKAJ9CuEAFDpYrm/fCKgOLWN93K6YpywCeLHSV +FMv2DIvp6VqMTYRvTtIV2Eo= +=ilZp -----END PGP SIGNATURE----- diff --git a/sys-apps/pciutils/files/pciutils-2.1.11-malloc.patch b/sys-apps/pciutils/files/pciutils-2.1.11-malloc.patch deleted file mode 100644 index e3e80ec9fef3..000000000000 --- a/sys-apps/pciutils/files/pciutils-2.1.11-malloc.patch +++ /dev/null @@ -1,16 +0,0 @@ -Remove the malloc.h inclusion. - -Patch by Diego Pettenò. - -http://bugs.gentoo.org/103241 - ---- pcimodules.c -+++ pcimodules.c -@@ -16,7 +16,6 @@ - - #include - #include --#include - #include - #include - #include