Version bump. Punt some old versions and stale patches

Package-Manager: portage-2.1.2-r8

11 files changed, 29 insertions, 159 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index ca26cd950046..3f4d8e588baf 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.86 2007/01/21 21:45:20 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.87 2007/02/07 14:26:40 leio Exp $
+
+*gtkhtml-3.12.3 (07 Feb 2007)
+
+  07 Feb 2007; Mart Raudsepp <leio@gentoo.org> -files/gtkhtml-gcc34.patch,
+  -files/gtkhtml-gcc4.patch, -gtkhtml-2.6.0.ebuild, -gtkhtml-3.8.2.ebuild,
+  -gtkhtml-3.12.1.ebuild, +gtkhtml-3.12.3.ebuild:
+  Version bump. Punt some old versions and stale patches
 
   21 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> gtkhtml-3.12.2.ebuild:
   Stable on IA64, bug 156662.
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 2a8076487666..f8aed41ac570 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -21,32 +21,18 @@ AUX gtkhtml-fix_preedit.patch 2439 RMD160 0378bb66953926b81d1ce15ee12c832a626777
 MD5 c3a4d4c5994a804fef9d7c8009d5bb67 files/gtkhtml-fix_preedit.patch 2439
 RMD160 0378bb66953926b81d1ce15ee12c832a62677713 files/gtkhtml-fix_preedit.patch 2439
 SHA256 944fc53a7b5d2085d6ff5b2705fd1c86ec0b263df9bbaec241311aa2741e1173 files/gtkhtml-fix_preedit.patch 2439
-AUX gtkhtml-gcc34.patch 484 RMD160 ef2f75dabd7333d79c9542faee90aeb8ea57f562 SHA1 3b652ebca07f605c19af8d0f631b1190eedaf104 SHA256 b4810cbfd3dc0b575084c612571aa2a71a50792c82b0189bb2878f45577f6c8a
-MD5 bc6bf91c4d69c7c6933885588f46eab3 files/gtkhtml-gcc34.patch 484
-RMD160 ef2f75dabd7333d79c9542faee90aeb8ea57f562 files/gtkhtml-gcc34.patch 484
-SHA256 b4810cbfd3dc0b575084c612571aa2a71a50792c82b0189bb2878f45577f6c8a files/gtkhtml-gcc34.patch 484
-AUX gtkhtml-gcc4.patch 485 RMD160 2fb99d2e4ddf7c93ed9bab6b5064497db713a234 SHA1 f1972ce925c4cabb2f51502f1a2bc1d12305b098 SHA256 deb8a3a1ecb8e4cf223176d01a7ab38cebf1801332f3ef33e490ab71956bdcd0
-MD5 9ccd59aedc67c72d6991971b74de2d6a files/gtkhtml-gcc4.patch 485
-RMD160 2fb99d2e4ddf7c93ed9bab6b5064497db713a234 files/gtkhtml-gcc4.patch 485
-SHA256 deb8a3a1ecb8e4cf223176d01a7ab38cebf1801332f3ef33e490ab71956bdcd0 files/gtkhtml-gcc4.patch 485
 AUX libgtkhtml-2.2.0-alpha.patch 652 RMD160 db8f1127f1539bc3b44f65d918ae7657a3175000 SHA1 5df0cd9a732ce5ca4f6b3c46ce1b5954b9aa01b3 SHA256 37fc95e6c2443e37b59dee81509f64d1ebca884c3797020f805e5da88a3a72f1
 MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
 RMD160 db8f1127f1539bc3b44f65d918ae7657a3175000 files/libgtkhtml-2.2.0-alpha.patch 652
 SHA256 37fc95e6c2443e37b59dee81509f64d1ebca884c3797020f805e5da88a3a72f1 files/libgtkhtml-2.2.0-alpha.patch 652
 DIST gtkhtml-3.0.10.tar.bz2 1074973 RMD160 28804d3bab14f2d76ce15c1f441fe873e5a607ba SHA1 1bda154cedea59088c7a2e4ae6236bbdf746d158 SHA256 47492876466dcbcd82e371264c6a1422f82feb80e40fe25a42ccc1fb7897180c
 DIST gtkhtml-3.10.2.tar.bz2 1268227 RMD160 372721db97276ecb499be38f6008571a7806804b SHA1 12eefaf2307fe1afb34f84fd2132fc77b239bb1a SHA256 8d95aca004d7ef0cf069a7829bf7feb35eacacac12e7522de401a3ee6aa07d21
