Split out malloc patch from the rest of bsd patch. Apply it on 2.2.0 that still needs it.

Package-Manager: portage-2.0.53_rc7

6 files changed, 35 insertions, 20 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 08dded6aef3b..f16465ca2f2f 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.61 2005/10/16 11:38:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.62 2005/11/11 19:46:34 flameeyes Exp $
+
+  11 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  files/pciutils-2.1.11-bsd.patch, +files/pciutils-2.1.11-malloc.patch,
+  pciutils-2.1.11-r5.ebuild, pciutils-2.2.0-r1.ebuild:
+  Split out malloc patch from the rest of bsd patch. Apply it on 2.2.0 that
+  still needs it.
 
 *pciutils-2.2.0-r1 (16 Oct 2005)
 
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 79d3efe67229..0a9266466728 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,23 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a31dae35d026223b1e9be027250ac6a3 ChangeLog 8219
+MD5 825702ffb2b6dcb185031992c5f8b065 ChangeLog 8497
 MD5 60d79fbf53038186b939f83841d5f318 files/2.1.11-scan.patch 277
 MD5 a6be9cf60dc5043160d757c9772b1e57 files/digest-pciutils-2.1.11-r5 131
 MD5 ae29f04095b43ceb06e6b0cc94653c36 files/digest-pciutils-2.2.0-r1 130
 MD5 c6135ce795940ebf3777592d4e6f8049 files/pcimodules-pciutils-2.1.11.diff 11026
 MD5 d3c7e97420324c1d5d1dc032fc39006e files/pcimodules-pciutils-2.2.0.patch 10872
-MD5 f8bc3cef20829127ecab494b6b9c886c files/pciutils-2.1.11-bsd.patch 1105
+MD5 05277cd33401a99ed9fe18fe614231d0 files/pciutils-2.1.11-bsd.patch 921
 MD5 6a0ae94d528195517f54f66653f8322e files/pciutils-2.1.11-gentoo-paths.patch 521
+MD5 d4b9ca6816f7e4310f2ed629531361fe files/pciutils-2.1.11-malloc.patch 272
 MD5 f4d220c568a00c1ceafe6dc129ae6e95 files/pciutils-2.1.11-sysfs.patch 10374
 MD5 cf455fe33057e081ba7aaec93e481642 files/pciutils-2.2.0-shared-lib.patch 496
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 b023a91785e7926967562f2139884ba8 pciutils-2.1.11-r5.ebuild 2255
-MD5 03afc3298aab14ad9d6964ee8c953e31 pciutils-2.2.0-r1.ebuild 1620
+MD5 61778080ed55196416ece68570ba885a pciutils-2.1.11-r5.ebuild 2298
+MD5 f40e1a53499bf0a736e364daf9a0a2ed pciutils-2.2.0-r1.ebuild 1671
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDYWxSgIKl8Uu19MoRAnoHAJ9Hxr6rZLeF0k5rIjP0HunCxE0SzgCcCFru
-cFPICtVep0WaqBK3AFEqST0=
-=FXL+
+iD8DBQFDdPUuAiZjviIA2XgRAmNEAKCM/9GM+9hIc/p0rMHiWbmTj/FDKQCeKZSo
+MXp9EAG2Z8zH0D19jl3h4Wo=
+=/r/2
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/files/pciutils-2.1.11-bsd.patch b/sys-apps/pciutils/files/pciutils-2.1.11-bsd.patch
index dae78712c4dd..d2668366f372 100644
--- a/sys-apps/pciutils/files/pciutils-2.1.11-bsd.patch
+++ b/sys-apps/pciutils/files/pciutils-2.1.11-bsd.patch
@@ -4,16 +4,6 @@ Patch by Diego Pettenò.
 
 http://bugs.gentoo.org/103241
 
---- pcimodules.c
-+++ pcimodules.c
-@@ -16,7 +16,6 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
--#include <malloc.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/utsname.h>
 --- lib/fbsd-device.c
 +++ lib/fbsd-device.c
 @@ -13,10 +13,21 @@
diff --git a/sys-apps/pciutils/files/pciutils-2.1.11-malloc.patch b/sys-apps/pciutils/files/pciutils-2.1.11-malloc.patch
new file mode 100644
index 000000000000..e3e80ec9fef3
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-2.1.11-malloc.patch
@@ -0,0 +1,16 @@
+Remove the malloc.h inclusion.
+
+Patch by Diego Pettenò.
+
+http://bugs.gentoo.org/103241
+
+--- pcimodules.c
++++ pcimodules.c
+@@ -16,7 +16,6 @@
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/utsname.h>
diff --git a/sys-apps/pciutils/pciutils-2.1.11-r5.ebuild b/sys-apps/pciutils/pciutils-2.1.11-r5.ebuild
index 4ad6474482bd..5e2fb1840885 100644
--- a/sys-apps/pciutils/pciutils-2.1.11-r5.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.11-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11-r5.ebuild,v 1.10 2005/10/28 00:09:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11-r5.ebuild,v 1.11 2005/11/11 19:46:34 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -26,6 +26,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-gentoo-paths.patch
 	epatch "${FILESDIR}"/${PV}-scan.patch #from fedora
 	epatch "${FILESDIR}"/${P}-bsd.patch #103241
+	epatch "${FILESDIR}"/${P}-malloc.patch
 
 	# Unconditionally use -fPIC for libs (#55238)
 	# Make sure we respect $AR / $RANLIB / $CFLAGS
diff --git a/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild b/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild
index d84e72a227d9..1efb629979d8 100644
--- a/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild,v 1.2 2005/10/28 00:09:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild,v 1.3 2005/11/11 19:46:34 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -23,6 +23,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/pcimodules-${P}.patch
 	epatch "${FILESDIR}"/${P}-shared-lib.patch
+	epatch "${FILESDIR}"/${PN}-2.1.11-malloc.patch
 
 	# Set Gentoo paths
 	sed -i \