Version bump

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 133 insertions, 6 deletions

diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index 3d7b37812a9f..3ad70fdb37f8 100644
--- a/dev-util/gtk-doc/ChangeLog
+++ b/dev-util/gtk-doc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/gtk-doc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.204 2014/04/26 07:28:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.205 2014/09/03 13:03:10 pacho Exp $
+
+*gtk-doc-1.21 (03 Sep 2014)
+
+  03 Sep 2014; Pacho Ramos <pacho@gentoo.org> +gtk-doc-1.21.ebuild:
+  Version bump
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -gtk-doc-1.19.ebuild:
   drop old
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index c495ede82ac5..d05bf3c7b704 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -4,13 +4,15 @@ Hash: SHA256
 AUX 61gtk-doc-gentoo.el 283 SHA256 211c75484f2a4651a1e65a00c066640c3bf782030cfff5872a7af51bafd027c8 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837 WHIRLPOOL ad0c1b52f70ef49c007c5b59849fa247cee94523cf9c95f4f0a07433250322dcdd5e67f13d3f2f48810ad4fbdf2a23be236f183082c713fb0ca26eedd607d118
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 SHA256 e81eb1d06c489e19567277c9a14d84122025b0184e8773db2d421ab074fc8b38 SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6 WHIRLPOOL dd5c595f0c1aa6b736060f334c5f3c166b3a5efd7d56c15ed4cc52021fd231ec2daeddf1f1819b927b08ead8150710c1edb06399ec1a9183e74f162e3af90b47
 DIST gtk-doc-1.20.tar.xz 643892 SHA256 3e6ecf134dbf92a74c24d79848fea3a48e59ab95408a38c6405905d95a293011 SHA512 8b48bac2f9c176295353d59306de63461073ba12baed767b102bb7e09ac8962e3ed54581a1acf22d732e5fc7f2b409b1fc51d10bf5541323dd6152d99434a8d6 WHIRLPOOL d7491d7bff7429949a1fcbd855799aaa62f496f5b201105f880acb2ab024c577379703b1936e9126510b70ce54ecc98154889a40b9c02de30c60c93d6864c8d4
+DIST gtk-doc-1.21.tar.xz 647484 SHA256 5d934d012ee08edd1585544792efa80da271652587ba5b843d2cea8e8b80ee3e SHA512 caef8f6fd42f2961b6703af6d8b9f003b6e6ba2e9e955b94d9c0ecce8d267b7f4c2315d273dbdca1aff244e81867e675434b09a9410248e93101e86105f60f9d WHIRLPOOL cd72184e6f58745573d8bec785b0a8c61f3f68ff9c20254dd6a03e113aeac1672a8408f03c84918c523e2031a98fd5d75990d9377ea8444c2ce7fdba03dfaccc
 EBUILD gtk-doc-1.20.ebuild 3050 SHA256 c7ea581cbd84a40c177bd7e6963208a3f60388868a1aff2b144c4c9e4a8b0b5c SHA512 22230ba06369f40a11c191b9ad76e1d048ac56b9e00ef5d41cdb3aaf570d942d35924b6eb681e54806d1ac67caefb799ad31799fbd8c325f1783e8d942e5706f WHIRLPOOL 37e78439991a7ef89e3362a108ef5ff08e5a8a351cc84e440b036ebdde53dc05725d4d546276950871393b9c5d970bd68868a34bd30264bea95bf28d41e39609
