11 files changed, 31 insertions, 151 deletions
diff --git a/app-emacs/ecb/ChangeLog b/app-emacs/ecb/ChangeLog
index 05fe71297ba4..9a13cb2ed8df 100644
--- a/app-emacs/ecb/ChangeLog
+++ b/app-emacs/ecb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/ecb
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ChangeLog,v 1.7 2004/03/08 16:54:07 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ChangeLog,v 1.8 2004/04/30 16:03:59 usata Exp $
+
+*ecb-2.24 (01 May 2004)
+
+  01 May 2004; Mamoru KOMACHI <usata@gentoo.org> ecb-1.80.ebuild,
+  ecb-1.90.ebuild, ecb-1.96.ebuild, ecb-2.11.ebuild, ecb-2.21.ebuild,
+  ecb-2.24.ebuild:
+  Version bumped. Marked previous version stable. Removed old ebuilds.
 
 *ecb-2.21 (08 Mar 2004)
 
diff --git a/app-emacs/ecb/Manifest b/app-emacs/ecb/Manifest
index d652edc0aa5c..e2a598706dcd 100644
--- a/app-emacs/ecb/Manifest
+++ b/app-emacs/ecb/Manifest
@@ -1,18 +1,20 @@
-MD5 bf88d754c37fc5df12a996583552816b files/50ecb-gentoo.el 134
-MD5 af9f327c163294046f2addc281abd91f files/70ecb-gentoo.el 88
+MD5 ee9bb53fb090e02e955d866401bcec12 ecb-1.80.ebuild 1702
+MD5 1c30e4e6b99b44c8763eab60177ea1bc ecb-1.96.ebuild 1254
+MD5 aab043a4e69434293702067b9fcdb237 ecb-2.11.ebuild 1218
+MD5 433aafbf99ba4709ae3fd0e7f934e799 ecb-1.90.ebuild 1530
+MD5 6a7178e60f39a263d6f84440ca859ec1 ChangeLog 1709
+MD5 d66885a4f4fda4d047843a29bc611fa5 metadata.xml 1347
+MD5 2bea3b69b2a2fd6dfa1a576ce46ed2da ecb-2.21.ebuild 1224
+MD5 01666f6ea2af9f6ffc630476c0b80671 ecb-2.24.ebuild 1225
 MD5 3d51075abd295aa76775d1c315d35dcc files/digest-ecb-1.80 60
 MD5 caecb2f0e391a0260149b86a9877e560 files/digest-ecb-1.90 60
 MD5 16eb737af1695abe7371fc78c0a863b3 files/digest-ecb-1.96 60
 MD5 b35fe0b668f59ade24b0c5359ecb8b2e files/digest-ecb-2.11 60
-MD5 3888d43ea733def4c7566c06aa442f79 files/ecb-1.90-gentoo.patch 2393
+MD5 9f6fdeeb2bb9e4dfef117f28fe5995de files/ecb.texi-gentoo.patch 251
 MD5 b2fecab970cb3caf89959102b9494cc9 files/ecb-help.el-ecb-1.96-gentoo.diff 1270
 MD5 0a0e7458fb9bcb8ccffce77ab25944a9 files/ecb-help.el-gentoo.patch 1427
-MD5 9f6fdeeb2bb9e4dfef117f28fe5995de files/ecb.texi-gentoo.patch 251
+MD5 bf88d754c37fc5df12a996583552816b files/50ecb-gentoo.el 134
+MD5 3888d43ea733def4c7566c06aa442f79 files/ecb-1.90-gentoo.patch 2393
+MD5 af9f327c163294046f2addc281abd91f files/70ecb-gentoo.el 88
 MD5 55d3c6fd5bb0cfbfea6600fc4340226b files/digest-ecb-2.21 60