-DIST gtkhtml-3.12.1.tar.bz2 1278075 RMD160 2aa7f90749b9a02290023b00a0783d782b2b50af SHA1 d3da374762c495a020683a94ec29fee96ed36168 SHA256 e374f0ab0df3429929baf2eb16f366f60f5134bf4ba139c4ce4b6bf925723a2f
 DIST gtkhtml-3.12.2.tar.bz2 1285380 RMD160 c8445d3e8893c0d99da1d153e984d5f567ff1a08 SHA1 ee194055cfdb0e572c006f4d196bff1cda755ef1 SHA256 42ba0592bd43e540c2c6c10f384b2ae5143576d4554e2ed32fd813595bc25854
+DIST gtkhtml-3.12.3.tar.bz2 1284704 RMD160 bb138582275ddd43e8fa45d62b841e3bc63fb8fd SHA1 8bdbd9365bdaa482821c5acf6369535e63e31836 SHA256 666849b22375efbaf2ab506b33868ac64126728a8e509f055882ae6940999847
 DIST gtkhtml-3.2.4.tar.bz2 1311427 RMD160 04ce25f1bb45a1b686c5c16841417126e831babf SHA1 91b597a38909bddf12de410d45d8f3dc46e95959 SHA256 b815adcabac35c1ccf2fd04c3c09d911b0fe257faf765e40425ea7b8c2397706
 DIST gtkhtml-3.2.5.tar.bz2 1315567 RMD160 21c61b1eefb2284376ace410cd3ff134e93efc5a SHA1 11717b4694cd7173f945ef70682848ce46def78b SHA256 ddb33b29132be2988b954a676c1237773c721441ad31449bfe3c673dff204df9
 DIST gtkhtml-3.6.2.tar.bz2 1416041 RMD160 5428cab4c27b1197537b34fb5c798d0aa223f29a SHA1 3f502be2fa30b346a8f1c658e48e2a57827482e8 SHA256 0c34357bd2b4ed3584e18a30f13a9f5d4c70738872ef90db97c1298013b2f7b9
-DIST gtkhtml-3.8.2.tar.bz2 1247395 RMD160 1e1d547dd2e4dbbc8ae52b9b9845f164f9a7d49b SHA1 8a131f95aaac773718d13f110f4b17a1b82cc1ec SHA256 d8fc9e7111773448bb07cc2619fbc3b8534a14a9b3075724465c7567cf1a94d0
-DIST libgtkhtml-2.6.0.tar.bz2 426126 RMD160 65f141f8f1ba985cb28fabbbe0ed4061f57c3f43 SHA1 24d31acfc923ef214a3d4e4e66527e5800a76217 SHA256 e8d9e94effaa97f85f321d5e6a7362848514e435f8a7498b2239cda59de429f5
 DIST libgtkhtml-2.6.3.tar.bz2 392127 RMD160 153d2f0e49f7a633e3129f625a7b705f87b0b950 SHA1 b5022ac2faf87e79ea5a687880f5ff7081b46bf5 SHA256 c84aab9dfe4211a0aa5459d0ef4cf2bc290dfc73d0a506cb273f91b16f102e73
-EBUILD gtkhtml-2.6.0.ebuild 1108 RMD160 b3685e8fe2aa2bacebfc752e7e46b7f5cb570f1b SHA1 3f253647888e2e65779a69a9d687abf7804ffca1 SHA256 8033f58aa1a0a04ef2c10ac3a82985789b1e580c8e922a0d893b502b217e70e2
-MD5 8bd1f8002efa5523d9622bce6dc757dd gtkhtml-2.6.0.ebuild 1108
-RMD160 b3685e8fe2aa2bacebfc752e7e46b7f5cb570f1b gtkhtml-2.6.0.ebuild 1108
-SHA256 8033f58aa1a0a04ef2c10ac3a82985789b1e580c8e922a0d893b502b217e70e2 gtkhtml-2.6.0.ebuild 1108
 EBUILD gtkhtml-2.6.3.ebuild 1117 RMD160 7b0470f564512003367e3a1288ed5b4e195f3f34 SHA1 4d9c0febfe6168b320e5bf9ff85e66a64716d316 SHA256 484d6fda793944593c211951cf7951d7b3e4f1b5314b16af66381ba06a814d88
 MD5 8c73ae5c73ef27af296c2d4bfb0b5a06 gtkhtml-2.6.3.ebuild 1117
 RMD160 7b0470f564512003367e3a1288ed5b4e195f3f34 gtkhtml-2.6.3.ebuild 1117
