Version bump, fixes bug 336718. Update LICENSE.

(Portage version: 2.2_rc71/cvs/Linux x86_64)

4 files changed, 93 insertions, 5 deletions

diff --git a/app-emacs/cedet/ChangeLog b/app-emacs/cedet/ChangeLog
index bfc4e435cd2e..2a8f82532f78 100644
--- a/app-emacs/cedet/ChangeLog
+++ b/app-emacs/cedet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/cedet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.55 2010/05/23 21:03:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.56 2010/09/11 10:20:20 ulm Exp $
+
+*cedet-1.0 (11 Sep 2010)
+
+  11 Sep 2010; Ulrich Mueller <ulm@gentoo.org> cedet-1.0_pre6.ebuild,
+  cedet-1.0_pre7-r1.ebuild, +cedet-1.0.ebuild:
+  Version bump, fixes bug 336718. Update LICENSE.
 
   23 May 2010; Pacho Ramos <pacho@gentoo.org> cedet-1.0_pre7-r1.ebuild:
   stable amd64, bug 313865
diff --git a/app-emacs/cedet/cedet-1.0.ebuild b/app-emacs/cedet/cedet-1.0.ebuild
new file mode 100644
index 000000000000..824513f70952
--- /dev/null
+++ b/app-emacs/cedet/cedet-1.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0.ebuild,v 1.1 2010/09/11 10:20:20 ulm Exp $
+
+NEED_EMACS=22
+
+inherit elisp
+
+MY_P=${P/_}
+DESCRIPTION="CEDET: Collection of Emacs Development Environment Tools"
+HOMEPAGE="http://cedet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cedet/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+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}" \
+		EMACSFLAGS="${EMACSFLAGS}" \
+		|| die "emake failed"
+}
+
+src_test() {
+	emake -j1 \
+		EMACS="${EMACS}" \
+		EMACSFLAGS="${EMACSFLAGS}" \
+		utest || die "make utest failed"
+}
+
+src_install() {
+	local target file dir
+	find . -type d -name tests -prune -o -type f -print | while read target
+	do
+		file=${target##*/}
+		dir=${target%/*}; dir=${dir#./}
+		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 "${dir}"
+				dodoc "${target}" || die ;;
+			*.el | *.by | *.wy)
+				# install grammar sources along with the elisp files, since
+				# the location where semantic expects them is not configurable
+				insinto "${SITELISP}/${PN}/${dir}"
+				doins "${target}" || die ;;
+			*.elc)
+				# we are in a subshell, so collecting in a variable won't work
+				echo "${target}" >>"${T}/elc-list.txt" ;;
+			*.srt | *.xpm)
+				insinto "${SITEETC}/${PN}/${dir}"
+				doins "${target}" || die ;;
+			*.info* | grammar-fw-ov.png)
+				doinfo "${target}" || die ;;
+			*)
+				die "Unrecognised file ${target}" ;;
+		esac
+	done
+
+	# make sure that the compiled elisp files have a later time stamp than
+	# the corresponding sources, in order to suppress warnings at run time
+	while read target; do
+		dir=${target%/*}; dir=${dir#./}
+		insinto "${SITELISP}/${PN}/${dir}"
+		doins "${target}" || die
+	done <"${T}/elc-list.txt"
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+}
diff --git a/app-emacs/cedet/cedet-1.0_pre6.ebuild b/app-emacs/cedet/cedet-1.0_pre6.ebuild
index 02eafc5e0eb7..7cd7e4d4c09f 100644
--- a/app-emacs/cedet/cedet-1.0_pre6.ebuild
+++ b/app-emacs/cedet/cedet-1.0_pre6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.11 2010/05/13 18:45:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre6.ebuild,v 1.12 2010/09/11 10:20:20 ulm Exp $
 
 NEED_EMACS=22
 
@@ -11,7 +11,7 @@ DESCRIPTION="CEDET: Collection of Emacs Development Environment Tools"
 HOMEPAGE="http://cedet.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cedet/${MY_P}.tar.gz"
 
-LICENSE="GPL-2 FDL-1.1"
+LICENSE="GPL-2 FDL-1.2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
diff --git a/app-emacs/cedet/cedet-1.0_pre7-r1.ebuild b/app-emacs/cedet/cedet-1.0_pre7-r1.ebuild
index cf62a2dc09d9..be9e118a8ddd 100644
--- a/app-emacs/cedet/cedet-1.0_pre7-r1.ebuild
+++ b/app-emacs/cedet/cedet-1.0_pre7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre7-r1.ebuild,v 1.6 2010/05/23 21:03:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre7-r1.ebuild,v 1.7 2010/09/11 10:20:20 ulm Exp $
 
 NEED_EMACS=22
 
@@ -11,7 +11,7 @@ DESCRIPTION="CEDET: Collection of Emacs Development Environment Tools"
 HOMEPAGE="http://cedet.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cedet/${MY_P}.tar.gz"
 
-LICENSE="GPL-2 FDL-1.1"
+LICENSE="GPL-2 FDL-1.2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""