[gentoo-commits] proj/hardened-dev:musl commit in: x11-libs/libpciaccess/files/, x11-libs/libpciaccess/

[gentoo-commits] proj/hardened-dev:musl commit in: x11-libs/libpciaccess/files/, x11-libs/libpciaccess/

[Anthony G. Basile]

commit:     895335d15523f72a1426d580314b3a74cffc219f
Author:     Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat Mar  1 13:25:06 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Mar  1 20:01:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=895335d1

x11-libs/libpciaccess: Fix build on arm because of empty sys/io.h

---
 x11-libs/libpciaccess/files/libpciaccess-0.13.2-arm.patch | 11 +++++++++++
 x11-libs/libpciaccess/libpciaccess-0.13.2-r99.ebuild      |  1 +
 2 files changed, 12 insertions(+)

diff --git a/x11-libs/libpciaccess/files/libpciaccess-0.13.2-arm.patch b/x11-libs/libpciaccess/files/libpciaccess-0.13.2-arm.patch
new file mode 100644
index 0000000..263dc01
--- /dev/null
+++ b/x11-libs/libpciaccess/files/libpciaccess-0.13.2-arm.patch
@@ -0,0 +1,11 @@
+--- a/libpciaccess-0.13.2/src/linux_sysfs.c
++++ b/libpciaccess-0.13.2/src/linux_sysfs.c
+@@ -45,7 +45,7 @@
+ #include <dirent.h>
+ #include <errno.h>
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
++#if defined(__i386__) || defined(__x86_64__)
+ #include <sys/io.h>
+ #else
+ #define inb(x) -1

diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.2-r99.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.2-r99.ebuild
index 5df130c..0a5d1e1 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.13.2-r99.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.2-r99.ebuild
@@ -18,6 +18,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.13.2-limits.patch
+	"${FILESDIR}"/${PN}-0.13.2-arm.patch
 )
 
 pkg_setup() {

[gentoo-commits] proj/hardened-dev:musl commit in: x11-libs/libpciaccess/files/, x11-libs/libpciaccess/

[Anthony G. Basile]

commit:     d3d6d5c606ec0681e016c5df636c6ca7cf0fbaf3
Author:     Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Fri Feb 14 21:13:05 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Feb 14 21:52:29 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=d3d6d5c6

x11-libs/libpciaccess: moved to tree

---
 .../files/libpciaccess-0.13.2-limits.patch         | 10 +++++
 .../libpciaccess/libpciaccess-0.13.2-r99.ebuild    | 43 ++++++++++++++++++++++
 x11-libs/libpciaccess/metadata.xml                 |  5 +++
 3 files changed, 58 insertions(+)

diff --git a/x11-libs/libpciaccess/files/libpciaccess-0.13.2-limits.patch b/x11-libs/libpciaccess/files/libpciaccess-0.13.2-limits.patch
new file mode 100644
index 0000000..463b418
--- /dev/null
+++ b/x11-libs/libpciaccess/files/libpciaccess-0.13.2-limits.patch
@@ -0,0 +1,10 @@
+--- a/libpciaccess-0.13.2/src/linux_sysfs.c
++++ b/libpciaccess-0.13.2/src/linux_sysfs.c
+@@ -44,6 +44,7 @@
+ #include <sys/mman.h>
+ #include <dirent.h>
+ #include <errno.h>
++#include <limits.h>
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
+ #include <sys/io.h>

diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.2-r99.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.2-r99.ebuild
new file mode 100644
index 0000000..66d32f1
--- /dev/null
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.2-r99.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.13.2.ebuild,v 1.11 2013/10/08 05:07:22 ago Exp $
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="Library providing generic access to the PCI bus and devices"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="minimal zlib"
+
+DEPEND="!<x11-base/xorg-server-1.5
+	zlib? (	sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	sys-apps/hwids"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13.2-limits.patch
+)
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		"$(use_with zlib)"
+		"--with-pciids-path=${EPREFIX}/usr/share/misc"
+	)
+}
+
+src_install() {
+	xorg-2_src_install
+
+	if ! use minimal; then
+		scanpci_install() {
+			${BASH} "${BUILD_DIR}/libtool" --mode=install "$(type -P install)" -c "${BUILD_DIR}/scanpci/scanpci" "${ED}"/usr/bin || die
+		}
+
+		dodir /usr/bin
+		multilib_foreach_abi scanpci_install
+	fi
+}

diff --git a/x11-libs/libpciaccess/metadata.xml b/x11-libs/libpciaccess/metadata.xml
new file mode 100644
index 0000000..01c4c00
--- /dev/null
+++ b/x11-libs/libpciaccess/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>