Adding missing emacs dependency. Install global gentoo-specific elisp file. Cleaning old ebuilds.

Package-Manager: portage-2.0.51.22-r2

6 files changed, 48 insertions, 12 deletions

diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index f4dc5a1d411b..ec2768065611 100644
--- a/dev-util/gtk-doc/ChangeLog
+++ b/dev-util/gtk-doc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-util/gtk-doc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.50 2005/07/19 17:34:10 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.51 2005/08/09 02:48:30 leonardop Exp $
+
+*gtk-doc-1.4-r1 (08 Aug 2005)
+
+  08 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gtk-doc-1.4-r1.ebuild, files/60gtk-doc-gentoo.el:
+  Install a gentoo-specific emacs file according to the relevant USE flag.
+  Moving elisp-compile call into src_compile().
+
+  08 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gtk-doc-1.3-r1.ebuild, gtk-doc-1.4.ebuild:
+  Added virtual/emacs dependency if 'emacs' is part of the USE flags.
 
 *gtk-doc-1.4 (19 Jul 2005)
 
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 004c97ed167f..5a5c84e1ef86 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,9 +1,10 @@
-MD5 6182bac2a7a64a0c71b51b179322ea55 ChangeLog 6029
+MD5 58ee5f138bfb69bd3924290faf690943 ChangeLog 6462
 MD5 f002a5762e9733c1c4302834540a4bb0 gtk-doc-1.1.ebuild 933
-MD5 265a368709170d9c639f0b2cb86a9c0d gtk-doc-1.4.ebuild 963
+MD5 d7fc9a13964a28f42c6c5edbfe23f451 gtk-doc-1.4-r1.ebuild 1279
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 efb3beb462f374bc5c109acb5f6f6ee4 gtk-doc-1.3-r1.ebuild 1136
+MD5 8708f42381ae890150e0511af84d959d gtk-doc-1.3-r1.ebuild 1165
 MD5 c036d436f5c42ec78ef0bb5507eb5437 files/digest-gtk-doc-1.1 64
-MD5 256ebf03501d496ca4a831688dc7283a files/digest-gtk-doc-1.4 64
+MD5 256ebf03501d496ca4a831688dc7283a files/digest-gtk-doc-1.4-r1 64
 MD5 01e1d20270319035161fbafc0d87132c files/gtk-doc-1.3-declaration.patch 372
 MD5 7cc023d59d3e76467752a9eddc070059 files/digest-gtk-doc-1.3-r1 64
+MD5 d1c8289d32d8c1c5eced0cc472dec0d8 files/60gtk-doc-gentoo.el 101
diff --git a/dev-util/gtk-doc/files/60gtk-doc-gentoo.el b/dev-util/gtk-doc/files/60gtk-doc-gentoo.el
new file mode 100644
index 000000000000..e6570bd46b05
--- /dev/null
+++ b/dev-util/gtk-doc/files/60gtk-doc-gentoo.el
@@ -0,0 +1,5 @@
+
+;;; gtk-doc site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(load-library "gtk-doc")
diff --git a/dev-util/gtk-doc/files/digest-gtk-doc-1.4 b/dev-util/gtk-doc/files/digest-gtk-doc-1.4-r1
index cabbdef0bf6c..cabbdef0bf6c 100644
--- a/dev-util/gtk-doc/files/digest-gtk-doc-1.4
+++ b/dev-util/gtk-doc/files/digest-gtk-doc-1.4-r1
diff --git a/dev-util/gtk-doc/gtk-doc-1.3-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.3-r1.ebuild
index 1b131e0bd19c..f61751079f44 100644
--- a/dev-util/gtk-doc/gtk-doc-1.3-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.3-r1.ebuild,v 1.11 2005/07/02 20:51:51 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.3-r1.ebuild,v 1.12 2005/08/09 02:48:30 leonardop Exp $
 
 inherit eutils elisp-common gnome.org
 
@@ -19,7 +19,8 @@ DEPEND=">=app-text/openjade-1.3.1
 	>=app-text/docbook-dsssl-stylesheets-1.40
 	>=dev-lang/perl-5.6
 	>=dev-libs/libxml2-2.3.6
-	dev-libs/libxslt"
+	dev-libs/libxslt
+	emacs? ( virtual/emacs )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-util/gtk-doc/gtk-doc-1.4.ebuild b/dev-util/gtk-doc/gtk-doc-1.4-r1.ebuild
index bceb1c758775..c220287c5763 100644
--- a/dev-util/gtk-doc/gtk-doc-1.4.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.4.ebuild,v 1.1 2005/07/19 17:34:10 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.4-r1.ebuild,v 1.1 2005/08/09 02:48:30 leonardop Exp $
 
 inherit elisp-common gnome.org
 
@@ -19,7 +19,18 @@ DEPEND=">=app-text/openjade-1.3.1
 	>=app-text/docbook-dsssl-stylesheets-1.40
 	>=dev-lang/perl-5.6
 	>=dev-libs/libxml2-2.3.6
-	dev-libs/libxslt"
+	dev-libs/libxslt
+	emacs? ( virtual/emacs )"
+
+SITEFILE="60gtk-doc-gentoo.el"
+
+
+src_compile() {
+	econf || die "Configuration failed"
+	emake || die "Compilation failed"
+
+	use emacs && elisp-compile tools/gtk-doc.el
+}
 
 src_install() {
 	make DESTDIR=${D} install || die
@@ -30,9 +41,16 @@ src_install() {
 	docinto examples
 	dodoc examples/*
 
-	if use emacs
-	then
-		elisp-compile tools/gtk-doc.el
+	if use emacs; then
 		elisp-install ${PN} tools/gtk-doc.el*
+		elisp-site-file-install ${FILESDIR}/${SITEFILE}
 	fi
 }
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}