Version bump, drop old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

2 files changed, 44 insertions, 34 deletions

diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index dfc9d33dd523..0805726905a3 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.191 2013/09/07 20:14:17 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.192 2014/02/16 09:04:01 pacho Exp $
+
+*gtk-doc-1.20 (16 Feb 2014)
+
+  16 Feb 2014; Pacho Ramos <pacho@gentoo.org> +gtk-doc-1.20.ebuild,
+  -gtk-doc-1.18-r1.ebuild:
+  Version bump, drop old
 
   07 Sep 2013; Agostino Sarubbo <ago@gentoo.org> gtk-doc-1.19.ebuild:
   Stable for sparc, wrt bug #482886
diff --git a/dev-util/gtk-doc/gtk-doc-1.18-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.20.ebuild
index ad7c2fe6baee..7314a8849417 100644
--- a/dev-util/gtk-doc/gtk-doc-1.18-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.20.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.18-r1.ebuild,v 1.10 2012/07/15 17:15:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.20.ebuild,v 1.1 2014/02/16 09:04:01 pacho Exp $
 
-EAPI="3"
+EAPI=5
 GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="xz"
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils elisp-common gnome2 python
+inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo
 
 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 x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # dev-tex/tex4ht blocker needed due bug #315287
-RDEPEND=">=dev-libs/glib-2.6:2
+RDEPEND="
+	>=dev-libs/glib-2.6:2
 	>=dev-lang/perl-5.6
 	>=app-text/openjade-1.3.1
 	dev-libs/libxslt
@@ -32,32 +33,25 @@ RDEPEND=">=dev-libs/glib-2.6:2
 		vim? ( || ( app-editors/vim app-editors/gvim ) )
 		!vim? ( dev-util/source-highlight )
 	)
-	!!<dev-tex/tex4ht-20090611_p1038-r1"
-
+	!!<dev-tex/tex4ht-20090611_p1038-r1
+"
 DEPEND="${RDEPEND}
 	~dev-util/gtk-doc-am-${PV}
-	virtual/pkgconfig
+	app-text/yelp-tools
 	>=app-text/scrollkeeper-0.3.14
-	>=app-text/gnome-doc-utils-0.3.2
-	test? ( app-text/scrollkeeper-dtd )"
+	virtual/pkgconfig
+	test? ( app-text/scrollkeeper-dtd )
+"
 
 pkg_setup() {
+	DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs.
+		You may set your own key bindings for \"gtk-doc-insert\" and
+		\"gtk-doc-insert-section\" in your ~/.emacs file."
 	SITEFILE=61${PN}-gentoo.el
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
-
-	if use vim; then
-		G2CONF="${G2CONF} $(use_with highlight highlight vim)"
-	else
-		G2CONF="${G2CONF} $(use_with highlight highlight source-highlight)"
-	fi
-	G2CONF+=" --with-xml-catalog=${EPREFIX}/etc/xml/catalog"
-
-	python_set_active_version 2
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Always disable fop; it is unreliable enough that gtk-doc upstream
 	# commented it out by default, and if it's autodetected, it causes build
 	# failures in other packages, bug #403165
@@ -66,18 +60,29 @@ src_prepare() {
 
 	# Remove global Emacs keybindings.
 	epatch "${FILESDIR}/${PN}-1.8-emacs-keybindings.patch"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	if use vim; then
+		G2CONF="${G2CONF} $(use_with highlight highlight vim)"
+	else
+		G2CONF="${G2CONF} $(use_with highlight highlight source-highlight)"
+	fi
+
+	gnome2_src_configure --with-xml-catalog="${EPREFIX}/etc/xml/catalog"
 }
 
 src_compile() {
 	gnome2_src_compile
-
 	use emacs && elisp-compile tools/gtk-doc.el
 }
 
 src_install() {
 	gnome2_src_install
 
-	python_convert_shebangs 2 "${ED}"/usr/bin/gtkdoc-depscan
+	python_fix_shebang "${ED}"/usr/bin/gtkdoc-depscan
 
 	# Don't install those files, they are in gtk-doc-am now
 	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
@@ -85,23 +90,22 @@ src_install() {
 
 	if use doc; then
 		docinto doc
-		dodoc doc/* || die
+		dodoc doc/*
 		docinto examples
-		dodoc examples/* || die
+		dodoc examples/*
 	fi
 
 	if use emacs; then
 		elisp-install ${PN} tools/gtk-doc.el*
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		readme.gentoo_create_doc
 	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."
+		readme.gentoo_print_elog
 	fi
 }