Version bump.

(Portage version: 2.1.3.9)

8 files changed, 71 insertions, 46 deletions

diff --git a/app-emacs/vhdl-mode/ChangeLog b/app-emacs/vhdl-mode/ChangeLog
index e0915d6e17fa..94d6d2b606ee 100644
--- a/app-emacs/vhdl-mode/ChangeLog
+++ b/app-emacs/vhdl-mode/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emacs/vhdl-mode
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vhdl-mode/ChangeLog,v 1.8 2007/07/04 23:36:27 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vhdl-mode/ChangeLog,v 1.9 2007/09/23 15:59:14 ulm Exp $
+
+*vhdl-mode-3.33.21 (23 Sep 2007)
+
+  23 Sep 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/vhdl-mode-info-dir-gentoo.patch, vhdl-mode-3.33.2.ebuild,
+  -vhdl-mode-3.33.3.ebuild, vhdl-mode-3.33.8.ebuild,
+  +vhdl-mode-3.33.21.ebuild:
+  Version bump. Remove dependency on app-emacs/speedbar; update HOMEPAGE and
+  SRC_URI; install Info file and documentation. Drop ~ppc-macos keyword.
+  Remove old version.
 
   04 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
   vhdl-mode-3.33.8.ebuild:
diff --git a/app-emacs/vhdl-mode/files/digest-vhdl-mode-3.33.21 b/app-emacs/vhdl-mode/files/digest-vhdl-mode-3.33.21
new file mode 100644
index 000000000000..e8a2d2d31043
--- /dev/null
+++ b/app-emacs/vhdl-mode/files/digest-vhdl-mode-3.33.21
@@ -0,0 +1,3 @@
+MD5 07fc0d968e0981bcebe32e56a08c3eea vhdl-mode-3.33.21.tar.gz 315398
+RMD160 760ccfa800c93e04277b4b675d2fe627c6091235 vhdl-mode-3.33.21.tar.gz 315398
+SHA256 21ae59183294552b12d8af9a5687f82b67305bccdd1b8a9ccaa63cd9d2abc2d1 vhdl-mode-3.33.21.tar.gz 315398
diff --git a/app-emacs/vhdl-mode/files/digest-vhdl-mode-3.33.3 b/app-emacs/vhdl-mode/files/digest-vhdl-mode-3.33.3
deleted file mode 100644
index 3e8aa9a1443d..000000000000
--- a/app-emacs/vhdl-mode/files/digest-vhdl-mode-3.33.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4ad73954a681ea5202badb1e9f4828ac vhdl-mode-3.33.3.tar.gz 411980
-RMD160 9b4f5343c7bf7dc31b150e99b83ed5cd33780034 vhdl-mode-3.33.3.tar.gz 411980
-SHA256 a8911f057732a6aea3e39a44a401ea9d8d8991116e8e8fa88123a3bfd382f7e7 vhdl-mode-3.33.3.tar.gz 411980
diff --git a/app-emacs/vhdl-mode/files/vhdl-mode-info-dir-gentoo.patch b/app-emacs/vhdl-mode/files/vhdl-mode-info-dir-gentoo.patch
new file mode 100644
index 000000000000..a8aa416a49b8
--- /dev/null
+++ b/app-emacs/vhdl-mode/files/vhdl-mode-info-dir-gentoo.patch
@@ -0,0 +1,14 @@
+--- vhdl-mode-3.33.21-orig/vhdl-mode.info	2007-08-10 12:07:23.000000000 +0200
++++ vhdl-mode-3.33.21/vhdl-mode.info	2007-09-23 17:37:09.000000000 +0200
+@@ -1,6 +1,11 @@
+ This is vhdl-mode.info, produced by makeinfo version 4.0 from
+ vhdl-mode.texi.
+ 
++INFO-DIR-SECTION Emacs
++START-INFO-DIR-ENTRY
++* VHDL Mode: (vhdl-mode).   Emacs mode for editing VHDL files.
++END-INFO-DIR-ENTRY
++
+    Copyright (C) 1997 - 2002 Reto Zimmermann <reto@gnu.org> Copyright
+ (C) 1995 - 1997 Rodney J. Whitby <software.vhdl-mode@rwhitby.net>
+ 
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.33.2.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.33.2.ebuild
index e625ae6c0929..5ffd4035d9ea 100644
--- a/app-emacs/vhdl-mode/vhdl-mode-3.33.2.ebuild
+++ b/app-emacs/vhdl-mode/vhdl-mode-3.33.2.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vhdl-mode/vhdl-mode-3.33.2.ebuild,v 1.6 2007/07/13 07:25:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vhdl-mode/vhdl-mode-3.33.2.ebuild,v 1.7 2007/09/23 15:59:14 ulm Exp $
 
 inherit elisp
 
