summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-10-25 22:01:10 +0000
committerMike Frysinger <vapier@gentoo.org>2008-10-25 22:01:10 +0000
commit89fbba77f66883da225144353f5600d417d42eb2 (patch)
tree08f81e818e5b66c4139daff2f147ae9575d8da7d /x11-libs/libpciaccess
parentarm/s390/sh stable (diff)
downloadhistorical-89fbba77f66883da225144353f5600d417d42eb2.tar.gz
historical-89fbba77f66883da225144353f5600d417d42eb2.tar.bz2
historical-89fbba77f66883da225144353f5600d417d42eb2.zip
Add blocker on older xorg-server so that systems get updated automatically rather than hitting a file collision.
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.2 x86_64
Diffstat (limited to 'x11-libs/libpciaccess')
-rw-r--r--x11-libs/libpciaccess/ChangeLog7
-rw-r--r--x11-libs/libpciaccess/Manifest10
-rw-r--r--x11-libs/libpciaccess/libpciaccess-0.10.4.ebuild4
3 files changed, 14 insertions, 7 deletions
diff --git a/x11-libs/libpciaccess/ChangeLog b/x11-libs/libpciaccess/ChangeLog
index 2f1f27a2d011..a0d2309e0c63 100644
--- a/x11-libs/libpciaccess/ChangeLog
+++ b/x11-libs/libpciaccess/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/libpciaccess
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/ChangeLog,v 1.9 2008/10/20 20:51:23 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/ChangeLog,v 1.10 2008/10/25 22:01:10 vapier Exp $
+
+ 25 Oct 2008; Mike Frysinger <vapier@gentoo.org>
+ libpciaccess-0.10.4.ebuild:
+ Add blocker on older xorg-server so that systems get updated automatically
+ rather than hitting a file collision.
*libpciaccess-0.10.4 (20 Oct 2008)
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index 7212f2b3fdb0..0e595b713afe 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -6,13 +6,13 @@ DIST libpciaccess-0.10.3.tar.bz2 259687 RMD160 5d972b5398f96bb94b2dab7f16613ad99
DIST libpciaccess-0.10.4.tar.bz2 256407 RMD160 fe398273b491e6ba06dcdaf506721e02ed295f0c SHA1 e5dbfca1d0a767ad9d0278c7e8ba551c90d9c980 SHA256 b167a5993411b798d2c0ede2710d843bb6a570a466dfd6275ca3ca92224a2a7b
EBUILD libpciaccess-0.10.2.ebuild 480 RMD160 a0923f5d9514916317764bb7aebfedbaec96594d SHA1 dfe74afc6f669852fb8db039d2e36ff7897cb073 SHA256 abb63751fc7bc235bb5c2728493fdf84b9e457c278903fe174072a253c873e47
EBUILD libpciaccess-0.10.3.ebuild 516 RMD160 0578103e6713006bbb982d89e7abfc4a778fe9b2 SHA1 e9b736228c568321df8d2cfda8e582b950116368 SHA256 263c64f9878696636f7721a712545550d01b54a7181efc8dcbce82236c37b47a
-EBUILD libpciaccess-0.10.4.ebuild 636 RMD160 5d5478ff973de82848cce2775b489114df1f80d6 SHA1 8708e340ef8b0b9fc5887fcf4c24012e0126a639 SHA256 2d992dae1ca10099ef57bf3117e40dd5a67ad7adfaa2a4b7b2abf47f1218d0df
-MISC ChangeLog 1384 RMD160 81b9eb3462c620f17310df032b4af0a623ceb659 SHA1 c77124bdd8eda4cc5396d5c8dee175e2b6b585aa SHA256 d5c84bcb56d50b79d44ad191ebec6c3dee1558e66b6b7d370006d399055bd46e
+EBUILD libpciaccess-0.10.4.ebuild 670 RMD160 f2676074df84e287ee274a07deca8381ad649d92 SHA1 fd0a4e39a0d21ee69cf03846d2b802a2374e6403 SHA256 380c0ab37a2432dc32925f0f343cffdfccd793bd9d0523c89298d15e7855a6a9
+MISC ChangeLog 1580 RMD160 99a88876205a00980fffeb8141a49d21643375f7 SHA1 811998c392ce8b73f05e467e0625c29bb71c6db3 SHA256 ecd83b288fbc395cb4064828361ad2b90b9a468c54823a8510dc2e1b8ac6b1ad
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkj871MACgkQXVaO67S1rtuIYgCfQlMjKpFeMVkfc+PDhDJbbmUC
-VxYAoO6ENBadd32r1NOF4gLnqitR1uH0
-=uWlf
+iEYEARECAAYFAkkDlywACgkQ67wieSYcaxdrhACfQ5pIQ7y575GGtGbgPuUUS5II
+co0AoLRs5jzqpcVl3zeGt4iHoGZjCJPL
+=Tf//
-----END PGP SIGNATURE-----
diff --git a/x11-libs/libpciaccess/libpciaccess-0.10.4.ebuild b/x11-libs/libpciaccess/libpciaccess-0.10.4.ebuild
index c83bbe5a002f..c66b16cedca1 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.10.4.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.10.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.10.4.ebuild,v 1.1 2008/10/20 20:51:23 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.10.4.ebuild,v 1.2 2008/10/25 22:01:10 vapier Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -12,6 +12,8 @@ LICENSE="MIT"
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE="minimal"
+DEPEND="!<x11-base/xorg-server-1.5"
+
CONFIGURE_OPTIONS="--with-pciids-path=/usr/share/misc"
src_install() {