ove some things from RDEPEND to DEPEND (intltool, gettext).

4 files changed, 156 insertions, 3 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 2aa3519e5184..eccf5e3016bd 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.37 2004/01/20 13:06:42 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.38 2004/02/06 02:09:59 spider Exp $
+
+  06 Feb 2004; <spider@gentoo.org> :
+  move some things from RDEPEND to DEPEND (intltool, gettext).
 
   20 Jan 2004; <gustavoz@gentoo.org> gtkhtml-1.1.10.ebuild:
   stable on sparc
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 55c28f05ba76..3cee64539c8e 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,6 +1,8 @@
-MD5 0fd1845c8847e93381162b6be3e97a7f gtkhtml-1.1.10.ebuild 4119
 MD5 4e25477f21889dec4fdc7363557e1e71 gtkhtml-1.1.8.ebuild 4054
 MD5 3320fb4da6b2e6ce3d2dd11468e02b07 ChangeLog 5543
+MD5 0fd1845c8847e93381162b6be3e97a7f gtkhtml-1.1.10.ebuild 4119
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 e535d0844b7715ab85f1672f4882f7a8 files/digest-gtkhtml-1.1.8 67
+MD5 ab1251ff083601d99c14a8ece2905803 gtkhtml-1.1.10-r1.ebuild 4119
 MD5 2da7540b316c5dfdd790869fdb2f4070 files/digest-gtkhtml-1.1.10 133
+MD5 e535d0844b7715ab85f1672f4882f7a8 files/digest-gtkhtml-1.1.8 67
+MD5 beee6dc1f9b01326aec9a28c8959c395 files/digest-gtkhtml-1.1.10-r1 68
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.10-r1 b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.10-r1
new file mode 100644
index 000000000000..3bab9cda0a4b
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.10-r1
@@ -0,0 +1 @@
+MD5 8647407560e4b61ba4a12653b9cc8869 gtkhtml-1.1.10.tar.bz2 1029542
diff --git a/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild
new file mode 100644
index 000000000000..ababdb9877ef
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2004 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.10-r1.ebuild,v 1.1 2004/02/06 02:09:59 spider 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 alpha hppa"
+
+# peg gtkhtml at gal-0.23 because it might get confused with gal-1.99
+RDEPEND="=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
+	<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
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext
+	>=dev-util/intltool-0.11 )"
+
+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
+}
+