-IUSE=""
-
 DESCRIPTION="VHDL-mode for Emacs"
 HOMEPAGE="http://opensource.ethz.ch/emacs/vhdl-mode.html"
 SRC_URI="http://opensource.ethz.ch/emacs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc ~ppc-macos x86"
+KEYWORDS="ppc x86"
+IUSE=""
 
 DEPEND="virtual/emacs"
 
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.33.21.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.33.21.ebuild
new file mode 100644
index 000000000000..7597fd98dd99
--- /dev/null
+++ b/app-emacs/vhdl-mode/vhdl-mode-3.33.21.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vhdl-mode/vhdl-mode-3.33.21.ebuild,v 1.1 2007/09/23 15:59:14 ulm Exp $
+
+inherit elisp eutils
+
+DESCRIPTION="VHDL-mode for Emacs"
+HOMEPAGE="http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
+SRC_URI="http://www.iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="|| ( app-emacs/cedet >=virtual/emacs-22 )"
+RDEPEND="${DEPEND}"
+
+SITEFILE=50${PN}-gentoo.el
+DOCS="ChangeLog README"
+
+src_unpack() {
+	unpack ${A}
+	rm "${S}"/site-start.* || die "rm failed"
+	epatch "${FILESDIR}/${PN}-info-dir-gentoo.patch"
+}
+
+src_install() {
+	elisp_src_install
+	doinfo vhdl-mode.info
+}
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.33.3.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.33.3.ebuild
deleted file mode 100644
index 3f0a296ae1cb..000000000000
--- a/app-emacs/vhdl-mode/vhdl-mode-3.33.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vhdl-mode/vhdl-mode-3.33.3.ebuild,v 1.3 2007/07/13 07:25:16 mr_bones_ Exp $
-
-inherit elisp
-
-IUSE=""
-
-DESCRIPTION="VHDL-mode for Emacs"
-HOMEPAGE="http://opensource.ethz.ch/emacs/vhdl-mode.html"
-SRC_URI="http://opensource.ethz.ch/emacs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
-
-DEPEND="virtual/emacs"
-
-SITEFILE=50vhdl-mode-gentoo.el
-
-# do these manually because we only want vhdl-mode right now.  The other .el
-# files are only needed for dependencies that need to be figured out
-src_compile() {
-	elisp-compile vhdl-mode.el speedbar.el dframe.el sb-image.el
-}
-
-src_install() {
-	elisp-install ${PN} vhdl-mode.el* speedbar.el* dframe.el* sb-image.el*
-	elisp-site-file-install ${FILESDIR}/${SITEFILE}
-}
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.33.8.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.33.8.ebuild
index 387b85b6f29e..51e90a559c5b 100644
--- a/app-emacs/vhdl-mode/vhdl-mode-3.33.8.ebuild
+++ b/app-emacs/vhdl-mode/vhdl-mode-3.33.8.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vhdl-mode/vhdl-mode-3.33.8.ebuild,v 1.3 2007/07/13 07:25:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vhdl-mode/vhdl-mode-3.33.8.ebuild,v 1.4 2007/09/23 15:59:14 ulm Exp $
 
 inherit elisp
 
 DESCRIPTION="VHDL-mode for Emacs"
-HOMEPAGE="http://opensource.ethz.ch/emacs/vhdl-mode.html"
-SRC_URI="http://opensource.ethz.ch/emacs/${P}.tar.gz"
+HOMEPAGE="http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
+SRC_URI="http://www.iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
-
-DEPEND="|| ( app-emacs/cedet app-emacs/speedbar )"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-SITEFILE=50vhdl-mode-gentoo.el
+DEPEND="|| ( app-emacs/cedet >=virtual/emacs-22 )"
+RDEPEND="${DEPEND}"
+
+SITEFILE=50${PN}-gentoo.el
 
 src_unpack() {
 	unpack ${A}