* bump to 3.16.3

* fix quoting
* fix style in 2.11.1
(Portage version: 2.1.4_rc14)

9 files changed, 79 insertions, 32 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 1248b878125f..42738aafdb1a 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-extra/gtkhtml
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.132 2007/12/01 17:25:01 corsair Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.133 2008/01/09 21:18:52 eva Exp $
+
+  09 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org> gtkhtml-2.6.3.ebuild,
+  gtkhtml-2.11.1.ebuild, gtkhtml-3.0.10-r1.ebuild, gtkhtml-3.2.4.ebuild,
+  gtkhtml-3.2.5.ebuild, gtkhtml-3.6.2.ebuild:
+  fix quoting and some ebuild style in 2.11.1
+
+*gtkhtml-3.16.3 (09 Jan 2008)
+
+  09 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +gtkhtml-3.16.3.ebuild:
+  bump to 3.16.3
 
   01 Dec 2007; Markus Rothe <corsair@gentoo.org> gtkhtml-3.2.5.ebuild:
   Stable on ppc64
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.16.3 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.16.3
new file mode 100644
index 000000000000..769c26131bce
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.16.3
@@ -0,0 +1,3 @@
+MD5 bba94aecc723946e2a4e68e2dcf59722 gtkhtml-3.16.3.tar.bz2 1302959
+RMD160 f4b7f134107180e8d244654366ac4cfd51761168 gtkhtml-3.16.3.tar.bz2 1302959
+SHA256 00a313b7f56c235f3ac520dc1ebbb5c8245d76f8992a1187f165c0595a474850 gtkhtml-3.16.3.tar.bz2 1302959
diff --git a/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild
index ee3b079d7bf6..74375c0da802 100644
--- a/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild,v 1.1 2007/09/16 12:34:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild,v 1.2 2008/01/09 21:18:52 eva Exp $
 
 inherit eutils gnome2 versionator autotools
 
@@ -27,18 +27,17 @@ RDEPEND=">=x11-libs/gtk+-2.4
 DEPEND="${RDEPEND}
 	 >=dev-util/pkgconfig-0.12.0"
 
-G2CONF="${G2CONF} $(use_enable accessibility)"
-
 DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS  README TODO docs/IDEAS"
-#MAKEOPTS="${MAKEOPTS} -j1"
 
-S=${WORKDIR}/${MY_P}
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable accessibility)"
+}
 
 src_unpack() {
 	gnome2_src_unpack
 
 	if use alpha; then
-		epatch ${FILESDIR}/${MY_PN}-2.2.0-alpha.patch || die
+		epatch "${FILESDIR}/${MY_PN}-2.2.0-alpha.patch"
 	fi
 
 	if use x86-fsbd; then
diff --git a/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild
index f4269978c93d..f0f31c4af77a 100644
--- a/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild,v 1.6 2007/09/13 13:24:21 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild,v 1.7 2008/01/09 21:18:52 eva Exp $
 
 inherit eutils gnome2 versionator autotools
 
@@ -36,10 +36,10 @@ S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	if use alpha; then
-		epatch ${FILESDIR}/${MY_PN}-2.2.0-alpha.patch || die
+		epatch "${FILESDIR}/${MY_PN}-2.2.0-alpha.patch" || die
 	fi
 
 	# We need a full autoreconf on FreeBSD at least to fix libtool errors.
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild
index 9119a1bdd622..76684afab0f6 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild,v 1.3 2007/08/29 14:49:33 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild,v 1.4 2008/01/09 21:18:52 eva Exp $
 
 inherit gnome2 eutils
 
@@ -33,11 +33,11 @@ ELTCONF="--reverse-deps"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/src
+	cd "${S}/src"
 
 	# bug 101970
-	epatch ${FILESDIR}/${P}-no-extern-cluealigned.diff
+	epatch "${FILESDIR}/${P}-no-extern-cluealigned.diff"
 
 	# bug 54244, patch for cjk input methods
-	epatch ${FILESDIR}/${PN}-fix_preedit.patch
+	epatch "${FILESDIR}/${PN}-fix_preedit.patch"
 }
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.16.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.16.3.ebuild
new file mode 100644
index 000000000000..1e413679c3e6
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-3.16.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.16.3.ebuild,v 1.1 2008/01/09 21:18:52 eva Exp $
+
+inherit gnome2
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.14"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="static"
+
+RDEPEND=">=x11-libs/gtk+-2.10
+	>=gnome-base/gail-1.1
+	>=x11-themes/gnome-icon-theme-1.2
+	>=gnome-base/libbonoboui-2.2.4
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/orbit-2
+	>=gnome-base/libbonobo-2
+	>=net-libs/libsoup-2.1.6"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35.5
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	ELTCONF="--reverse-deps"
+	G2CONF="$(use_enable static) --enable-file-chooser"
+}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild
index 95c1a0e12408..056fa00a0f90 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild,v 1.6 2007/07/12 04:19:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild,v 1.7 2008/01/09 21:18:52 eva Exp $
 
 inherit gnome2 eutils
 
@@ -34,8 +34,8 @@ ELTCONF="--reverse-deps"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	# bug 101970
-	epatch ${FILESDIR}/${PN}-3.0.10-no-extern-cluealigned.diff
-	epatch ${FILESDIR}/${PN}-3.2-i18n.patch
+	epatch "${FILESDIR}/${PN}-3.0.10-no-extern-cluealigned.diff"
+	epatch "${FILESDIR}/${PN}-3.2-i18n.patch"
 }
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild
index 053a5e2daf6e..197eb16861d7 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild,v 1.7 2007/12/01 17:25:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild,v 1.8 2008/01/09 21:18:52 eva Exp $
 
 inherit gnome2 eutils
 
@@ -34,8 +34,8 @@ ELTCONF="--reverse-deps"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	# bug 101970
-	epatch ${FILESDIR}/${PN}-3.0.10-no-extern-cluealigned.diff
-	epatch ${FILESDIR}/${PN}-3.2-i18n.patch || die "gettext fix"
+	epatch "${FILESDIR}/${PN}-3.0.10-no-extern-cluealigned.diff"
+	epatch "${FILESDIR}/${PN}-3.2-i18n.patch" || die "gettext fix"
 }
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild
index 1345610324fa..a5c2fe1d9606 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild,v 1.6 2007/07/12 04:19:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild,v 1.7 2008/01/09 21:18:52 eva Exp $
 
 inherit gnome2 eutils
 
@@ -38,7 +38,7 @@ G2CONF="${G2CONF} $(use_enable static)"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-fbsd.patch
+	epatch "${FILESDIR}/${P}-fbsd.patch"
 }