Fix for collsion with spp-editors/leo per bug 304709

Package-Manager: portage-2.2_rc62/cvs/Linux i686

4 files changed, 41 insertions, 9 deletions

diff --git a/dev-perl/WWW-Dict-Leo-Org/ChangeLog b/dev-perl/WWW-Dict-Leo-Org/ChangeLog
index b3ebdb9f1861..58614314a6e8 100644
--- a/dev-perl/WWW-Dict-Leo-Org/ChangeLog
+++ b/dev-perl/WWW-Dict-Leo-Org/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/WWW-Dict-Leo-Org
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Dict-Leo-Org/ChangeLog,v 1.1 2010/02/04 22:36:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Dict-Leo-Org/ChangeLog,v 1.2 2010/02/12 16:12:14 jlec Exp $
+
+*WWW-Dict-Leo-Org-1.34-r1 (12 Feb 2010)
+
+  12 Feb 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  WWW-Dict-Leo-Org-1.34.ebuild, +WWW-Dict-Leo-Org-1.34-r1.ebuild:
+  Fixed file collision with app-editors/leo per 304709
 
 *WWW-Dict-Leo-Org-1.34 (04 Feb 2010)
 
diff --git a/dev-perl/WWW-Dict-Leo-Org/Manifest b/dev-perl/WWW-Dict-Leo-Org/Manifest
index a542a311af60..1896ea5e8c99 100644
--- a/dev-perl/WWW-Dict-Leo-Org/Manifest
+++ b/dev-perl/WWW-Dict-Leo-Org/Manifest
@@ -2,13 +2,14 @@
 Hash: SHA1
 
 DIST WWW-Dict-Leo-Org-1.34.tar.gz 12611 RMD160 7d2a72dc6f7881491f8e8ebb6844d234a4be008a SHA1 dce1f50a4f34cfcb8d82988d320337609f9cab6b SHA256 271d33689425dee015cd6c0f51959b92c07f388dacb128aa6f15f1399e55c8e8
-EBUILD WWW-Dict-Leo-Org-1.34.ebuild 466 RMD160 758d73955a3a44290c4158212584c1696302e924 SHA1 ce9d40e42909d9466eabfef98d1c9b96520c6382 SHA256 e55f927adf6baa1385411d18ed999eba6b04035e5f65bf53af5fc5e5306e7ef3
-MISC ChangeLog 404 RMD160 0f4507fd44981588c9ac7fd1ced1e22dd426dee0 SHA1 3cf02312a087db211603980ee713bd5238766a7c SHA256 c0981e6072a8e2fa2ac4d79b0f91501b7b3f99a198f0e2919bf20fa01296f4fa
+EBUILD WWW-Dict-Leo-Org-1.34-r1.ebuild 549 RMD160 2bfcae6b31518f8e5f3dce4547d6a0da15c66c82 SHA1 807641793ff927d0a1d0d68662d80bf2ce520707 SHA256 30fe199b953b856aab7a5b88b4986a237c311a372b09a770ac88f9a34b8f1e8b
+EBUILD WWW-Dict-Leo-Org-1.34.ebuild 486 RMD160 c86797312c58661dec4d23e4fb658c13bd4b67aa SHA1 b4c42621e1824dabb0bdd8160a338e3986031876 SHA256 595297f2098d4112e28394c6aed1f7334a41b1f34c5785acb09575846c0db607
+MISC ChangeLog 624 RMD160 0186428d004017285ca90365fb67ca168a3c526f SHA1 8c37865feba414738b694f2db5f567cd231325f3 SHA256 2ef72efdd1923e70e6cad2742fbc4a3411b593eb674de94b0754a0040d8bcf76
 MISC metadata.xml 219 RMD160 3db7605f2d00a829c136482bf73442d2c42245c4 SHA1 9fe91f6605a549b3b4209da9a7a3db55fd33c344 SHA256 50d56a14da2a870fc9d3e53060fb825d358af3b6334e7172fc8e3ebf467b6551
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktrS98ACgkQgAnW8HDreRbcFwCgputOtdEfoivFOtzNPvvBSKsn
-s88AoI/Ye4GH1FXK8b+f4E1HOQPMyalW
-=n7V8
+iEYEARECAAYFAkt1feQACgkQgAnW8HDreRbAUgCfQ7xVKgAyqNilwsQTAlSfCXzK
+DeYAoJxPh1woUAMbKEcD6YFAEAngWyAV
+=kxUE
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-1.34-r1.ebuild b/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-1.34-r1.ebuild
new file mode 100644
index 000000000000..eecfa5c4d531
--- /dev/null
+++ b/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-1.34-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-1.34-r1.ebuild,v 1.1 2010/02/12 16:12:14 jlec Exp $
+
+MODULE_AUTHOR="TLINDEN"
+inherit perl-app
+
+DESCRIPTION="commandline interface to http://dict.leo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/HTML-TableParser"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	perl-module_src_install
+	mv "${D}"/usr/bin/{l,L}eo || die
+}
diff --git a/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-1.34.ebuild b/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-1.34.ebuild
index 8e0cce093680..48c2247cfdd7 100644
--- a/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-1.34.ebuild
+++ b/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-1.34.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-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-1.34.ebuild,v 1.1 2010/02/04 22:36:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-1.34.ebuild,v 1.2 2010/02/12 16:12:14 jlec Exp $
 
 MODULE_AUTHOR="TLINDEN"
 inherit perl-app
@@ -12,6 +12,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-lang/perl
-	dev-perl/HTML-TableParser"
+RDEPEND="
+	dev-lang/perl
+	dev-perl/HTML-TableParser
+	!app-editors/leo"
 DEPEND="${RDEPEND}"