Split gtk-doc.m4 out into dev-util/gtk-doc-am so that packages needing it to run automake can depend on just that.

Package-Manager: portage-2.1.4.4

4 files changed, 56 insertions, 5 deletions

diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index 9b542fc957a9..66ca1e75e7a3 100644
--- a/dev-util/gtk-doc/ChangeLog
+++ b/dev-util/gtk-doc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/gtk-doc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.90 2008/03/19 23:40:36 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.91 2008/03/24 15:39:45 dang Exp $
+
+*gtk-doc-1.10-r1 (24 Mar 2008)
+
+  24 Mar 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gtk-doc-1.10-no-m4.patch, gtk-doc-1.8-r2.ebuild,
+  -gtk-doc-1.10.ebuild, +gtk-doc-1.10-r1.ebuild:
+  Split gtk-doc.m4 out into dev-util/gtk-doc-am so that packages needing it
+  to run automake can depend on just that.
 
 *gtk-doc-1.10 (19 Mar 2008)
 
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.10-no-m4.patch b/dev-util/gtk-doc/files/gtk-doc-1.10-no-m4.patch
new file mode 100644
index 000000000000..8c71c3cc5484
--- /dev/null
+++ b/dev-util/gtk-doc/files/gtk-doc-1.10-no-m4.patch
@@ -0,0 +1,38 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk-doc-1.9.orig/Makefile.am gtk-doc-1.9/Makefile.am
+--- gtk-doc-1.9.orig/Makefile.am	2007-09-24 15:16:20.000000000 -0400
++++ gtk-doc-1.9/Makefile.am	2008-03-24 10:29:24.000000000 -0400
+@@ -35,16 +35,12 @@ gtkdocdata_DATA = \
+ pkgconfigdir = $(datadir)/pkgconfig
+ pkgconfig_DATA = gtk-doc.pc
+ 
+-aclocaldir = $(datadir)/aclocal
+-aclocal_DATA = gtk-doc.m4
+-
+ sgmldir = $(datadir)/sgml/gtk-doc
+ sgml_DATA = gtk-doc.cat
+ 
+ EXTRA_DIST = \
+   MAINTAINERS     \
+   gtk-doc.pc.in   \
+-  gtk-doc.m4      \
+   gtk-doc.make    \
+   gtk-doc.notmpl.make \
+   gtk-doc.spec.in \
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk-doc-1.9.orig/Makefile.in gtk-doc-1.9/Makefile.in
+--- gtk-doc-1.9.orig/Makefile.in	2007-09-24 15:18:36.000000000 -0400
++++ gtk-doc-1.9/Makefile.in	2008-03-24 10:29:22.000000000 -0400
+@@ -260,14 +260,11 @@ gtkdocdata_DATA = \
+ 
+ pkgconfigdir = $(datadir)/pkgconfig
+ pkgconfig_DATA = gtk-doc.pc
+-aclocaldir = $(datadir)/aclocal
+-aclocal_DATA = gtk-doc.m4
+ sgmldir = $(datadir)/sgml/gtk-doc
+ sgml_DATA = gtk-doc.cat
+ EXTRA_DIST = \
+   MAINTAINERS     \
+   gtk-doc.pc.in   \
+-  gtk-doc.m4      \
+   gtk-doc.make    \
+   gtk-doc.notmpl.make \
+   gtk-doc.spec.in \
diff --git a/dev-util/gtk-doc/gtk-doc-1.10.ebuild b/dev-util/gtk-doc/gtk-doc-1.10-r1.ebuild
index 646834c6ee96..f1efec7373da 100644
--- a/dev-util/gtk-doc/gtk-doc-1.10.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.10.ebuild,v 1.1 2008/03/19 23:40:36 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.10-r1.ebuild,v 1.1 2008/03/24 15:39:45 dang Exp $
 
 inherit eutils elisp-common gnome2
 
@@ -23,6 +23,7 @@ RDEPEND=">=dev-lang/perl-5.6
 	emacs? ( virtual/emacs )"
 
 DEPEND="${RDEPEND}
+	=dev-util/gtk-doc-am-${PV}
 	>=dev-util/pkgconfig-0.19
 	>=app-text/scrollkeeper-0.3.5"
 
@@ -38,6 +39,9 @@ src_unpack() {
 
 	# Remove global Emacs keybindings.
 	epatch "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
+
+	# Don't install gtk-doc.m4; it's in gtk-doc-am now
+	epatch "${FILESDIR}"/${PN}-1.10-no-m4.patch
 }
 
 src_compile() {
diff --git a/dev-util/gtk-doc/gtk-doc-1.8-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.8-r2.ebuild
index c7641fa73db5..3993b067f292 100644
--- a/dev-util/gtk-doc/gtk-doc-1.8-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.8-r2.ebuild,v 1.2 2007/11/06 22:28:37 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.8-r2.ebuild,v 1.3 2008/03/24 15:39:45 dang Exp $
 
 inherit eutils elisp-common gnome2
 
@@ -24,7 +24,8 @@ RDEPEND=">=dev-lang/perl-5.6
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.19
-	>=app-text/scrollkeeper-0.3.5"
+	>=app-text/scrollkeeper-0.3.5
+	!dev-util/gtk-doc-am"
 
 SITEFILE=61${PN}-gentoo.el