From 833433670a3ad5400c38989486a0de16d920dcab Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Mon, 1 Jan 2018 18:26:19 +0100
Subject: [PATCH] libpciaccess, bump version, move to the proper place (#2028)

---
 .../libpciaccess/libpciaccess-0.14.recipe     | 40 ++++++++++++++-----
 .../patches/libpciaccess-0.14.patchset        |  0
 2 files changed, 31 insertions(+), 9 deletions(-)
 rename dev-libs/libpciaccess/libpciaccess-0.13.5.recipe => x11-libs/libpciaccess/libpciaccess-0.14.recipe (50%)
 rename dev-libs/libpciaccess/patches/libpciaccess-0.13.5.patchset => x11-libs/libpciaccess/patches/libpciaccess-0.14.patchset (100%)

diff --git a/dev-libs/libpciaccess/libpciaccess-0.13.5.recipe b/x11-libs/libpciaccess/libpciaccess-0.14.recipe
similarity index 50%
rename from dev-libs/libpciaccess/libpciaccess-0.13.5.recipe
rename to x11-libs/libpciaccess/libpciaccess-0.14.recipe
index 425e47a1e..c938c14fc 100644
--- a/dev-libs/libpciaccess/libpciaccess-0.13.5.recipe
+++ b/x11-libs/libpciaccess/libpciaccess-0.14.recipe
@@ -1,24 +1,34 @@
 SUMMARY="Standardized interface for PCI access"
 DESCRIPTION="Standardized interface for accessing PCI devices."
-HOMEPAGE="http://xcb.freedesktop.org/"
+HOMEPAGE="https://www.x.org/releases/individual/lib/"
 COPYRIGHT="2006, 2007 IBM Corporation
 	2006 Eric Anholt
 	2011 Mark Kettenis
 	2012 Robert Millan
 	2007, 2008, 2009, 2011, 2012, 2013 Oracle and/or its affiliates.
-	2009, 2012 Red Hat, Inc."
+	2009, 2012 Red Hat, Inc.
+	2007 Paulo R. Zanoni, Tiago Vignatti
+	2009 Tiago Vignatti
+	2000 The XFree86 Project, Inc.
+	2009, 2012 Samuel Thibault
+	2009 Michael Lorenz
+	2008, 2011 Mark Kettenis
+	2008 Juan Romero Pardines"
 LICENSE="MIT"
 REVISION="1"
-SOURCE_URI="https://xorg.freedesktop.org/releases/individual/lib/libpciaccess-$portVersion.tar.gz"
-CHECKSUM_SHA256="fe26ec788732b4ef60b550f2d3fa51c605d27f646e18ecec878f061807a3526e"
+SOURCE_URI="https://www.x.org/releases/individual/lib/libpciaccess-$portVersion.tar.bz2"
+CHECKSUM_SHA256="3df543e12afd41fea8eac817e48cbfde5aed8817b81670a4e9e493bb2f5bf2a4"
 PATCHES="libpciaccess-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion=0.11.1
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	libpciaccess$secondaryArchSuffix = $portVersion
-	lib:libpciaccess$secondaryArchSuffix = 0.11.1 compat >= 0
+	lib:libpciaccess$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -26,7 +36,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libpciaccess${secondaryArchSuffix}_devel = $portVersion
-	devel:libpciaccess$secondaryArchSuffix = 0.11.1 compat >= 0
+	devel:libpciaccess$secondaryArchSuffix = $libVersion
 	"
 REQUIRES_devel="
 	libpciaccess$secondaryArchSuffix == $portVersion base
@@ -41,13 +51,25 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtool
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage libpciaccess$secondaryArchSuffix \
+	$libDir/libpciaccess.so.$libVersion
+
+PATCH()
+{
+	if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
+		sed -i -e "s/\(err(1, \)\(\"Couldn't initialize PCI system\");\)/\1\"%s\", \2/;" \
+			scanpci/scanpci.c
+	fi
+}
+
 BUILD()
 {
+	autoreconf -vfi
 	runConfigure ./configure
 	make $jobArgs
 }
diff --git a/dev-libs/libpciaccess/patches/libpciaccess-0.13.5.patchset b/x11-libs/libpciaccess/patches/libpciaccess-0.14.patchset
similarity index 100%
rename from dev-libs/libpciaccess/patches/libpciaccess-0.13.5.patchset
rename to x11-libs/libpciaccess/patches/libpciaccess-0.14.patchset