new version

7 files changed, 42 insertions, 98 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 4275940999bb..3c74dc4f3b24 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.7 2002/09/15 10:43:22 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.8 2002/09/28 07:35:48 azarah Exp $
+
+*gtkhtml-1.1.2 (28 Sep 2002)
+  28 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  New version.  Add gnome.org eclass support.  Libtoolize
+  all of them.  It seems it should be compadible to 1.0,
+  but we will need to do some work to get everything to
+  find the headers (CFLAGS="$CFLAGS -I/usr/include/gtkhtml-1.1" ?).
 
 *gtkhtml-1.0.4 (19 Aug 2002)
   15 Sep 2002; Spider <<spider@gentoo.org>> :
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.0.2-r1 b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.0.2-r1
deleted file mode 100644
index 04bc2137df61..000000000000
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.0.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5276fcca2007f2d1a9da912f167da942 gtkhtml-1.0.2.tar.gz 1303882
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.0.2-r2 b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.0.2-r2
deleted file mode 100644
index 04bc2137df61..000000000000
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.0.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5276fcca2007f2d1a9da912f167da942 gtkhtml-1.0.2.tar.gz 1303882
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.2 b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.2
new file mode 100644
index 000000000000..22965868f044
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.2
@@ -0,0 +1 @@
+MD5 94ebc8a1e24b1ff52ad47b2e900d5ed9 gtkhtml-1.1.2.tar.bz2 1054639
diff --git a/gnome-extra/gtkhtml/gtkhtml-1.0.2-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.0.2-r1.ebuild
deleted file mode 100644
index d846572f5550..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.0.2-r1.ebuild,v 1.4 2002/08/16 04:13:58 murphy Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="gtkhtml"
-SRC_URI="ftp://ftp.ximian.com/pub/source/evolution/${P}.tar.gz
-	 ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz"
-
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="x86 ppc sparc sparc64"
-SLOT="0"
-
-
-RDEPEND=">=gnome-extra/gal-0.19
-	>=gnome-base/control-center-1.4.0.1-r1
-	>=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.0.7-r2 )
-	nls? ( sys-devel/gettext
-	>=dev-util/intltool-0.11 )"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
-
-	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.0.4.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.0.4.ebuild
index 08e065576da3..537703d52532 100644
--- a/gnome-extra/gtkhtml/gtkhtml-1.0.4.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-1.0.4.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.0.4.ebuild,v 1.2 2002/09/15 10:43:22 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.0.4.ebuild,v 1.3 2002/09/28 07:35:48 azarah Exp $
+
+inherit libtool
 
 S=${WORKDIR}/${P}
-DESCRIPTION="gtkhtml"
+DESCRIPTION="Lightweight HTML rendering/printing/editing engine."
 SRC_URI="ftp://ftp.ximian.com/pub/source/evolution/${P}.tar.gz
 	 ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz"
-
 HOMEPAGE="http://www.gnome.org/"
+
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="x86 ppc sparc sparc64"
 SLOT="0"
-
+KEYWORDS="x86 ppc sparc sparc64"
 
 RDEPEND=">=gnome-extra/gal-0.19
 	<gnome-base/control-center-1.99.0
@@ -27,8 +28,9 @@ RDEPEND=">=gnome-extra/gal-0.19
 DEPEND="${RDEPEND}"
 
 src_compile() {
+	elibtoolize
 
-	local myconf
+	local myconf=""
 
 	use nls || myconf="${myconf} --disable-nls"
 
@@ -52,7 +54,6 @@ src_compile() {
 }
 
 src_install() {
-
 	make prefix=${D}/usr \
 		sysconfdir=${D}/etc \
 		localstatedir=${D}/var/lib \
@@ -64,3 +65,4 @@ src_install() {
   	dodoc AUTHORS COPYING* ChangeLog README
   	dodoc NEWS TODO
 }
+
diff --git a/gnome-extra/gtkhtml/gtkhtml-1.0.2-r2.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.2.ebuild
index 3ea5aa706fd1..cf6360b639d8 100644
--- a/gnome-extra/gtkhtml/gtkhtml-1.0.2-r2.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-1.1.2.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.0.2-r2.ebuild,v 1.6 2002/08/16 04:13:58 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.2.ebuild,v 1.1 2002/09/28 07:35:48 azarah Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="gtkhtml"
-SRC_URI="ftp://ftp.ximian.com/pub/source/evolution/${P}.tar.gz
-	 ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz"
+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"
-KEYWORDS="x86 ppc sparc sparc64"
 SLOT="0"
+KEYWORDS="x86 ppc sparc sparc64"
 
-
-RDEPEND=">=gnome-extra/gal-0.19
+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
@@ -21,41 +20,42 @@ RDEPEND=">=gnome-extra/gal-0.19
 	>=gnome-base/bonobo-1.0.18
 	gnome? ( <gnome-base/gconf-1.1.0 )
 	nls? ( sys-devel/gettext
-		>=dev-util/intltool-0.11 )"
+	>=dev-util/intltool-0.11 )
+	<gnome-base/libglade-0.99.0"
 
 DEPEND="${RDEPEND}"
 
 src_compile() {
+	elibtoolize
 
-	local myconf
+	local myconf=""
 
 	use nls || myconf="${myconf} --disable-nls"
 
 	# Evo users need to have bonobo support
 	#use bonobo \
-	#	&& myconf="${myconf} --with-bonobo"	\
+	#	&& myconf="${myconf} --with-bonobo" \
 	#	|| myconf="${myconf} --without-bonobo"
 
-	use gnome	\
-		&& myconf="${myconf} --with-gconf"	\
+	use gnome \
+		&& myconf="${myconf} --with-gconf" \
 		|| myconf="${myconf} --without-gconf"
 
-  	./configure 	\
-		--host=${CHOST} 				\
-		--prefix=/usr					\
-		--sysconfdir=/etc					\
-		--localstatedir=/var/lib				\
+  	./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
+	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
@@ -63,3 +63,4 @@ src_install() {
   	dodoc AUTHORS COPYING* ChangeLog README
   	dodoc NEWS TODO
 }
+