diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-11-01 20:42:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-11-01 20:42:35 +0000 |
| commit | 5c5dcb1c097494a8f4c0dcbcfdbaaaa239ff3fcd (patch) | |
| tree | 60cca172a951d81a135bf684fb77a9d2653bfd2f | |
| parent | Make USE=qt-static preferable for builds that misbehave with Qt 4.5.3 (bug #2... (diff) | |
| download | historical-5c5dcb1c097494a8f4c0dcbcfdbaaaa239ff3fcd.tar.gz historical-5c5dcb1c097494a8f4c0dcbcfdbaaaa239ff3fcd.tar.bz2 historical-5c5dcb1c097494a8f4c0dcbcfdbaaaa239ff3fcd.zip | |
Block older versions of scrnsaverproto, in order to avoid file collisions when installing from binary packages.
Package-Manager: portage-2.2_rc48/cvs/Linux i686
| -rw-r--r-- | x11-libs/libXScrnSaver/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libXScrnSaver/Manifest | 14 | ||||
| -rw-r--r-- | x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild | 8 |
3 files changed, 22 insertions, 6 deletions
diff --git a/x11-libs/libXScrnSaver/ChangeLog b/x11-libs/libXScrnSaver/ChangeLog index b255b6868a92..a56782053aa1 100644 --- a/x11-libs/libXScrnSaver/ChangeLog +++ b/x11-libs/libXScrnSaver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libXScrnSaver # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/ChangeLog,v 1.59 2009/10/03 15:10:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/ChangeLog,v 1.60 2009/11/01 20:42:35 zmedico Exp $ + + 01 Nov 2009; Zac Medico <zmedico@gentoo.org> libXScrnSaver-1.2.0.ebuild: + Block older versions of scrnsaverproto, in order to avoid file collisions + when installing from binary packages. *libXScrnSaver-1.2.0 (03 Oct 2009) diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest index 65b59a5b9172..21ffea38e4a0 100644 --- a/x11-libs/libXScrnSaver/Manifest +++ b/x11-libs/libXScrnSaver/Manifest @@ -1,6 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST libXScrnSaver-1.1.3.tar.bz2 219568 RMD160 7beecf684faad4948b139e71201a628cb60ce874 SHA1 c4589ca80623b7c87648cccf1591a8d42a4b4544 SHA256 4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988 DIST libXScrnSaver-1.2.0.tar.bz2 248744 RMD160 7b749f61d77e4022fbe081fe4039b302c6b4b509 SHA1 ea2935eb67efa77fd90372337f2d782a8ef74cea SHA256 5b067bec0f2eb6405226bde5f20ca107eb0e5c11f5e5e24b455930c450487f85 EBUILD libXScrnSaver-1.1.3.ebuild 540 RMD160 262aa4e2c49fa39a72e0ae3ec171602697bb8bcc SHA1 da47725198fd1532bbdc5364c2b5600ca34c0e03 SHA256 fcfdd88dd8bef02d94f3db8d4da44e9051711e9f01c8095d0b871293cb2d8575 -EBUILD libXScrnSaver-1.2.0.ebuild 554 RMD160 cc0b20e93828f01611903147136bbb4207c3bf3d SHA1 5afc060edfa3f1bfa4177f219447455e7702de5e SHA256 0b2ab251881af0842f27fc5d03b357786fc982fc557f7bd756da704fb52d8550 -MISC ChangeLog 7780 RMD160 3530a51c871954385aa2addab0205bfe7c8e6907 SHA1 72dca97e2a9fba5c5a2f725de2313e42ff83cfe1 SHA256 a9d23ac2ed791f57882c4cb110eae967df4722a03f7fef49ddc5381822bb622d +EBUILD libXScrnSaver-1.2.0.ebuild 623 RMD160 00f01878b989554ad87eda23b6fdf7dfdbeb4b8b SHA1 1d680d34fb98ce48020371151d2fc19daa454be4 SHA256 a3219ca6fd1c53b1972f4a28ea6e9e8f42b7aecc29251d4a54e3cdcd55d7efb8 +MISC ChangeLog 7970 RMD160 3d89a7e1b44e85e8766791e812c8d49b3a1fe447 SHA1 d13505112f1327da1575f34a70539d2b70602ecd SHA256 2624465417178b3c51620694b3cc503200a83fd16ad4d7b25079c4681e92e310 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkrt8uIACgkQ/ejvha5XGaNu6wCg5FDTWAClY+2CIw/ttDGw1xSy +WiIAni2mCvAKSyLNcVp4wZrN5Cf97JDX +=PC/p +-----END PGP SIGNATURE----- diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild index 2e7a13d7f14e..c0e29c4aadae 100644 --- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild +++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.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/libXScrnSaver/libXScrnSaver-1.2.0.ebuild,v 1.1 2009/10/03 15:10:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild,v 1.2 2009/11/01 20:42:35 zmedico Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -11,7 +11,9 @@ DESCRIPTION="X.Org XScrnSaver 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/scrnsaverproto-1.2" +DEPEND="${COMMON_DEPEND} >=x11-proto/scrnsaverproto-1.2" |