[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[Nirbheek Chauhan]

commit:     d9f6ec5a85b603bc0c7cc37a4f0e91b9f1650a76
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  7 18:09:51 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 18:17:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d9f6ec5a

gnome-extra/gtkhtml: bump to 3.32.2 to match portage

---
 ...32.1-r200.ebuild => gtkhtml-3.32.2-r200.ebuild} |    0
 gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild          |    2 +-
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-3.32.1-r200.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.32.2-r200.ebuild
similarity index 100%
rename from gnome-extra/gtkhtml/gtkhtml-3.32.1-r200.ebuild
rename to gnome-extra/gtkhtml/gtkhtml-3.32.2-r200.ebuild

diff --git a/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild
index 00d0f2f..b88b189 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild
@@ -25,7 +25,7 @@ RDEPEND=">=x11-libs/gtk+-2.99.2:3
 	>=app-text/iso-codes-0.49
 	>=net-libs/libsoup-2.26.0:2.4
 
-	!!<gnome-extra/gtkhtml-3.32.1-r200:3.14"
+	!!<gnome-extra/gtkhtml-3.32.2-r200:3.14"
 DEPEND="${RDEPEND}
 	x11-proto/xproto
 	sys-devel/gettext

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[Nirbheek Chauhan]

commit:     19dca1a8c23078a2d98df4d4f406fc5ee2ced032
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 12:18:29 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 12:18:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=19dca1a8

gnome-extra/gtkhtml: 3.91.6 -> 3.91.90, rename gtkhtml-editor-test

* Instead of removing it from SLOT=3.14, just rename it for SLOT=4.0 .
  This reduces one blocker for the user to resolve

---
 gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild          |   41 --------------------
 ...l-3.32.2-r200.ebuild => gtkhtml-3.91.90.ebuild} |   15 +++----
 2 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild
deleted file mode 100644
index b88b189..0000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.32.1.ebuild,v 1.1 2010/11/28 14:43:21 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.99.2:3
-	>=x11-libs/cairo-1.10
-	>=x11-themes/gnome-icon-theme-2.22.0
-	>=gnome-base/orbit-2
-	>=app-text/enchant-1.1.7
-	gnome-base/gconf:2
-	>=app-text/iso-codes-0.49
-	>=net-libs/libsoup-2.26.0:2.4
-
-	!!<gnome-extra/gtkhtml-3.32.2-r200:3.14"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	>=dev-util/pkgconfig-0.9"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-deprecated-warning-flags"
-	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-}

diff --git a/gnome-extra/gtkhtml/gtkhtml-3.32.2-r200.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.91.90.ebuild
similarity index 79%
rename from gnome-extra/gtkhtml/gtkhtml-3.32.2-r200.ebuild
rename to gnome-extra/gtkhtml/gtkhtml-3.91.90.ebuild
index b82b3fc..aca0d2f 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.32.2-r200.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.91.90.ebuild
@@ -12,21 +12,19 @@ DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
-SLOT="3.14"
+SLOT="4.0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
-COMMON_DEPEND=">=x11-libs/gtk+-2.20:2
+RDEPEND=">=x11-libs/gtk+-3.0:3
+	>=x11-libs/cairo-1.10
 	>=x11-themes/gnome-icon-theme-2.22.0
 	>=gnome-base/orbit-2
 	>=app-text/enchant-1.1.7
 	gnome-base/gconf:2
 	>=app-text/iso-codes-0.49
 	>=net-libs/libsoup-2.26.0:2.4"
-# Depend on the 4.0 slot for the files removed below
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/gtkhtml:4.0"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	x11-proto/xproto
 	sys-devel/gettext
 	>=dev-util/intltool-0.40.0
