From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-410599-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1RcRQk-0004ak-8C
	for garchives@archives.gentoo.org; Mon, 19 Dec 2011 00:50:14 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id B7C9321C033;
	Mon, 19 Dec 2011 00:50:05 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 87CEF21C033
	for <gentoo-commits@lists.gentoo.org>; Mon, 19 Dec 2011 00:50:05 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id BFEDC1B400E
	for <gentoo-commits@lists.gentoo.org>; Mon, 19 Dec 2011 00:50:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id B585F80042
	for <gentoo-commits@lists.gentoo.org>; Mon, 19 Dec 2011 00:50:02 +0000 (UTC)
From: "Chi-Thanh Christopher Nguyen" <chithanh@cs.tu-berlin.de>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Chi-Thanh Christopher Nguyen" <chithanh@cs.tu-berlin.de>
Message-ID: <68531ff0ebe01928b1bf16f153e324ec7f36d506.chithead@gentoo>
Subject: [gentoo-commits] proj/x11:master commit in: x11-libs/libpciaccess/
X-VCS-Repository: proj/x11
X-VCS-Files: x11-libs/libpciaccess/libpciaccess-9999.ebuild
X-VCS-Directories: x11-libs/libpciaccess/
X-VCS-Committer: chithead
X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen
X-VCS-Revision: 68531ff0ebe01928b1bf16f153e324ec7f36d506
Date: Mon, 19 Dec 2011 00:50:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 56aa4f28-33ce-406b-a75c-db797a51d912
X-Archives-Hash: 5c2ff8e42901c8fd66459492447de192

commit:     68531ff0ebe01928b1bf16f153e324ec7f36d506
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 00:49:52 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berli=
n <DOT> de>
CommitDate: Mon Dec 19 00:49:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc=
ommit;h=3D68531ff0

x11-libs/libpciaccess: sync with portage for bug #353699 and #354145.

---
 x11-libs/libpciaccess/libpciaccess-9999.ebuild |   22 ++++++++++++++----=
----
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/x11-libs/libpciaccess/libpciaccess-9999.ebuild b/x11-libs/li=
bpciaccess/libpciaccess-9999.ebuild
index f97750b..03b57ca 100644
--- a/x11-libs/libpciaccess/libpciaccess-9999.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
@@ -6,20 +6,26 @@ EAPI=3D4
 inherit xorg-2
=20
 DESCRIPTION=3D"Library providing generic access to the PCI bus and devic=
es"
+KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc =
~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-s=
olaris ~x64-solaris ~x86-solaris"
+IUSE=3D"minimal zlib"
=20
-KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc =
~x86 ~x86-fbsd"
-IUSE=3D"minimal"
-
-DEPEND=3D"!<x11-base/xorg-server-1.5"
+DEPEND=3D"!<x11-base/xorg-server-1.5
+	zlib? ( sys-libs/zlib )"
 RDEPEND=3D"${DEPEND}"
=20
-XORG_CONFIGURE_OPTIONS=3D(
-	--with-pciids-path=3D/usr/share/misc
-)
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=3D(
+		"$(use_with zlib)"
+		"--with-pciids-path=3D${EPREFIX}/usr/share/misc"
+	)
+}
=20
 src_install() {
 	xorg-2_src_install
 	if ! use minimal; then
-		dobin "${AUTOTOOLS_BUILD_DIR}"/scanpci/scanpci
+		dodir /usr/bin || die
+		${BASH} "${AUTOTOOLS_BUILD_DIR:-${S}}/libtool" --mode=3Dinstall "$(typ=
e -P install)" -c "${AUTOTOOLS_BUILD_DIR:-${S}}/scanpci/scanpci" "${ED}"/=
usr/bin || die
 	fi
 }