-MISC ChangeLog 27672 SHA256 47a51c7b414c7efe7a99126107b0add4fb17795837da703ab09994dcb260a283 SHA512 7c282acfa6ded6ef1d5da46145bf78d1aa785ec78826d1c59b5cbb18d17641a064aa5c34a51781b0f93560cb2c69636a458f7237aadb97e42dbbc46cdf2a65f9 WHIRLPOOL e529384893881a944518d7d94890da6971714d6e65949f5684e47d51b2c3129491b1cbc1704ac29c96b497c4b57256ea6f15336fec2df536cd45185e179b777f
+EBUILD gtk-doc-1.21.ebuild 3139 SHA256 4c0b9226ade156f39c22027b5a8ac7fdb24f1aa642b9b601f3cdf2ad6487f3d0 SHA512 d2e16077aa05a8db149367d41788378ea7449d8651dd981f1310956577150c323f1adf74cb60c8b4ed5c59d52ff308805ff77da8faa449ffafacac1098ce6b0d WHIRLPOOL 49b126835f86f4e238785f77081e780ff8d31c3334aa685deb70dcdc123816befa7bafe51049cc33f5458e4e6e7f4bf987af5724fe1c0214a4bf8a0eddaee086
+MISC ChangeLog 27785 SHA256 713cd8469c85d996f88d8fe6cbff376fc529d7a2f736a1e8a24e0e7edbb25da6 SHA512 661743dd7ecdf1baf0c2c500046ebb2cd19229bd259e9c8df47599fbd33a2530143bb5c2244a9dd734baad71c1fee73dce93f41478f52775258c816a9021b241 WHIRLPOOL 2e52db649ca09150e7405efab9b1a9ba95553f58c266c763e622c4a74274f27ba2905be090ccea42954660da71674bb334614935b7767eb33bf587ee82cd36b4
 MISC metadata.xml 568 SHA256 351bf17354d07b9bc14055c0092cb0368387437cdf5c1707bdb5120e35419326 SHA512 a2a3d1839ef92674a98fa19098ec51f587fcd0369f100ef2e25afda69dddc493762d50ed6a30459d67f433d7b6cb13fd409676786e68dc3bca9e32bf3a52edd5 WHIRLPOOL 5be5c6de21215c4a9f0ef3757fc43a590f8df19bea757b58bdf03e6ae62667ddc2dcdf73018c2a960abaa218605d28433e9970b1cbd826640984ab8601af28b0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNbYCcACgkQCaWpQKGI+9SFGACcCcPdzUtIg0qhnq8Jl/EQ2Efm
-N1MAnjZXSVgD98uG1rS0isBruFpEQx6j
-=2vtQ
+iEYEAREIAAYFAlQHEY8ACgkQCaWpQKGI+9TNGACeLwLNurnBCRQFGIMt7fqFxsjX
+FjwAnA8DNU1s7ll+erKoACn3NdLkrNTo
+=jmkr
 -----END PGP SIGNATURE-----
diff --git a/dev-util/gtk-doc/gtk-doc-1.21.ebuild b/dev-util/gtk-doc/gtk-doc-1.21.ebuild
new file mode 100644
index 000000000000..1bef14f278a0
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.21.ebuild
@@ -0,0 +1,120 @@
+# 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.21.ebuild,v 1.1 2014/09/03 13:03:10 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+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 ~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 test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# dev-tex/tex4ht blocker needed due bug #315287
+RDEPEND="
+	>=dev-libs/glib-2.6:2
+	>=dev-lang/perl-5.6
+	>=app-text/openjade-1.3.1
+	dev-libs/libxslt
+	>=dev-libs/libxml2-2.3.6:2
+	~app-text/docbook-xml-dtd-4.3
+	app-text/docbook-xsl-stylesheets
+	~app-text/docbook-sgml-dtd-3.0
+	>=app-text/docbook-dsssl-stylesheets-1.40
+	emacs? ( virtual/emacs )
+	highlight? (
+		vim? ( || ( app-editors/vim app-editors/gvim ) )
+		!vim? ( dev-util/source-highlight )
+	)
+	!!<dev-tex/tex4ht-20090611_p1038-r1
+"
+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() {
+	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
+	python-single-r1_pkg_setup
+}
+
+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
+	sed -e 's:test -n "@FOP@":test -n "":' \
+		-i gtkdoc-mkpdf.in || die "sed failed"
+
+	# 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
+		myconf="${myconf} $(use_with highlight highlight vim)"
+	else
+		G2CONF="${myconf} $(use_with highlight highlight source-highlight)"
+	fi
+
+	gnome2_src_configure \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog" \
+		${myconf}
+}
+
+src_compile() {
+	gnome2_src_compile
+	use emacs && elisp-compile tools/gtk-doc.el
+}
+
+src_install() {
+	gnome2_src_install
+
+	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"
+	rm "${ED}"/usr/bin/gtkdoc-rebase || die "failed to remove gtkdoc-rebase"
+
+	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}"
+		readme.gentoo_create_doc
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use emacs; then
+		elisp-site-regen
+		readme.gentoo_print_elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	use emacs && elisp-site-regen
+}