@@ -63,14 +49,14 @@ EBUILD gtkhtml-3.10.2.ebuild 879 RMD160 05ff1d9ba7ac9cb9ccf01cdfceaf184310458fbc
 MD5 9aa71fbfb1409d3ab788f8c959caaa6d gtkhtml-3.10.2.ebuild 879
 RMD160 05ff1d9ba7ac9cb9ccf01cdfceaf184310458fbc gtkhtml-3.10.2.ebuild 879
 SHA256 671d4079b8ee2cd5c9d360f92261e2d6cf4e294ead765b71d09ef1b5e38a6d4d gtkhtml-3.10.2.ebuild 879
-EBUILD gtkhtml-3.12.1.ebuild 985 RMD160 155b495e4ce7690e24503972dfaa31f82f45c4ce SHA1 cfd75ae284a5d1928e8cc2012427cdad42b40268 SHA256 43de56aa5ded430b3e64f1e32099d8c34e2c48ccce075e46db8b208dea36b137
-MD5 ff3b3d668c0a59e86dd35b80362fb766 gtkhtml-3.12.1.ebuild 985
-RMD160 155b495e4ce7690e24503972dfaa31f82f45c4ce gtkhtml-3.12.1.ebuild 985
-SHA256 43de56aa5ded430b3e64f1e32099d8c34e2c48ccce075e46db8b208dea36b137 gtkhtml-3.12.1.ebuild 985
 EBUILD gtkhtml-3.12.2.ebuild 976 RMD160 59c0b51f1d65bdedbcc95abd6f2079e9d909aab2 SHA1 ec50146b2e8fb5991c5b5a13ebc1c73a7740d6f2 SHA256 0b2dc67b7444180ecf689fecdd8e793af600c78d08aeacb75b1a349dad06ec7f
 MD5 c657d31f7b58d88d3440001818ec9674 gtkhtml-3.12.2.ebuild 976
 RMD160 59c0b51f1d65bdedbcc95abd6f2079e9d909aab2 gtkhtml-3.12.2.ebuild 976
 SHA256 0b2dc67b7444180ecf689fecdd8e793af600c78d08aeacb75b1a349dad06ec7f gtkhtml-3.12.2.ebuild 976
+EBUILD gtkhtml-3.12.3.ebuild 983 RMD160 f3a974358988916c6838219ee378bc7882fd6ea7 SHA1 d67b24e6a52e4dabbe0a2e3e4b090441c9b3d3f3 SHA256 20ae0536c13732e08003a39a640825bd0424aaa43b739e648dca97dde8cdd46e
+MD5 127fbca3b70fcae8e156fe011867b248 gtkhtml-3.12.3.ebuild 983
+RMD160 f3a974358988916c6838219ee378bc7882fd6ea7 gtkhtml-3.12.3.ebuild 983
+SHA256 20ae0536c13732e08003a39a640825bd0424aaa43b739e648dca97dde8cdd46e gtkhtml-3.12.3.ebuild 983
 EBUILD gtkhtml-3.2.4.ebuild 1066 RMD160 e17e7bae4e2af37287aefe032f6db2c380ddfdb7 SHA1 43a2769ab004a2b363e21af897640e1f8d749242 SHA256 1ff5dbc275bcb28fcadf4579c633380172afabacc40a7582219ff11ce9e4d644
 MD5 bcf7a35107e488869ade3741b41b8505 gtkhtml-3.2.4.ebuild 1066
 RMD160 e17e7bae4e2af37287aefe032f6db2c380ddfdb7 gtkhtml-3.2.4.ebuild 1066
@@ -83,21 +69,14 @@ EBUILD gtkhtml-3.6.2.ebuild 1104 RMD160 148e40628cd9d43821c16548fbc5db35d9a779fd
 MD5 3f1312e751219f8dfebad10d169ed80d gtkhtml-3.6.2.ebuild 1104
 RMD160 148e40628cd9d43821c16548fbc5db35d9a779fd gtkhtml-3.6.2.ebuild 1104
 SHA256 cae4af4de7418d92cddfddf22c3385351b407f2423d7aae6c8e046151b601026 gtkhtml-3.6.2.ebuild 1104
