Version bump. Add emacs and vim-syntax use flags (bug #398889).

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 154 insertions, 10 deletions

diff --git a/dev-util/coccinelle/ChangeLog b/dev-util/coccinelle/ChangeLog
index 525ceac5994d..385494150291 100644
--- a/dev-util/coccinelle/ChangeLog
+++ b/dev-util/coccinelle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/coccinelle
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.13 2011/11/05 15:38:18 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.14 2012/03/05 11:04:44 radhermit Exp $
+
+*coccinelle-1.0.0_rc10 (05 Mar 2012)
+
+  05 Mar 2012; Tim Harder <radhermit@gentoo.org> +files/50coccinelle-gentoo.el,
+  +coccinelle-1.0.0_rc10.ebuild:
+  Version bump. Add emacs and vim-syntax use flags (bug #398889).
 
   05 Nov 2011; Tim Harder <radhermit@gentoo.org> coccinelle-1.0.0_rc7.ebuild:
   Conditionalize python related setup.
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index b38048e87cbd..9e07f00d907b 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -1,23 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX 50coccinelle-gentoo.el 154 RMD160 7e2d1bd4e9811a1bb6768511f1bf150e0c8e4dd6 SHA1 08220402a063f2d983d55a5fb949bc92d9f669a9 SHA256 66dba99a78fd02b8b232b14b11d6f2b2595dd5bfa867d5bb16be117999fbb4cc
 AUX coccinelle-1.0.0_rc7-parallel-make.patch 192 RMD160 54c44bc377ee6aab1906424b94969db2f7defcb3 SHA1 3284b714e134cb3a749f4b5db5cbcf19aca471e8 SHA256 a497f4f24985a609e9f9845192b912253d8351e63703707eed7700c18e1ec8ed
 AUX coccinelle-1.0.0_rc7-pcre-linking.patch 736 RMD160 d159a9e2135c1642d5d197eee283ae6e05cf0eb9 SHA1 e12323cc52971c020bbc18fbc7039860435d0c0f SHA256 a56f00fd839a289800280ab5c6b8b8ddf056b2662a667307a09b33349ba86c2f
 AUX coccinelle-1.0.0_rc7-pcre.patch 1127 RMD160 e1020264de12f81f20490e2930828b19b18d0887 SHA1 78e961458cf4e5bbae6e09fa11fababa02eee5dd SHA256 432bedf758407089ebc9fd453b2dc197c9de3602671ae5dddd2d57cdef680e51
 DIST coccinelle-0.2.5.tgz 2295665 RMD160 a0811ba0a2c50b70fc52155cc062af6ba383d0d2 SHA1 fa9aed17ee23a253cf01a8571b61d1320082751b SHA256 b80360d8106be90aff4801330f0400525c980409dadf3eb6a1079a7e43c5d017
+DIST coccinelle-1.0.0-rc10.tgz 2356062 RMD160 0a18a978830790162ea4659c3ca0a7fdca893da1 SHA1 178032fdb4620307e1213ae4a9a947004371985f SHA256 4eb787ca8c6af21fca5c08deee4543188fee9f9a5aee3592f3dc1fa10380d6df
 DIST coccinelle-1.0.0-rc7.tgz 2337344 RMD160 5a999e751e55232015c2741a25ea4f9835a9197c SHA1 42544ba5b5597793620b17b331612388609ef9fa SHA256 b74ab606938cd481bd4515b77f330e66e21ec6340b100a6f6dcfd9267aae53ba
 EBUILD coccinelle-0.2.5-r2.ebuild 1890 RMD160 6b1cb608a2a22796075db9a837138bdbdc39d96c SHA1 d89b93694e3cf94884205acd52cc974144ffb419 SHA256 3bf25cd7f660fa96e8f19b454bc853a5dd5cb1fef79e98b9219d279594d80146
+EBUILD coccinelle-1.0.0_rc10.ebuild 3077 RMD160 ec200797bdd0f55bf1eda2bad75ad19ca8c29f71 SHA1 de3e9ae735b063c4f62af6df2cedc9744d85c0eb SHA256 2f5c329adccafe1caeedf6ef6e5626595d50de45f8a6a98b4120eebcbffef96a
 EBUILD coccinelle-1.0.0_rc7.ebuild 2544 RMD160 42994d9bb410c48e9796cf1e8883f62c257c69bf SHA1 9c04ba25c328845b744be23edecd74a1ec2f2e72 SHA256 3ee94b636d68e2250b22ffbe2de6bc43ba98e19c1773f6173c51961f0749b1a9
-MISC ChangeLog 2423 RMD160 e8d39801c95a450ad10bebe6ae72196d9cdb485d SHA1 9ce7a20db9162e2d1fa6ba37f40b17f3c094eb46 SHA256 91b73c54caee7d757aecc36c4c29e123eb59bb3918e6551a26ca8bea560cc7f0
+MISC ChangeLog 2641 RMD160 e9a7fd62a0758a503535cb71dfae675387abb1cd SHA1 f79b9022c0dd6eb18f4100fa22a2a9de21baf9b4 SHA256 63e3b1ae306b01e1702134869376de05de346b585809da57cb005d2f44bbaa44
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOtVh8AAoJEEqz6FtPBkyjmd8IAK/YVfqkOZLeC05h5hGJhm1D
-i6yKRcK4np1+TT07l955RdlC9p+nZ4U3rmO2smPipDow8s/7l/VfwBL/Q5Kpvjbo
-Q8RYySjoxXKA+lJ2Cd9sfyCg292YgYy0hNnXUfi8UOZxZArKWYb4298gk9NCDzAZ
-jdh3l9pEtTRZCH+XbUKHhoQJ0SQ9IM865KgB+AsnUETD4dZ4pSiBkGQUI1ygl5kq
-4ZYm6MT1x7eatgsh2eWO1Ul++ZnoCi8vr9mQ+kCTBYyvc4fyJ1JluG6RyEkO7jqe
-KTpnPMKA6a13qzWfwPwVb+DjmG+8uIhsp1+oXeAfa1CkomJaT6ArFPBUU6tOYck=
-=vUmq
+iQEcBAEBCgAGBQJPVJ3iAAoJEEqz6FtPBkyjL3cH/0LhgH+KnuUx4q39yYHyHnDh
+Ki42P6xt5kDt/7lTzmKbYgXuGJyBR9jEgStD9WThh4ziNDOAd25z8GVyrd4Itypn
+P2SXWNKZDy/l2mv1yIAtirrVCc0uV6nLwTWSGmcrx++J9gNzkPRzUKl4u8YQpPbY
+4k5ltepJ7/3Sp2tlwRkv3QQ5fGwmVYaRWJpLd8FAI9zfoiJZZdWAZXMcipEFFBBN
+32moqS46WytvbIHvk8yYlTKYGkFY4PnmnqviX018DjT8gmqr0eETKj1f5Hf5XPTD
+obGkpJxmhqDp3VzGfyRn4DT+ARdBNEQ/K286zEELyOpUzLvihdZeUVDlErgtSAU=
+=Pk8N
 -----END PGP SIGNATURE-----
diff --git a/dev-util/coccinelle/coccinelle-1.0.0_rc10.ebuild b/dev-util/coccinelle/coccinelle-1.0.0_rc10.ebuild
new file mode 100644
index 000000000000..1dfb6aca38a3
--- /dev/null
+++ b/dev-util/coccinelle/coccinelle-1.0.0_rc10.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/coccinelle-1.0.0_rc10.ebuild,v 1.1 2012/03/05 11:04:44 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+
+inherit multilib eutils python bash-completion-r1 elisp-common
+
+MY_P="${P/_/-}"
+DESCRIPTION="Program matching and transformation engine"
+HOMEPAGE="http://coccinelle.lip6.fr/"
+SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
+
+# ocaml enables ocaml scripting (uses findlib)
+CDEPEND=">=dev-lang/ocaml-3.10[ocamlopt?]
+	dev-ml/sexplib
+	emacs? ( virtual/emacs )
+	ocaml? ( dev-ml/findlib )
+	pcre? ( dev-ml/pcre-ocaml )"
+
+RDEPEND="${CDEPEND}
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+# dev-texlive/texlive-fontsextra contains 'ifsym.sty'
+DEPEND="${CDEPEND}
+	doc? ( virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsextra )"
+
+REQUIRED_USE="test? ( ocaml python )"
+
+DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
+
+S=${WORKDIR}/${MY_P}
+
+SITEFILE=50coccinelle-gentoo.el
+
+pkg_setup() {
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.0_rc7-parallel-make.patch
+
+	if use python ; then
+		# Fix python install location
+		sed -i -e "s:\$(SHAREDIR)/python:$(python_get_sitedir):" Makefile || die
+		sed -i -e "/export PYTHONPATH/s:\$COCCINELLE_HOME/python:$(python_get_sitedir):" \
+			scripts/spatch.sh || die
+	fi
+}
+
+src_configure() {
+	# non-autoconf
+	./configure \
+		--prefix=/usr \
+		$(use ocamlopt || echo "--no-opt") \
+		$(use_with python) \
+		$(use_with ocaml) \
+		$(use_with pcre) \
+		|| die
+
+	sed -i -e "s:^LIBDIR=.*:LIBDIR=/usr/$(get_libdir)/ocaml/stublibs/:" \
+		-e "s:^SHAREDIR=.*:SHAREDIR=/usr/$(get_libdir)/ocaml/${PN}/:" \
+		-e "s:^MANDIR=.*:MANDIR=/usr/share/man/:" \
+		Makefile.config || die
+}
+
+src_compile() {
+	emake depend
+	emake
+
+	use ocamlopt && emake opt
+
+	if use doc ; then
+		VARTEXFONTS="${T}"/fonts emake docs
+	fi
+
+	if use emacs ; then
+		elisp-compile editors/emacs/cocci.el || die
+	fi
+}
+
+src_test() {
+	source env.sh # needed for built in-place python plugin
+	./spatch standard.h -parse_c -dir tests/ || die
+	yes | ./spatch -iso_file standard.iso -macro_file_builtins standard.h -testall || die
+	if use ocamlopt ; then
+		./spatch.opt -iso_file standard.iso -macro_file_builtins standard.h -testall ||	die
+	fi
+}
+
+src_install() {
+	default
+
+	use doc && dodoc docs/manual/*.pdf
+	newbashcomp scripts/spatch.bash_completion spatch
+
+	if use emacs ; then
+		elisp-install ${PN} editors/emacs/*
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	if use vim-syntax ; then
+		newdoc editors/vim/README README-vim
+		rm editors/vim/README || die
+		insinto /usr/share/vim/vimfiles
+		doins -r editors/vim/*
+	fi
+
+	export STRIP_MASK='*/coccinelle/spatch'
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/coccinelle/files/50coccinelle-gentoo.el b/dev-util/coccinelle/files/50coccinelle-gentoo.el
new file mode 100644
index 000000000000..6721b3c5e5a1
--- /dev/null
+++ b/dev-util/coccinelle/files/50coccinelle-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; site-lisp configuration for coccinelle
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'cocci-mode "cocci" "Major mode for editing cocci code." t)