evo 1.4 and deps

6 files changed, 16 insertions, 72 deletions

diff --git a/gnome-extra/gal/Manifest b/gnome-extra/gal/Manifest
index 7d76b96183e3..1c3e613b94d9 100644
--- a/gnome-extra/gal/Manifest
+++ b/gnome-extra/gal/Manifest
@@ -1,16 +1,12 @@
-MD5 fd98609c931e345f2c2561271cda5732 ChangeLog 4416
-MD5 f0144670c2f0aad8f157ce9e62ef677b gal-1.99.4.ebuild 980
+MD5 97e41571d2c95d6fa0e3d27759b45a5c ChangeLog 4539
 MD5 b82adcb37f04e55c9bd0f15671d61523 gal-0.23.ebuild 1693
 MD5 25e8ccb0ac6fa000828aecc22e80e943 gal-0.24.ebuild 1951
-MD5 4210f2110f458a1a99ae6b5a81d7e127 gal-1.99.7.ebuild 1244
-MD5 894551a094cc6f50e3dfb2b84b18b253 gal-0.20-r1.ebuild 1372
+MD5 a5f48375b7968efb7b44076ee1b76f9e gal-1.99.7.ebuild 1244
 MD5 4210f2110f458a1a99ae6b5a81d7e127 gal-1.99.6.ebuild 1244
 MD5 86ce180c545e5973d1fea36e43143dca files/digest-gal-0.23 62
-MD5 ce4f94c694a8d723c93e54bb88d0edb6 files/digest-gal-0.20-r1 61
 MD5 1ac519328da6233734867158e8c004fd files/digest-gal-1.99.7 63
 MD5 78bec5aec485baac3fa825378fabb471 files/digest-gal-0.24 121
 MD5 4690f5246b395401f10fd9082b676912 files/gal-1.99.3-docfix.patch 436
-MD5 efeec932a9bf5575169b8ff440d7d9e1 files/digest-gal-1.99.4 63
 MD5 e9f948c5931c9d67eda10d77421c573c files/digest-gal-1.99.6 63
 MD5 b2f242d8b7015030276291e22e03aa48 files/gal-0.24-sgml-1.patch 1363
 MD5 0afa4aa750d486262adfd4f1533f6f8f files/gal-1.99.4-sgml-fix2.patch 595
diff --git a/gnome-extra/gal/files/digest-gal-0.20-r1 b/gnome-extra/gal/files/digest-gal-0.20-r1
deleted file mode 100644
index bb96c4bedad5..000000000000
--- a/gnome-extra/gal/files/digest-gal-0.20-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 be215178a7404822f202c2ddc499c614 gal-0.20.tar.bz2 952405
diff --git a/gnome-extra/gal/files/digest-gal-1.99.4 b/gnome-extra/gal/files/digest-gal-1.99.4
deleted file mode 100644
index 3164c4d6936f..000000000000
--- a/gnome-extra/gal/files/digest-gal-1.99.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d710777a063dd16658d6e68c35f46fa gal-1.99.4.tar.bz2 953020
diff --git a/gnome-extra/gal/files/digest-gal-1.99.7 b/gnome-extra/gal/files/digest-gal-1.99.7
new file mode 100644
index 000000000000..42f334498d4a
--- /dev/null
+++ b/gnome-extra/gal/files/digest-gal-1.99.7
@@ -0,0 +1 @@
+MD5 10cf22f030cb5cc69557473695d2e103 gal-1.99.7.tar.bz2 950615
diff --git a/gnome-extra/gal/gal-0.20-r1.ebuild b/gnome-extra/gal/gal-0.20-r1.ebuild
deleted file mode 100644
index 67afb23f0f22..000000000000
--- a/gnome-extra/gal/gal-0.20-r1.ebuild
+++ /dev/null
@@ -1,58 +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-0.20-r1.ebuild,v 1.6 2003/03/11 21:11:45 seemant Exp $
-
-IUSE="nls alsa"
-
-inherit gnome.org libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The Gnome Application Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND="virtual/python
-	nls? ( sys-devel/gettext )
-	>=dev-util/intltool-0.11
-	dev-lang/perl
-    <gnome-base/gnome-vfs-1.9.0
-	>=dev-libs/libunicode-0.4-r1
-	alsa? ( >=media-libs/alsa-lib-0.5.10 )
-	>=gnome-base/gnome-print-0.34
-	=gnome-base/libglade-0*
-	>=dev-libs/libxml-1.8.16
-	media-libs/gdk-pixbuf"
-
-
-src_compile() {
-	elibtoolize
-
-	local myconf=""
-	use nls || myconf="--disable-nls"
-
-	./configure --host=${CHOST}	\
-		    --prefix=/usr \
-		    --sysconfdir=/etc \
-		    --localstatedir=/var/lib \
-		     ${myconf} || die
-
-	make || die # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {
-	make prefix=${D}/usr \
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/lib	\
-	     install || die
-
-	# Add some type of backward compat...
-	local fullname=$(python -c "import os; \
-		print os.path.realpath(\"${D}/usr/lib/libgal.so\")")
-	dosym ${fullname##*/} /usr/lib/libgal.so.$((${PV##*.}-1))
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
-
diff --git a/gnome-extra/gal/gal-1.99.4.ebuild b/gnome-extra/gal/gal-1.99.7.ebuild
index 13065d7915cc..d85cb6272f87 100644
--- a/gnome-extra/gal/gal-1.99.4.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.4.ebuild,v 1.1 2003/05/07 11:12:33 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-1.99.7.ebuild,v 1.1 2003/06/10 13:53:59 liquidx Exp $
 
 IUSE="doc"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 RDEPEND=">=gnome-base/libgnomeprint-2.2.0
 	>=gnome-base/libgnomeprintui-2.2.1
@@ -32,10 +32,17 @@ src_unpack() {
 	unpack ${A}
 	gnome2_omf_fix
 	
-	# patch sgml
-	epatch ${FILESDIR}/${P}-sgml-fix2.patch
-	epatch ${FILESDIR}/${P}-sgml-fix3.patch
-	
 	# 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
+}