Version bump, fixes bug 336718. Update LICENSE.

Package-Manager: portage-2.2_rc71/cvs/Linux x86_64

5 files changed, 102 insertions, 12 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/Manifest b/app-emacs/cedet/Manifest
index 17f8ca790947..088f975c12d8 100644
--- a/app-emacs/cedet/Manifest
+++ b/app-emacs/cedet/Manifest
@@ -5,16 +5,18 @@ AUX 50cedet-gentoo-1.0_pre6.el 431 RMD160 b5bc7021dbd536ed1f28e910f1c28c2fec2888
 AUX 50cedet-gentoo.el 519 RMD160 23d1339390986080f21b23f64a72ef79196be625 SHA1 492d18330ea8ad416cb24bb7145c300ca78c20a5 SHA256 4d55c2ebd679c6825087453925c5488e2c732a84cc8fd3cec5c081da5eb9f395
 AUX cedet-1.0_pre6-fix-eieio-comp.patch 645 RMD160 18c3a46e1e298ccf255f2839f559cd044e0a961d SHA1 c87eb873c647e10da0fda12d90ab65e9114cc003 SHA256 ab6b599e7b19f63d8640209f2637299ae2b694640b453d517cf33cfb70f07568
 AUX cedet-1.0_pre7-cogre-srecode-init.patch 427 RMD160 9330b196e506a83c0c717a1b17978fbcfc96790f SHA1 3e0b2b2fe896b1b63a98ba132d59db5f700a991c SHA256 4f55f34e9dcfb249df29a615da4878408d09233d0d7770c22753d59d9de4ede7
+DIST cedet-1.0.tar.gz 2100938 RMD160 a3703cb76f21468a1d218a091599441ca9aa5d11 SHA1 bc3c7c22465f79df603fb6bb5684442a439f198e SHA256 f0d5c76d22a8d7dceaccb659be094c44cb999eae75db3545eef086d8dcd342f4
 DIST cedet-1.0pre6.tar.gz 1895977 RMD160 9c82cdb47d7141703825cdc976dd47984b5b4750 SHA1 e8978695e0a552e1d9484721172ce0251658900c SHA256 abb7fbe7964e2df66848e8a72158c9837414c9467545fc3a13412d2a33296d5f
 DIST cedet-1.0pre7.tar.gz 2052276 RMD160 4f90db2ad9c63a3d8ff6ac9e3a1c83f99fb2b777 SHA1 b48bfe50df43b6941e9ffd40256c10d58b14b832 SHA256 63392bea5b8e573e6cdf5cc7e43d76f931a35d7596718527ab5b598ca905991e
-EBUILD cedet-1.0_pre6.ebuild 2344 RMD160 29a0b7d37f330964b7a8043911c7e29f39f19913 SHA1 add34fb27830daae6f3353a596bf4b469c4f661d SHA256 a687fe52c1edbd519515c528c1212d683bc66706022382fbb7b71a1c85a698c8
-EBUILD cedet-1.0_pre7-r1.ebuild 2346 RMD160 00cd27d93ff231b4104fdae061b05c62efdfdc49 SHA1 f44859e1956daf613723d10151ed5738130237ab SHA256 a5cd9530adc0d63725ad7aef81f014b75481c0edd841582a16b448570b5c6b3c
-MISC ChangeLog 7858 RMD160 8ebd07a2b174f6e8b7fcbdb4d34f3d61352a88a5 SHA1 9f07e82a6df779338daff73f9a87859a6e1df92b SHA256 1c0415fd6ede7046ee6361f445cab5cdb7dec62aaa095a1b5ed1be9c6c6f018d
+EBUILD cedet-1.0.ebuild 2283 RMD160 14a9bd129139214d354834b66efac8f306c89763 SHA1 32a0fa415ad13ea8a9b9d140ef5661236fc80fe8 SHA256 06942602a75fc7d971151df9f862c9501f518cc0f4c10c33f11ec317ba6c4f47
+EBUILD cedet-1.0_pre6.ebuild 2344 RMD160 dab464cea2bd994d1064e6227a6c038537bdd160 SHA1 44990617d21ac5ba991e6eb147725a6c55f422e6 SHA256 bc3299c6afb5a88332ab088e4f0c271a0e0c6cf5349e338d321d2774f862e99f
+EBUILD cedet-1.0_pre7-r1.ebuild 2344 RMD160 f6989f220ec28b2228a20aeccca0770b4db57a5d SHA1 7bd403cf114e50dffa373045af118f23b9d57353 SHA256 55ff041e1de05441dd74cfb220caf00b372e7a1c569baf52b7bc0c562a57f517
+MISC ChangeLog 8050 RMD160 1a1faca77126501add3bf406e28bb81cccff0a08 SHA1 1aa9bf465289961f9c48f355cceaab4006e193f1 SHA256 0fd5b6f84883f4cfda8967237ef8231b7ca5be8c69aa4e1d04476a25c957f2b4
 MISC metadata.xml 831 RMD160 742d588c9f37c4639acf627470e88e8da5c9e8c4 SHA1 315ec457e01f99f17211cf7229a17caec0ff3bf6 SHA256 3ef03457bb7af19d84fdd463e7a780ee79fa2812f5bd04fe5b15064d648b2999
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkv5mBsACgkQCaWpQKGI+9QZcACeJ4W5CjSuN1KzSvzz5lBF5x13
-cEwAnRpw769NGHOx/gRYJo9+wy8YQhQS
-=FJQQ
+iEYEARECAAYFAkyLWB0ACgkQOeoy/oIi7uyN2ACggzGXGjE7GPEGSsg/r3cwGr/B
+LtIAn0A227xPYrruOSLHqHLofmtGWbf2
+=3miH
 -----END PGP SIGNATURE-----
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=""