3 files changed, 12 insertions, 149 deletions
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index b3eb4e745cc4..343faa3a0159 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,7 +1,15 @@
-MD5 593c1f3eb6427b68defa458574541da9 gtkhtml-1.1.10.ebuild 4062
-MD5 38ba514ac42d50a81ff0284c6623315c gtkhtml-1.1.10-r1.ebuild 4177
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 3c635656fff7fb845d147e99044d792d ChangeLog 5904
+MD5 38ba514ac42d50a81ff0284c6623315c gtkhtml-1.1.10-r1.ebuild 4177
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 bc6bf91c4d69c7c6933885588f46eab3 files/gtkhtml-gcc34.patch 484
 MD5 beee6dc1f9b01326aec9a28c8959c395 files/digest-gtkhtml-1.1.10-r1 68
-MD5 2da7540b316c5dfdd790869fdb2f4070 files/digest-gtkhtml-1.1.10 133
+MD5 bc6bf91c4d69c7c6933885588f46eab3 files/gtkhtml-gcc34.patch 484
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBeWC8Rkyva5PS18kRAqlmAJ9PFay/1Cx/UTnQ7NcZJFWujsf2ygCfQysk
+sPXJwUkGiEjWgOcK6NnmfGw=
+=ofKS
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.10 b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.10
deleted file mode 100644
index f17ac7d4efa9..000000000000
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e649ed68294dc6c00657b4e124380c41 /gtkhtml-1.1.10.ebuild 4125
-MD5 8647407560e4b61ba4a12653b9cc8869 gtkhtml-1.1.10.tar.bz2 1029542
diff --git a/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild
deleted file mode 100644
index 35e416ad320e..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild
+++ /dev/null
@@ -1,143 +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/gtkhtml/gtkhtml-1.1.10.ebuild,v 1.12 2004/07/14 15:55:08 agriffis Exp $
-
-IUSE="nls"
-
-inherit gnome.org libtool
-
-MY_PV="`echo ${PV} | cut -d. -f1,2`"
-DESCRIPTION="Lightweight HTML rendering/printing/editing engine."
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-# This one lets gtkhtml-1.0 compiled stuff work, but some stuff do
-# not compile, so not sure as to what to set SLOT to .. it could be
-# that new versions will support 1.[12] of gtkhtml ...
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa"
-
-# peg gtkhtml at gal-0.23 because it might get confused with gal-1.99
-DEPEND="=gnome-extra/gal-0.24*
-	<gnome-base/control-center-1.99.0
-	>=gnome-base/libghttp-1.0.9-r1
-	>=dev-libs/libunicode-0.4-r1
-	>=gnome-base/gnome-print-0.34
-	>=gnome-base/bonobo-1.0.20
-	nls? ( sys-devel/gettext
-	>=dev-util/intltool-0.11 )
-	<gnome-base/libglade-0.99.0
-	<gnome-base/gconf-1.1.0"
-#	gnome? ( <gnome-base/gconf-1.1.0 )
-# Borks without gconf in most cases
-
-src_compile() {
-	elibtoolize
-
-	local myconf=
-
-	use nls || {
-		myconf="${myconf} --disable-nls"
-
-		mkdir -p ${S}/intl
-		touch ${S}/intl/libgettext.h
-	}
-
-	# Evo users need to have bonobo support
-	#use bonobo \
-	#	&& myconf="${myconf} --with-bonobo" \
-	#	|| myconf="${myconf} --without-bonobo"
-
-	# Otherwise it will use the wrong include dir
-	#use gnome \
-	#	&& myconf="${myconf} --with-gconf" \
-	#	|| myconf="${myconf} --without-gconf"
-	myconf="${myconf} --with-gconf"
-# Borks without gconf in most cases
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		${myconf} || die
-
-	emake || die "Package building failed."
-}
-
-# This function converts a pkgconfig config type file to
-# a Conf.sh type file used by gnome-config.
-#
-#   Usage:  conv_pkgconfig_confsh foo.pc
-#
-# <azarah@gentoo.org> (9 Nov 2002)
-conv_pkgconfig_confsh() {
-
-	local pkgconfig_file="$1"
-	local confsh_file="${pkgconfig_file%%-*}Conf.sh"
-	local package_name="`echo ${pkgconfig_file%%-*} | awk '{print toupper($0)}'`"
-	local tmpfile="${T}/$$.env"
-
-	[ "$#" -ne 1 ] && return 1
-	[ ! -f ${D}/usr/lib/pkgconfig/${pkgconfig_file} ] && return 1
-
-	# Remove bogus info and convert to bash type file we can
-	# source ...
-	sed -e 's|: *|=|g' \
-		-e '/^$/ d' \
-		-e 's|$|"|g' \
-		-e 's|=|="|g' \
-		-e 's|Libs=|libs=|' \
-		-e 's|Cflags=|cflags=|' \
-		-e '/^Name.*/ d' \
-		-e '/^Description.*/ d' \
-		-e '/^Version.*/ d' \
-		${D}/usr/lib/pkgconfig/${pkgconfig_file} > ${tmpfile}
-
-	source ${tmpfile}
-
-	# Ok, generate our Conf.sh file
-	cat > ${D}/usr/lib/${confsh_file} <<CONFSHEND
-#
-# Configuration file for using the ${package_name} library in GNOME applications
-#
-${package_name}_LIBDIR="-L${libdir}"
-${package_name}_LIBS="${libs}"
-${package_name}_INCLUDEDIR="${cflags}"
-${package_name}_DATADIR="${gtkhtml_datadir}"
-MODULE_VERSION="${module_version}"
-
-CONFSHEND
-
-	# Fix permissions
-	fperms 0755 /usr/lib/${confsh_file}
-}
-
-src_install() {
-	local fullname=""
-
-	einstall || die
-
-	# Fix the double entry in Control Center
-	rm -f ${D}/usr/share/control-center/capplets/gtkhtml-properties.desktop
-
-	# This next big gets gtkhtml-1.1 to be compadible with gtkhtml-1.0.
-	# We basically generate a /usr/lib/gtkhtmlConf.sh so that gnome-config
-	# will see gtkhtml-1.1 and other older gnome apps should then be able
-	# to use it.  We also create libgtkhtml.so and libgtkhtml.so.20 symlinks,
-	# and /usr/share/gtkhtml-1.1/gtkhtml symlinks for apps compiled against
-	# older gtkhtml to find their libs, and data .idl files.
-	#
-	# <azarah@gentoo.org> (9 Nov 2002)
-	conv_pkgconfig_confsh ${PN}-${MY_PV}.pc
-
-	# Add some type of backward compat for libs...
-	fullname="`eval basename \`readlink ${D}/usr/lib/lib${PN}-${MY_PV}.so\``"
-	dosym ${fullname##*/} /usr/lib/lib${PN}.so
-	dosym ${fullname##*/} /usr/lib/lib${PN}.so.20
-
-	# For older apps to be able to find the data...
-	dosym '.' /usr/share/${PN}-${MY_PV}/${PN}
-
-	dodoc AUTHORS COPYING* ChangeLog README NEWS TODO
-}