From a9f18f65559e0aff5ec7102c7e4f4afadfb94900 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Wed, 19 Nov 2008 22:06:39 +0000 Subject: New version for GNOME 2.24. Rewrite of the composer code, we keep the bonobo component until we make sure nothing uses it in the tree anymore. Clean up old revisions. (Portage version: 2.2_rc14/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64) --- gnome-extra/gtkhtml/ChangeLog | 11 +++++- gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild | 56 ---------------------------- gnome-extra/gtkhtml/gtkhtml-3.18.1.ebuild | 47 ----------------------- gnome-extra/gtkhtml/gtkhtml-3.18.2.ebuild | 47 ----------------------- gnome-extra/gtkhtml/gtkhtml-3.24.1.1.ebuild | 55 +++++++++++++++++++++++++++ 5 files changed, 65 insertions(+), 151 deletions(-) delete mode 100644 gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild delete mode 100644 gnome-extra/gtkhtml/gtkhtml-3.18.1.ebuild delete mode 100644 gnome-extra/gtkhtml/gtkhtml-3.18.2.ebuild create mode 100644 gnome-extra/gtkhtml/gtkhtml-3.24.1.1.ebuild (limited to 'gnome-extra') diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog index 804712a0c6ec..1d2a92875622 100644 --- a/gnome-extra/gtkhtml/ChangeLog +++ b/gnome-extra/gtkhtml/ChangeLog @@ -1,6 +1,15 @@ # 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.168 2008/11/13 19:16:52 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.169 2008/11/19 22:06:39 eva Exp $ + +*gtkhtml-3.24.1.1 (19 Nov 2008) + + 19 Nov 2008; Gilles Dartiguelongue + -gtkhtml-3.14.3-r1.ebuild, -gtkhtml-3.18.1.ebuild, -gtkhtml-3.18.2.ebuild, + +gtkhtml-3.24.1.1.ebuild: + New version for GNOME 2.24. Rewrite of the composer code, we keep the + bonobo component until we make sure nothing uses it in the tree anymore. + Clean up old revisions. 13 Nov 2008; Brent Baude gtkhtml-3.18.3.ebuild: Marking gtkhtml-3.18.3 ppc64 stable for bug 236971 diff --git a/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild deleted file mode 100644 index 230ea5bacb54..000000000000 --- a/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild +++ /dev/null @@ -1,56 +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-r1.ebuild,v 1.11 2008/04/20 02:10:15 vapier Exp $ -EAPI="1" - -inherit gnome2 eutils - -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 - - # A fix for a html_object_get_left_margin related crashes - epatch "${FILESDIR}/${P}-get_left_margin-fix.patch" -} - -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.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.18.1.ebuild deleted file mode 100644 index 9ec97f3d2bc6..000000000000 --- a/gnome-extra/gtkhtml/gtkhtml-3.18.1.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-3.18.1.ebuild,v 1.1 2008/04/07 22:56:47 eva 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=">=x11-libs/gtk+-2.12 - >=gnome-base/gail-1.1 - >=x11-themes/gnome-icon-theme-1.2 - >=gnome-base/libbonobo-2.20.3 - >=gnome-base/libbonoboui-2.2.4 - >=gnome-base/libglade-2 - >=gnome-base/libgnomeui-2 - >=gnome-base/orbit-2 - net-libs/libsoup:2.4" -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}/gtkhtml/Makefile.am" "${S}/gtkhtml/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.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.18.2.ebuild deleted file mode 100644 index 561fbd336fc9..000000000000 --- a/gnome-extra/gtkhtml/gtkhtml-3.18.2.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-3.18.2.ebuild,v 1.5 2008/08/12 13:42:31 armin76 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=">=x11-libs/gtk+-2.12 - >=gnome-base/gail-1.1 - >=x11-themes/gnome-icon-theme-1.2 - >=gnome-base/libbonobo-2.20.3 - >=gnome-base/libbonoboui-2.2.4 - >=gnome-base/libglade-2 - >=gnome-base/libgnomeui-2 - >=gnome-base/orbit-2 - net-libs/libsoup:2.4" -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}/gtkhtml/Makefile.am" "${S}/gtkhtml/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.24.1.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.24.1.1.ebuild new file mode 100644 index 000000000000..e28a3e6c3de9 --- /dev/null +++ b/gnome-extra/gtkhtml/gtkhtml-3.24.1.1.ebuild @@ -0,0 +1,55 @@ +# 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.24.1.1.ebuild,v 1.1 2008/11/19 22:06:39 eva 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="" + +# We keep bonobo until we can make sure no apps in tree uses +# the old composer code. +# We could probably enable the glade catalog installation with +# USE="glade" if someone requests it +RDEPEND=">=x11-libs/gtk+-2.12 + >=gnome-base/gail-1.1 + >=x11-themes/gnome-icon-theme-1.2 + >=gnome-base/libbonobo-2.20.3 + >=gnome-base/libbonoboui-2.2.4 + >=gnome-base/orbit-2 + >=gnome-base/libglade-2 + >=gnome-base/libgnomeui-2 + app-text/enchant + gnome-base/gconf:2 + >=app-text/iso-codes-0.49 + net-libs/libsoup:2.4" +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/intltool-0.36.3 + >=dev-util/pkgconfig-0.9" + +DOCS="AUTHORS BUGS ChangeLog NEWS README TODO" + +pkg_setup() { + ELTCONF="--reverse-deps" + G2CONF="--disable-static --with-bonobo-editor" +} + +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}/gtkhtml/Makefile.am" "${S}/gtkhtml/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" +} -- cgit v1.2.3-65-gdbad