Bump to 1.8-r1

	Cleanups for emacs site files; bug #184588

(Portage version: 2.1.3)

5 files changed, 102 insertions, 1 deletions

diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index ac992a2e032e..7b8299b54d21 100644
--- a/dev-util/gtk-doc/ChangeLog
+++ b/dev-util/gtk-doc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/gtk-doc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.84 2007/06/02 02:55:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.85 2007/07/30 19:02:36 dang Exp $
+
+*gtk-doc-1.8-r1 (30 Jul 2007)
+
+  30 Jul 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gtk-doc-1.8-emacs-keybindings.patch, +files/61gtk-doc-gentoo.el,
+  +gtk-doc-1.8-r1.ebuild:
+  Bump to 1.8-r1
+  	Cleanups for emacs site files; bug #184588
 
   02 Jun 2007; Brent Baude <ranger@gentoo.org> gtk-doc-1.8.ebuild:
   Marking gtk-doc-1.8 ppc stable for bug #171107
diff --git a/dev-util/gtk-doc/files/61gtk-doc-gentoo.el b/dev-util/gtk-doc/files/61gtk-doc-gentoo.el
new file mode 100644
index 000000000000..56d260640dd5
--- /dev/null
+++ b/dev-util/gtk-doc/files/61gtk-doc-gentoo.el
diff --git a/dev-util/gtk-doc/files/digest-gtk-doc-1.8-r1 b/dev-util/gtk-doc/files/digest-gtk-doc-1.8-r1
new file mode 100644
index 000000000000..8aae6f84d30c
--- /dev/null
+++ b/dev-util/gtk-doc/files/digest-gtk-doc-1.8-r1
@@ -0,0 +1,3 @@
+MD5 e61595df21431db28c83fe4c7d4a4fa8 gtk-doc-1.8.tar.bz2 186203
+RMD160 fbb3e36e3cdf9904439262b2bafab86017691984 gtk-doc-1.8.tar.bz2 186203
+SHA256 7a21c6f094f39b73ab23653ec628dd78ded47412636c491b3513fa760a8a22d3 gtk-doc-1.8.tar.bz2 186203
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.8-emacs-keybindings.patch b/dev-util/gtk-doc/files/gtk-doc-1.8-emacs-keybindings.patch
new file mode 100644
index 000000000000..bbc989afb2b7
--- /dev/null
+++ b/dev-util/gtk-doc/files/gtk-doc-1.8-emacs-keybindings.patch
@@ -0,0 +1,17 @@
+--- gtk-doc-1.8-orig/tools/gtk-doc.el	2007-01-03 16:04:14.000000000 +0100
++++ gtk-doc-1.8/tools/gtk-doc.el	2007-07-29 21:56:45.000000000 +0200
+@@ -262,7 +262,7 @@
+ 
+ ;; set global binding for this key (follows the format for
+ ;;   creating a changelog entry ...)
+-(global-set-key "\C-x4h"  'gtk-doc-insert)
++;;(global-set-key "\C-x4h"  'gtk-doc-insert)
+ 
+ 
+ ;; Define another function for inserting a section header.
+@@ -280,4 +280,4 @@
+ 	  " */\n"))
+ 
+ ;; Set the key binding.
+-(global-set-key "\C-x4s" 'gtk-doc-insert-section)
++;;(global-set-key "\C-x4s" 'gtk-doc-insert-section)
diff --git a/dev-util/gtk-doc/gtk-doc-1.8-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.8-r1.ebuild
new file mode 100644
index 000000000000..e97d27dfbd1a
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.8-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.8-r1.ebuild,v 1.1 2007/07/30 19:02:36 dang Exp $
+
+inherit eutils elisp-common gnome2
+
+DESCRIPTION="GTK+ Documentation Generator"
+HOMEPAGE="http://www.gtk.org/gtk-doc/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86"
+IUSE="doc emacs"
+
+RDEPEND=">=dev-lang/perl-5.6
+	>=app-text/openjade-1.3.1
+	dev-libs/libxslt
+	>=dev-libs/libxml2-2.3.6
+	~app-text/docbook-xml-dtd-4.1.2
+	app-text/docbook-xsl-stylesheets
+	~app-text/docbook-sgml-dtd-3.0
+	>=app-text/docbook-dsssl-stylesheets-1.40
+	emacs? ( virtual/emacs )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.19
+	>=app-text/scrollkeeper-0.3.5"
+
+SITEFILE=61${PN}-gentoo.el
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Remove global Emacs keybindings.
+	epatch "${FILESDIR}"/${P}-emacs-keybindings.patch
+}
+
+src_compile() {
+	gnome2_src_compile
+
+	use emacs && elisp-compile tools/gtk-doc.el
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use doc; then
+		docinto doc
+		dodoc doc/*
+		docinto examples
+		dodoc examples/*
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} tools/gtk-doc.el*
+		elisp-site-file-install ${FILESDIR}/${SITEFILE}
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		elog "gtk-doc does no longer define global key bindings for Emacs."
+		elog "You may set your own key bindings for \"gtk-doc-insert\" and"
+		elog "\"gtk-doc-insert-section\" in your ~/.emacs file."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}