Version bump. Remove old.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)

6 files changed, 18 insertions, 146 deletions

diff --git a/x11-libs/libpciaccess/ChangeLog b/x11-libs/libpciaccess/ChangeLog
index bed764e3464b..f0f4288921bc 100644
--- a/x11-libs/libpciaccess/ChangeLog
+++ b/x11-libs/libpciaccess/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/libpciaccess
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/ChangeLog,v 1.100 2014/06/18 21:02:11 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/ChangeLog,v 1.101 2015/02/07 16:43:02 chithanh Exp $
+
+*libpciaccess-0.13.3 (07 Feb 2015)
+
+  07 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +libpciaccess-0.13.3.ebuild,
+  -files/libpciaccess-0.13-fix-out-bwl-macros.patch,
+  -libpciaccess-0.12.1.ebuild, -libpciaccess-0.13.1-r1.ebuild,
+  -libpciaccess-0.13.1.ebuild, -libpciaccess-0.13.ebuild:
+  Version bump. Remove old.
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> libpciaccess-0.13.2.ebuild:
   Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/x11-libs/libpciaccess/files/libpciaccess-0.13-fix-out-bwl-macros.patch b/x11-libs/libpciaccess/files/libpciaccess-0.13-fix-out-bwl-macros.patch
deleted file mode 100644
index 004b41adefff..000000000000
--- a/x11-libs/libpciaccess/files/libpciaccess-0.13-fix-out-bwl-macros.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Bug https://bugs.gentoo.org/show_bug.cgi?id=407299
-
-From b16336c0b389ace07f7418f5a021bfbc68fec2b6 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 5 Mar 2012 11:01:01 -0500
-Subject: [PATCH] linux: Fix out[bwl] macros on non-I/O architectures
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- src/linux_sysfs.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
-index b817860..97fcf36 100644
---- a/src/linux_sysfs.c
-+++ b/src/linux_sysfs.c
-@@ -51,9 +51,9 @@
- #define inb(x) -1
- #define inw(x) -1
- #define inl(x) -1
--#define outb(x) do {} while (0)
--#define outw(x) do {} while (0)
--#define outl(x) do {} while (0)
-+#define outb(x,y) do {} while (0)
-+#define outw(x,y) do {} while (0)
-+#define outl(x,y) do {} while (0)
- #define iopl(x) -1
- #endif
- 
--- 
-1.7.3.4
-
diff --git a/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild
deleted file mode 100644
index fd1926a659f7..000000000000
--- a/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild,v 1.11 2011/08/19 11:58:06 chithanh Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="minimal zlib"
-
-DEPEND="!<x11-base/xorg-server-1.5
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-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
-		dodir /usr/bin || die
-		${BASH} "${AUTOTOOLS_BUILD_DIR:-${S}}/libtool" --mode=install "$(type -P install)" -c "${AUTOTOOLS_BUILD_DIR:-${S}}/scanpci/scanpci" "${ED}"/usr/bin || die
-	fi
-}
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.1.ebuild
deleted file mode 100644
index 3270fc483451..000000000000
--- a/x11-libs/libpciaccess/libpciaccess-0.13.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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.1.ebuild,v 1.11 2013/01/21 01:26:12 vapier Exp $
-
-EAPI=4
-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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="minimal zlib"
-
-DEPEND="!<x11-base/xorg-server-1.5
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	sys-apps/hwids"
-
-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
-		dodir /usr/bin || die
-		${BASH} "${AUTOTOOLS_BUILD_DIR:-${S}}/libtool" --mode=install "$(type -P install)" -c "${AUTOTOOLS_BUILD_DIR:-${S}}/scanpci/scanpci" "${ED}"/usr/bin || die
-	fi
-}
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.1-r1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild
index 306a999e58e6..2d2a4dc46f0f 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.13.1-r1.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.1-r1.ebuild,v 1.2 2013/02/27 05:56:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild,v 1.1 2015/02/07 16:43:02 chithanh Exp $
 
 EAPI=5
 
@@ -12,11 +12,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="minimal zlib"
 
 DEPEND="!<x11-base/xorg-server-1.5
-	zlib? (
-		sys-libs/zlib
-		amd64? ( abi_x86_32? (
-			app-emulation/emul-linux-x86-baselibs[development] ) )
-	)"
+	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
 	sys-apps/hwids"
 
@@ -29,15 +25,11 @@ pkg_setup() {
 	)
 }
 
-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
-		}
+multilib_src_install() {
+	default
 
+	if multilib_is_native_abi; then
 		dodir /usr/bin
-		multilib_foreach_abi scanpci_install
+		${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
 	fi
 }
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.ebuild
deleted file mode 100644
index 3f75627858be..000000000000
--- a/x11-libs/libpciaccess/libpciaccess-0.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.13.ebuild,v 1.2 2012/03/14 17:52:12 mattst88 Exp $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="minimal zlib"
-
-DEPEND="!<x11-base/xorg-server-1.5
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-out-bwl-macros.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
-		dodir /usr/bin || die
-		${BASH} "${AUTOTOOLS_BUILD_DIR:-${S}}/libtool" --mode=install "$(type -P install)" -c "${AUTOTOOLS_BUILD_DIR:-${S}}/scanpci/scanpci" "${ED}"/usr/bin || die
-	fi
-}