evo 1.3.92 update

11 files changed, 104 insertions, 71 deletions

diff --git a/gnome-extra/gal/ChangeLog b/gnome-extra/gal/ChangeLog
index 33eb7915dc4b..b53569525ef8 100644
--- a/gnome-extra/gal/ChangeLog
+++ b/gnome-extra/gal/ChangeLog
@@ -1,6 +1,12 @@
 # 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.33 2003/05/16 01:02:46 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.34 2003/06/03 10:25:27 liquidx Exp $
+
+*gal-1.99.6 (03 Jun 2003)
+
+  03 Jun 2003; Alastair Tse <liquidx@gentoo.org> gal-1.99.6.ebuild:
+  version bump. added symlinks for backwards compatibility. part of evo 1.3.92
+  update
 
   16 May 2003; Lars Weiler <pylon@gentoo.org> gal-0.24.ebuild:
   Set ppc in KEYWORDS
diff --git a/gnome-extra/gal/Manifest b/gnome-extra/gal/Manifest
index 2342dc9a033f..c522b4b80d37 100644
--- a/gnome-extra/gal/Manifest
+++ b/gnome-extra/gal/Manifest
@@ -1,17 +1,15 @@
-MD5 beadfd90e6d35da053fbdaeec9ad4f7d ChangeLog 4139
-MD5 894551a094cc6f50e3dfb2b84b18b253 gal-0.20-r1.ebuild 1372
-MD5 b82adcb37f04e55c9bd0f15671d61523 gal-0.23.ebuild 1693
-MD5 cde1b7146b870fdbc63e4417bc7da57f gal-1.99.2.ebuild 1059
-MD5 103090fd04b2975972d9e0f3eb6fa28d gal-1.99.3.ebuild 843
+MD5 69d40341dec6696710149ae92cc4c217 ChangeLog 4325
 MD5 f0144670c2f0aad8f157ce9e62ef677b gal-1.99.4.ebuild 980
+MD5 b82adcb37f04e55c9bd0f15671d61523 gal-0.23.ebuild 1693
 MD5 25e8ccb0ac6fa000828aecc22e80e943 gal-0.24.ebuild 1951
-MD5 ce4f94c694a8d723c93e54bb88d0edb6 files/digest-gal-0.20-r1 61
+MD5 894551a094cc6f50e3dfb2b84b18b253 gal-0.20-r1.ebuild 1372
+MD5 a4844dddbf76621be10ecbd7d2874b48 gal-1.99.6.ebuild 1239
 MD5 86ce180c545e5973d1fea36e43143dca files/digest-gal-0.23 62
+MD5 ce4f94c694a8d723c93e54bb88d0edb6 files/digest-gal-0.20-r1 61
 MD5 78bec5aec485baac3fa825378fabb471 files/digest-gal-0.24 121
-MD5 bbb2a26c302a51f76db63bb11f76eb3a files/digest-gal-1.99.2 63
-MD5 bd7b82308d48c973abab68ecfa95bf4c files/digest-gal-1.99.3 63
 MD5 4690f5246b395401f10fd9082b676912 files/gal-1.99.3-docfix.patch 436
-MD5 b2f242d8b7015030276291e22e03aa48 files/gal-0.24-sgml-1.patch 1363
 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
 MD5 79d534ebc15484d2e755e6e94a90dfca files/gal-1.99.4-sgml-fix3.patch 1367
