New version for GNOME-2.22.2. Bug fixes and translation updates. Cleaning up old revisions.

Package-Manager: portage-2.1.5

5 files changed, 16 insertions, 108 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 5639b1581b02..f0114d8a075d 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.155 2008/04/07 22:56:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.156 2008/05/26 20:58:27 eva Exp $
+
+*gtkhtml-3.18.2 (26 May 2008)
+
+  26 May 2008; Gilles Dartiguelongue <eva@gentoo.org> -gtkhtml-2.6.3.ebuild,
+  -gtkhtml-3.14.3.ebuild, -gtkhtml-3.18.0.ebuild, +gtkhtml-3.18.2.ebuild:
+  New version for GNOME-2.22.2. Bug fixes and translation updates. Cleaning
+  up old revisions.
 
 *gtkhtml-3.18.1 (07 Apr 2008)
 
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index e9b1c02e314d..a8f083b82d13 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -11,28 +11,25 @@ AUX libgtkhtml-2.2.0-alpha.patch 652 RMD160 db8f1127f1539bc3b44f65d918ae7657a317
 DIST gtkhtml-3.12.3.tar.bz2 1284704 RMD160 bb138582275ddd43e8fa45d62b841e3bc63fb8fd SHA1 8bdbd9365bdaa482821c5acf6369535e63e31836 SHA256 666849b22375efbaf2ab506b33868ac64126728a8e509f055882ae6940999847
 DIST gtkhtml-3.14.3.tar.bz2 1283748 RMD160 2761c056a1ed9d8759c1897afb61808872305f9d SHA1 aede744b666fdefb9478e214aa5d38e0122aa289 SHA256 6419265c9766de668bd553742d915df095bdab2737a4583f63e67242d3903832
 DIST gtkhtml-3.16.3.tar.bz2 1302959 RMD160 f4b7f134107180e8d244654366ac4cfd51761168 SHA1 6fbf5736a9f10cd45287e7aa50bf558510f2dbf5 SHA256 00a313b7f56c235f3ac520dc1ebbb5c8245d76f8992a1187f165c0595a474850
-DIST gtkhtml-3.18.0.tar.bz2 1312369 RMD160 95161c0dcfbb2aae8317de7f3c6119970fbb86fe SHA1 b77e342fc5f90104c87f6f2e8e970b6319d047e4 SHA256 867036b10dd4b21f79bc0d8b303d348ff55cb4ded896c8cb384b2bb4bbf378d7
 DIST gtkhtml-3.18.1.tar.bz2 1311405 RMD160 944b05240695b6a21949a2b3d28ffba73a7522e7 SHA1 6f2310fd7ef392941593f873e3181827705f6021 SHA256 06c91417f2582a36acb0be8bd4761a19200c879ac6a38fb36b77fac7351ad2cf
+DIST gtkhtml-3.18.2.tar.bz2 1313837 RMD160 56a850d2fe307cf5c0340549c191502b504c79b5 SHA1 03cb5c873eea65dda63cc4452374a72ca8d92b19 SHA256 3c2b27f339ac1b3e80f009eb8b36f8dd9d9cc4d6bb15682e471b17d3f7b40b8d
 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 libgtkhtml-2.11.1.tar.bz2 597923 RMD160 4f3a65b616c0fbfaaa487d11c8749718708deb2a SHA1 1325c1540091b89cc03d99a1e594285d2e846e50 SHA256 3ca77a0d0f15e94fb654097c2f78cf928194d4c4bf64ff7b2ba408d29c924a57
-DIST libgtkhtml-2.6.3.tar.bz2 392127 RMD160 153d2f0e49f7a633e3129f625a7b705f87b0b950 SHA1 b5022ac2faf87e79ea5a687880f5ff7081b46bf5 SHA256 c84aab9dfe4211a0aa5459d0ef4cf2bc290dfc73d0a506cb273f91b16f102e73
 EBUILD gtkhtml-2.11.1.ebuild 1264 RMD160 2220abb1725e3f8fa7388c7788f5fa103c51438c SHA1 3b95720ab49d4b795fae3d444e30efc6c257ff6c SHA256 ceb21d9fd572c9beb3431195781f964fff84aa4b23677eaa33e23279d8332502
-EBUILD gtkhtml-2.6.3.ebuild 1250 RMD160 8559044cc5973be72385502644634cbb04b80f75 SHA1 5479f57a09555a452d0867348101b36735149c22 SHA256 b08cb348b25da20462211ea53e151072355b68aae18ae882973e6f116c5031a4
 EBUILD gtkhtml-3.12.3.ebuild 1363 RMD160 9f54d0d1baffffb777930456eda10ff9146c2dd0 SHA1 f323a7097123e338c6fdbd21a42482e8ca858047 SHA256 2d822594dbd08326428373c4c2acb7e605fae31b763d8dbea067462f71cff475
 EBUILD gtkhtml-3.14.3-r1.ebuild 1621 RMD160 fca1d954f9e2c297273d2b15bae935ec34a3c41c SHA1 9a8aff02529141ac5c6c0e6b425a6836a716e1c3 SHA256 e6993f09c6f702ee25b977c51f18d6724c34a888d01387575832fcb4fab437cd
