sys-apps/pciutils-3.5.0: fix missing pci_init for LIBPCI_3.0

Bug: http://bugs.gentoo.org/583580

Package-Manager: portage-2.2.28

diff --git a/sys-apps/pciutils/files/pciutils-3.5.0-expose-pci_init_v30.patch b/sys-apps/pciutils/files/pciutils-3.5.0-expose-pci_init_v30.patch
new file mode 100644 (file)
index 0000000..d5e9a5e
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.5.0-expose-pci_init_v30.patch
@@ -0,0 +1,21 @@
+--- a/lib/init.c       2016-05-20 11:53:00.065874342 -0400
++++ b/lib/init.c       2016-05-20 11:53:16.725850370 -0400
+@@ -214,6 +214,8 @@
+ }
+ 
+ STATIC_ALIAS(void pci_init(struct pci_access *a), pci_init_v35(a));
++DEFINE_ALIAS(void pci_init_v30(struct pci_access *a), pci_init_v35);
++SYMBOL_VERSION(pci_init_v30, pci_init@LIBPCI_3.0);
+ SYMBOL_VERSION(pci_init_v35, pci_init@@LIBPCI_3.5);
+ 
+ void
+--- a/lib/internal.h   2016-05-14 05:58:01.000000000 -0400
++++ b/lib/internal.h   2016-05-20 12:04:02.144993094 -0400
+@@ -61,6 +61,7 @@
+ void pci_mfree(void *);
+ char *pci_strdup(struct pci_access *a, const char *s);
+ 
++void pci_init_v30(struct pci_access *a) VERSIONED_ABI;
+ void pci_init_v35(struct pci_access *a) VERSIONED_ABI;
+ 
+ /* access.c */

diff --git a/sys-apps/pciutils/pciutils-3.5.0.ebuild b/sys-apps/pciutils/pciutils-3.5.0-r1.ebuild
similarity index 96%
rename from sys-apps/pciutils/pciutils-3.5.0.ebuild
rename to sys-apps/pciutils/pciutils-3.5.0-r1.ebuild
index 392ac4c249e9d6abd62addad920a4f113c241627..334ecdb2fdbd5abe19fa8124f19295ae1be1582e 100644 (file)
--- a/sys-apps/pciutils/pciutils-3.5.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.0-r1.ebuild
@@ -42,7 +42,8 @@ switch_config() {
 }
 
 src_prepare() {
-       epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
+       epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch \
+               "${FILESDIR}"/${PN}-3.5.0-expose-pci_init_v30.patch
 
        if use static-libs ; then
                cp -pPR "${S}" "${S}.static" || die