Version bump.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

4 files changed, 107 insertions, 18 deletions

diff --git a/app-emacs/cedet/ChangeLog b/app-emacs/cedet/ChangeLog
index 01d2d8866ef2..b6a8232e7771 100644
--- a/app-emacs/cedet/ChangeLog
+++ b/app-emacs/cedet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/cedet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.73 2012/02/01 17:27:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.74 2012/04/29 19:01:52 ulm Exp $
+
+*cedet-1.1 (29 Apr 2012)
+
+  29 Apr 2012; Ulrich Müller <ulm@gentoo.org> files/50cedet-gentoo.el,
+  +cedet-1.1.ebuild:
+  Version bump.
 
   01 Feb 2012; Ulrich Müller <ulm@gentoo.org> -cedet-1.0.ebuild:
   Remove vulnerable version wrt bug 398227.
diff --git a/app-emacs/cedet/Manifest b/app-emacs/cedet/Manifest
index 0dc63fa97e98..7b51d614f9cf 100644
--- a/app-emacs/cedet/Manifest
+++ b/app-emacs/cedet/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 50cedet-gentoo.el 556 RMD160 b7f5cb7631c0eb1bdea6cfa7e320fb127f9769d6 SHA1 e5dcd163996d7a3c3e8eaf74f7ce6d10da8ba2b8 SHA256 a6fb7de601604f95bfd5800ebf01a599debb848d3dfdc21b74eb22869a1627e1
+AUX 50cedet-gentoo.el 612 RMD160 00423a6bcfb07ce70c5f16b5105de12a3fc9951b SHA1 c394fdd234ba33fb1182cd0654bbcf883550d361 SHA256 3c5ca44c4e5e51589aace588012a575ecaf21af767f1e2afc661619899711ceb
 DIST cedet-1.0.1.tar.gz 2101932 RMD160 1862ccd138297b24282b10edb7b1f74450923d5b SHA1 583cf48c50720a8944d5b2f499ecaac5adad5090 SHA256 8b651232f9a1c79cdddce9d0933c22a9240115272f2b395395c4f026151f96f4
+DIST cedet-1.1.tar.gz 2234539 RMD160 4995ba86c3e0516a3391dad6d1c45ca7e80145e3 SHA1 6c683a4921868b0c596ffc04b11abd3fd2564ba1 SHA256 42c0650fa1d0c9a428d186b421f0057294bcfaec09c8b7bb4a0128ce2fe54b5c
 EBUILD cedet-1.0.1.ebuild 2237 RMD160 26fa3751ddf19c18eeaa06fe4223121f57acd3a0 SHA1 d46ca62dcca6adf2daf2933aa394ea641a8f217a SHA256 8486c52112fe9e3448e26c947f40a3aee09fa385940c1805c0e7cf9609cafee1