-EBUILD gtkhtml-3.8.2.ebuild 942 RMD160 0ced0f697524a3e8a0d7cb97388fe577da96af1d SHA1 9bf97f97f44417c392febe2cab1eecbb1252271d SHA256 211a1f71a7a7c761e59acfee9181374b07943d6390700fde08b2e7da42e43eab
-MD5 777f4de7c71364df8d47b92063082faa gtkhtml-3.8.2.ebuild 942
-RMD160 0ced0f697524a3e8a0d7cb97388fe577da96af1d gtkhtml-3.8.2.ebuild 942
-SHA256 211a1f71a7a7c761e59acfee9181374b07943d6390700fde08b2e7da42e43eab gtkhtml-3.8.2.ebuild 942
-MISC ChangeLog 12474 RMD160 5f9445240e5fc37b918115f7322df192a612a3f0 SHA1 f972b30b96942f67d181df97d176dd369ee54b4c SHA256 6c21f8f5608a6e86e6d410b4327d0a0ca05fb8eb5edc13141f642ccce7219e62
-MD5 830bbf2e1ae534b723fb3641185a3540 ChangeLog 12474
-RMD160 5f9445240e5fc37b918115f7322df192a612a3f0 ChangeLog 12474
-SHA256 6c21f8f5608a6e86e6d410b4327d0a0ca05fb8eb5edc13141f642ccce7219e62 ChangeLog 12474
+MISC ChangeLog 12761 RMD160 8e3f2c1e754f42c1537193ea4672225bfa5ca7ab SHA1 5c9bd0bd0b58eec9b40691bb1896d060ae73ee12 SHA256 e04b857d8794b4799bdf30582069479d38009e1cecfd3df6988918861b961c05
+MD5 6807b6cee733657753d7f91f69f57152 ChangeLog 12761
+RMD160 8e3f2c1e754f42c1537193ea4672225bfa5ca7ab ChangeLog 12761
+SHA256 e04b857d8794b4799bdf30582069479d38009e1cecfd3df6988918861b961c05 ChangeLog 12761
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 5210777a2503e58ea03553b4279cc463 files/digest-gtkhtml-2.6.0 253
-RMD160 02b1a7325f9c2c267e9f4821dafb6ae291b8ad01 files/digest-gtkhtml-2.6.0 253
-SHA256 d5c972bf502b5fe04377f0b11c069c1f8f46d1dbfa50eb427da509be29e3f6f6 files/digest-gtkhtml-2.6.0 253
 MD5 e8ad10c6fea0b49024098ebc98068753 files/digest-gtkhtml-2.6.3 253
 RMD160 02b63960edbe37d2b1de6f0947897343d819cfa5 files/digest-gtkhtml-2.6.3 253
 SHA256 d9770b3ca2a64d14fd429f9fd7e16535e02aa2fe4c8b0b44f78246e937b4b421 files/digest-gtkhtml-2.6.3 253
@@ -110,12 +89,12 @@ SHA256 d1d6b0dfb5d716eb9c9cb18daa5d93679dfd75cbcd521ca63e220bb6ec83a2f6 files/di
 MD5 428bb8786ae13c7187e70241aec98e37 files/digest-gtkhtml-3.10.2 250
 RMD160 3f83c60338491b9aaab978b4fc2e0c000fcffc58 files/digest-gtkhtml-3.10.2 250
 SHA256 68a278fb59114a8a90e793a8525bb9dc7d33b083b936bb6c644c68a43e606450 files/digest-gtkhtml-3.10.2 250
-MD5 d07b137a4bc7345e8e81d3fe3871419b files/digest-gtkhtml-3.12.1 250
-RMD160 dc035b09cf484f8464492b27144be6a787b2a323 files/digest-gtkhtml-3.12.1 250
-SHA256 1747bd6d78a133cbff11637ff25df394f2253173de6aeda7c044f1c985acc7dd files/digest-gtkhtml-3.12.1 250
 MD5 58802755d4f600e4aa736c265c9bde59 files/digest-gtkhtml-3.12.2 250
 RMD160 5a63fb4d0de6a445623694d65a3dbaf3ead5b5cd files/digest-gtkhtml-3.12.2 250
 SHA256 15da7109d12fcceb7ed865c35d704cc85b5f49bc906f15d1ab413dcd2c71deac files/digest-gtkhtml-3.12.2 250
