Version bump.

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 148 insertions, 1 deletions

diff --git a/dev-util/coccinelle/ChangeLog b/dev-util/coccinelle/ChangeLog
index 78867a6e9795..ba2533806f27 100644
--- a/dev-util/coccinelle/ChangeLog
+++ b/dev-util/coccinelle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/coccinelle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.25 2012/08/31 21:28:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.26 2012/12/13 22:11:49 radhermit Exp $
+
+*coccinelle-1.0.0_rc16 (13 Dec 2012)
+
+  13 Dec 2012; Tim Harder <radhermit@gentoo.org> +coccinelle-1.0.0_rc16.ebuild,
+  +files/coccinelle-1.0.0_rc16-findtool.patch:
+  Version bump.
 
 *coccinelle-1.0.0_rc15-r1 (31 Aug 2012)
 
diff --git a/dev-util/coccinelle/coccinelle-1.0.0_rc16.ebuild b/dev-util/coccinelle/coccinelle-1.0.0_rc16.ebuild
new file mode 100644
index 000000000000..ddbc11922c04
--- /dev/null
+++ b/dev-util/coccinelle/coccinelle-1.0.0_rc16.ebuild
@@ -0,0 +1,130 @@
+# 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_rc16.ebuild,v 1.1 2012/12/13 22:11:49 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+
+inherit multilib eutils python bash-completion-r1 elisp-common autotools
+
+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}
+	virtual/pkgconfig
+	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() {
+	if use python ; then
+		# Fix python install location
+		sed -i -e "s:\$(SHAREDIR)/python:$(python_get_sitedir):" \
+			-e "s:PYTHON_TARGET:PYTHON_INSTALL_TARGET:" Makefile || die
+	fi
+
+	sed -i "s:^SHAREDIR=.*:SHAREDIR=/usr/$(get_libdir)/ocaml/${PN}/:" scripts/spatch.sh.in || die
+
+	epatch "${FILESDIR}"/${P}-findtool.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable python) \
+		$(use_enable ocaml) \
+		$(use_enable pcre) \
+		$(use_enable pcre pcre-syntax)
+
+	sed -i -e "s:^LIBDIR=.*:LIBDIR=/usr/$(get_libdir)/ocaml/stublibs/:" \
+		-e "s:^SHAREDIR=.*:SHAREDIR=/usr/$(get_libdir)/ocaml/${PN}/:" \
+		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/coccinelle-1.0.0_rc16-findtool.patch b/dev-util/coccinelle/files/coccinelle-1.0.0_rc16-findtool.patch
new file mode 100644
index 000000000000..bc0dd97ddcfc
--- /dev/null
+++ b/dev-util/coccinelle/files/coccinelle-1.0.0_rc16-findtool.patch
@@ -0,0 +1,11 @@
+--- coccinelle-1.0.0-rc16/setup/cocci.m4
++++ coccinelle-1.0.0-rc16/setup/cocci.m4
+@@ -285,7 +285,7 @@
+     AC_SUBST([$1], [no])
+   ],
+   [dnl  find the tool
+-    AC_COCCI_FINDTOOL([$1],[[$]$1])
++    AC_COCCI_FINDTOOL([$1],[$2])
+   ])
+ 
+   AS_IF([test -z "[$]$1" -o "x[$]$1" = xno],