dep cleanup

7 files changed, 18 insertions, 133 deletions

diff --git a/gnome-extra/gal/ChangeLog b/gnome-extra/gal/ChangeLog
index 76165fe2da8e..f1b9d5349730 100644
--- a/gnome-extra/gal/ChangeLog
+++ b/gnome-extra/gal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gal
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.40 2003/07/06 11:29:41 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.41 2003/07/09 15:57:31 liquidx Exp $
+
+  09 Jul 2003; Alastair Tse <liquidx@gentoo.org> gal-1.99.6.ebuild,
+  gal-1.99.7.ebuild, files/gal-1.99.4-sgml-fix2.patch,
+  files/gal-1.99.4-sgml-fix3.patch:
+  dep cleanup
 
   02 Jul 2003; Jason Wever <weeve@gentoo.org> gal-0.24.ebuild:
   Changed ~sparc keyword to sparc.
diff --git a/gnome-extra/gal/Manifest b/gnome-extra/gal/Manifest
index d8b5872deeb1..ba481df3ce9d 100644
--- a/gnome-extra/gal/Manifest
+++ b/gnome-extra/gal/Manifest
@@ -1,14 +1,10 @@
-MD5 0fe7080cae9b337569da89cb18398c36 ChangeLog 4934
+MD5 3cdf48b52b657125101f9e72fece5a65 ChangeLog 5109
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 b82adcb37f04e55c9bd0f15671d61523 gal-0.23.ebuild 1693
 MD5 c9c25aba1937653012029a106c161dd2 gal-0.24.ebuild 1956
-MD5 4210f2110f458a1a99ae6b5a81d7e127 gal-1.99.6.ebuild 1244
-MD5 d55a3d23f44a9dee7dc75ae26d124a85 gal-1.99.7.ebuild 1255
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 a52aeb9d55a9ebd9e3805a06b96e62ef gal-1.99.7.ebuild 1289
 MD5 86ce180c545e5973d1fea36e43143dca files/digest-gal-0.23 62
-MD5 78bec5aec485baac3fa825378fabb471 files/digest-gal-0.24 121
-MD5 e9f948c5931c9d67eda10d77421c573c files/digest-gal-1.99.6 63
 MD5 1ac519328da6233734867158e8c004fd files/digest-gal-1.99.7 63
-MD5 b2f242d8b7015030276291e22e03aa48 files/gal-0.24-sgml-1.patch 1363
+MD5 78bec5aec485baac3fa825378fabb471 files/digest-gal-0.24 121
 MD5 4690f5246b395401f10fd9082b676912 files/gal-1.99.3-docfix.patch 436