+MD5 8d1b4a7d8d00f871c18bbd73d35b2737 files/digest-gtkhtml-3.12.3 250
+RMD160 7571092ceb740fce1c5bd016d8d4b7edb3dee95f files/digest-gtkhtml-3.12.3 250
+SHA256 9b7f3b7700b7fdb4027d937db9025188ff2d87280e336de5b294006a657e6e8c files/digest-gtkhtml-3.12.3 250
 MD5 1766d4c6fabb2fc26806dce873b739f9 files/digest-gtkhtml-3.2.4 247
 RMD160 5a4014ebc06c78190b748e7c7ad38cdf785ea544 files/digest-gtkhtml-3.2.4 247
 SHA256 a813a24e67df9fb4f484b6ecbd878b45745c8ad5c97a7d7d20a84da1540d9072 files/digest-gtkhtml-3.2.4 247
@@ -125,13 +104,10 @@ SHA256 846ceb94d7d342844893500937d847f0a3f07287fb1c6a1396d89307842c089a files/di
 MD5 593de6d403fd8164b7b05d437b129019 files/digest-gtkhtml-3.6.2 247
 RMD160 8c9f57dc83543afadcd9841b9cab8f4b45a725b8 files/digest-gtkhtml-3.6.2 247
 SHA256 b61839611a0d72760e25c475b2d41598fdf167d50b10e08ee1aaefb946d10b18 files/digest-gtkhtml-3.6.2 247