-EBUILD gtkhtml-3.14.3.ebuild 1460 RMD160 ef887595a575c577edd5ba5369f01951af921ea1 SHA1 52df261dc57729ecc3a54e12840aa9a0a5b812ef SHA256 e92cad55b3689eadb90ebe8e16d527b25df2ed79fb6d4bf8b1db3a6751f4a655
 EBUILD gtkhtml-3.16.3.ebuild 1433 RMD160 05b073023c4bcac23e617d6e2e3a3197662ea4ff SHA1 962c21b91ada811de1978ee3f54d79b3c7d9a6cf SHA256 cb0a31d35f469a4117433d343bcbcba54db862f1e07c3ece7236353d491ae474
-EBUILD gtkhtml-3.18.0.ebuild 1453 RMD160 5b7d266835acbe6a4a6a76ce914dc8bc93d1088b SHA1 16f4ac9298c6677364cf1060a666207160cdcc57 SHA256 8f04a8a7abaae0003511b9cda2aa34d342b6e42d3d9b26230a0e14abcfeaadd6
 EBUILD gtkhtml-3.18.1.ebuild 1452 RMD160 bf885561b2ec9797c5b63728f8a5d8a95f5d988a SHA1 54f59d4fd983a32f5835e19f9ec9a4bebec4edfd SHA256 87616f30a7d17e66bbe76f8cebe11319ce0a814f7907c77807af2aa3e25ad1fd
+EBUILD gtkhtml-3.18.2.ebuild 1452 RMD160 3e1d058adbef4e661119fb73b8f629237ee702ef SHA1 9c73fc776cc2aa881717f39a5d2111ee0f0d24f7 SHA256 0447a0f0945776936360335a47416c6becc26c04726b923f21820b69eab1b7c5
 EBUILD gtkhtml-3.2.5.ebuild 1609 RMD160 f247f183a31d56f81345372eff93525aed6aba70 SHA1 e779c0a9452416decf69563066a74d86a7d0d200 SHA256 064ad9d14d4db9a4f7927793e1ed82e129f949c9e20fe0033bff7e3278464111
 EBUILD gtkhtml-3.6.2.ebuild 1558 RMD160 691ae09fae87f310b0f0211ec47a3ee531ac926c SHA1 d37e5ec644bbe8ae9712b3e52fb66f692a9bc0ce SHA256 f9b45b3411e345c4b41ead10b478385fce264bfff4c1c8629538ebe1de434a0d
-MISC ChangeLog 21667 RMD160 8789569a2d2548cfad1399a2145e15cfc9b62a17 SHA1 9eb05c54ad23edda416d4ee8ad70dd7e5fc145df SHA256 214ce193e6a6a34d23d2d6ee61f1b76aed7f58e5841b8a6019d1bb35837e3702
+MISC ChangeLog 21946 RMD160 8d712639066df3d66ae057a4fe1c97c11d27d8e2 SHA1 b4113f6dddf3da507122674c433b5033f2722180 SHA256 7dd872cc6ea8358514ad74616a1f793358a899d821329398b8d055f2e2f8426e
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFICqYmj9hvisErhMIRAmamAKCwiSDRfJnZIzfdtzWYFe1jv0xOOgCgwtys
-Vo3Pu2oWZASijzOde2ADRkg=
-=IFX/
+iEYEARECAAYFAkg7QJcACgkQ1fmVwcYIWAYrLwCg4IpOtVH0wcGTgJMRRp0joRdo
+p4oAoKa5QHrv7r24K1xoMhmyYxbrxT7r
+=t3xY
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild
deleted file mode 100644
index f0f31c4af77a..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild,v 1.7 2008/01/09 21:18:52 eva Exp $
-
-inherit eutils gnome2 versionator autotools
-
-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 ppc64 sparc x86 ~x86-fbsd"
-IUSE="accessibility test"
-
-# gnome-vfs is only needed to run testgtkhtml (1/3 tests)
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/libxml2-2.4.16
-	test? ( >=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
-
-	# We need a full autoreconf on FreeBSD at least to fix libtool errors.
-	eautoreconf
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild
deleted file mode 100644
index 62dd0de354ee..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild,v 1.10 2008/03/17 02:13:58 leio Exp $
-EAPI="1"
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.14"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="static"
-
-RDEPEND=">=gnome-base/gail-1.1
-	>=gnome-base/libgnomeui-2
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonoboui-2.2.4
-	>=gnome-base/orbit-2
-	>=gnome-base/libbonobo-2
-	net-libs/libsoup:2.2
-	>=x11-libs/pango-1.15.2
-	>=x11-themes/gnome-icon-theme-1.2"
-
-DEPEND="${RDEPEND}
-	  sys-devel/gettext
-	>=dev-util/intltool-0.35.5
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	G2CONF="$(use_enable static) --enable-file-chooser"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix deprecated API disabling in used glib library - this is not future-proof, bug 210657
-	sed -i -e '/G_DISABLE_DEPRECATED/d' \
-		"${S}/src/Makefile.am" "${S}/src/Makefile.in" \
-		"${S}/components/html-editor/Makefile.am" "${S}/components/html-editor/Makefile.in"
-
-	sed -i -e 's:-DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1::g' \
-		"${S}/a11y/Makefile.am" "${S}/a11y/Makefile.in"
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.18.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.18.2.ebuild
index 880f349ed68e..977edb36ef71 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.18.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.18.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.18.0.ebuild,v 1.1 2008/03/23 21:59:39 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.18.2.ebuild,v 1.1 2008/05/26 20:58:27 eva Exp $
 EAPI="1"
 
 inherit gnome2