-MISC ChangeLog 10135 RMD160 fab9c80dd5eb54ea14cb6253a35c94e6a266b6df SHA1 5c57a97e38bcf2f7347ab35454643dae04202526 SHA256 690ef3a4ea9aa05cdde42a783922f24f41f52271e20a1f1913b834eaade38e51
+EBUILD cedet-1.1.ebuild 2249 RMD160 685ebd7af773990f8891435d17a8e1cae41c7cdb SHA1 7c88f81651b53796d7116547ad749075df18bee4 SHA256 76ac1b0884e3bff3faf7e4be9c83a9d9112c8b4d423ff5a44217428c86e14ee9
+MISC ChangeLog 10271 RMD160 0de8f5e743b75de6d653058637c0ab958d1e40d1 SHA1 2888049ef091588aec64bd077cf657a343cf21f9 SHA256 7e45ff1cfd123986631011e0f333280704f868685c4913120db5ee1bf07d4f2a
 MISC metadata.xml 831 RMD160 742d588c9f37c4639acf627470e88e8da5c9e8c4 SHA1 315ec457e01f99f17211cf7229a17caec0ff3bf6 SHA256 3ef03457bb7af19d84fdd463e7a780ee79fa2812f5bd04fe5b15064d648b2999
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPKXZcAAoJEDxpGckxwJCBCG8P/156TCRClPg/VmBWWntJ/gP5
-qnyD2EV7YH/TTmMH1JcoZZgAEh6r/ygXZQ7zfuI1IKZz8ri5UN2BhWmhe+wVph3U
-X+895BXt97uMejcW0Ltxgt0fPikHtdSQTzMnpzfGtM9SAY7k6xvZecvHOu89Hsxy
-L5QrVSpO35XIzTybniEgY0fzdkgeXjjV429jPGPRYBB6dTQPlZGA2Iocbwx4FCcE
-sUoZXELTr7sWhy7h8osSin4V9zQY/lsNMBzTCjKA8KfqHiLHJY3eObKJp9HejIke
-Dyg6csa/DMFuhR00FjJAsUk5m55uUKNXzSicsWK8zHrnA2h6zE2ER1/h9wxvAp65
-SkchY3L3hPOkwy4a266bC4wN9eB7ceXY90NIFOsSubkt5StgnOmbTdgveoA+xWcy
-i0hFGPzBNubUAJuo3kCBlPAT3lRzWx8fap9jROsBEai6sSCwpbj1mOFvrwcfPMg6
-0wxOKBG1eeDmOKUoDl4XR3MR5MjQe3yKI4cGtEk9mekYaoApE0qBahtL1N0kswSO
-kPa2bufB25Sty79ppoooQr1MZEtui6lOyLC2zZ55UmExwQZRJ3d3cmoimpp+HFT+
-uIMK7a900Iz61NYVWmgvHQZEZo6bFkaTMzVIn1+OTsg6ECLz33P501yZ5CYllAwo
-HOdtGyX8l6J76UvVIdBv
-=LirA
+iQIcBAEBAgAGBQJPnZEeAAoJEDxpGckxwJCBhpsP/39Gel4ePGtFd1mRp1PuJKU4
+hphFel2peaZygrAnPS0HZ1yJjm5fcrgYApZVVW+RboGPNsSwpbzqYCr3Dpi4E7/S
+gHbz1Tz+vYLEdHHGyivcdkT0zOF19Ng1xw9v6xBP7wmZfDczgckT2efA3w0Ohr99
+BGBkh2t0LawTPQSqDcbnWz0T0VMlhajhZOkjK1h0uh7RlC8fY4MU1/FAwZJhe091
+aCtE3yw5ZltKAfLxpGAUeV8Ox/DMMII7z/B9lj5sfHA5p2xXqtavLfsu80yas965
+pzqO/dmzZSx7SlUNIAHigyRxnqJpiU7aKoYq5yWeYYpsxn5mEuncBA23+uYQWLFN
+0MVr1qSH2gHPagOWNlxNf90tE+/E4AO9LzaLY8p/kV+VSPbmAjqj3bIdoNwk95Co
+h3Z5i19XSDCZnbpWhVlrfN3uiHzn+InQ+gd6/W4ZqWOcXVRFOEtmqaiUoGVn9zjo
+CRqFZReCTRR8MeH7VUSPuOOqdiqPeNOjC+PEqlrFvFATY66YDvFfezXLrjpXd1ep
+24VZ/kvhxf7yywd3jUUWIUjQqQI5s0o/iTNi27VsD1VpCluOmgmwAn0dDVCkU08W
+q8XJUwkhcLkts8ET6lbAzAb8FWSnJ/xd94JpOxEEsj6mx6YA8AYsj89iUoJ3LJC1
+obD2xMcsqH+7BL3n9QMj
+=o8OE
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/cedet/cedet-1.1.ebuild b/app-emacs/cedet/cedet-1.1.ebuild
new file mode 100644
index 000000000000..f533f42e0b60
--- /dev/null
+++ b/app-emacs/cedet/cedet-1.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.1.ebuild,v 1.1 2012/04/29 19:01:50 ulm Exp $
+
+EAPI=4
+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-3 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo.el"
+EMACSFLAGS="${EMACSFLAGS} -L ${S}/eieio -L ${S}/semantic -L ${S}/srecode \
+	-L ${S}/ede -L ${S}/speedbar -L ${S}/cogre"
+
+src_compile() {
+	emake -j1 \
+		EMACS="${EMACS}" \
+		EMACSFLAGS="${EMACSFLAGS}"
+}
+
+src_test() {
+	emake -j1 \
+		EMACS="${EMACS}" \
+		EMACSFLAGS="${EMACSFLAGS}" \
+		utest
+}
+
+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_BZR | grammar-fw-ov.txt)
+				# ignore
+				;;
+			ChangeLog | README | AUTHORS | *NEWS | INSTALL \
+				| renamelist.txt | semanticdb.sh)
+				docinto "${dir}"
+				dodoc "${target}" ;;
+			*.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}" ;;
+			*.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}" ;;
+			*.info* | grammar-fw-ov.png)
+				doinfo "${target}" ;;
+			*)
+				die "Unrecognised file ${target}" ;;
+		esac
+	done
+
+	# make sure that the compiled elisp files don't have older time stamps
+	# than corresponding sources, in order to suppress warnings at run time
+	while read target; do
+		dir=${target%/*}; dir=${dir#./}
+		insinto "${SITELISP}/${PN}/${dir}"
+		doins "${target}"
+	done <"${T}/elc-list.txt"
+
+	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
index 600ad3ba7e96..b11d4ee2c280 100644
--- a/app-emacs/cedet/files/50cedet-gentoo.el
+++ b/app-emacs/cedet/files/50cedet-gentoo.el
@@ -1,7 +1,8 @@
 (require 'cedet "@SITELISP@/common/cedet")
 (when (boundp 'image-load-path)
   (add-to-list 'image-load-path "@SITEETC@/common/icons" t)
-  (add-to-list 'image-load-path "@SITEETC@/cogre" t))
+  (add-to-list 'image-load-path "@SITEETC@/cogre" t)
+  (add-to-list 'image-load-path "@SITEETC@/speedbar" t))
 (setq srecode-map-load-path
       (list "@SITEETC@/srecode/templates"
 	    "@SITEETC@/ede/templates"