dep fixes, mark 1.99.11 x86

7 files changed, 11 insertions, 85 deletions

diff --git a/gnome-extra/gal/ChangeLog b/gnome-extra/gal/ChangeLog
index ea44e4a13bc0..1d8e69ed3c53 100644
--- a/gnome-extra/gal/ChangeLog
+++ b/gnome-extra/gal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/gal
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.56 2004/04/27 22:33:41 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.57 2004/04/28 12:49:05 foser Exp $
+
+  28 Apr 2004; foser <foser@gentoo.org> gal-1.99.10.ebuild :
+  Add a blocker for gtk+-2.4, it will not build vs it's API (#45104)
 
   27 Apr 2004; Guy Martin <gmsoft@gentoo.org> gal-1.99.11.ebuild:
   Marked stable on hppa.
diff --git a/gnome-extra/gal/files/digest-gal-1.99.8 b/gnome-extra/gal/files/digest-gal-1.99.8
deleted file mode 100644
index 46a6f190d322..000000000000
--- a/gnome-extra/gal/files/digest-gal-1.99.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2f3323decf2bbfa11d32f97998e044d9 gal-1.99.8.tar.bz2 949862
diff --git a/gnome-extra/gal/files/digest-gal-1.99.9 b/gnome-extra/gal/files/digest-gal-1.99.9
deleted file mode 100644
index 9ef3d4e75a68..000000000000
--- a/gnome-extra/gal/files/digest-gal-1.99.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 02f098cbd2d5dd69f1b808356a80a0d3 gal-1.99.9.tar.bz2 938816
diff --git a/gnome-extra/gal/gal-1.99.10.ebuild b/gnome-extra/gal/gal-1.99.10.ebuild
index 611c0d39f6eb..ec64d9d810ad 100644
--- a/gnome-extra/gal/gal-1.99.10.ebuild
+++ b/gnome-extra/gal/gal-1.99.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/gal/gal-1.99.10.ebuild,v 1.11 2004/04/27 21:14:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-1.99.10.ebuild,v 1.12 2004/04/28 12:49:05 foser Exp $
 
 inherit gnome2 gnome.org libtool eutils
 
@@ -18,7 +18,10 @@ RDEPEND=">=gnome-base/libgnomeprint-2.2.0
 	>=gnome-base/libgnomeui-2.0
 	>=gnome-base/libgnomecanvas-2.2.0.2
 	>=dev-libs/libxml2-2.0
-	app-text/scrollkeeper"
+	app-text/scrollkeeper
+	!>x11-libs/gtk+-2.3"
+# this & older versions of gal will not build vs. gtk-2.4 api
+
 DEPEND="sys-devel/gettext
 	dev-util/pkgconfig
 	doc? ( dev-util/gtk-doc )
diff --git a/gnome-extra/gal/gal-1.99.11.ebuild b/gnome-extra/gal/gal-1.99.11.ebuild
index df91b9465c45..13b7fe2db43e 100644
--- a/gnome-extra/gal/gal-1.99.11.ebuild
+++ b/gnome-extra/gal/gal-1.99.11.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/gal/gal-1.99.11.ebuild,v 1.3 2004/04/27 22:33:41 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-1.99.11.ebuild,v 1.4 2004/04/28 12:49:05 foser Exp $
 
 inherit gnome2 gnome.org libtool eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc hppa ~alpha ~ia64 ~amd64"
+KEYWORDS="x86 ~ppc ~sparc hppa ~alpha ~ia64 ~amd64"
 IUSE="doc"
 
 RDEPEND=">=gnome-base/libgnomeprint-2.2.0
diff --git a/gnome-extra/gal/gal-1.99.8.ebuild b/gnome-extra/gal/gal-1.99.8.ebuild
deleted file mode 100644
index 4b7e31435d1a..000000000000
--- a/gnome-extra/gal/gal-1.99.8.ebuild
+++ /dev/null
@@ -1,39 +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/gal/gal-1.99.8.ebuild,v 1.5 2004/04/27 21:14:16 agriffis Exp $
-
-IUSE="doc"
-
-inherit gnome2 gnome.org libtool
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="The Gnome Application Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2"
-KEYWORDS="x86 ~ppc ~sparc hppa"
-
-RDEPEND=">=gnome-base/libgnomeprint-2.2.0
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/libgnomecanvas-2.2.0.2
-	>=dev-libs/libxml2-2.0
-	app-text/scrollkeeper"
-
-DEPEND="sys-devel/gettext
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	${RDEPEND}"
-
-MAKEOPTS="-j1"
-USE_DESTDIR="1"
-ELTCONF="--reverse-deps"
-
-src_unpack() {
-	unpack ${A}
-	gnome2_omf_fix
-	# remove gtkdoc-fixxref
-	cd ${S}; patch -p1 < ${FILESDIR}/gal-1.99.3-docfix.patch
-}
diff --git a/gnome-extra/gal/gal-1.99.9.ebuild b/gnome-extra/gal/gal-1.99.9.ebuild
deleted file mode 100644
index ec96e7699cad..000000000000
--- a/gnome-extra/gal/gal-1.99.9.ebuild
+++ /dev/null
@@ -1,39 +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/gal/gal-1.99.9.ebuild,v 1.6 2004/04/27 21:14:16 agriffis Exp $
-
-inherit gnome2 gnome.org libtool eutils
-
-DESCRIPTION="The Gnome Application Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-IUSE="doc"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2"
-KEYWORDS="x86 ~ppc ~sparc ~hppa ~alpha"
-
-RDEPEND=">=gnome-base/libgnomeprint-2.2.0
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/libgnomecanvas-2.2.0.2
-	>=dev-libs/libxml2-2.0
-	app-text/scrollkeeper"
-
-DEPEND="sys-devel/gettext
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	${RDEPEND}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-USE_DESTDIR="1"
-ELTCONF="--reverse-deps"
-
-src_unpack() {
-	unpack ${A}
-
-	gnome2_omf_fix
-
-	# Remove gtkdoc-fixxref
-	cd ${S}; epatch ${FILESDIR}/gal-1.99.3-docfix.patch
-}