-MD5 0afa4aa750d486262adfd4f1533f6f8f files/gal-1.99.4-sgml-fix2.patch 595
-MD5 79d534ebc15484d2e755e6e94a90dfca files/gal-1.99.4-sgml-fix3.patch 1367
+MD5 b2f242d8b7015030276291e22e03aa48 files/gal-0.24-sgml-1.patch 1363
diff --git a/gnome-extra/gal/files/digest-gal-1.99.6 b/gnome-extra/gal/files/digest-gal-1.99.6
deleted file mode 100644
index 7fedffee1d0e..000000000000
--- a/gnome-extra/gal/files/digest-gal-1.99.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57f6cbc6b5d1d1c9f727bc1f60b6f9eb gal-1.99.6.tar.bz2 959427
diff --git a/gnome-extra/gal/files/gal-1.99.4-sgml-fix2.patch b/gnome-extra/gal/files/gal-1.99.4-sgml-fix2.patch
deleted file mode 100644
index b13b281607ad..000000000000
--- a/gnome-extra/gal/files/gal-1.99.4-sgml-fix2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gal-1.99.4/docs/sgml/e-table-header-item.sgml	2003-04-29 19:28:49.000000000 +0100
-+++ gal-1.99.4/docs/sgml/e-table-header-item.sgml	2003-05-06 22:57:53.000000000 +0100
-@@ -197,12 +197,10 @@
- </entry></row>
- <row><entry align="right"><parameter>arg1</parameter>&nbsp;:</entry>
- <entry>The GdkEvent.
--</para>
--
- </entry></row>
- <row><entry align="right"><parameter>user_data</parameter>&nbsp;:</entry>
- <entry>user data set when the signal handler was connected.</entry></row>
--</tbody></tgroup></informaltable></refsect2>
-+</tbody></tgroup></informaltable></para></refsect2>
- </refsect1>
- 
- 
diff --git a/gnome-extra/gal/files/gal-1.99.4-sgml-fix3.patch b/gnome-extra/gal/files/gal-1.99.4-sgml-fix3.patch
deleted file mode 100644
index 0e1101a8609f..000000000000
--- a/gnome-extra/gal/files/gal-1.99.4-sgml-fix3.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- gal-1.99.4/docs/gal-api.sgml	2001-01-12 07:25:25.000000000 +0000
-+++ gal-1.99.4/docs/gal-api.sgml	2003-05-06 22:50:05.000000000 +0100
-@@ -148,7 +148,7 @@
-   </chapter>
- 
-   <chapter id="e-text">
--    <title>E-text<title>
-+    <title>E-text</title>
-       &EText;
-       &ETextEventProcessor;
-       &ETextEventProcessorEmacsLike;
-@@ -156,12 +156,12 @@
-   </chapter>
- 
-   <chapter id="e-font">
--    <title>E-Font<title>
-+    <title>E-Font</title>
-       &gal-e-font;
-   </chapter>
-   
-   <chapter id="view-configurationt">
--    <title>View configuration<title>
-+    <title>View configuration</title>
-       &GalViewFactoryEtable;
-       &GalDefineViewsDialog;
-       &GalView;
-@@ -173,7 +173,7 @@
-   </chapter>
- 
-   <chapter id="combo-boxes">
--    <title>Combo Boxes and associated utilities<title>
-+    <title>Combo Boxes and associated utilities</title>
-     &GtkComboStack;
-     &GtkComboText;
-     &PixmapCombo;
-@@ -183,7 +183,7 @@
-   </chapter>
-   
-   <chapter id="utility-widgets">
--    <title>Extended GNOME widgets and utilities<title>
-+    <title>Extended GNOME widgets and utilities</title>
-       &ECanvas;
-       &ECanvasVbox;
-       &gal-e-canvas-utils;
-@@ -208,7 +208,7 @@
-   </chapter>
-   
-   <chapter id="cut-and-paste">
--    <title>Cut and Paste code<title>
-+    <title>Cut and Paste code</title>
-       &EHPaned;
-       &EVPaned;
-       &EPaned;
diff --git a/gnome-extra/gal/gal-1.99.6.ebuild b/gnome-extra/gal/gal-1.99.6.ebuild
deleted file mode 100644
index c619b282defd..000000000000
--- a/gnome-extra/gal/gal-1.99.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2003 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.6.ebuild,v 1.2 2003/06/05 13:36:50 lu_zero 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"
-
-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.0
-    >=dev-libs/libxml2-2.0"
-    
-DEPEND="sys-devel/gettext
-        doc? ( dev-util/gtk-doc )
-        ${RDEPEND}"
-
-MAKEOPTS="-j1"
-USE_DESTDIR="1"
-
-src_unpack() {
-	unpack ${A}
-	gnome2_omf_fix
-	
-	# remove gtkdoc-fixxref
-	cd ${S}; patch -p1 < ${FILESDIR}/gal-1.99.3-docfix.patch
-}	     
-
-src_install() {
-	gnome2_src_install
-	
-	# HACK HACK HACK !!
-	# See libgtkhtml-3.x for more info. but basically this is here
-	# for exactly the same reason. We should NOT release this until
-	# we get those libtool problems fixed! However, this is the
-	# temporary workaround. - <liquidx@gentoo.org>
-	dosym /usr/lib/libgal-2.0.so.3 /usr/lib/libgal-2.0.so.2
-}
diff --git a/gnome-extra/gal/gal-1.99.7.ebuild b/gnome-extra/gal/gal-1.99.7.ebuild
index 9bbf0bd6b351..e685729378c3 100644
--- a/gnome-extra/gal/gal-1.99.7.ebuild
+++ b/gnome-extra/gal/gal-1.99.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.7.ebuild,v 1.3 2003/07/06 11:29:41 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-1.99.7.ebuild,v 1.4 2003/07/09 15:57:31 liquidx Exp $
 
 IUSE="doc"
 
@@ -18,12 +18,14 @@ 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.0
-    >=dev-libs/libxml2-2.0"
+    >=gnome-base/libgnomecanvas-2.2.0.2
+    >=dev-libs/libxml2-2.0
+	app-text/scrollkeeper"
     
 DEPEND="sys-devel/gettext
-        doc? ( dev-util/gtk-doc )
-        ${RDEPEND}"
+	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	${RDEPEND}"
 
 MAKEOPTS="-j1"
 USE_DESTDIR="1"