Add new version for Gnome 2.30

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

4 files changed, 150 insertions, 2 deletions

diff --git a/dev-util/gtk-doc-am/ChangeLog b/dev-util/gtk-doc-am/ChangeLog
index 8788f08bd5a0..5c42eabae0ec 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/ChangeLog,v 1.35 2010/06/04 19:40:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/ChangeLog,v 1.36 2010/06/13 15:53:36 pacho Exp $
+
+*gtk-doc-am-1.15 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> +gtk-doc-am-1.15.ebuild:
+  Add new version for Gnome 2.30.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> gtk-doc-am-1.13.ebuild:
   x86 stable, bug #314899
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.15.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.15.ebuild
new file mode 100644
index 000000000000..e40e84e1db69
--- /dev/null
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.15.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 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.15.ebuild,v 1.1 2010/06/13 15:53:36 pacho Exp $
+
+EAPI="3"
+
+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.bz2"
+
+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 ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6"
+
+DEPEND="${RDEPEND}
+	!<dev-util/gtk-doc-${MAJ_PV}
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/pkgconfig-0.19"
+
+# 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() {
+	econf --with-xml-catalog="${EPREFIX}"/etc/xml/catalog
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	exeinto /usr/bin/
+	doexe gtkdoc-rebase || die "doexe failed"
+
+	insinto /usr/share/aclocal
+	doins gtk-doc.m4 || die "doins failed"
+}
diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index a3aa4c8f6ff1..e2a6cf68bc1b 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.119 2010/06/04 19:41:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.120 2010/06/13 15:56:43 pacho Exp $
+
+*gtk-doc-1.15 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> +gtk-doc-1.15.ebuild:
+  Add new version for Gnome 2.30.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> gtk-doc-1.13-r2.ebuild:
   x86 stable, bug #314899
diff --git a/dev-util/gtk-doc/gtk-doc-1.15.ebuild b/dev-util/gtk-doc/gtk-doc-1.15.ebuild
new file mode 100644
index 000000000000..6a74b0ac1436
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.15.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2010 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.15.ebuild,v 1.1 2010/06/13 15:56:43 pacho Exp $
+
+EAPI="2"
+
+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 ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="debug doc emacs test"
+
+RDEPEND=">=dev-libs/glib-2.6
+	>=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.3
+	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/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 )"
+
+SITEFILE=61${PN}-gentoo.el
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Remove global Emacs keybindings.
+	epatch "${FILESDIR}/${PN}-1.8-emacs-keybindings.patch"
+
+	# Fix bug 306569 by not loading vim plugins while calling vim in
+	# gtkdoc-fixxref for fixing vim syntax highlighting
+	epatch "${FILESDIR}/${PN}-1.13-fixxref-vim-u-NONE.patch"
+}
+
+src_compile() {
+	gnome2_src_compile
+
+	use emacs && elisp-compile tools/gtk-doc.el
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Don't install those files, they are in gtk-doc-am now
+	rm "${D}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
+	rm "${D}"/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}"
+	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
+}