diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-08-19 11:58:06 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-08-19 11:58:06 +0000 |
| commit | 47c178075ee2d3066b1cae1a27477103d9b3c080 (patch) | |
| tree | 214b3d85ad22383eb9353fadd1b73099d80da190 /x11-libs/libpciaccess | |
| parent | Bump to 3.0.1, from gnome overlay for GNOME 3 (diff) | |
| download | gentoo-2-47c178075ee2d3066b1cae1a27477103d9b3c080.tar.gz gentoo-2-47c178075ee2d3066b1cae1a27477103d9b3c080.tar.bz2 gentoo-2-47c178075ee2d3066b1cae1a27477103d9b3c080.zip | |
Add blocker for old xorg-server due to file collision, bug #379809.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/libpciaccess')
| -rw-r--r-- | x11-libs/libpciaccess/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/x11-libs/libpciaccess/ChangeLog b/x11-libs/libpciaccess/ChangeLog index ea3ba8b84342..1fde7e668572 100644 --- a/x11-libs/libpciaccess/ChangeLog +++ b/x11-libs/libpciaccess/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libpciaccess # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/ChangeLog,v 1.70 2011/06/24 13:17:08 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/ChangeLog,v 1.71 2011/08/19 11:58:06 chithanh Exp $ + + 19 Aug 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + libpciaccess-0.12.1.ebuild: + Add blocker for old xorg-server due to file collision, bug #379809. 24 Jun 2011; Jeremy Olexa <darkside@gentoo.org> libpciaccess-0.12.1.ebuild: Add prefix keywords to align with x11-libs/libdrm diff --git a/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild index 3d4279ac1395..fd1926a659f7 100644 --- a/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild +++ b/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild @@ -1,6 +1,6 @@ # 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.10 2011/06/24 13:17:08 darkside Exp $ +# $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 @@ -10,14 +10,17 @@ 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="zlib? ( sys-libs/zlib )" +DEPEND="!<x11-base/xorg-server-1.5 + zlib? ( sys-libs/zlib )" RDEPEND="${DEPEND}" pkg_setup() { xorg-2_pkg_setup - CONFIGURE_OPTIONS="$(use_with zlib) - --with-pciids-path=${EPREFIX}/usr/share/misc" + XORG_CONFIGURE_OPTIONS=( + "$(use_with zlib)" + "--with-pciids-path=${EPREFIX}/usr/share/misc" + ) } src_install() { |