summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2009-01-04 01:14:52 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2009-01-04 01:14:52 +0000
commitb461c202223b8879b2b69728a9e3b62a8ac9eb10 (patch)
treea1a8a6a342bde6d69909c83e5456c0a80aa9ba7d /app-dicts/aspell-pt-br
parentDo not install any pt_BR stuff. Leave it for aspell-pt-br instead, to avoid c... (diff)
downloadgentoo-2-b461c202223b8879b2b69728a9e3b62a8ac9eb10.tar.gz
gentoo-2-b461c202223b8879b2b69728a9e3b62a8ac9eb10.tar.bz2
gentoo-2-b461c202223b8879b2b69728a9e3b62a8ac9eb10.zip
Block aspell-pt versions that would install a file conflict, per bug #247391.
(Portage version: 2.2_rc20/cvs/Linux 2.6.28-rc5-00117-g7f0f598 i686)
Diffstat (limited to 'app-dicts/aspell-pt-br')
-rw-r--r--app-dicts/aspell-pt-br/ChangeLog9
-rw-r--r--app-dicts/aspell-pt-br/aspell-pt-br-6.0.20070411.ebuild9
-rw-r--r--app-dicts/aspell-pt-br/aspell-pt-br-6.0.20080221.ebuild7
3 files changed, 18 insertions, 7 deletions
diff --git a/app-dicts/aspell-pt-br/ChangeLog b/app-dicts/aspell-pt-br/ChangeLog
index 481394dcc540..e75ae69afb15 100644
--- a/app-dicts/aspell-pt-br/ChangeLog
+++ b/app-dicts/aspell-pt-br/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-dicts/aspell-pt-br
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-pt-br/ChangeLog,v 1.8 2008/11/19 20:09:47 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-pt-br/ChangeLog,v 1.9 2009/01/04 01:14:52 robbat2 Exp $
+
+ 04 Jan 2009; Robin H. Johnson <robbat2@gentoo.org>
+ aspell-pt-br-6.0.20070411.ebuild, aspell-pt-br-6.0.20080221.ebuild:
+ Block aspell-pt versions that would install a file conflict, per bug
+ #247391.
19 Nov 2008; Peter Volkov <pva@gentoo.org>
aspell-pt-br-6.0.20080221.ebuild:
diff --git a/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20070411.ebuild b/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20070411.ebuild
index ebda3b43a948..083842d41f47 100644
--- a/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20070411.ebuild
+++ b/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20070411.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20070411.ebuild,v 1.7 2007/11/03 22:18:07 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20070411.ebuild,v 1.8 2009/01/04 01:14:52 robbat2 Exp $
ASPELL_LANG="Brazilian Portuguese"
ASPOSTFIX="6"
@@ -13,4 +13,7 @@ SRC_URI="mirror://gnu/aspell/dict/pt_BR/${FILENAME}.tar.bz2"
LICENSE="LGPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-S=${WORKDIR}/${FILENAME}
+S="${WORKDIR}/${FILENAME}"
+
+# Contains a conflict
+RDEPEND="!<app-dicts/aspell-pt-0.50.2-r1"
diff --git a/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20080221.ebuild b/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20080221.ebuild
index f00f1fe4b2bd..bcea17f9cff3 100644
--- a/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20080221.ebuild
+++ b/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20080221.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20080221.ebuild,v 1.2 2008/11/19 20:09:47 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20080221.ebuild,v 1.3 2009/01/04 01:14:52 robbat2 Exp $
ASPELL_LANG="Brazilian Portuguese"
ASPOSTFIX="6"
@@ -14,3 +14,6 @@ LICENSE="LGPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
S="${WORKDIR}/${FILENAME}"
+
+# Contains a conflict
+RDEPEND="!<app-dicts/aspell-pt-0.50.2-r1"