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 | 9b0942ec906a5eabf1cb8e1477a6e6ed2754a447 (patch) | |
| tree | 0693541fc8a8701ad93949ae743437abf79ec051 /x11-libs | |
| parent | Bump to 3.0.1, from gnome overlay for GNOME 3 (diff) | |
| download | historical-9b0942ec906a5eabf1cb8e1477a6e6ed2754a447.tar.gz historical-9b0942ec906a5eabf1cb8e1477a6e6ed2754a447.tar.bz2 historical-9b0942ec906a5eabf1cb8e1477a6e6ed2754a447.zip | |
Add blocker for old xorg-server due to file collision, bug #379809.
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/libpciaccess/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libpciaccess/Manifest | 4 | ||||
| -rw-r--r-- | x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild | 11 |
3 files changed, 14 insertions, 7 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/Manifest b/x11-libs/libpciaccess/Manifest index 2752b886be3d..d5cb32c9c500 100644 --- a/x11-libs/libpciaccess/Manifest +++ b/x11-libs/libpciaccess/Manifest @@ -1,4 +1,4 @@ DIST libpciaccess-0.12.1.tar.bz2 326217 RMD160 d74b62e6d6dd502805f7c4d456f4bcf3f2a0780e SHA1 4933bda545df37395e57ff6b4bd61e17a5431770 SHA256 cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344 -EBUILD libpciaccess-0.12.1.ebuild 943 RMD160 8e360121962053602758f9fefdd563d14df2513c SHA1 d7dbcef9ab9b47c2bdea2f4edf1f7fb5a9b11ecd SHA256 ec8006dc1edc7cc22f4b9466f4d954a07a35b9f59ae8568cccd72f6dffa130a6 -MISC ChangeLog 8660 RMD160 87c1298ad3dc6a66b57b03bf0103ede4305ac6d7 SHA1 30fd1f42146d86113e2d9cf3f20c568c9720d880 SHA256 51329a3d709359965e053cd871aab05f1d8bbadb4103f941e90b1895361e3931 +EBUILD libpciaccess-0.12.1.ebuild 985 RMD160 3a93d8d69b4852398df8d2382a3688476d237eba SHA1 85aa04e9f70ae91357db74d1f0359e550aaa464d SHA256 6faf47dfcc606d8f3144b7e97c7ac2184d02d7437d6091e38f666fc273c23037 +MISC ChangeLog 8830 RMD160 cc8a4c61dc4127258a31aa21d3d47a11b9938c26 SHA1 ebdc5c8d3a62ca5db04e118b70061b02a8ff83d0 SHA256 845b285a8191e1fee61659ad76b9fcb9f49d58978e07ef7e5eeba2e1d0b43a94 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 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() { |