fix atoms so we dont block the newer gtkhtml-3.10. fixes #126734, thanks to Jose daLuz.

(Portage version: 2.1_pre6-r3)

10 files changed, 49 insertions, 36 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 313172fa9585..4031c33c76d4 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.58 2006/03/18 19:17:42 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.59 2006/03/19 02:28:10 allanonjl Exp $
+
+  19 Mar 2006; John N. Laliberte <allanonjl@gentoo.org>
+  gtkhtml-3.2.4.ebuild, gtkhtml-3.2.5.ebuild, gtkhtml-3.6.1.ebuild,
+  gtkhtml-3.6.2.ebuild:
+  fix atoms so we dont block the newer gtkhtml-3.10. fixes
 
 *gtkhtml-3.10.0 (18 Mar 2006)
 
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index e475994f7ef5..d2bf7cb59a7e 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,6 +1,6 @@
-MD5 e82ebab5819aaa44a01705ccc8e5d900 ChangeLog 8694
-RMD160 f4b4f6f8c0e17b8083adb97583124a9f0da17e52 ChangeLog 8694
-SHA256 3ef1316c96ef353792de75b44692599f4ab985410b39490635ff644f84f9a650 ChangeLog 8694
+MD5 d8dd7a28fc8da177e0f60e6f21953fd1 ChangeLog 8902
+RMD160 8f05663767c1b19d456f7dee357f9e35e4759253 ChangeLog 8902
+SHA256 ea75259eabe1b3e8c14c8d7e5a31caa74f53b0efb86477076bd1cf364fd43a97 ChangeLog 8902
 MD5 beee6dc1f9b01326aec9a28c8959c395 files/digest-gtkhtml-1.1.10-r1 68
 RMD160 ce63e62409adba4536d932521ef4ac53fc44fdd8 files/digest-gtkhtml-1.1.10-r1 68
 SHA256 87b631426f5297cd3077e37092904112f0680d7ed734f2319a437352541aae0e files/digest-gtkhtml-1.1.10-r1 68
@@ -19,18 +19,18 @@ SHA256 f7f3a91657d5940232cfef1d27eb86aa50249531785bbefe8691280e14d2a60c files/di
 MD5 f3adb3a80e8377a1c561a6149cd1a0e5 files/digest-gtkhtml-3.10.0 250
 RMD160 818bc5bdb84658f94b2a6ea8615a2d84f1e66d9b files/digest-gtkhtml-3.10.0 250
 SHA256 7cd173c07e1fa12a23dbac1e7be608e49c737fe3bf311ba24c62255c916918a4 files/digest-gtkhtml-3.10.0 250
