added gtk 2.4 build fix to 2.0.9, mark 3.0.10 x86

10 files changed, 101 insertions, 149 deletions

diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index b3fd64b708c6..26446d8fe9eb 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/libgtkhtml
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.68 2004/04/27 21:19:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.69 2004/04/28 12:50:34 foser Exp $
+
+  28 Apr 2004; foser <foser@gentoo.org> libgtkhtml-3.0.9.ebuild :
+  Add patch to fix gtk-2.4 build, provided by gmsoft in #49218
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> libgtkhtml-3.0.10.ebuild,
   libgtkhtml-3.0.8-r2.ebuild, libgtkhtml-3.0.9.ebuild:
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.5.6 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.5.6
deleted file mode 100644
index 661a2d984a98..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.5.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19395d3ed0e93a1d48d477645029e56b libgtkhtml-2.5.6.tar.bz2 424521
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.7 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.7
deleted file mode 100644
index 9a6b0afe2c17..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 561d588d113c61e3b1977b3ea09c90ad gtkhtml-3.0.7.tar.bz2 1043147
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.8-r2 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.8-r2
deleted file mode 100644
index e89e703e2c13..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.8-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef54e1dd447f3e4e00ad11e18326fb92 gtkhtml-3.0.8.tar.bz2 1034139
diff --git a/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.9-gtk-2.4.patch b/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.9-gtk-2.4.patch
new file mode 100644
index 000000000000..0484bd8a2441
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.9-gtk-2.4.patch
@@ -0,0 +1,90 @@
+diff -uNr gtkhtml-3.0.9.orig/a11y/Makefile.am gtkhtml-3.0.9/a11y/Makefile.am
+--- gtkhtml-3.0.9.orig/a11y/Makefile.am	2004-04-28 02:00:18.000000000 +0000
++++ gtkhtml-3.0.9/a11y/Makefile.am	2004-04-28 02:00:42.000000000 +0000
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES = -I$(top_srcdir)/src $(GTKHTML_CFLAGS)
+ 
+-CFLAGS += $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
++CFLAGS += $(GAIL_CFLAGS)
+ 
+ lib_LTLIBRARIES = libgtkhtml-a11y-3.0.la
+ 
+diff -uNr gtkhtml-3.0.9.orig/a11y/Makefile.in gtkhtml-3.0.9/a11y/Makefile.in
+--- gtkhtml-3.0.9.orig/a11y/Makefile.in	2004-04-28 02:00:18.000000000 +0000
++++ gtkhtml-3.0.9/a11y/Makefile.in	2004-04-28 02:00:58.000000000 +0000
+@@ -50,7 +50,7 @@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ 
+-CFLAGS = @CFLAGS@ $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
++CFLAGS = @CFLAGS@ $(GAIL_CFLAGS)
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+diff -uNr gtkhtml-3.0.9.orig/components/html-editor/Makefile.am gtkhtml-3.0.9/components/html-editor/Makefile.am
+--- gtkhtml-3.0.9.orig/components/html-editor/Makefile.am	2004-04-28 02:00:18.000000000 +0000
++++ gtkhtml-3.0.9/components/html-editor/Makefile.am	2004-04-28 02:01:25.000000000 +0000
+@@ -16,15 +16,10 @@
+         -DGTKHTML_DATADIR=\""$(gtkhtml_data)"\"		\
+         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+ 	-DGLADE_DATADIR=\"$(gladedir)\"			\
+-	-DGTK_DISABLE_DEPRECATED=1 			\
+-	-DGDK_DISABLE_DEPRECATED=1			\
+-	-DG_DISABLE_DEPRECATED=1			\
+-	-DGNOME_DISABLE_DEPRECATED=1			\
+ 	-DPREFIX=\""$(prefix)"\"			\
+ 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
+ 	-DDATADIR=\""$(datadir)"\"			\
+ 	-DLIBDIR=\""$(datadir)"\"			\
+-	-DBONOBO_DISABLE_DEPRECATED=1
+ 
+ # CORBA stuff
+ IDLS = Editor.idl
+diff -uNr gtkhtml-3.0.9.orig/components/html-editor/Makefile.in gtkhtml-3.0.9/components/html-editor/Makefile.in
+--- gtkhtml-3.0.9.orig/components/html-editor/Makefile.in	2004-04-28 02:00:18.000000000 +0000
++++ gtkhtml-3.0.9/components/html-editor/Makefile.in	2004-04-28 02:01:40.000000000 +0000
+@@ -198,15 +198,10 @@
+         -DGTKHTML_DATADIR=\""$(gtkhtml_data)"\"		\
+         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+ 	-DGLADE_DATADIR=\"$(gladedir)\"			\
+-	-DGTK_DISABLE_DEPRECATED=1 			\
+-	-DGDK_DISABLE_DEPRECATED=1			\
+-	-DG_DISABLE_DEPRECATED=1			\
+-	-DGNOME_DISABLE_DEPRECATED=1			\
+ 	-DPREFIX=\""$(prefix)"\"			\
+ 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
+ 	-DDATADIR=\""$(datadir)"\"			\
+ 	-DLIBDIR=\""$(datadir)"\"			\
+-	-DBONOBO_DISABLE_DEPRECATED=1
+ 
+ 
+ # CORBA stuff
+diff -uNr gtkhtml-3.0.9.orig/src/Makefile.am gtkhtml-3.0.9/src/Makefile.am
+--- gtkhtml-3.0.9.orig/src/Makefile.am	2004-04-28 02:00:17.000000000 +0000
++++ gtkhtml-3.0.9/src/Makefile.am	2004-04-28 02:01:54.000000000 +0000
+@@ -12,10 +12,6 @@
+ 
+ AM_CFLAGS = 								\
+ 	-DICONDIR=\"$(datadir)/gtkhtml-@GTKHTML_RELEASE@/icons\"	\
+-	-DGTK_DISABLE_DEPRECATED=1					\
+-	-DGDK_DISABLE_DEPRECATED=1					\
+-	-DG_DISABLE_DEPRECATED=1					\
+-	-DGNOME_DISABLE_DEPRECATED=1
+ 
+ lib_LTLIBRARIES = libgtkhtml-3.0.la
+ 
+diff -uNr gtkhtml-3.0.9.orig/src/Makefile.in gtkhtml-3.0.9/src/Makefile.in
+--- gtkhtml-3.0.9.orig/src/Makefile.in	2004-04-28 02:00:17.000000000 +0000
++++ gtkhtml-3.0.9/src/Makefile.in	2004-04-28 02:02:06.000000000 +0000
+@@ -193,10 +193,6 @@
+ 
+ AM_CFLAGS = \
+ 	-DICONDIR=\"$(datadir)/gtkhtml-@GTKHTML_RELEASE@/icons\"	\
+-	-DGTK_DISABLE_DEPRECATED=1					\
+-	-DGDK_DISABLE_DEPRECATED=1					\
+-	-DG_DISABLE_DEPRECATED=1					\
+-	-DGNOME_DISABLE_DEPRECATED=1
+ 
+ 
+ lib_LTLIBRARIES = libgtkhtml-3.0.la
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-2.5.6.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-2.5.6.ebuild
deleted file mode 100644
index 8bd2e25dc889..000000000000
--- a/gnome-extra/libgtkhtml/libgtkhtml-2.5.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-2.5.6.ebuild,v 1.1 2004/03/21 15:06:24 foser Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="a Gtk+ based HTML rendering library"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="LGPL-2.1 GPL-2"
-
-IUSE="accessibility"
-SLOT="1"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
-
-# 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"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	if use alpha; then
-		epatch ${FILESDIR}/${PN}-2.2.0-alpha.patch || die
-	fi
-
-}
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild
index ee2794348585..46100a6fdc1a 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild,v 1.4 2004/04/27 21:19:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild,v 1.5 2004/04/28 12:50:34 foser Exp $
 
 inherit gnome2 eutils
 