-MD5 138523f9d48523f07c6db9ff864bee26 files/digest-gtkhtml-3.8.2 247
-RMD160 26fd762937e8f153f3adbaa1b198131e393ff31e files/digest-gtkhtml-3.8.2 247
-SHA256 c27b258b035fb38474d5f1377ac9628e1758aa3f8c79f14c61000a4b61427ec5 files/digest-gtkhtml-3.8.2 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFvFUG8bi6rjpTunYRAvbBAJ9UsTNm9fYXWcEC/aZg3vNWUdkOKwCfWNdX
-+R3tp5Ev0zGw21Zo41BZR+g=
-=U328
+iD8DBQFFyeGWkeYb6olFHJcRAl4WAKDyMbALiqR5v2CKYecnvFGIaJgFngCeM8Fa
+7ih0QHC29uAKb8yZSrm0cLc=
+=qTrh
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.0 b/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.0
deleted file mode 100644
index 843bfded4037..000000000000
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 100d747ee9dce852e313c4f9fa202813 libgtkhtml-2.6.0.tar.bz2 426126
-RMD160 65f141f8f1ba985cb28fabbbe0ed4061f57c3f43 libgtkhtml-2.6.0.tar.bz2 426126
-SHA256 e8d9e94effaa97f85f321d5e6a7362848514e435f8a7498b2239cda59de429f5 libgtkhtml-2.6.0.tar.bz2 426126
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.12.1 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.12.1
deleted file mode 100644
index 28036f3b5ca8..000000000000
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.12.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ac86f5770ea2d054644d14e7aa673eaa gtkhtml-3.12.1.tar.bz2 1278075
-RMD160 2aa7f90749b9a02290023b00a0783d782b2b50af gtkhtml-3.12.1.tar.bz2 1278075
-SHA256 e374f0ab0df3429929baf2eb16f366f60f5134bf4ba139c4ce4b6bf925723a2f gtkhtml-3.12.1.tar.bz2 1278075
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.12.3 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.12.3
new file mode 100644
index 000000000000..a786904a7ee8
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.12.3
@@ -0,0 +1,3 @@
+MD5 b580590014988b02e51b66be65319570 gtkhtml-3.12.3.tar.bz2 1284704
+RMD160 bb138582275ddd43e8fa45d62b841e3bc63fb8fd gtkhtml-3.12.3.tar.bz2 1284704
+SHA256 666849b22375efbaf2ab506b33868ac64126728a8e509f055882ae6940999847 gtkhtml-3.12.3.tar.bz2 1284704
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.2 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.2
deleted file mode 100644
index b7908e2213b5..000000000000
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4455e24142cc914f00f1e8b81940df68 gtkhtml-3.8.2.tar.bz2 1247395
-RMD160 1e1d547dd2e4dbbc8ae52b9b9845f164f9a7d49b gtkhtml-3.8.2.tar.bz2 1247395
-SHA256 d8fc9e7111773448bb07cc2619fbc3b8534a14a9b3075724465c7567cf1a94d0 gtkhtml-3.8.2.tar.bz2 1247395
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-gcc34.patch b/gnome-extra/gtkhtml/files/gtkhtml-gcc34.patch
deleted file mode 100644
index 020301260140..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-gcc34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur gtkhtml-1.1.10-orig/components/html-editor/popup.c gtkhtml-1.1.10/components/html-editor/popup.c
---- gtkhtml-1.1.10-orig/components/html-editor/popup.c	2004-05-25 00:27:37.463103516 -0400
-+++ gtkhtml-1.1.10/components/html-editor/popup.c	2004-05-25 00:28:20.916203966 -0400
-@@ -496,6 +496,7 @@
- 			ADD_PROP (PARAGRAPH);
- 			break;
- 		default:
-+			break;
- 		}
- 		if (obj->parent && obj->parent->parent && HTML_IS_TABLE_CELL (obj->parent->parent)) {
- 			if (cd->format_html) {
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-gcc4.patch b/gnome-extra/gtkhtml/files/gtkhtml-gcc4.patch
deleted file mode 100644
index d01353ce2e73..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-gcc4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN ../tmp-orig/gtkhtml3.1-3.1.20/src/htmlcluealigned.h ./src/htmlcluealigned.h
---- ../tmp-orig/gtkhtml3.1-3.1.20/src/htmlcluealigned.h	2001-05-21 14:47:11.000000000 +0200
-+++ ./src/htmlcluealigned.h	2004-12-23 00:11:07.458004704 +0100
-@@ -38,9 +38,6 @@
- };
- 
- 
--extern HTMLClueAlignedClass html_cluealigned_class;
--
--
- void        html_cluealigned_type_init   (void);
- void        html_cluealigned_class_init  (HTMLClueAlignedClass *klass,
- 					  HTMLType              type,
diff --git a/gnome-extra/gtkhtml/gtkhtml-2.6.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-2.6.0.ebuild
deleted file mode 100644
index 9b90e322e3cb..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-2.6.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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-2.6.0.ebuild,v 1.2 2006/09/05 04:01:17 kumba Exp $
-
-inherit eutils gnome2 versionator
-
-MY_P="lib${P}"
-MY_PN="lib${PN}"
-MY_MAJ_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="a Gtk+ based HTML rendering library"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_MAJ_PV}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
-IUSE="accessibility"
-
-# FIXME : seems only testapps need gnomevfs
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/libxml2-2.4.16
-	>=gnome-base/gnome-vfs-2
-	accessibility? ( >=gnome-base/gail-1.3 )"
-
-DEPEND="${RDEPEND}
-	 >=dev-util/pkgconfig-0.12.0"
-
-G2CONF="${G2CONF} $(use_enable accessibility)"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS  README TODO docs/IDEAS"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	if use alpha; then
-		epatch ${FILESDIR}/${MY_PN}-2.2.0-alpha.patch || die
-	fi
-
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.12.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild
index 84fb2a8a1a8d..bdf7e7aad251 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.12.1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.12.1.ebuild,v 1.2 2006/10/14 21:07:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild,v 1.1 2007/02/07 14:26:40 leio Exp $
 
 inherit gnome2 eutils
 
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.8.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.8.2.ebuild
deleted file mode 100644
index 6652a86aae1e..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.8.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.8.2.ebuild,v 1.11 2006/10/14 21:07:04 vapier Exp $
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.8"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="static"
-
-RDEPEND=">=gnome-base/gail-1.1
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonoboui-2.2.4
-	>=gnome-base/orbit-2
-	>=gnome-base/libbonobo-2
-	>=net-libs/libsoup-2.1.6
-	>=x11-libs/gtk+-2.4
-	>=x11-themes/gnome-icon-theme-1.2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.30
-	>=dev-util/pkgconfig-0.9"
-
-USE_DESTDIR="1"
-ELTCONF="--reverse-deps"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-
-pkg_setup() {
-	G2CONF="$(use_enable static)"
-}