-MD5 714aa2ab68649c7292585791ef3b2cf8 files/digest-gtkhtml-3.2.4 67
-RMD160 4df775eb582227959912efa791894739933eb4cf files/digest-gtkhtml-3.2.4 67
-SHA256 3fd866f26d9fe6bc83655454b655e7912f56cc0e0f4b324da32c2d102a424c2e files/digest-gtkhtml-3.2.4 67
-MD5 8ad22906ca369e77ef84242fd95d1900 files/digest-gtkhtml-3.2.5 67
-RMD160 1f2b17f06e25a0da3a8c501c6c66487c2d7293f1 files/digest-gtkhtml-3.2.5 67
-SHA256 e0cc580a9f0c7a3007fcbbb729c970a09406b1346b2a50b00ec7e39382d32628 files/digest-gtkhtml-3.2.5 67
-MD5 1fefab12ccd22babef0f9cf0178a8dec files/digest-gtkhtml-3.6.1 67
-RMD160 f51c131e112c4c84e5584401786b52256753d3b8 files/digest-gtkhtml-3.6.1 67
-SHA256 7bfd02cc8cd4b1231eab0bc18298864d0a20f87391bc1a3afe4be86f07baed63 files/digest-gtkhtml-3.6.1 67
-MD5 dec731b7d8ca685be1de143a447a827f files/digest-gtkhtml-3.6.2 67
-RMD160 4d4d15513af0777ab92d3254c277316206d98381 files/digest-gtkhtml-3.6.2 67
-SHA256 1cfe8b4aa12032c5367edcb59779288536c3ab0f9a1e6cb942c8367428640eff files/digest-gtkhtml-3.6.2 67
+MD5 1766d4c6fabb2fc26806dce873b739f9 files/digest-gtkhtml-3.2.4 247
+RMD160 5a4014ebc06c78190b748e7c7ad38cdf785ea544 files/digest-gtkhtml-3.2.4 247
+SHA256 95bebd272ce2dd04135adc49f845b5a9d348f8555b76d9154b2ba1eacc3329d7 files/digest-gtkhtml-3.2.4 247
+MD5 3435c9b149f097bc76161f5ff2913f05 files/digest-gtkhtml-3.2.5 247
+RMD160 93effaf476b9f7f696451e47651e66ed98be425b files/digest-gtkhtml-3.2.5 247
+SHA256 051fce2f806758de19eb2fe384d4e600e019e7d62a9031f7a81b99a338467bd2 files/digest-gtkhtml-3.2.5 247
+MD5 40e5da8d7c0f4e42d27988549f772faf files/digest-gtkhtml-3.6.1 247
+RMD160 f0bd7c6c4b34d24e129f5b087aaf7a4294543a06 files/digest-gtkhtml-3.6.1 247
+SHA256 8dd7e7c0e28f759070180874b6838df406e752a21f25ff7ea4b1e576181f5dcb files/digest-gtkhtml-3.6.1 247
+MD5 593de6d403fd8164b7b05d437b129019 files/digest-gtkhtml-3.6.2 247
+RMD160 8c9f57dc83543afadcd9841b9cab8f4b45a725b8 files/digest-gtkhtml-3.6.2 247
+SHA256 f1e19408a0af8de236704224d288e585033ea9388c922435780ca67d3522dd40 files/digest-gtkhtml-3.6.2 247
 MD5 90c59d0d5d58451a570c4345cf208b9e files/digest-gtkhtml-3.8.1 67
 RMD160 26e8d23700359d48997df0ad5fd9e4fcb7cdb80d files/digest-gtkhtml-3.8.1 67
 SHA256 22e8a3accfa8b924775b657570e01e197e98f73222a05848fd30f8be17cd99e6 files/digest-gtkhtml-3.8.1 67
@@ -79,18 +79,18 @@ SHA256 2a8aed2c242b8ebc10ef8a20663c4f61db0aecd5b00808bd2fd93a39a5a6755d gtkhtml-
 MD5 a84937c967f0066b82258b7720146f33 gtkhtml-3.10.0.ebuild 893
 RMD160 30d441e4e47479d255420dd79bf7692c6e9c1564 gtkhtml-3.10.0.ebuild 893
 SHA256 f5b7c12da3b71c050d9e8de95af7c7542d15f7546ed892192c841b9f2ed721b9 gtkhtml-3.10.0.ebuild 893