@@ -16,7 +16,7 @@ PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
 SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.${GNOME_TARBALL_SUFFIX}"
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.7.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.7.ebuild
deleted file mode 100644
index d9d0a3e2cf9e..000000000000
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.7.ebuild,v 1.9 2004/04/27 21:19:18 agriffis Exp $
-
-inherit gnome2
-
-MY_P=${P/lib/}
-MY_PN=${PN/lib/}
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-# stolen from gnome.org eclass because it support this one-off name-mangling
-
-[ -z "${GNOME_TARBALL_SUFFIX}" ] && export GNOME_TARBALL_SUFFIX="bz2"
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.${GNOME_TARBALL_SUFFIX}"
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="x86 ~ppc ~sparc hppa"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=gnome-extra/gal-1.99.8
-	>=net-libs/libsoup-1.99.23
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/libbonobo-2.0
-	>=gnome-base/ORBit2-2.5.6
-	>=gnome-base/gnome-vfs-2.1
-	>=gnome-base/gail-1.1
-	>=dev-libs/libxml2-2.5"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-USE_DESTDIR="1"
-SCROLLKEEPER_UPDATE="0"
-ELTCONF="--reverse-deps"
-
-src_compile() {
-	gnome2_src_configure
-	patch ${S}/libtool < ${FILESDIR}/${P}-libtool.patch || die "libtool patch failed"
-	emake || die "make failed"
-}
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r2.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r2.ebuild
deleted file mode 100644
index a07bd6ed824f..000000000000
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r2.ebuild,v 1.4 2004/04/27 21:19:18 agriffis Exp $
-
-inherit gnome2 eutils
-
-MY_P=${P/lib/}
-MY_PN=${PN/lib/}
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-# stolen from gnome.org eclass because it support this one-off name-mangling
-
-[ -z "${GNOME_TARBALL_SUFFIX}" ] && export GNOME_TARBALL_SUFFIX="bz2"
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.${GNOME_TARBALL_SUFFIX}"
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="x86 ~ppc ~sparc ~hppa ~alpha"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=gnome-extra/gal-1.99.9
-	>=net-libs/libsoup-1.99.23
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/libbonobo-2.0
-	>=gnome-base/ORBit2-2.5.6
-	>=gnome-base/gnome-vfs-2.1
-	>=gnome-base/gail-1.1
-	>=dev-libs/libxml2-2.5"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-USE_DESTDIR="1"
-SCROLLKEEPER_UPDATE="0"
-ELTCONF="--reverse-deps"
-
-src_unpack() {
-	unpack ${A}
-	if use alpha; then
-		epatch ${FILESDIR}/${PN}-3.0.8-alpha.patch
-	fi
-}
-
-src_compile() {
-	gnome2_src_configure
-
-	EPATCH_OPTS="${S}/libtool"
-	epatch ${FILESDIR}/${PN}-3.0.7-libtool.patch
-
-	emake || die "make failed"
-}
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.9.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.9.ebuild
index f698b8b748d3..21f0a0dc853e 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.9.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.9.ebuild,v 1.12 2004/04/27 21:19:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.9.ebuild,v 1.13 2004/04/28 12:50:34 foser Exp $
 
 inherit gnome2 eutils
 
@@ -47,6 +47,10 @@ src_unpack() {
 	# The following patch fixes problems on 64-bit, but doesn't hurt
 	# to apply everywhere
 	epatch ${FILESDIR}/${PN}-3.0.8-alpha.patch
+
+	# fix gtk-2.4 build (#49218)
+	epatch ${FILESDIR}/${P}-gtk-2.4.patch
+
 }
 
 src_compile() {