commit: fe6f79c8281f0f33ad393992f8044f9022b36122
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat Jan 16 16:56:22 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 18:03:55 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=fe6f79c8
x11-libs/libpciaccess: clean up and fixes
x11-libs/libpciaccess/Manifest | 5 +--
.../files/libpciaccess-0.13.4-path_max.patch | 11 ------
...3-r99.ebuild => libpciaccess-0.13.4-r99.ebuild} | 6 ++--
x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild | 40 ----------------------
4 files changed, 4 insertions(+), 58 deletions(-)
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index 4ce1748..ebf0c3d 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,8 +1,5 @@
AUX libpciaccess-0.13.2-arm.patch 308 SHA256
177fa4db376ce1f1ef405bd26efc10014ab95e10048ce7af2278aa6b5d2aac3d SHA512
fc34aa03609f0f8eb48ccc123e461730b4d1823eb06c57b73a5dfbbf13aa1c1aad81b665189a5c3b884be77e92adf4339211335e2d489426573d04880d539867
WHIRLPOOL
4215374d49b587e93f49a63a01421e427832af61836195746045e7e6635e081ba2cb2e9cc5bbafdd14bc78e452894a0be32b3e1e6093aa806e03a0e699d26156
AUX libpciaccess-0.13.2-limits.patch 280 SHA256
b2cc4d3f0671e2bfb069c0195f286b134289c8ac74ca3b102ac4ce916c5dca16 SHA512
90fb7f4ae553e528f14764c7eaa3abf9d71330d7cab25d7fb5304ed13e967adf319cbd836a460b43d5a3828b10405c06d3140028e7cf05fe151e0275558db5ab
WHIRLPOOL
36674f63b4de4e99acff7002c53c919acd995b8b170ae9e697f216d639770d55cf5392c2820a3ddc3a4600d85e9ed8828816f8add182b572bfc638fd4de02baa
-AUX libpciaccess-0.13.4-path_max.patch 302 SHA256
d709d535cdb96726d7a7f0e88c74065b4566621832fd7ddc1ac8dd0fc1785008 SHA512
2aa4289c33f830a21791dd68f62f98e8513b94c135ee5fc1a76c80ea3c32689175ddec216408fab8e7f5d1d0f6b7899bccfd2ad417e1e73ba23fb716b1b86bc3
WHIRLPOOL
36d1278eb9e948f0b0eb82b587f2597630821d73cb67ac2c825b727796c656686907ef3c92af338798b2b0ef045896b41ea47446ca13d75ef15df883f3866e8e
-DIST libpciaccess-0.13.3.tar.bz2 368755 SHA256
6cd76ccae4e06eee47d3ead84a118740e9406e2a9b7adc9b08e92c69ce89c2e3 SHA512
11ad783c6278e340973a621339cece3776c098952d0eaf96bfe745d013347e928c0883ed8444c5ddea870f5e4b3c25da16a44facb9d7fc1c8fea1c7e77bd592b
WHIRLPOOL
92ba320540535c2b2811c29272a2d94dd3c1f586a0e3073ed4678c03cb3e30656772ad6b0a3e9612a0972a28cfe0d9c4c93ea955610e609fb103a15bb8051e31
DIST libpciaccess-0.13.4.tar.bz2 372004 SHA256
07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf SHA512
d5b32c525dd36dc85c9a09f45696808730eabbbd3cce892a6dbfb02a566598baad27be58567eb7ced15b3d99fb9afa1d1c24ec19754bcf7a1857a0c8cea34d92
WHIRLPOOL
d48ecb99e7e31bc1c13e779261b7ae579ca28a054b20521cb7503c2bfe3182fa2f96c939eee0ebcca1783f3f38c07535173a3bb9a0713834cadd4b9709f25174
-EBUILD libpciaccess-0.13.3-r99.ebuild 945 SHA256
e472b1dd6eef8f555425a89e430636bd1f075abaf5c5bea07d0c5ffb65b77c63 SHA512
93e26cf079f6fed8d5a5091d007b6b3aee94a1832e14e7b9fe466a2420185ff2f124eb96e2cd454340020fd7a616441f975eb77cb4dceb2102c25c77b6dd579f
WHIRLPOOL
a11af2395ead76d99b0024eeb6935bdaa36e64a841cdc61a7203c6fafc6eec2b377b6ca3533845fd590f1e4cb7b5a6b17ccb568fd60290ee7295e82752c9dc77
-EBUILD libpciaccess-0.13.4.ebuild 1000 SHA256
3bbbc880d9b8990c59182f60ba849c48ce1a4938b26b28353e7b0485274f0eda SHA512
43165a1c98e27d2987fc20754758f7d97c1e06382f270bfae2c0c2adc566e3f71abfa4476a386f2827d36e41b5d6a27bcd69314314acf8760e1d5efc26149e34
WHIRLPOOL
8e7abfb7ac8ff0277e9520770f64f343f371b6dda934d7831328b74670d8e936d9429e6301b7bc1924ce02f9ba421fef71c6d46b116b7cbca40a38fbe6f64ea9
+EBUILD libpciaccess-0.13.4-r99.ebuild 825 SHA256
6418963310211694468d07fbfdcb0b5f168c97aba86201e2be153fa7c45920ca SHA512
3c8a41c41dc5d602245b86c98a1f368ebf389e43b0238a8e9cb86e3ca6a0361060a553c421b8a71457a365ce6a2fad08ab3531ac49ce7eec43153554f7d6dce7
WHIRLPOOL
42ecd8036e5044fce18e38bec87067585650a1a21bfbcd4f3e0168fdf4c933cd94b364d5a076a5c477ddd32d2b177843d6450044b350d9d316fe0717519cc834
MISC metadata.xml 156 SHA256
5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512
daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019
WHIRLPOOL
691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
diff --git a/x11-libs/libpciaccess/files/libpciaccess-0.13.4-path_max.patch
b/x11-libs/libpciaccess/files/libpciaccess-0.13.4-path_max.patch
deleted file mode 100644
index db5cca8..0000000
--- a/x11-libs/libpciaccess/files/libpciaccess-0.13.4-path_max.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN a/src/linux_sysfs.c b/src/linux_sysfs.c
---- a/src/linux_sysfs.c 2015-04-30 23:44:47.000000000 -0500
-+++ b/src/linux_sysfs.c 2015-12-09 22:53:31.824813630 -0600
-@@ -38,6 +38,7 @@
- #include "config.h"
- #endif
-
-+#include <limits.h>
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.3-r99.ebuild
b/x11-libs/libpciaccess/libpciaccess-0.13.4-r99.ebuild
similarity index 84%
rename from x11-libs/libpciaccess/libpciaccess-0.13.3-r99.ebuild
rename to x11-libs/libpciaccess/libpciaccess-0.13.4-r99.ebuild
index 61b75f1..f1eda99 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.13.3-r99.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.4-r99.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild,v 1.4
2015/02/20 11:18:03 ago Exp $
+# $Id$
EAPI=5
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="Library providing generic access to the PCI bus and devices"
KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="minimal zlib"
+IUSE="zlib"
DEPEND="!<x11-base/xorg-server-1.5
zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
@@ -19,7 +19,7 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-0.13.2-limits.patch
"${FILESDIR}"/${PN}-0.13.2-arm.patch
-)
+ )
pkg_setup() {
xorg-2_pkg_setup
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
b/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
deleted file mode 100644
index 515a03c..0000000
--- a/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="zlib"
-
-DEPEND="!<x11-base/xorg-server-1.5
- zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
- sys-apps/hwids"
-
-PATCHES=(
- "${FILESDIR}"/${P}-path_max.patch
- "${FILESDIR}"/arm-implicit-declaration-musl.patch
- )
-
-pkg_setup() {
- xorg-2_pkg_setup
-
- XORG_CONFIGURE_OPTIONS=(
- "$(use_with zlib)"
- "--with-pciids-path=${EPREFIX}/usr/share/misc"
- )
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi; then
- dodir /usr/bin
- ${BASH} libtool --mode=install "$(type -P install)" -c
scanpci/scanpci "${ED}"/usr/bin || die
- fi
-}