-MD5 b985e29087603b4a9a312d36379642f8 gtkhtml-3.2.4.ebuild 1042
-RMD160 0a2dd62d440cdc6596098eae28fb0f4b8c7f5e16 gtkhtml-3.2.4.ebuild 1042
-SHA256 f1eddfd562f54288033c6a833d963eb1ddb0e88e805baad1dd108545586a3ae6 gtkhtml-3.2.4.ebuild 1042
-MD5 7788772b0b3f0a442389e31cb7efc98d gtkhtml-3.2.5.ebuild 1065
-RMD160 42cdfc6fa7ff171195f8e3db672b2adbc2d42429 gtkhtml-3.2.5.ebuild 1065
-SHA256 1d0603c185f2d60208445a5396b5209c1d89004bfa325ba60fb60a86911ef9f2 gtkhtml-3.2.5.ebuild 1065
-MD5 9f8dffd167fa12c4a06ea411f54c9010 gtkhtml-3.6.1.ebuild 906
-RMD160 e33e0363c5ef451673c513aa55ba24b2c08ad4da gtkhtml-3.6.1.ebuild 906
-SHA256 96d87a1c65a95c34c8c18e7e5861040fc674273c891c9ad8c06c654f7438e200 gtkhtml-3.6.1.ebuild 906
-MD5 5ccacad75988f3925714324ef32dd55f gtkhtml-3.6.2.ebuild 1080
-RMD160 e283a76d64c53ec7742cc73595e836b41d129643 gtkhtml-3.6.2.ebuild 1080
-SHA256 cb6a167d5b0a91f5ec05f189d8fa944104a361f3dfdaa5d8c0c72292ebe9dbe2 gtkhtml-3.6.2.ebuild 1080
+MD5 660029b226e1ecb5628d89fa0b687d6a gtkhtml-3.2.4.ebuild 1043
+RMD160 81e10d1189d7843a032b0a08e14af5b68452a1e8 gtkhtml-3.2.4.ebuild 1043
+SHA256 250f970a0ef01eb0980c706e776a0ab32bdfaad99d939de87d768ff7db25a48e gtkhtml-3.2.4.ebuild 1043
+MD5 2ab05901d289caa06a3b44c35d8d4471 gtkhtml-3.2.5.ebuild 1066
+RMD160 9fcc3b231d1e6aed84b9c3429d014b3fddfb3eb9 gtkhtml-3.2.5.ebuild 1066
+SHA256 489e2e75cb488a8cfd50f78dff7e13eab1ef2fd4cdaba22dd3c8e4098a1c085f gtkhtml-3.2.5.ebuild 1066
+MD5 0bc73b5eb07ee5994799f813b915978c gtkhtml-3.6.1.ebuild 907
+RMD160 485da78807b9d08a0c0f61906efff75d35ea1f6c gtkhtml-3.6.1.ebuild 907
+SHA256 5babc32a523ca64250db0fe3368488480bfbdfa84721f000a93347c541f0415a gtkhtml-3.6.1.ebuild 907
+MD5 a0cf1da47c2e6d3cfe2ab8e656ccd2a6 gtkhtml-3.6.2.ebuild 1081
+RMD160 7584c001a7ecb495cabaf81b4f5bb4f9e9a27fbf gtkhtml-3.6.2.ebuild 1081
+SHA256 b72dd32e36e2d4da3fff3a13092c1196417afb2df9e9228da51caeafe11a5529 gtkhtml-3.6.2.ebuild 1081
 MD5 1738729d9974cf21de2092f2cffe59b9 gtkhtml-3.8.1.ebuild 955
 RMD160 7d73cad7b67f8fcf8c9dad5b8918474724491ecb gtkhtml-3.8.1.ebuild 955
 SHA256 1137399b1184066a1ed928e98f5ea437bf7b995c2de6a9ddebb27656ea00d3d8 gtkhtml-3.8.1.ebuild 955
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.4 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.4
index f8b455572697..4c0b0834f8ce 100644
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.4
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.4
@@ -1 +1,3 @@
 MD5 1978a1ef8f376593e579ab3ad9f48426 gtkhtml-3.2.4.tar.bz2 1311427
+RMD160 04ce25f1bb45a1b686c5c16841417126e831babf gtkhtml-3.2.4.tar.bz2 1311427
+SHA256 b815adcabac35c1ccf2fd04c3c09d911b0fe257faf765e40425ea7b8c2397706 gtkhtml-3.2.4.tar.bz2 1311427
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.5 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.5
index 5da267fcd81e..78ff113f226f 100644
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.5
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.5
@@ -1 +1,3 @@
 MD5 86e1ce32fed536bce5b2d6e8d41b0c65 gtkhtml-3.2.5.tar.bz2 1315567
