evo-1.5 devel version libraries (#35456). patch for gcc3.4 thanks to Joe McCann <joe@breakmygentoo.net>

7 files changed, 72 insertions, 47 deletions

diff --git a/gnome-extra/gal/ChangeLog b/gnome-extra/gal/ChangeLog
index 3a5fca5b31ee..63cd3bd15ca2 100644
--- a/gnome-extra/gal/ChangeLog
+++ b/gnome-extra/gal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gal
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.65 2004/07/28 03:06:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.66 2004/08/06 18:39:04 liquidx Exp $
+
+*gal-2.1.13 (06 Aug 2004)
+
+  06 Aug 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/gal-2.1.12-gcc34.patch, -gal-1.99.10.ebuild, +gal-2.1.13.ebuild:
+  evo-1.5 devel version libraries (#35456). patch for gcc3.4 thanks to Joe
+  McCann <joe@breakmygentoo.net>
 
   27 Jul 2004; <agriffis@gentoo.org> gal-1.99.11.ebuild:
   stable on ia64
diff --git a/gnome-extra/gal/Manifest b/gnome-extra/gal/Manifest
index 4ce36eb3b74b..a8d1d1e73b94 100644
--- a/gnome-extra/gal/Manifest
+++ b/gnome-extra/gal/Manifest
@@ -1,10 +1,15 @@
-MD5 2b6e66b5a98de0c61a6f5e0030dd1037 gal-0.24.ebuild 2085
-MD5 e50bf64cd764330ee16766a24d5e118b gal-1.99.10.ebuild 1019
 MD5 ae45492535caad3aec2b6816de49b6d1 gal-1.99.11.ebuild 967
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 96fdb5f3fcbe2de3c43a70c3c419480b gal-2.1.13.ebuild 927
+MD5 e50bf64cd764330ee16766a24d5e118b gal-1.99.10.ebuild 1019
+MD5 564a68d4a3724273ee6a58a8e719e621 .#Manifest.1.54 812
+MD5 2b6e66b5a98de0c61a6f5e0030dd1037 gal-0.24.ebuild 2085
 MD5 8877a7cdd63f68cddcffe3e9f851a477 ChangeLog 7624
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 78bec5aec485baac3fa825378fabb471 files/digest-gal-0.24 121
+MD5 0c80e089f592df4ca90a02e03b1ec75e files/digest-gal-2.1.12 64
+MD5 d8bae7d1f416770456393bd52068fa3c files/digest-gal-2.1.13 64
+MD5 b2f242d8b7015030276291e22e03aa48 files/gal-0.24-sgml-1.patch 1363
 MD5 cb565a4aa9136bd033e3f4986bf877ce files/digest-gal-1.99.10 64
 MD5 95ab7cf92689f0cd2db97884cc53c423 files/digest-gal-1.99.11 64
-MD5 b2f242d8b7015030276291e22e03aa48 files/gal-0.24-sgml-1.patch 1363
 MD5 4690f5246b395401f10fd9082b676912 files/gal-1.99.3-docfix.patch 436
+MD5 737e4a75668a5590e54e746295c5efd7 files/gal-2.1.12-gcc34.patch 483
diff --git a/gnome-extra/gal/files/digest-gal-1.99.10 b/gnome-extra/gal/files/digest-gal-1.99.10
deleted file mode 100644
index de0e5ed15fb6..000000000000
--- a/gnome-extra/gal/files/digest-gal-1.99.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 72284a1e174329cb42149ae327f43995 gal-1.99.10.tar.bz2 943975
diff --git a/gnome-extra/gal/files/digest-gal-2.1.13 b/gnome-extra/gal/files/digest-gal-2.1.13
new file mode 100644
index 000000000000..a3711032c895
--- /dev/null
+++ b/gnome-extra/gal/files/digest-gal-2.1.13
@@ -0,0 +1 @@
+MD5 5c0af9a8e5ed86fc53377705256d30c5 gal-2.1.13.tar.bz2 1112602
diff --git a/gnome-extra/gal/files/gal-2.1.12-gcc34.patch b/gnome-extra/gal/files/gal-2.1.12-gcc34.patch
new file mode 100644
index 000000000000..7b16c7bb1cb2
--- /dev/null
+++ b/gnome-extra/gal/files/gal-2.1.12-gcc34.patch
@@ -0,0 +1,10 @@
+--- gal/a11y/e-table/gal-a11y-e-table-item.c	2004/05/21 14:10:56	1.1
++++ gal/a11y/e-table/gal-a11y-e-table-item.c	2004/05/21 14:11:48
+@@ -48,6 +48,7 @@ struct _GalA11yETableItemPrivate {
+ static gboolean gal_a11y_e_table_item_ref_selection (GalA11yETableItem *a11y,
+ 						     ESelectionModel *selection);
+ static gboolean gal_a11y_e_table_item_unref_selection (GalA11yETableItem *a11y);
++static gpointer * eti_reinit_data (AtkTable *table, ETableItem *item);
+ 
+ #if 0
+ static void
diff --git a/gnome-extra/gal/gal-1.99.10.ebuild b/gnome-extra/gal/gal-1.99.10.ebuild
deleted file mode 100644
index 2e8117d3e0fb..000000000000
--- a/gnome-extra/gal/gal-1.99.10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.13 2004/06/24 22:03:18 agriffis Exp $
-
-inherit gnome2 gnome.org libtool eutils
-
-DESCRIPTION="The Gnome Application Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2"
-KEYWORDS="x86 ppc sparc hppa alpha ia64 amd64"
-IUSE="doc"
-
-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
-	!>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 )
-	${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
-}
diff --git a/gnome-extra/gal/gal-2.1.13.ebuild b/gnome-extra/gal/gal-2.1.13.ebuild
new file mode 100644
index 000000000000..79b5ba6df8ea
--- /dev/null
+++ b/gnome-extra/gal/gal-2.1.13.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-2.1.13.ebuild,v 1.1 2004/08/06 18:39:04 liquidx Exp $
+
+inherit gnome2 libtool debug eutils
+
+DESCRIPTION="The Gnome Application Libraries"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="2.2"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64 ~mips"
+IUSE="doc"
+
+RDEPEND=">=x11-libs/gtk+-2.2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomecanvas-2
+	>=dev-libs/libxml2-2
+	app-text/scrollkeeper"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.30
+	doc? ( dev-util/gtk-doc )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+USE_DESTDIR="1"
+ELTCONF="--reverse-deps"
+G2CONF="--disable-gtk-doc"
+
+src_unpack() {
+	unpack ${A}
+
+	gnome2_omf_fix
+
+	# Remove gtkdoc-fixxref
+	cd ${S}
+	epatch ${FILESDIR}/gal-1.99.3-docfix.patch
+	epatch ${FILESDIR}/gal-2.1.12-gcc34.patch
+}