-MD5 6a7178e60f39a263d6f84440ca859ec1 ChangeLog 1709
-MD5 ee9bb53fb090e02e955d866401bcec12 ecb-1.80.ebuild 1702
-MD5 433aafbf99ba4709ae3fd0e7f934e799 ecb-1.90.ebuild 1530
-MD5 b09f4dc51e26a042e3723caef8950e05 ecb-1.96.ebuild 1255
-MD5 f07427cc3ec5e7e575e6fc130145c282 ecb-2.11.ebuild 1240
-MD5 d66885a4f4fda4d047843a29bc611fa5 metadata.xml 1347
-MD5 022117a4c5ae4ebcf05ef7482fcfcf99 ecb-2.21.ebuild 1246
+MD5 eaf88c4204fa1150d1e9ee41b7c8dd9f files/digest-ecb-2.24 60
diff --git a/app-emacs/ecb/ecb-1.80.ebuild b/app-emacs/ecb/ecb-1.80.ebuild
deleted file mode 100644
index 25111fe8269d..000000000000
--- a/app-emacs/ecb/ecb-1.80.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-1.80.ebuild,v 1.4 2003/09/08 04:22:45 msterret Exp $
-
-inherit elisp eutils
-
-IUSE=""
-
-DESCRIPTION="ECB is source code browser for Emacs. It is a global minor-mode which displays a couple of windows that can be used to browse directories, files and methods. It supports method parsing for Java, C, C++, Elisp etc."
-HOMEPAGE="http://home.swipnet.se/mayhem/ecb.html"
-SRC_URI="mirror://sourceforge/ecb/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="virtual/emacs
-	app-emacs/speedbar
-	app-emacs/eieio
-	app-emacs/jde
-	app-emacs/elib"
-
-S="${WORKDIR}/${P}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 <${FILESDIR}/ecb.texi-gentoo.patch || die
-	patch -p0 <${FILESDIR}/ecb-help.el-gentoo.patch || die
-	sed -e "s,@ECBINFOFILE@,/usr/share/info/ecb.info.gz,g" <ecb-help.el >ecb-help.el.new && \
-		mv ecb-help.el.new ecb-help.el
-	sed -e "s,@ECBHTMLFILE@,/usr/share/doc/${P}/html/ecb.html,g" <ecb-help.el >ecb-help.el.new && \
-		mv ecb-help.el.new ecb-help.el
-	edos2unix ecb.texi
-}
-
-src_compile() {
-	make LOADPATH="${SITELISP}/elib ${SITELISP}/semantic ${SITELISP}/eieio ${SITELISP}/jde/lisp" || die
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install ${FILESDIR}/50ecb-gentoo.el
-	dodoc HISTORY README RELEASE_NOTES
-	makeinfo --force ecb.texi
-	doinfo ecb.info*
-	dohtml ecb.html
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	einfo ""
-	einfo "Add the following to your ~/.emacs to use ECB:"
-	einfo "	(require 'ecb)"
-	einfo "To start ECB:"
-	einfo "	M-x ecb-activate"
-	einfo ""
-}
-
-pkg_postrm() {
-	elisp-site-regen
-}
diff --git a/app-emacs/ecb/ecb-1.90.ebuild b/app-emacs/ecb/ecb-1.90.ebuild
deleted file mode 100644
index ff3e4e336e2f..000000000000
--- a/app-emacs/ecb/ecb-1.90.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-1.90.ebuild,v 1.5 2003/09/08 04:22:45 msterret Exp $
-
-inherit elisp
-
-IUSE=""
-
-DESCRIPTION="ECB is source code browser for Emacs. It is a global minor-mode which displays a couple of windows that can be used to browse directories, files and methods. It supports method parsing for Java, C, C++, Elisp etc."
-HOMEPAGE="http://home.swipnet.se/mayhem/ecb.html"
-SRC_URI="mirror://sourceforge/ecb/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="virtual/emacs
-	app-emacs/speedbar
-	app-emacs/eieio
-	app-emacs/jde
-	app-emacs/elib"
-
-S="${WORKDIR}/${P}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S} && patch -p1 <${FILESDIR}/${P}-gentoo.patch || die
-	sed -e "s,@ECB_INFO@,/usr/share/info/ecb.info.gz,g" <ecb-help.el >ecb-help.el.new && \
-		mv ecb-help.el.new ecb-help.el
-	sed -e "s,@ECB_HTML@,/usr/share/doc/${P}/html/ecb.html,g" <ecb-help.el >ecb-help.el.new && \
-		mv ecb-help.el.new ecb-help.el
-}
-
-src_compile() {
-	make LOADPATH="${SITELISP}/elib ${SITELISP}/semantic ${SITELISP}/eieio ${SITELISP}/jde/lisp" || die
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install ${FILESDIR}/50ecb-gentoo.el
-	dodoc HISTORY README RELEASE_NOTES
-	makeinfo --force ecb.texi
-	doinfo ecb.info*
-	dohtml ecb.html
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	einfo ""
-	einfo "To start ECB:"
-	einfo "	M-x ecb-activate"
-	einfo ""
-}
-
-pkg_postrm() {
-	elisp-site-regen
-}
diff --git a/app-emacs/ecb/ecb-1.96.ebuild b/app-emacs/ecb/ecb-1.96.ebuild
index 865565d29fc7..4ac669844e62 100644
--- a/app-emacs/ecb/ecb-1.96.ebuild
+++ b/app-emacs/ecb/ecb-1.96.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-1.96.ebuild,v 1.3 2004/04/06 03:45:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-1.96.ebuild,v 1.4 2004/04/30 16:03:59 usata Exp $
 
 inherit elisp eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ecb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="java"
 
 DEPEND="virtual/emacs