diff --git a/gnome-extra/gal/files/digest-gal-1.99.2 b/gnome-extra/gal/files/digest-gal-1.99.2
deleted file mode 100644
index d0a5a3e1c01b..000000000000
--- a/gnome-extra/gal/files/digest-gal-1.99.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51236a16ec342f89054632ba07a2302b gal-1.99.2.tar.bz2 783268
diff --git a/gnome-extra/gal/files/digest-gal-1.99.3 b/gnome-extra/gal/files/digest-gal-1.99.3
deleted file mode 100644
index 3cde54eab882..000000000000
--- a/gnome-extra/gal/files/digest-gal-1.99.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cee3ab010655c5ef10cec56f2bb74c25 gal-1.99.3.tar.bz2 957375
diff --git a/gnome-extra/gal/files/digest-gal-1.99.6 b/gnome-extra/gal/files/digest-gal-1.99.6
new file mode 100644
index 000000000000..7fedffee1d0e
--- /dev/null
+++ b/gnome-extra/gal/files/digest-gal-1.99.6
@@ -0,0 +1 @@
+MD5 57f6cbc6b5d1d1c9f727bc1f60b6f9eb gal-1.99.6.tar.bz2 959427
diff --git a/gnome-extra/gal/gal-1.99.2.ebuild b/gnome-extra/gal/gal-1.99.2.ebuild
deleted file mode 100644
index 3a920a0211ab..000000000000
--- a/gnome-extra/gal/gal-1.99.2.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.2.ebuild,v 1.3 2003/03/19 14:33:52 liquidx Exp $
-
-IUSE="doc"
-
-inherit 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"
-
-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}"
-
-src_compile() {
-	elibtoolize
-
-	local myconf=""
-
-    if [ -n "`use doc`" ]; then
-       myconf="${myconf} --enable-gtk-doc"
-    else 
-       myconf="${myconf} --disable-gtk-doc"
-    fi
-
-	econf ${myconf} || die
-	make || die # parallel make doesn't work
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
-
diff --git a/gnome-extra/gal/gal-1.99.3.ebuild b/gnome-extra/gal/gal-1.99.6.ebuild
index 9d2937e7af83..a212969ee255 100644
--- a/gnome-extra/gal/gal-1.99.3.ebuild
+++ b/gnome-extra/gal/gal-1.99.6.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.3.ebuild,v 1.2 2003/04/22 15:24:55 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-1.99.6.ebuild,v 1.1 2003/06/03 10:25:27 liquidx Exp $
 
 IUSE="doc"
 
@@ -29,7 +29,20 @@ MAKEOPTS="-j1"
 USE_DESTDIR="1"
 
 src_unpack() {
-	     cd ${S}
-	     unpack ${A}
-	     epatch ${FILESDIR}/${P}-docfix.patch
+	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/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index 71704d6b335d..98b3447f5b86 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgtkhtml
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.27 2003/05/13 18:26:27 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.28 2003/06/03 10:24:37 liquidx Exp $
+
+*libgtkhtml-3.0.4 (03 Jun 2003)
+
+  03 Jun 2003; Alastair Tse <liquidx@gentoo.org> libgtkhtml-3.0.4.ebuild:
+  version bump. added more hacks around libtool problems. part of evo 1.3.92
+  update
 
 *libgtkhtml-2.2.4 (13 May 2003)
 
diff --git a/gnome-extra/libgtkhtml/Manifest b/gnome-extra/libgtkhtml/Manifest
index 1b191862de4e..1c4216d62853 100644
--- a/gnome-extra/libgtkhtml/Manifest
+++ b/gnome-extra/libgtkhtml/Manifest
@@ -1,14 +1,14 @@
-MD5 6e70d11a1af0f266911b869ee9426779 ChangeLog 3318
+MD5 7be8cb1f06963582e9028c6efdd09f59 ChangeLog 3647
 MD5 992c9f1c51d87cbb85e72f239b02f845 libgtkhtml-2.2.1.ebuild 805
 MD5 141c72af723465b446502e50562d796d libgtkhtml-3.0.3.ebuild 1784
 MD5 a98a27c7ff7d616fdd134e1cb90d3007 libgtkhtml-2.0.2.ebuild 735
-MD5 ea985cb9f34fd51bd2b19a2fb028a4a0 libgtkhtml-2.2.3.ebuild 807
-MD5 a510615f71848f13b82ff16a69616f26 libgtkhtml-3.0.1.ebuild 1204
-MD5 06ef193ee7832ebb46c0d6bbc66644e1 libgtkhtml-3.0.2.ebuild 1785
+MD5 9ce3075265dd0f30ee9838e58d79ac6d libgtkhtml-2.2.3.ebuild 806
+MD5 9a8ddd0549c9ed28fa97a3e162366977 libgtkhtml-3.0.4.ebuild 1915
+MD5 14bb65ca2fbe85961b2cebcaf7314460 libgtkhtml-2.2.4.ebuild 844
 MD5 470c04d01c1c093ee1439465a3c650ea files/digest-libgtkhtml-2.2.1 69
-MD5 729c836f5eeae9823f074f7729ecadfe files/digest-libgtkhtml-3.0.1 66
-MD5 1d102cc4ec5ae76f652e75c8e020c297 files/digest-libgtkhtml-3.0.2 67
+MD5 1550372a31c190050da919422b6bf051 files/digest-libgtkhtml-3.0.4 67
 MD5 277fd5b1d3246d060bc3821f73bf4392 files/digest-libgtkhtml-2.0.2 69
 MD5 59cd7ffde71d082b5c68834945dc71cc files/digest-libgtkhtml-2.2.3 69
 MD5 b8f138597164ed0131bdedb8f973ebd7 files/digest-libgtkhtml-3.0.3 67
 MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
+MD5 931991370c138ac1ef64cd5df5b57387 files/digest-libgtkhtml-2.2.4 69
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.4 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.4
new file mode 100644
index 000000000000..2f2c8ae3c0de
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.4
@@ -0,0 +1 @@
+MD5 37181c66c5cd02017c29340b4fccbd22 gtkhtml-3.0.4.tar.bz2 1041751
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.4.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.4.ebuild
new file mode 100644
index 000000000000..89c9e1c6eea0
--- /dev/null
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2003 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.4.ebuild,v 1.1 2003/06/03 10:24:37 liquidx 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"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND=">=gnome-base/libgnomeui-2.2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=gnome-base/libbonoboui-2.0
+	>=gnome-base/bonobo-activation-2.0
+	>=gnome-base/libbonobo-2.0
+	>=gnome-extra/gal-1.99.6
+	>=gnome-base/ORBit2-2.5.6
+	>=net-libs/libsoup-1.99.17
+	>=dev-libs/libxml2-2.5
+	>=gnome-base/gnome-vfs-2.1
+	>=gnome-base/gail-1.1"
+ 
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0"
+
+USE_DESTDIR="1"
+SCROLLKEEPER_UPDATE="0"
+
+# HACK HACK HACK !!!
+# libtool's lameness causes libgtkhtml to link to the older installed version
+# rather than the one in its own source tree. normally, elibtoolize 
+# --reverse-deps solves this, but in this case, it screws up when linking
+# src/gtest.c
+#
+# so, i've decided to re-create libgtkhtml-3.0.so.0 symlinks. if anyone
+# knows a better solution, please let me know. - <liquidx@gentoo.org>
+
+src_install() {
+	gnome2_src_install
+	dosym /usr/lib/libgtkhtml-a11y-3.0.so.2 /usr/lib/libgtkhtml-a11y-3.0.so.0
+	dosym /usr/lib/libgtkhtml-3.0.so.2 /usr/lib/libgtkhtml-3.0.so.0
+	dosym /usr/lib/libgtkhtml-a11y-3.0.so.2 /usr/lib/libgtkhtml-a11y-3.0.so.1
+	dosym /usr/lib/libgtkhtml-3.0.so.2 /usr/lib/libgtkhtml-3.0.so.1
+}