Version bump, bug 260694. Change some install locations.

(Portage version: 2.2_rc23/cvs/Linux i686)

4 files changed, 91 insertions, 6 deletions

diff --git a/app-emacs/cedet/ChangeLog b/app-emacs/cedet/ChangeLog
index 82eec54127a0..2957c882dc86 100644
--- a/app-emacs/cedet/ChangeLog
+++ b/app-emacs/cedet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/cedet
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.39 2008/01/23 10:14:36 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.40 2009/03/01 15:38:25 ulm Exp $
+
+*cedet-1.0_pre6 (01 Mar 2009)
+
+  01 Mar 2009; Ulrich Mueller <ulm@gentoo.org> +files/50cedet-gentoo.el,
+  +cedet-1.0_pre6.ebuild:
+  Version bump, bug 260694. Add src_test ebuild function. Install templates
+  and icons in SITEETC directory.
 
   23 Jan 2008; Raúl Porcel <armin76@gentoo.org> cedet-1.0_pre4-r2.ebuild:
   sparc stable wrt #206584
diff --git a/app-emacs/cedet/cedet-1.0_pre4-r2.ebuild b/app-emacs/cedet/cedet-1.0_pre4-r2.ebuild
index d39c8499a1f8..562c38fa06ca 100644
--- a/app-emacs/cedet/cedet-1.0_pre4-r2.ebuild
+++ b/app-emacs/cedet/cedet-1.0_pre4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre4-r2.ebuild,v 1.7 2008/01/23 10:14:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre4-r2.ebuild,v 1.8 2009/03/01 15:38:25 ulm Exp $
 
 inherit elisp eutils versionator
 
@@ -14,13 +14,14 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND="!app-emacs/semantic
+DEPEND=""
+RDEPEND="!app-emacs/semantic
 	!app-emacs/eieio
 	!app-emacs/speedbar"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-SITEFILE=60${PN}-gentoo.el
+SITEFILE="60${PN}-gentoo.el"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-emacs/cedet/cedet-1.0_pre6.ebuild b/app-emacs/cedet/cedet-1.0_pre6.ebuild
new file mode 100644
index 000000000000..221a21454fb5
--- /dev/null
+++ b/app-emacs/cedet/cedet-1.0_pre6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre6.ebuild,v 1.1 2009/03/01 15:38:25 ulm Exp $
+
+NEED_EMACS=22
+
+inherit elisp
+
+MY_P=${P/_}
+DESCRIPTION="CEDET: Collection of Emacs Development Tools"
+HOMEPAGE="http://cedet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cedet/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!app-emacs/semantic
+	!app-emacs/eieio
+	!app-emacs/speedbar"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake -j1 EMACS="${EMACS}" || die "emake failed"
+}
+
+src_test() {
+	make utest || die "make utest failed"
+}
+
+src_install() {
+	find . -type d -name tests -prune -o -type f -print | while read target
+	do
+		local directory=$(dirname ${target}) file=$(basename ${target})
+		local sub_directory=$(echo ${directory} | sed "s%^${S}/*%%;s/^$/./")
+		case $file in
+			*~ | Makefile | *.texi | *-script | PRERELEASE_CHECKLIST \
+				| Project.ede | USING_CEDET_FROM_CVS | grammar-fw-ov.txt)
+				;;
+			ChangeLog | README | AUTHORS | *NEWS | INSTALL \
+				| renamelist.txt | semanticdb.sh)
+				docinto ${sub_directory}
+				dodoc ${target} || die ;;
+			*.el | *.elc | *.by | *.wy)
+				# install grammar sources along with the elisp files, since
+				# the location where semantic expects them is not configurable
+				insinto ${SITELISP}/${PN}/${sub_directory}
+				doins ${target} || die ;;
+			*.srt | *.xpm)
+				insinto ${SITEETC}/${PN}/${sub_directory}
+				doins ${target} || die ;;
+			*.info* | grammar-fw-ov.png)
+				doinfo ${target} || die ;;
+			*)
+				die "Unrecognised file ${sub_directory}/${file}" ;;
+		esac
+	done
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+}
diff --git a/app-emacs/cedet/files/50cedet-gentoo.el b/app-emacs/cedet/files/50cedet-gentoo.el
new file mode 100644
index 000000000000..621e2f1a1f6f
--- /dev/null
+++ b/app-emacs/cedet/files/50cedet-gentoo.el
@@ -0,0 +1,13 @@
+
+;;; cedet site-lisp configuration
+
+(load "@SITELISP@/common/cedet" nil t)
+(add-to-list 'image-load-path "@SITEETC@/common/icons" t)
+(setq srecode-map-load-path
+      (list "@SITEETC@/srecode/templates"
+	    "@SITEETC@/ede/templates"
+	    (expand-file-name "~/.srecode")))
+
+;; If you wish to customize CEDET, you will need to follow the
+;; directions in the INSTALL (installed in the documentation) file and
+;; customize your ~/.emacs /before/ site-gentoo is loaded.