diff --git a/app-emacs/ecb/ecb-2.21.ebuild b/app-emacs/ecb/ecb-2.21.ebuild
index 8aacb9c1b295..8d9490ea1ee0 100644
--- a/app-emacs/ecb/ecb-2.21.ebuild
+++ b/app-emacs/ecb/ecb-2.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-2.21.ebuild,v 1.1 2004/03/08 16:54:07 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-2.21.ebuild,v 1.2 2004/04/30 16:03:59 usata Exp $
 
 inherit elisp
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://ecb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ecb/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="java"
 DEPEND="virtual/emacs
 	>=app-emacs/speedbar-0.14_beta4
@@ -17,8 +17,6 @@ DEPEND="virtual/emacs
 	>=app-emacs/eieio-0.17
 	java? ( app-emacs/jde )"
 
-S="${WORKDIR}/${P}"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/app-emacs/ecb/ecb-2.11.ebuild b/app-emacs/ecb/ecb-2.24.ebuild
index 6eb40ba73a02..05b34b8afa0a 100644
--- a/app-emacs/ecb/ecb-2.11.ebuild
+++ b/app-emacs/ecb/ecb-2.24.ebuild
@@ -1,28 +1,23 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-2.11.ebuild,v 1.1 2003/12/08 07:30:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-2.24.ebuild,v 1.1 2004/04/30 16:03:59 usata Exp $
 
 inherit elisp
 
-IUSE="java"
-
 DESCRIPTION="ECB is a source code browser for Emacs"
 HOMEPAGE="http://ecb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ecb/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-
+IUSE="java"
 DEPEND="virtual/emacs
 	>=app-emacs/speedbar-0.14_beta4
 	>=app-emacs/semantic-1.4
 	>=app-emacs/eieio-0.17
 	java? ( app-emacs/jde )"
 
-S="${WORKDIR}/${P}"
-
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 	sed -i -e "s%./info-help%../../../info%" \
@@ -32,11 +27,10 @@ src_unpack() {
 }
 
 src_compile() {
-
 	local my_loadpath="${SITELISP}/semantic ${SITELISP}/eieio"
 	[ "`use java`" ] \
 		&& my_loadpath="${my_loadpath} ${SITELISP}/elib ${SITELISP}/jde/lisp"
-	make \
+	make CEDET='' \
 		LOADPATH="${my_loadpath}" \
 		|| die
 	make online-help \
@@ -45,10 +39,8 @@ src_compile() {
 }
 
 src_install() {
-
 	elisp-install ${PN} *.el *.elc
 	elisp-site-file-install ${FILESDIR}/70ecb-gentoo.el
-
 	dodoc NEWS README RELEASE_NOTES
 	doinfo info-help/ecb.info*
 	dohtml html-help/*.html
diff --git a/app-emacs/ecb/files/digest-ecb-1.80 b/app-emacs/ecb/files/digest-ecb-1.80
deleted file mode 100644
index 491af44a71c1..000000000000
--- a/app-emacs/ecb/files/digest-ecb-1.80
+++ /dev/null
@@ -1 +0,0 @@
-MD5 034623542065620a3ecf969e088f5a60 ecb-1.80.tar.gz 235721
diff --git a/app-emacs/ecb/files/digest-ecb-1.90 b/app-emacs/ecb/files/digest-ecb-1.90
deleted file mode 100644
index 4447232d4c77..000000000000
--- a/app-emacs/ecb/files/digest-ecb-1.90
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c0e8f5afe0bf7ab9c0cbda43de55e9f ecb-1.90.tar.gz 362425
diff --git a/app-emacs/ecb/files/digest-ecb-2.11 b/app-emacs/ecb/files/digest-ecb-2.11
deleted file mode 100644
index 50b086984956..000000000000
--- a/app-emacs/ecb/files/digest-ecb-2.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f9f15e5881e06413cce7521f0e79c9b ecb-2.11.tar.gz 567940
diff --git a/app-emacs/ecb/files/digest-ecb-2.24 b/app-emacs/ecb/files/digest-ecb-2.24
new file mode 100644
index 000000000000..77bd4ec8671b
--- /dev/null
+++ b/app-emacs/ecb/files/digest-ecb-2.24
@@ -0,0 +1 @@
+MD5 d0a5bddf7d8f5fe57bd05b122d20345d ecb-2.24.tar.gz 683776