diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-10-31 21:42:03 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-31 21:42:03 +0000 |
| commit | 9f4bdbbf95943e0a89298bae7f9faa34ddaf16ef (patch) | |
| tree | b028d6f570c092605cb6c7e07201e6713a30ddc0 /x11-libs/libXext | |
| parent | respect my FLAGS (diff) | |
| download | historical-9f4bdbbf95943e0a89298bae7f9faa34ddaf16ef.tar.gz historical-9f4bdbbf95943e0a89298bae7f9faa34ddaf16ef.tar.bz2 historical-9f4bdbbf95943e0a89298bae7f9faa34ddaf16ef.zip | |
Add blocker for <xextproto-7.1.1, to avoid file collisions when merging binary packages.
Package-Manager: portage-2.2_rc48/cvs/Linux i686
Diffstat (limited to 'x11-libs/libXext')
| -rw-r--r-- | x11-libs/libXext/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libXext/Manifest | 14 | ||||
| -rw-r--r-- | x11-libs/libXext/libXext-1.1.1.ebuild | 8 |
3 files changed, 22 insertions, 6 deletions
diff --git a/x11-libs/libXext/ChangeLog b/x11-libs/libXext/ChangeLog index 832ceb35eafd..4454054cd60d 100644 --- a/x11-libs/libXext/ChangeLog +++ b/x11-libs/libXext/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libXext # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/ChangeLog,v 1.65 2009/10/26 21:01:45 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/ChangeLog,v 1.66 2009/10/31 21:42:03 zmedico Exp $ + + 31 Oct 2009; Zac Medico <zmedico@gentoo.org> libXext-1.1.1.ebuild: + Add blocker for <xextproto-7.1.1, to avoid file collisions when merging + binary packages. 26 Oct 2009; Jeroen Roovers <jer@gentoo.org> libXext-1.0.5.ebuild: Stable for HPPA (bug #282290). diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest index ffa79acadd7f..0f17b5d0812d 100644 --- a/x11-libs/libXext/Manifest +++ b/x11-libs/libXext/Manifest @@ -1,8 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST libXext-1.0.4.tar.bz2 264491 RMD160 c13e54d388f2fa91e09b221ca91a2ee281f10bbc SHA1 dbadb6b71d303f75980ea66ef76096a9d17243c4 SHA256 2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f DIST libXext-1.0.5.tar.bz2 271301 RMD160 a6ed71d3b4d0e7f1442e196fc795324ff3188f5a SHA1 926c7237108aaccbb8e437ebd80b8edc67615249 SHA256 1280af98466cb4484a89858ede3347ba9d7785baeb80b11f2066142dc2317d97 DIST libXext-1.1.1.tar.bz2 318737 RMD160 b2659a7ed3034712e811474c039bfd9d8cb0cfe1 SHA1 c2eb8d8d760c6881e51c938812764d1d6cefd51c SHA256 110ce3bc7fb3a86659556994d0801c74bedcbd8ba8d1f90ee33d4c47a91e9bb3 EBUILD libXext-1.0.4.ebuild 519 RMD160 e7c4ae4faa8840957c5f07b82c943bf4bed22190 SHA1 4216032883c7c381447fc85a4f0602bfcd294775 SHA256 537e35d9178093d471e75fa3e1bc9fd8dd7beab8e667c451f7b1399cacd53333 EBUILD libXext-1.0.5.ebuild 545 RMD160 1616f2fb49b15e37f677bf4989a8e2be166d1e2e SHA1 525d7e155cc831bb21970e8d8c412e511c5eed79 SHA256 4e4d64d6386c16712f0c95073e67db759efe41c299a2b9c532acb1ae013ef661 -EBUILD libXext-1.1.1.ebuild 493 RMD160 f66fdd643af8aa012f90863940b9d5dd2ded9710 SHA1 ff418f18c30c5d4e709ed93efc869bb572a928fe SHA256 9e6e8f8587d211982492e0a5b778ec87cb71892b30486b20cc7501068707e526 -MISC ChangeLog 7905 RMD160 4b58d8fc8e37db80da8a7322b86d3b7ec8e62a5b SHA1 9363c0a37cbcc3228876ab232a003e55bcc2cef0 SHA256 c83f91404e5e39c94b0ef15a7c18fe7ee4739af2caa32d7653c3e77e1b47509c +EBUILD libXext-1.1.1.ebuild 559 RMD160 d65b7ed2a870db52da9662f897558828093cb653 SHA1 9e1f5e0fac85965767c04c4ee8be8f1e512ceedb SHA256 bcb4648b6b464a2c12411bfc170a13d1a3c49414ebb6fcd3db743d07b4ae9493 +MISC ChangeLog 8072 RMD160 2f1d034f98cb954dafdf85d5f35f765c114ba028 SHA1 f927aa89eb5ac123de55cd7a79a6b52d6c274128 SHA256 4d088dbb535ed3f2aa1e2e30506886eabeb5c291fed38e0216cc90953848223b MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkrsr0AACgkQ/ejvha5XGaOGHgCdHS+iEWVAdC/R7vKbpaseppO8 +/NsAn3hqKIf2Vqvs7lI57GC8I27Y0HaB +=NY7k +-----END PGP SIGNATURE----- diff --git a/x11-libs/libXext/libXext-1.1.1.ebuild b/x11-libs/libXext/libXext-1.1.1.ebuild index a8d361c2632e..a3875536607e 100644 --- a/x11-libs/libXext/libXext-1.1.1.ebuild +++ b/x11-libs/libXext/libXext-1.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/libXext/libXext-1.1.1.ebuild,v 1.1 2009/10/25 20:32:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.1.1.ebuild,v 1.2 2009/10/31 21:42:03 zmedico Exp $ inherit x-modular @@ -9,7 +9,9 @@ DESCRIPTION="X.Org Xext library" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="" -RDEPEND=">=x11-libs/libX11-1.1.99.1" -DEPEND="${RDEPEND} +COMMON_DEPEND=">=x11-libs/libX11-1.1.99.1" +RDEPEND="${COMMON_DEPEND} + !<x11-proto/xextproto-7.1.1" +DEPEND="${COMMON_DEPEND} >=x11-proto/xextproto-7.0.99.2 >=x11-proto/xproto-7.0.13" |