new version

4 files changed, 139 insertions, 69 deletions

diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.2 b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.2
deleted file mode 100644
index 22965868f044..000000000000
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94ebc8a1e24b1ff52ad47b2e900d5ed9 gtkhtml-1.1.2.tar.bz2 1054639
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.4 b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.4
new file mode 100644
index 000000000000..5dc37c59a58d
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.4
@@ -0,0 +1 @@
+MD5 cc03437091b6cfd84f4de76a02e48f41 gtkhtml-1.1.4.tar.bz2 1090236
diff --git a/gnome-extra/gtkhtml/gtkhtml-1.1.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.2.ebuild
deleted file mode 100644
index 3a59e5ca6ec7..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-1.1.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.2.ebuild,v 1.3 2002/10/05 05:39:14 drobbins Exp $
-
-IUSE="nls gnome"
-
-inherit gnome.org libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Lightweight HTML rendering/printing/editing engine."
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ppc sparc sparc64"
-
-RDEPEND=">=gnome-extra/gal-0.20
-	<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.18
-	gnome? ( <gnome-base/gconf-1.1.0 )
-	nls? ( sys-devel/gettext
-	>=dev-util/intltool-0.11 )
-	<gnome-base/libglade-0.99.0"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	elibtoolize
-
-	local myconf=""
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	# Evo users need to have bonobo support
-	#use bonobo \
-	#	&& myconf="${myconf} --with-bonobo" \
-	#	|| myconf="${myconf} --without-bonobo"
-
-	use gnome \
-		&& myconf="${myconf} --with-gconf" \
-		|| myconf="${myconf} --without-gconf"
-
-  	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		${myconf} || die
-
-  	emake || die "Package building failed."
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		install || die
-
-	# Fix the double entry in Control Center
-	rm ${D}/usr/share/control-center/capplets/gtkhtml-properties.desktop
-
-  	dodoc AUTHORS COPYING* ChangeLog README
-  	dodoc NEWS TODO
-}
-
diff --git a/gnome-extra/gtkhtml/gtkhtml-1.1.4.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.4.ebuild
new file mode 100644
index 000000000000..cca07471d578
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-1.1.4.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.4.ebuild,v 1.1 2002/11/09 12:43:22 azarah Exp $
+
+IUSE="nls gnome"
+
+inherit gnome.org libtool
+
+MY_PV="`echo ${PV} | cut -d. -f1,2`"
+S="${WORKDIR}/${P}"
+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 ~sparc64"
+
+RDEPEND=">=gnome-extra/gal-0.20
+	<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
+	gnome? ( <gnome-base/gconf-1.1.0 )
+	nls? ( sys-devel/gettext
+	>=dev-util/intltool-0.11 )
+	<gnome-base/libglade-0.99.0"
+
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	elibtoolize
+
+	local myconf=""
+	use nls || myconf="${myconf} --disable-nls"
+
+	# Evo users need to have bonobo support
+	#use bonobo \
+	#	&& myconf="${myconf} --with-bonobo" \
+	#	|| myconf="${myconf} --without-bonobo"
+
+	use gnome \
+		&& myconf="${myconf} --with-gconf" \
+		|| myconf="${myconf} --without-gconf"
+
+  	./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=""
+	
+	make prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/var/lib \
+		install || 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
+}
+