From: Pacho Ramos <pacho@gentoo.org>
Date: Thu, 15 Sep 2011 09:35:44 +0000 (+0000)
Subject: Version bump.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=56403dc3e132e2a72ed7b78ad8db9859372437e8;p=gentoo.git

Version bump.

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64
---

diff --git a/dev-util/gtk-doc-am/ChangeLog b/dev-util/gtk-doc-am/ChangeLog
index 1a74318666e2..dc838cf4dfea 100644
--- a/dev-util/gtk-doc-am/ChangeLog
+++ b/dev-util/gtk-doc-am/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/gtk-doc-am
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/ChangeLog,v 1.69 2011/09/10 17:05:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/ChangeLog,v 1.70 2011/09/15 09:34:48 pacho Exp $
+
+*gtk-doc-am-1.18 (15 Sep 2011)
+
+  15 Sep 2011; Pacho Ramos <pacho@gentoo.org> +gtk-doc-am-1.18.ebuild:
+  Version bump.
 
   10 Sep 2011; Pacho Ramos <pacho@gentoo.org> -gtk-doc-am-1.15.ebuild,
   -gtk-doc-am-1.16.ebuild:
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.18.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.18.ebuild
new file mode 100644
index 000000000000..f3e5b723bf06
--- /dev/null
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.18.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/gtk-doc-am-1.18.ebuild,v 1.1 2011/09/15 09:34:48 pacho Exp $
+
+EAPI="4"
+
+inherit versionator
+
+MY_PN="gtk-doc"
+MY_P=${MY_PN}-${PV}
+MAJ_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Automake files from gtk-doc"
+HOMEPAGE="http://www.gtk.org/gtk-doc/"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6"
+DEPEND="${RDEPEND}
+	!<dev-util/gtk-doc-${MAJ_PV}"
+# pkg-config is used by gtkdoc-rebase at runtime
+# PDEPEND to avoid circular deps, bug 368301
+PDEPEND="dev-util/pkgconfig"
+
+# This ebuild doesn't even compile anything, causing tests to fail when updating (bug #316071)
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+
+src_configure() {
+	# Duplicate autoconf checks so we don't have to call configure
+	local PERL=$(type -P perl)
+
+	test -n "${PERL}" || die "Perl not found!"
+	"${PERL}" -e "require v5.6.0" || die "perl >= 5.6.0 is required for gtk-doc"
+
+	# Replicate AC_SUBST
+	sed -e "s:@PERL@:${PERL}:g" -e "s:@VERSION@:${PV}:g" \
+		"${S}/gtkdoc-rebase.in" > "${S}/gtkdoc-rebase" || die "sed failed!"
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	fperms +x gtkdoc-rebase
+	exeinto /usr/bin/
+	doexe gtkdoc-rebase
+
+	insinto /usr/share/aclocal
+	doins gtk-doc.m4
+}
diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index f236e848decc..4702b08fe2b3 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.163 2011/09/12 15:42:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.164 2011/09/15 09:35:44 pacho Exp $
+
+*gtk-doc-1.18 (15 Sep 2011)
+
+  15 Sep 2011; Pacho Ramos <pacho@gentoo.org> +gtk-doc-1.18.ebuild:
+  Version bump.
 
   12 Sep 2011; Pacho Ramos <pacho@gentoo.org> -gtk-doc-1.16.ebuild:
   Remove old.
diff --git a/dev-util/gtk-doc/gtk-doc-1.18.ebuild b/dev-util/gtk-doc/gtk-doc-1.18.ebuild
new file mode 100644
index 000000000000..61d778bf4ad9
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.18.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2011 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.ebuild,v 1.1 2011/09/15 09:35:44 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+GNOME_TARBALL_SUFFIX="xz"
+PYTHON_DEPEND="2"
+
+inherit eutils elisp-common gnome2 python
+
+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 ~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"
+
+# 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}
+	>=dev-util/pkgconfig-0.19
+	>=app-text/scrollkeeper-0.3.14
+	>=app-text/gnome-doc-utils-0.3.2
+	test? ( app-text/scrollkeeper-dtd )"
+
+pkg_setup() {
+	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
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Remove global Emacs keybindings.
+	epatch "${FILESDIR}/${PN}-1.8-emacs-keybindings.patch"
+}
+
+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
+
+	# 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/* || die
+		docinto examples
+		dodoc examples/* || die
+	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
+}