Incorporated dictionary pdepends (bug #48072)

Package-Manager: portage-2.1.2-r13

3 files changed, 39 insertions, 15 deletions

diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog
index 967d8adfdb36..51f3fcfa7290 100644
--- a/app-text/aspell/ChangeLog
+++ b/app-text/aspell/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/aspell
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.83 2007/03/04 07:27:33 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.84 2007/03/04 23:30:54 kevquinn Exp $
+
+  04 Mar 2007; Kevin F. Quinn <kevquinn@gentoo.org> aspell-0.60.5.ebuild:
+  Incorporated dictionary pdepends (bug #48072)
 
   04 Mar 2007; Marius Mauch <genone@gentoo.org> aspell-0.50.5-r4.ebuild,
   aspell-0.60.3.ebuild, aspell-0.60.3-r1.ebuild, aspell-0.60.4.ebuild,
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 085ea3dad4b1..3da25b80a5cc 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -65,14 +65,14 @@ EBUILD aspell-0.60.4.ebuild 2219 RMD160 132bb4c97b920a02f9365c8ad1afaffa23a708d4
 MD5 b59b7e789781886177faf8a4283bb9fb aspell-0.60.4.ebuild 2219
 RMD160 132bb4c97b920a02f9365c8ad1afaffa23a708d4 aspell-0.60.4.ebuild 2219
 SHA256 d26672e574236feabf0dbc05afaebbd715603fd5c4a8494c94051392fd906450 aspell-0.60.4.ebuild 2219
-EBUILD aspell-0.60.5.ebuild 2164 RMD160 c884924535d6987be2eb5e42e8d5b949b474a148 SHA1 6e6ebbc49e5eb5db2f82b7b1f117a6165db02db2 SHA256 9b6956489d497702ec29499eb7e07e501ddd8ee68200003c4f049961d15cc252
-MD5 70337bb3f19b1431c5532da4b780d002 aspell-0.60.5.ebuild 2164
-RMD160 c884924535d6987be2eb5e42e8d5b949b474a148 aspell-0.60.5.ebuild 2164
-SHA256 9b6956489d497702ec29499eb7e07e501ddd8ee68200003c4f049961d15cc252 aspell-0.60.5.ebuild 2164
-MISC ChangeLog 13672 RMD160 7cc372fe073d68e758a6661c6c9cb8fe54c3f19a SHA1 35b860a210ab6b81baf5a496f68c5b49da3de34f SHA256 41f1f91dc1aca52f769eaa3a19cc3b67865116540a7990236a3d221f1076c088
-MD5 0eb965581efe8a8386fc73a1bb4594c0 ChangeLog 13672
-RMD160 7cc372fe073d68e758a6661c6c9cb8fe54c3f19a ChangeLog 13672
-SHA256 41f1f91dc1aca52f769eaa3a19cc3b67865116540a7990236a3d221f1076c088 ChangeLog 13672
+EBUILD aspell-0.60.5.ebuild 2890 RMD160 12c77ca264b485fcaf225714cda28314b24065d8 SHA1 f8f8e32677f2b07a9343749360f67cfffe01e98c SHA256 f0a3203ee9399844810394272daa3f08fc7ba597cc9c805344de890d9e5647e6
+MD5 9cce0594280cd347aa281aaa28149dd7 aspell-0.60.5.ebuild 2890
+RMD160 12c77ca264b485fcaf225714cda28314b24065d8 aspell-0.60.5.ebuild 2890
+SHA256 f0a3203ee9399844810394272daa3f08fc7ba597cc9c805344de890d9e5647e6 aspell-0.60.5.ebuild 2890
+MISC ChangeLog 13797 RMD160 c1be7dc30a60058770df3c61402115ff32ccde91 SHA1 4f60c23c4da81c4f2def6245436b2c0ca8d5e590 SHA256 7e2a6506455d1b4cf92d9eb6a112a2d62ba77254ea96b82f9ab54268f9305e4d
+MD5 8abfcaf2d86963424282f9776e76b39a ChangeLog 13797
+RMD160 c1be7dc30a60058770df3c61402115ff32ccde91 ChangeLog 13797
+SHA256 7e2a6506455d1b4cf92d9eb6a112a2d62ba77254ea96b82f9ab54268f9305e4d ChangeLog 13797
 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
 MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162
 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 metadata.xml 162
@@ -99,9 +99,9 @@ MD5 c31f27ac40db6f20afe07e52415798ee files/digest-aspell-0.60.5 244
 RMD160 78e785f403050228f6b08883c17d4bcfe772eb5e files/digest-aspell-0.60.5 244
 SHA256 51268ecaad42f293ab3328ed3c26e39bdd2ce550db6e87de42609f92dedeb600 files/digest-aspell-0.60.5 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF6nXW6J2i8a8J4okRAttMAJ9+aazC9qB8DG+n1CjWUAk0yug9zgCgm3/c
-J6r4WTxUg9SCdbxnA5EEpC8=
-=m2Hy
+iD8DBQFF61dzZfNLSOUrp0sRAqmBAKDRsmIW0wmuMpxwtycTL+WG43vvwwCggFXe
+5B5cdIu9Cbsi+iJaZudyhp0=
+=Pp5C
 -----END PGP SIGNATURE-----
diff --git a/app-text/aspell/aspell-0.60.5.ebuild b/app-text/aspell/aspell-0.60.5.ebuild
index 31fb4f4f4ed2..d44dba3b8d96 100644
--- a/app-text/aspell/aspell-0.60.5.ebuild
+++ b/app-text/aspell/aspell-0.60.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.5.ebuild,v 1.2 2007/03/04 07:27:33 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.5.ebuild,v 1.3 2007/03/04 23:30:54 kevquinn Exp $
 
 # N.B. This is before inherit of autotools, as autotools.eclass adds the
 # relevant dependencies to DEPEND.
@@ -16,10 +16,31 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="gpm nls"
+# Note; app-text/aspell-0.6 and app-dicts/aspell-en-0.6 must go stable together
+
+# Build PDEPEND from list of language codes provided in the tree.
+# The PDEPEND string is static - this code just makes it easier to maintain.
+def="app-dicts/aspell-en"
+for l in \
+	"af" "be" "bg" "br" "ca" "cs" "cy" "da" "de" "el" \
+	"en" "eo" "es" "et" "fi" "fo" "fr" "ga" "gl" "he" \
+	"hr" "is" "it" "nl" "no" "pl" "pt" "ro" "ru" "sk" \
+	"sl" "sr" "sv" "uk" "vi"; do
+	dep="linguas_${l}? ( app-dicts/aspell-${l} )"
+	[[ -z ${PDEPEND} ]] &&
+		PDEPEND="${dep}" ||
+		PDEPEND="${PDEPEND}
+${dep}"
+	def="!linguas_${l}? ( ${def} )"
+done
+PDEPEND="${PDEPEND}
+${def}"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	gpm? ( sys-libs/gpm )
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+	!=app-dicts/aspell-en-0.5*"
+# English dictionary 0.5 is incompatible with aspell-0.6
 
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"