summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2010-11-11 13:44:58 +0000
committerChristian Faulhammer <fauli@gentoo.org>2010-11-11 13:44:58 +0000
commite2dee68f577353db4ba88f55c64ed48240b725ff (patch)
tree1e6a02d22ed5eff3cec45e0bcf77855ebae171eb /dev-lang
parentStable on amd64 wrt bug #345087 (diff)
downloadhistorical-e2dee68f577353db4ba88f55c64ed48240b725ff.tar.gz
historical-e2dee68f577353db4ba88f55c64ed48240b725ff.tar.bz2
historical-e2dee68f577353db4ba88f55c64ed48240b725ff.zip
block app-accessibility/speech-dispatcher to avoid file collisions as reported in bug 344643 by Alexander Koryushkin <madcored AT gmail DOT com>
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/erlang/ChangeLog6
-rw-r--r--dev-lang/erlang/Manifest14
-rw-r--r--dev-lang/erlang/erlang-14.2.ebuild3
3 files changed, 9 insertions, 14 deletions
diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 2184f99d1cba..fa1b28c8d75b 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/erlang
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.200 2010/11/08 01:03:16 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.201 2010/11/11 13:44:58 fauli Exp $
+
+ 11 Nov 2010; <fauli@gentoo.org> erlang-14.2.ebuild:
+ block app-accessibility/speech-dispatcher to avoid file collisions as
+ reported in bug 344643 by Alexander Koryushkin <madcored AT gmail DOT com>
08 Nov 2010; Christian Faulhammer <fauli@gentoo.org> -erlang-14.1.ebuild,
-files/erlang-14.1-lm.patch:
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 311b75203adf..3fcde14684bb 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1 7c17979f533654ef05bbfcc8ae30554e7843923b SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4
AUX epmd.init 515 RMD160 7f5927b020809ec9013a6f0e997fc0232489162a SHA1 dd32584a9e4971fac65881ce2e215afb570a5292 SHA256 d60df142ee0e47e9d55f543effe99b057dbf763586cadffb05a82ce74edeb494
DIST otp_doc_html_R13B04.tar.gz 27440785 RMD160 7257fad19ecfeee69b1c7021692374d1e29aba79 SHA1 dc0e68cb1dd6f45cbd5ea792260b16f91eaa0e2f SHA256 fdad0db55ab9339703e7cd61626b5cca95f187084d1dabf07ac97f528b4f47aa
@@ -10,13 +7,6 @@ DIST otp_doc_man_R14B.tar.gz 1067515 RMD160 4c11c653e231edbab0f3f8a7b7fdc275911e
DIST otp_src_R13B04.tar.gz 59060560 RMD160 5546431e710814da2089d70d5d02c658a1a2f79b SHA1 fe785833a8029cbb3aee188bdb417f4da33fbd06 SHA256 e2694383b3857f5edfc242b8c3acbfba4683e448387fa124d8e587cba234af43
DIST otp_src_R14B.tar.gz 59800980 RMD160 69578a2019fcaab4e7c11f2d1d2d5eef21d5c5fa SHA1 811c17346415159644f16387f1267004a632c452 SHA256 b35af03c69c40c0e4758ee011f71e28ce92783368afec764ce46e6e54cb05d9f
EBUILD erlang-13.2.4.ebuild 5164 RMD160 2d746d7d8383a0504bd4f80a24505bb20e4cbeda SHA1 ecdd965ef4c747762671a4bb6f8b44aeb1b41193 SHA256 203e4238e06787b5e988366c56c763e3656d63eb44c52038ed6ff271dace9bd7
-EBUILD erlang-14.2.ebuild 5461 RMD160 dd5356643ef3bab3e8ab95efc77f68fa45b3d714 SHA1 1e55b3b68cabf30821efc321a2b91e76b37261c5 SHA256 bc49bc851f3ac8776a9c0be168af516ac55c59d650e9947ae2b7ec6f554d92f1
-MISC ChangeLog 31817 RMD160 e85f4e401cb377831a912901143e80815bd55d5d SHA1 f44f6f6fa3da3a0e8fb7559ee6729979923b87df SHA256 6c65daa3835119e89d90ecc5299936b784ba27f2d62a93ba6d7df0bd3a168d3c
+EBUILD erlang-14.2.ebuild 5509 RMD160 2062caa472f9d11fc2959fda1978ad0d389c9e4f SHA1 716db64602f732fa7c3b3e409f3f75cb4b4fa967 SHA256 a3b644ca2c4d937bae04410dea074ecb1a1276c0af176d413fd57621ec97f837
+MISC ChangeLog 32021 RMD160 3b08466121b3a6abf617d6a398c1131b107c16da SHA1 a3cc3ff24a4981a26d7f52accb4c090bd7616dc6 SHA256 6b66cc9af7e9dd9f7419beecede10d6f22cd130cdb84a8126ef938aab70e6f3a
MISC metadata.xml 693 RMD160 6c8d43bd35549421b055b468c45f1f2e5d39357d SHA1 7c778bbc7faf1dfdc11a6155e1c525e42d63ebb5 SHA256 ee0ac0699562802a5191deaef78770c25a342875a3b363ea95a0b92da6f107e3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzXTG8ACgkQNQqtfCuFneOtlgCfT2hiIM7UPcCXR8Ng0TD3XMhJ
-GMsAn1jB+Ua4PdAM6izrRYoU5ghQza36
-=Y5cj
------END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-14.2.ebuild b/dev-lang/erlang/erlang-14.2.ebuild
index 161637b4b8b3..01de793cf3d4 100644
--- a/dev-lang/erlang/erlang-14.2.ebuild
+++ b/dev-lang/erlang/erlang-14.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.2.ebuild,v 1.1 2010/11/08 00:47:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.2.ebuild,v 1.2 2010/11/11 13:44:58 fauli Exp $
EAPI=3
WX_GTK_VER="2.8"
@@ -33,6 +33,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebs
IUSE="doc emacs hipe java kpoll odbc smp sctp ssl tk wxwidgets"
RDEPEND=">=dev-lang/perl-5.6.1
+ !<app-accessibility/speech-dispatcher-0.7.1-r1
ssl? ( >=dev-libs/openssl-0.9.7d )
emacs? ( virtual/emacs )
java? ( >=virtual/jdk-1.2 )