Deprecating bonobo-activation

9 files changed, 87 insertions, 21 deletions

diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index bf371ba5614d..44771563e5ce 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,14 @@
 # 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.42 2003/09/08 17:29:06 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.43 2003/09/12 09:22:50 spider Exp $
+
+*libgtkhtml-3.0.8-r2 (12 Sep 2003)
+
+  12 Sep 2003; <spider@gentoo.org> libgtkhtml-3.0.4.ebuild,
+  libgtkhtml-3.0.5.ebuild, libgtkhtml-3.0.7.ebuild,
+  libgtkhtml-3.0.8-r1.ebuild, libgtkhtml-3.0.8-r2.ebuild,
+  libgtkhtml-3.0.8.ebuild:
+  Removed bonobo-activation dep's, made a last-version bump as well.
 
   08 Sep 2003; Alexander Gabert <pappy@gentoo.org> libgtkhtml-3.0.7.ebuild,
   libgtkhtml-3.0.8-r1.ebuild:
diff --git a/gnome-extra/libgtkhtml/Manifest b/gnome-extra/libgtkhtml/Manifest
index ae4cdc5dcc28..7ab70aea35ca 100644
--- a/gnome-extra/libgtkhtml/Manifest
+++ b/gnome-extra/libgtkhtml/Manifest
@@ -1,15 +1,18 @@
-MD5 3fe4b52a13ca0d117d6134511b1cf7cc ChangeLog 5937
-MD5 a98a27c7ff7d616fdd134e1cb90d3007 libgtkhtml-2.0.2.ebuild 735
+MD5 69e53bd5f473e9ba254a6d2b4e1febfd libgtkhtml-3.0.4.ebuild 1881
+MD5 4b66633ff9275bc92b181d8bdccc1cea libgtkhtml-2.2.4.ebuild 852
 MD5 eccf98bc3b301df70dd18bcc9b94440b libgtkhtml-2.2.1.ebuild 803
+MD5 b8d63aa6fcccd033d26cc1a9d5464351 libgtkhtml-3.0.5.ebuild 1893
+MD5 a98a27c7ff7d616fdd134e1cb90d3007 libgtkhtml-2.0.2.ebuild 735
 MD5 a7ec932042000406f51f7fbceb8e9f82 libgtkhtml-2.2.3.ebuild 817
-MD5 4b66633ff9275bc92b181d8bdccc1cea libgtkhtml-2.2.4.ebuild 852
-MD5 ec9b49c06f2e8f0e2efd383534c26399 libgtkhtml-3.0.4.ebuild 1919
-MD5 eb0cdd34b5d09d5062692ecb9e0c442c libgtkhtml-3.0.5.ebuild 1931
-MD5 742b90b1d53f48ea42247cf5043d6157 libgtkhtml-3.0.7.ebuild 1510
-MD5 6e6789429bc101152820edfbbdebbacc libgtkhtml-3.0.8-r1.ebuild 1615
-MD5 ca38f9d6ed7e218d9c13f216a399d5c3 libgtkhtml-3.0.8.ebuild 1390
+MD5 910b03f9c7d62f18bfa01b3785a04165 libgtkhtml-3.0.7.ebuild 1475
+MD5 8d2b0e2a6bab44aa4316dc2ea1b545b0 ChangeLog 6241
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 4840adb790e73cec25583429c915cdaf libgtkhtml-3.0.8.ebuild 1352
+MD5 71535e505952c1ecd17d90786458ed44 libgtkhtml-3.0.8-r1.ebuild 1580
 MD5 6c28af1ecd345f6fed88fdc05529eefa libgtkhtml-2.4.0.ebuild 851
+MD5 bef8b3805f5174b0c4412e4e8494ed2e libgtkhtml-3.0.8-r2.ebuild 1580
+MD5 c802878860f7a2692df330e54e635c0c files/libgtkhtml-3.0.7-libtool.patch 656
+MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
 MD5 277fd5b1d3246d060bc3821f73bf4392 files/digest-libgtkhtml-2.0.2 69
 MD5 470c04d01c1c093ee1439465a3c650ea files/digest-libgtkhtml-2.2.1 69
 MD5 59cd7ffde71d082b5c68834945dc71cc files/digest-libgtkhtml-2.2.3 69
@@ -19,7 +22,6 @@ MD5 3c7e7d4061cc0eb07844561b5c466b45 files/digest-libgtkhtml-3.0.5 67
 MD5 50c625f91326bee698360208ee9aa2cc files/digest-libgtkhtml-3.0.7 67
 MD5 70d6bcd78d5175bb973a7a46c4bae08e files/digest-libgtkhtml-3.0.8 67
 MD5 70d6bcd78d5175bb973a7a46c4bae08e files/digest-libgtkhtml-3.0.8-r1 67
-MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
-MD5 c802878860f7a2692df330e54e635c0c files/libgtkhtml-3.0.7-libtool.patch 656
 MD5 91961ab08a6720382576581f1c879963 files/libgtkhtml-3.0.8-alpha.patch 700
 MD5 c4945ff6d58733accdf9ff738ddc34b1 files/digest-libgtkhtml-2.4.0 69
+MD5 70d6bcd78d5175bb973a7a46c4bae08e files/digest-libgtkhtml-3.0.8-r2 67
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.8-r2 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.8-r2
new file mode 100644
index 000000000000..e89e703e2c13
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.8-r2
@@ -0,0 +1 @@
+MD5 ef54e1dd447f3e4e00ad11e18326fb92 gtkhtml-3.0.8.tar.bz2 1034139
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.4.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.4.ebuild
index 7f46251c3792..d82caa9f0fce 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.4.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.4.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/libgtkhtml/libgtkhtml-3.0.4.ebuild,v 1.3 2003/09/06 23:52:57 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.4.ebuild,v 1.4 2003/09/12 09:22:50 spider Exp $
 
 inherit gnome2
 
@@ -25,7 +25,6 @@ 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
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.5.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.5.ebuild
index ab267bb98c9d..5542ef3cf824 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.5.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.5.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/libgtkhtml/libgtkhtml-3.0.5.ebuild,v 1.5 2003/09/06 23:52:57 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.5.ebuild,v 1.6 2003/09/12 09:22:50 spider Exp $
 
 inherit gnome2
 
@@ -25,7 +25,6 @@ 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.7
 	>=gnome-base/ORBit2-2.5.6
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.7.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.7.ebuild
index cb4780924c82..65fe1ce2173a 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.7.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.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/libgtkhtml/libgtkhtml-3.0.7.ebuild,v 1.6 2003/09/08 17:29:06 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.7.ebuild,v 1.7 2003/09/12 09:22:50 spider Exp $
 
 inherit gnome2
 
@@ -27,7 +27,6 @@ RDEPEND=">=gnome-extra/gal-1.99.8
 	>=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-base/ORBit2-2.5.6
 	>=gnome-base/gnome-vfs-2.1
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r1.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r1.ebuild
index f0fa1aee0b5f..d522759f504e 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r1.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r1.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/libgtkhtml/libgtkhtml-3.0.8-r1.ebuild,v 1.4 2003/09/08 17:29:06 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r1.ebuild,v 1.5 2003/09/12 09:22:50 spider Exp $
 
 inherit gnome2
 
@@ -27,7 +27,6 @@ RDEPEND=">=gnome-extra/gal-1.99.9
 	>=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-base/ORBit2-2.5.6
 	>=gnome-base/gnome-vfs-2.1
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r2.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r2.ebuild
new file mode 100644
index 000000000000..0a4eac5a939d
--- /dev/null
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r2.ebuild
@@ -0,0 +1,60 @@
+# 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.8-r2.ebuild,v 1.1 2003/09/12 09:22:50 spider 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 ~ppc ~sparc ~hppa ~alpha"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND=">=gnome-extra/gal-1.99.9
+	>=net-libs/libsoup-1.99.23
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=gnome-base/libbonoboui-2.0
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/ORBit2-2.5.6
+	>=gnome-base/gnome-vfs-2.1
+	>=gnome-base/gail-1.1
+	>=dev-libs/libxml2-2.5"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0"
+
+USE_DESTDIR="1"
+SCROLLKEEPER_UPDATE="0"
+ELTCONF="--reverse-deps"
+
+src_unpack() {
+	unpack ${A}
+	if use alpha; then
+		epatch ${FILESDIR}/${PN}-3.0.8-alpha.patch
+	fi
+}
+
+src_compile() {
+	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
+	# has_version 'sys-devel/hardened-gcc' && append-flags '-yet_exec'
+
+	gnome2_src_configure
+
+	EPATCH_OPTS="${S}/libtool"
+	epatch ${FILESDIR}/${PN}-3.0.7-libtool.patch
+
+	emake || die "make failed"
+}
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.8.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.8.ebuild
index 5ccb38b91353..26c37a63cbe2 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.8.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.8.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/libgtkhtml/libgtkhtml-3.0.8.ebuild,v 1.3 2003/09/06 23:52:57 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.8.ebuild,v 1.4 2003/09/12 09:22:50 spider Exp $
 
 inherit gnome2
 
@@ -27,7 +27,6 @@ RDEPEND=">=gnome-extra/gal-1.99.9
 	>=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-base/ORBit2-2.5.6
 	>=gnome-base/gnome-vfs-2.1