+RMD160 21c61b1eefb2284376ace410cd3ff134e93efc5a gtkhtml-3.2.5.tar.bz2 1315567
+SHA256 ddb33b29132be2988b954a676c1237773c721441ad31449bfe3c673dff204df9 gtkhtml-3.2.5.tar.bz2 1315567
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.1 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.1
index 6f17c00f66bf..553d62294419 100644
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.1
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.1
@@ -1 +1,3 @@
 MD5 df30dbbd12b6a3f1355a9a82aa430781 gtkhtml-3.6.1.tar.bz2 1356878
+RMD160 49b95c382193d4ff8763ec0b3c32d90731caf899 gtkhtml-3.6.1.tar.bz2 1356878
+SHA256 5d0a2ad7ad5bd8e000e662c13f10a7a2a06713beee40a89d74cc995c261529c1 gtkhtml-3.6.1.tar.bz2 1356878
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.2 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.2
index f049928dbe78..7ecf89faccc7 100644
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.2
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.2
@@ -1 +1,3 @@
 MD5 37465fde0f1e1d7ba2284c5a4fd06fe7 gtkhtml-3.6.2.tar.bz2 1416041
+RMD160 5428cab4c27b1197537b34fb5c798d0aa223f29a gtkhtml-3.6.2.tar.bz2 1416041
+SHA256 0c34357bd2b4ed3584e18a30f13a9f5d4c70738872ef90db97c1298013b2f7b9 gtkhtml-3.6.2.tar.bz2 1416041
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild
index fbae066b14be..71b9f809b8ce 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild,v 1.2 2006/01/12 23:10:04 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild,v 1.3 2006/03/19 02:28:10 allanonjl Exp $
 
 inherit gnome2 eutils
 
@@ -21,7 +21,7 @@ RDEPEND=">=net-libs/libsoup-2.2.1
 	>=gnome-base/libglade-2
 	>=gnome-base/libbonoboui-2.2.4
 	>=gnome-base/gail-1
-	!=gnome-extra/gtkhtml-3.1*"
+	!=gnome-extra/gtkhtml-3.1.*"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.30
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild
index de82a31737da..55b47060354e 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild,v 1.2 2006/01/12 23:10:04 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild,v 1.3 2006/03/19 02:28:10 allanonjl Exp $
 
 inherit gnome2 eutils
 
@@ -21,7 +21,7 @@ RDEPEND=">=net-libs/libsoup-2.2.1
 	>=gnome-base/libglade-2
 	>=gnome-base/libbonoboui-2.2.4
 	>=gnome-base/gail-1
-	!=gnome-extra/gtkhtml-3.1*"
+	!=gnome-extra/gtkhtml-3.1.*"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.30
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.6.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.6.1.ebuild
index 7af34c67ed58..edf35fb19329 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.6.1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.1.ebuild,v 1.2 2006/01/12 23:10:04 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.1.ebuild,v 1.3 2006/03/19 02:28:10 allanonjl Exp $
 
 inherit gnome2
 
@@ -22,7 +22,7 @@ RDEPEND=">=net-libs/libsoup-2.2.1
 	>=gnome-base/libbonoboui-2.2.4
 	>=gnome-base/gail-1
 	>=net-libs/libsoup-2.1.6
-	!=gnome-extra/gtkhtml-3.1*"
+	!=gnome-extra/gtkhtml-3.1.*"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.30
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild
index dc42248ad7f6..9bbdb97dd06c 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild,v 1.2 2006/01/12 23:10:04 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild,v 1.3 2006/03/19 02:28:10 allanonjl Exp $
 
 inherit gnome2 eutils
 
@@ -22,7 +22,7 @@ RDEPEND=">=net-libs/libsoup-2.1.6
 	>=gnome-base/libbonoboui-2.2.4
 	>=gnome-base/orbit-2
 	>=gnome-base/gail-0.13
-	!=gnome-extra/gtkhtml-3.1*"
+	!=gnome-extra/gtkhtml-3.1.*"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.30