diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-11-01 20:26:30 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-11-01 20:26:30 +0000 |
| commit | 5bebade92b70852f9b5f301eb1398368de1c6658 (patch) | |
| tree | 5ff8c3da22b664fc45d537ca2487354f70744c41 /x11-libs | |
| parent | Remove java last rites that were removed. (diff) | |
| download | historical-5bebade92b70852f9b5f301eb1398368de1c6658.tar.gz historical-5bebade92b70852f9b5f301eb1398368de1c6658.tar.bz2 historical-5bebade92b70852f9b5f301eb1398368de1c6658.zip | |
Block older versions of xineramaproto, in order to avoid file collisions when installing from binary packages.
Package-Manager: portage-2.2_rc48/cvs/Linux i686
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/libXinerama/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libXinerama/Manifest | 14 | ||||
| -rw-r--r-- | x11-libs/libXinerama/libXinerama-1.1.ebuild | 8 |
3 files changed, 22 insertions, 6 deletions
diff --git a/x11-libs/libXinerama/ChangeLog b/x11-libs/libXinerama/ChangeLog index 504be92694e8..fc98f9e883a8 100644 --- a/x11-libs/libXinerama/ChangeLog +++ b/x11-libs/libXinerama/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libXinerama # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/ChangeLog,v 1.49 2009/10/03 15:29:10 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/ChangeLog,v 1.50 2009/11/01 20:26:30 zmedico Exp $ + + 01 Nov 2009; Zac Medico <zmedico@gentoo.org> libXinerama-1.1.ebuild: + Block older versions of xineramaproto, in order to avoid file collisions + when installing from binary packages. *libXinerama-1.1 (03 Oct 2009) diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest index d05fae0f4188..86cfffef7aec 100644 --- a/x11-libs/libXinerama/Manifest +++ b/x11-libs/libXinerama/Manifest @@ -1,8 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST libXinerama-1.0.2.tar.bz2 214046 RMD160 4ed664e8cc2aae67bc64f603c10484fcc60c95ea SHA1 522d60020bd30591462b9f88e6fcf31b68a1f14a SHA256 d245d7ae4c766ecbc4e5cc2666e2e78198d8386dbaa06b35c3d1b1457ee5d03d DIST libXinerama-1.0.3.tar.bz2 236386 RMD160 99115fedb0930a6acb5450bfabfe7416159ee45b SHA1 64e982c7503d7c1c11f5f71971caf1f2da61e736 SHA256 07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219 DIST libXinerama-1.1.tar.bz2 245133 RMD160 2f5a9dbad4a6db093838e99b0f991a387a553c62 SHA1 5f445194ef3318f66c287c0c69f778988a3f9266 SHA256 e0d39e74c2e131b44cc98dd4910165c9b8d937df93be58e6afb7c2a56772bf34 EBUILD libXinerama-1.0.2.ebuild 530 RMD160 73d299ed36c6e70e8d0a3f36abe59fc714435511 SHA1 7653ccfd1e49e2a92cf3ac087e2058461db531fb SHA256 4dc5cd8614ad92f58fa5f9f42db2f468bb8c76cfed24c0a65105e1a2b1cb1e53 EBUILD libXinerama-1.0.3.ebuild 530 RMD160 b89ae7a83b31dcdf2cc566b2b369361a7c8205e7 SHA1 636459ec5fd640935a8f7446c94619f82af75c87 SHA256 903b5fa1a63932b5c0c127480955f03e3863ce9d0a9fde619fee91d1b06efd80 -EBUILD libXinerama-1.1.ebuild 566 RMD160 049378e08f56e9b168b59b6976dc04accfceef94 SHA1 f23d0c47e0eee549d1d111c3cbdb55add0719868 SHA256 110cecbf366e8a27504610a75b59e87f518c054ae9389df6b144d0e0d5cd6301 -MISC ChangeLog 5970 RMD160 68c2a243ae34dd05cf2d68f2267cd84fb1af6236 SHA1 dd2530c0c8afc392b3f81311ac78b794237efc2b SHA256 9f29efafd9f469e9a743b9896e2f605d467c3a3f43f11ee5dac25a34ac09ab1f +EBUILD libXinerama-1.1.ebuild 634 RMD160 0a8f2e6ed46d3786e7b24c944cd7ed56ddedab60 SHA1 423306ab43a9fa52d319f6bd91bbf144de763a00 SHA256 e8ac025d33708324af224802b1aecb95a7ad199257a348c4580f64cb60352c4e +MISC ChangeLog 6155 RMD160 e30cf8c865395ed9c9fe7f1b68fddbff4af7523d SHA1 71077b5d8e2772ece27fee009caebfcd0d58af17 SHA256 af957c7221f76cee7a73b2c53986c1525fd77fc24362986e75f818335842312d MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkrt7x0ACgkQ/ejvha5XGaMl3QCgoQhC2xFBHVtNQyZXi24NuoAG +V58AoKGaZW1oqG7NtsO/wFxd9o+IWcKY +=GWfd +-----END PGP SIGNATURE----- diff --git a/x11-libs/libXinerama/libXinerama-1.1.ebuild b/x11-libs/libXinerama/libXinerama-1.1.ebuild index 6b0b00cfe62d..bcff1b3f6130 100644 --- a/x11-libs/libXinerama/libXinerama-1.1.ebuild +++ b/x11-libs/libXinerama/libXinerama-1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.ebuild,v 1.1 2009/10/03 15:29:10 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.ebuild,v 1.2 2009/11/01 20:26:30 zmedico Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -11,8 +11,10 @@ DESCRIPTION="X.Org Xinerama library" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="" -RDEPEND="x11-libs/libX11 +COMMON_DEPEND="x11-libs/libX11 x11-libs/libXext" -DEPEND="${RDEPEND} +RDEPEND="${COMMON_DEPEND} + !<x11-proto/xineramaproto-1.2" +DEPEND="${COMMON_DEPEND} x11-proto/xextproto >=x11-proto/xineramaproto-1.2" |