@@ -43,6 +41,7 @@ pkg_setup() {
 src_install() {
 	gnome2_src_install
 
-	# Don't clash with gtkhtml:4.0
-	rm -vf "${ED}/usr/bin/gtkhtml-editor-test" || die
+	elog "The gtkhtml-editor-test utility is now called gtkhtml-editor-test-${SLOT}"
+	# Don't collide with 3.14 slot
+	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
 }

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[Nirbheek Chauhan]

commit:     31ba2c23932d14b5512bbaea8e5cc936c5acc19d
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  6 20:38:19 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun Mar  6 20:54:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=31ba2c23

gnome-extra/gtkhtml: 3.91.90 → 3.91.91

* The time for unicode is finally here

---
 ...khtml-3.91.90.ebuild => gtkhtml-3.91.91.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-3.91.90.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.91.91.ebuild
similarity index 100%
rename from gnome-extra/gtkhtml/gtkhtml-3.91.90.ebuild
rename to gnome-extra/gtkhtml/gtkhtml-3.91.91.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[Nirbheek Chauhan]

commit:     6bf9a49de6114d28d1dd508170849028c68672fd
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 00:27:31 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 00:27:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6bf9a49d

gnome-extra/gtkhtml: 3.91.91 → 3.91.92

---
 ...khtml-3.91.91.ebuild => gtkhtml-3.91.92.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-3.91.91.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.91.92.ebuild
similarity index 100%
rename from gnome-extra/gtkhtml/gtkhtml-3.91.91.ebuild
rename to gnome-extra/gtkhtml/gtkhtml-3.91.92.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[Nirbheek Chauhan]

commit:     f71da1d080a94ec19ea80798c198e771d05860e1
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 13:40:51 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 13:40:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f71da1d0

gnome-extra/gtkhtml: 3.91.92 → 4.0.0

---
 ...gtkhtml-3.91.92.ebuild => gtkhtml-4.0.0.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-3.91.92.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.0.0.ebuild
similarity index 100%
rename from gnome-extra/gtkhtml/gtkhtml-3.91.92.ebuild
rename to gnome-extra/gtkhtml/gtkhtml-4.0.0.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[Nirbheek Chauhan]

commit:     a98a9be7f05b0bebefb3787d898762ed7a074f11
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 13:49:55 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 13:49:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a98a9be7

gnome-extra/gtkhtml: 4.0.0 → 4.0.1

---
 .../{gtkhtml-4.0.0.ebuild => gtkhtml-4.0.1.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-4.0.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.0.1.ebuild
similarity index 100%
rename from gnome-extra/gtkhtml/gtkhtml-4.0.0.ebuild
rename to gnome-extra/gtkhtml/gtkhtml-4.0.1.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[Alexandre Restovtsev]

commit:     74f03ae3f5cd32c038f25c643d8d2b4190cdd43c
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Aug 15 07:31:24 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Aug 15 07:41:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=74f03ae3

gnome-extra/gtkhtml: drop unneeded orbit dependency (#379233)

Orbit is referenced in configure, but is not used anywhere else:
gnome-git/gtkhtml $ grep -ri orbit *
configure.ac:ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
configure.ac:AC_SUBST(ORBIT_IDL)
gnome-git/gtkhtml $
so the dependency can safely be dropped. Thanks to Andreas Proschofsky
(suka <AT> gentoo.org) for reporting; resolves bug #379233.

---
 gnome-extra/gtkhtml/gtkhtml-4.0.1.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-4.0.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.0.1.ebuild
index aca0d2f..958be18 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.0.1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.0.1.ebuild
@@ -16,10 +16,10 @@ SLOT="4.0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
+# orbit is referenced in configure, but is not used anywhere else
 RDEPEND=">=x11-libs/gtk+-3.0:3
 	>=x11-libs/cairo-1.10
 	>=x11-themes/gnome-icon-theme-2.22.0
-	>=gnome-base/orbit-2
 	>=app-text/enchant-1.1.7
 	gnome-base/gconf:2
 	>=app-text/iso-codes-0.49

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[Alexandre Restovtsev]

commit:     86961c54f425ddefc8b57043a8e1da7f0915c623
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 17:38:46 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Oct 23 17:38:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=86961c54

gnome-extra/gtkhtml: 4.2.0 → 4.2.1

Bump, fixes a crash.

---
 .../{gtkhtml-4.2.0.ebuild => gtkhtml-4.2.1.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-4.2.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.2.1.ebuild
similarity index 100%
rename from gnome-extra/gtkhtml/gtkhtml-4.2.0.ebuild
rename to gnome-extra/gtkhtml/gtkhtml-4.2.1.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[Priit Laes]

commit:     6b117f70018c8259b0e5a3d6475bec00ac710d57
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Wed Aug  8 20:40:09 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Wed Aug  8 20:40:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6b117f70

gnome-extra/gtkhtml: Add 4.5.5 to overlay

---
 gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild |   54 ++++++++++++++++++++++++++++++
 1 files changed, 54 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild
new file mode 100644
index 0000000..314c69b
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild,v 1.1 2012/06/23 09:46:13 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 eutils
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE=""
+
+# orbit is referenced in configure, but is not used anywhere else
+RDEPEND=">=x11-libs/gtk+-3.0.2:3
+	>=x11-libs/cairo-1.10
+	x11-libs/pango
+	>=x11-themes/gnome-icon-theme-2.22.0
+	>=app-text/enchant-1.1.7
+	gnome-base/gsettings-desktop-schemas
+	>=app-text/iso-codes-0.49
+	>=net-libs/libsoup-2.26.0:2.4"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	sys-devel/gettext
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig"
+
+pkg_setup() {
+	ELTCONF="--reverse-deps"
+	G2CONF="${G2CONF}
+		--disable-static"
+	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+	# Regenerate marshallers for <glib-2.31 compatibility
+	rm -v components/editor/gtkhtml-spell-marshal.{c,h} \
+		components/editor/gtkhtml-editor-marshal.{c,h} || die
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	elog "The gtkhtml-editor-test utility is now called gtkhtml-editor-test-${SLOT}"
+	# Don't collide with 3.14 slot
+	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
+}

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[Alexandre Rostovtsev]

commit:     2259d3e1f1cb0477ec8aa30d595dd895d8e977dc
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 28 08:29:17 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Fri Sep 28 08:30:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2259d3e1

gnome-extra/gtkhtml: 4.5.5 → 4.6.0 and add live ebuild

---
 .../{gtkhtml-4.5.5.ebuild => gtkhtml-4.6.0.ebuild} |   19 +++++++++++++------
 .../{gtkhtml-4.5.5.ebuild => gtkhtml-9999.ebuild}  |   19 +++++++++++++------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.6.0.ebuild
similarity index 72%
copy from gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild
copy to gnome-extra/gtkhtml/gtkhtml-4.6.0.ebuild
index 314c69b..9735a4b 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.6.0.ebuild
@@ -1,19 +1,24 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild,v 1.1 2012/06/23 09:46:13 pacho Exp $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 eutils
+inherit gnome2
+[[ ${PV} = 9999 ]] && inherit gnome2-live
 
 DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+fi
 IUSE=""
 
 # orbit is referenced in configure, but is not used anywhere else
@@ -40,8 +45,10 @@ pkg_setup() {
 
 src_prepare() {
 	# Regenerate marshallers for <glib-2.31 compatibility
-	rm -v components/editor/gtkhtml-spell-marshal.{c,h} \
-		components/editor/gtkhtml-editor-marshal.{c,h} || die
+	if [[ ${PV} != 9999 ]]; then
+		rm -v components/editor/gtkhtml-spell-marshal.{c,h} \
+			components/editor/gtkhtml-editor-marshal.{c,h} || die
+	fi
 	gnome2_src_prepare
 }
 

diff --git a/gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
similarity index 72%
rename from gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild
rename to gnome-extra/gtkhtml/gtkhtml-9999.ebuild
index 314c69b..9735a4b 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.5.5.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
@@ -1,19 +1,24 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild,v 1.1 2012/06/23 09:46:13 pacho Exp $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 eutils
+inherit gnome2
+[[ ${PV} = 9999 ]] && inherit gnome2-live
 
 DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+fi
 IUSE=""
 
 # orbit is referenced in configure, but is not used anywhere else
@@ -40,8 +45,10 @@ pkg_setup() {
 
 src_prepare() {
 	# Regenerate marshallers for <glib-2.31 compatibility
-	rm -v components/editor/gtkhtml-spell-marshal.{c,h} \
-		components/editor/gtkhtml-editor-marshal.{c,h} || die
+	if [[ ${PV} != 9999 ]]; then
+		rm -v components/editor/gtkhtml-spell-marshal.{c,h} \
+			components/editor/gtkhtml-editor-marshal.{c,h} || die
+	fi
 	gnome2_src_prepare
 }
 

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[Gilles Dartiguelongue]

commit:     320156b8ad25af55ed4ed517494175c71a4da936
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 21 23:28:23 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Nov 21 23:28:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=320156b8

gnome-extra/gtkhtml: 4.6.0 → 4.6.1

---
 .../{gtkhtml-4.6.0.ebuild => gtkhtml-4.6.1.ebuild} |    0
 gnome-extra/gtkhtml/metadata.xml                   |    5 +++++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-4.6.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.6.1.ebuild
similarity index 100%
rename from gnome-extra/gtkhtml/gtkhtml-4.6.0.ebuild
rename to gnome-extra/gtkhtml/gtkhtml-4.6.1.ebuild

diff --git a/gnome-extra/gtkhtml/metadata.xml b/gnome-extra/gtkhtml/metadata.xml
new file mode 100644
index 0000000..6e0e2ec
--- /dev/null
+++ b/gnome-extra/gtkhtml/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+</pkgmetadata>

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[Gilles Dartiguelongue]

commit:     39a713424a4945a57967e0cdc0827c97d91e87b7
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 18 22:25:24 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Dec 18 22:25:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=39a71342

gnome-extra/gtkhtml: moved to gx86

    * Sync live ebuild with gx86 changes.

---
 gnome-extra/gtkhtml/gtkhtml-4.6.1.ebuild |   61 ------------------------------
 gnome-extra/gtkhtml/gtkhtml-9999.ebuild  |   15 +++----
 2 files changed, 6 insertions(+), 70 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-4.6.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.6.1.ebuild
deleted file mode 100644
index 9735a4b..0000000
--- a/gnome-extra/gtkhtml/gtkhtml-4.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-[[ ${PV} = 9999 ]] && inherit gnome2-live
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="4.0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-fi
-IUSE=""
-
-# orbit is referenced in configure, but is not used anywhere else
-RDEPEND=">=x11-libs/gtk+-3.0.2:3
-	>=x11-libs/cairo-1.10
-	x11-libs/pango
-	>=x11-themes/gnome-icon-theme-2.22.0
-	>=app-text/enchant-1.1.7
-	gnome-base/gsettings-desktop-schemas
-	>=app-text/iso-codes-0.49
-	>=net-libs/libsoup-2.26.0:2.4"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	G2CONF="${G2CONF}
-		--disable-static"
-	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-}
-
-src_prepare() {
-	# Regenerate marshallers for <glib-2.31 compatibility
-	if [[ ${PV} != 9999 ]]; then
-		rm -v components/editor/gtkhtml-spell-marshal.{c,h} \
-			components/editor/gtkhtml-editor-marshal.{c,h} || die
-	fi
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	elog "The gtkhtml-editor-test utility is now called gtkhtml-editor-test-${SLOT}"
-	# Don't collide with 3.14 slot
-	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
-}

diff --git a/gnome-extra/gtkhtml/gtkhtml-9999.ebuild b/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
index 9735a4b..5b3a0b5 100644
--- a/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
@@ -2,15 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 [[ ${PV} = 9999 ]] && inherit gnome2-live
 
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
+DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
+HOMEPAGE="http://projects.gnome.org/evolution/"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4.0"
@@ -23,10 +23,10 @@ IUSE=""
 
 # orbit is referenced in configure, but is not used anywhere else
 RDEPEND=">=x11-libs/gtk+-3.0.2:3
-	>=x11-libs/cairo-1.10
+	>=x11-libs/cairo-1.10:=
 	x11-libs/pango
 	>=x11-themes/gnome-icon-theme-2.22.0
-	>=app-text/enchant-1.1.7
+	>=app-text/enchant-1.1.7:=
 	gnome-base/gsettings-desktop-schemas
 	>=app-text/iso-codes-0.49
 	>=net-libs/libsoup-2.26.0:2.4"
@@ -36,14 +36,11 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40.0
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_prepare() {
 	ELTCONF="--reverse-deps"
 	G2CONF="${G2CONF}
 		--disable-static"
-	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-}
 
-src_prepare() {
 	# Regenerate marshallers for <glib-2.31 compatibility
 	if [[ ${PV} != 9999 ]]; then
 		rm -v components/editor/gtkhtml-spell-marshal.{c,h} \

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[Gilles Dartiguelongue]

commit:     f64bf72a114db2bf3b10c26e69a9eba75efc0615
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 21 12:01:52 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Apr 21 13:34:38 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f64bf72a

gnome-extra/gtkhtml: 4.6.6 → 4.8.0

---
 .../{gtkhtml-9999.ebuild => gtkhtml-4.8.0.ebuild}        | 16 +++++-----------
 gnome-extra/gtkhtml/gtkhtml-9999.ebuild                  |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-9999.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.8.0.ebuild
similarity index 72%
copy from gnome-extra/gtkhtml/gtkhtml-9999.ebuild
copy to gnome-extra/gtkhtml/gtkhtml-4.8.0.ebuild
index ec8839b..641b92a 100644
--- a/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.8.0.ebuild
@@ -6,23 +6,18 @@ EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2
-[[ ${PV} = 9999 ]] && inherit gnome2-live
 
 DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
 HOMEPAGE="http://projects.gnome.org/evolution/"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4.0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
 # orbit is referenced in configure, but is not used anywhere else
 RDEPEND="
-	>=x11-libs/gtk+-3.0.2:3
+	>=x11-libs/gtk+-3.2:3
 	>=x11-libs/cairo-1.10:=
 	x11-libs/pango
 	>=x11-themes/gnome-icon-theme-2.22.0
@@ -43,10 +38,9 @@ src_prepare() {
 	ELTCONF="--reverse-deps"
 
 	# Regenerate marshallers for <glib-2.31 compatibility
-	if [[ ${PV} != 9999 ]]; then
-		rm -v components/editor/gtkhtml-spell-marshal.{c,h} \
-			components/editor/gtkhtml-editor-marshal.{c,h} || die
-	fi
+	rm -v components/editor/gtkhtml-spell-marshal.{c,h} \
+		components/editor/gtkhtml-editor-marshal.{c,h} || die
+
 	gnome2_src_prepare
 }
 

diff --git a/gnome-extra/gtkhtml/gtkhtml-9999.ebuild b/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
index ec8839b..6b27c95 100644
--- a/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-9999.ebuild
@@ -22,7 +22,7 @@ IUSE=""
 
 # orbit is referenced in configure, but is not used anywhere else
 RDEPEND="
-	>=x11-libs/gtk+-3.0.2:3
+	>=x11-libs/gtk+-3.2:3
 	>=x11-libs/cairo-1.10:=
 	x11-libs/pango
 	>=x11-themes/gnome-icon-theme-2.22.0