Version bump. Clean up old revision.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key C6085806)

2 files changed, 21 insertions, 11 deletions

diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index fad27883d97f..ff56c73425ca 100644
--- a/dev-util/gtk-doc/ChangeLog
+++ b/dev-util/gtk-doc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/gtk-doc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.216 2015/04/08 17:54:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.217 2015/05/12 22:46:42 eva Exp $
+
+*gtk-doc-1.22 (12 May 2015)
+
+  12 May 2015; Gilles Dartiguelongue <eva@gentoo.org> -gtk-doc-1.20.ebuild,
+  +gtk-doc-1.22.ebuild:
+  Version bump. Clean up old revision.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> gtk-doc-1.20.ebuild,
   gtk-doc-1.21.ebuild:
diff --git a/dev-util/gtk-doc/gtk-doc-1.20.ebuild b/dev-util/gtk-doc/gtk-doc-1.22.ebuild
index 4118b6b01b80..964b2a3bd148 100644
--- a/dev-util/gtk-doc/gtk-doc-1.20.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.20.ebuild,v 1.13 2015/04/08 17:54:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.22.ebuild,v 1.1 2015/05/12 22:46:42 eva Exp $
 
 EAPI=5
 GCONF_DEBUG="yes"
@@ -13,8 +13,9 @@ 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 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="debug doc emacs highlight vim test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+
+IUSE="doc emacs highlight vim"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # dev-tex/tex4ht blocker needed due bug #315287
@@ -38,9 +39,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	~dev-util/gtk-doc-am-${PV}
 	app-text/yelp-tools
-	>=app-text/scrollkeeper-0.3.14
 	virtual/pkgconfig
-	test? ( app-text/scrollkeeper-dtd )
 "
 
 pkg_setup() {
@@ -58,20 +57,23 @@ src_prepare() {
 	sed -e 's:test -n "@FOP@":test -n "":' \
 		-i gtkdoc-mkpdf.in || die "sed failed"
 
-	# Remove global Emacs keybindings.
-	epatch "${FILESDIR}/${PN}-1.8-emacs-keybindings.patch"
+	# Remove global Emacs keybindings, bug #184588
+	epatch "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
 
 	gnome2_src_prepare
 }
 
 src_configure() {
+	local myconf
 	if use vim; then
-		G2CONF="${G2CONF} $(use_with highlight highlight vim)"
+		myconf="${myconf} $(use_with highlight highlight vim)"
 	else
-		G2CONF="${G2CONF} $(use_with highlight highlight source-highlight)"
+		myconf="${myconf} $(use_with highlight highlight source-highlight)"
 	fi
 
-	gnome2_src_configure --with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+	gnome2_src_configure \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		${myconf}
 }
 
 src_compile() {
@@ -103,6 +105,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	gnome2_pkg_postinst
 	if use emacs; then
 		elisp-site-regen
 		readme.gentoo_print_elog
@@ -110,5 +113,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	gnome2_pkg_postrm
 	use emacs && elisp-site-regen
 }