Version bump.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 159 insertions, 9 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/Manifest b/dev-util/coccinelle/Manifest
index 1811a004072e..d006499149dc 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -3,21 +3,24 @@ Hash: SHA256
 
 AUX 50coccinelle-gentoo.el 154 SHA256 66dba99a78fd02b8b232b14b11d6f2b2595dd5bfa867d5bb16be117999fbb4cc SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d WHIRLPOOL 84ee1036e267f8079fc43eff7ea8313f913b96b0a2869e99c3e684c6b73992a2d7fa0a44a030f894557f1e34fa1d1a1f86543dfa5072fbc9f6505be9650de4a2
 AUX coccinelle-1.0.0_rc14-findtool.patch 685 SHA256 c33224288cc3a7c768e5bac7f2035b2de82a84c12e0bb6b3a098d683ae7cc369 SHA512 4cbf0facf3557a1c24db3197995bf3b2ad2e922c1dde562c1b94b903d9557854bff3f13fe63aae8ad66aee177d0baa739a0a4ced5f1cf93ac3052e53c249b05a WHIRLPOOL b7bda3485e10389add3bd1e388aae18d560adce3fd3c3b3115bf0b6521205f99354ce780f26da3698ea2edfcbf9c8866007f16de8f947dfddab6a5dfe571fc35
+AUX coccinelle-1.0.0_rc16-findtool.patch 282 SHA256 aa5291f33134a84900a24527a1090f231e841704c011e2d74c3dac4f8dbb8037 SHA512 aefc8343a370fb3fdad3d63f5bd3367ecd7473658bf06a67472019b7eebafe938d728043e3869f208056043f4fd0459736d29b2430e36408cc8e2a48b6b51e89 WHIRLPOOL 1c5e0fdc5819b4bbe48d2ecc7bdc4c6622f3bb0ad5513c72e47ec829283cdae4f6d9d59a2e3bf56ddb9d346c077405e6f5d89d547836a10a0c4718bd5de43254
 DIST coccinelle-1.0.0-rc14.tgz 3529203 SHA256 9e5c08ea1684e595508beeaa602387334e18260e00fdc15d71a33a9084b8dc77 SHA512 87dc23b2479a2799279025215ffa580ca4a1be24867f1a5f083e0804a604d19e10ccd2eeb4c783a6b1ef41fa2a71530d8bf8834c093b035501555d0db3bcd1c2 WHIRLPOOL 4d1786e398710e33c53aab208b1ff128c5d71f1e5c172a8d3ce8bbde0a628e93f9c4287e213387807e74e10e4933addde07bc71f82a058131b88bf9f1887a365
 DIST coccinelle-1.0.0-rc15.tgz 3328556 SHA256 07fab4e17512925b958890bb13c0809797074f2e44a1107b0074bdcc156b9596 SHA512 d0800ac087e9acefd6fe1bd6fae5c8a912c94dd3a9ac5566b984f97ebee4f96302db00d12ec5111e75f4aa410233093115a8cd166367b25e4464c5aa0bd08993 WHIRLPOOL 63c32074102e11e89e8342d92a4ba6716b2092c7d6fab80791a677a9bce98b756674da71e4f1e441e46833c756232803bdaec8c9ce0695bb612930d21686cc91
+DIST coccinelle-1.0.0-rc16.tgz 2983187 SHA256 83ad8b2757f49e90e97571b3a5f11b5fb6772165a8a23a4a12200e3637070140 SHA512 244225ffddc3ca9a46004331c62c784cc4359f1fa10902bbfe3394a5a2b944233c21aa0ce41e6aa06828860f1697de04afc6ed6d549b2e3d06810d9ae7d8aa1d WHIRLPOOL 72122465da1ce3b6020c2335bac68a650f43f0152d783f610978072fb857a32c9168eabf55456db26bda70f9c26d0d99267282c97d92687d651fda6febb1c6b3
 EBUILD coccinelle-1.0.0_rc14.ebuild 3132 SHA256 80a59a02f086bd0d3e39a8d54791ea11abf1c6cd07c324580930dccdaa58b5af SHA512 fd031c14f26684bca7b5b6f5c280eee7051b991e40f67b3cfb4cd434ca4be132fffe5eb6cf43ea797e7e7c6934fec501bb65a162ab0ef9d26f7d054d79a754c0 WHIRLPOOL 987be955eb3a6aa837e48925f84d560fd92f41bb859b215c97d98543c3a7f5a7c090a529574946308b29f5b8a8547037d6afb1cede848a835f4487168075eef9
 EBUILD coccinelle-1.0.0_rc15-r1.ebuild 3127 SHA256 807110f82b5ccff81ddcae016aaadc8b674440b0f95a0499279b1e3173e4e6ca SHA512 5b27613424c942d14f448371397f7a7ec621071450ac8081093c433d16799cfb436680b4882b55e44b2ff44bb8a3a886734012ae0f86e4bd83494c22fcc8ab67 WHIRLPOOL 9b93df357b5856b83f6c3479c74762259a115fdcf4afc5807787ba689c97d55e7a11c35383fe04e76235a9fa9214a490818ddfabafc369af5a62322be5c29553
 EBUILD coccinelle-1.0.0_rc15.ebuild 3144 SHA256 5ac5604cc8494280a252e1fa1d74d1fe7075104d20f20ce5792b7b2ec2ef0893 SHA512 442ec48c1313c2f3d39e151e87bc54c154b77eb922204046e95d603ddf78380e8865eeb658160bb1b78aa02a5a9dce3aa491f42d565c487452c829f2512a1dab WHIRLPOOL a0a02f9b92621c2cbaf23513671fb20f0a46ecd793f082e8c6f7519756887db8228488ca8fa089008c9a550944ff007723d9382a3a0e13dfee41bd857c6fb0ad
-MISC ChangeLog 4238 SHA256 12c8bfd0a7213ed312bd8e11eca61c7644887a6f990a41ab09d6eb9c9eb4945e SHA512 1e982676ccd41cdc3e202e068e726e83d5c1cf81e2bee822cd2dc5d16f023e608df53a44328ab7b949b30a68fb866720a748d404ce53251eb193a995ae9b4041 WHIRLPOOL 2deaa727ac8fd77316b9f877f499752872b39d0dc563bca31af1770a4f6c4937cfeb5c38b464f4504f726dba1782d06ca9d20f77d6a2a51676c33eb7c7b1a012
+EBUILD coccinelle-1.0.0_rc16.ebuild 3043 SHA256 728b72a86c00194ceac1519cf595c490a05be48673aa097448c15b9937f072db SHA512 a1825fca7152016c196494a9fccc14cbbfcd73f0b9332ed9eaab283d86e8aad813a5389f453ecd01fcc126f139dbd8646b7e4ab06d8e9a30eff83802a154fcca WHIRLPOOL d6cc0b05d48eb50272113ba1ce081d7b48ff0ca4e7fb25359118a7f67a64b135c4d682bb8f6c79ec0638c4670a7bfda2cbb5d2342450c6e7f7300160c1e86eea
+MISC ChangeLog 4420 SHA256 b261fdd8b1717ae84fe2aa540a650126bfb77a3a3ede509b294acb11b4bf117a SHA512 d3b5596d038a4043e36452006ad5fc3c6ac875cb7e84617e30f815ebdcc97a1b75d235e90d561af2a60e23726247ce064f5beef7edb877b15337497a95847777 WHIRLPOOL 22eab4ca39fce6ae4ff71ba5217e423b8109a44f42d4e1a557a79146502e3d051df79cabc2cd03fb657cdca6f11a7b9022115152840a81c2db63d19d83dc6a88
 MISC metadata.xml 246 SHA256 7c41a7e52e792cf6b02e544290706ab0266df8c36214b503083c4daa89a636fe SHA512 2f2e5377658d7b8bb082253b0fb66d54c086e005cbc574f60050b41c039f116e9dc142d1618950f635de7ddd9ab0e7f15c431f660e81bacd01215cbf25be589e WHIRLPOOL f63fe763cf8a07f7c56f0f55a72f1b567d91dbc477654939933178af55edc4687700d0952424669006b301377ccffd3b1510b2290e75b070e1c23b7d9f74f4dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQQSx2AAoJEEqz6FtPBkyjoNAH/RDT284LIojujmIfk3KEVs2X
-oZ3MvK72UDHT1uINGlf4jKNbHK91vuLfOXIV/F/oUYsW9NYF3rR+a0vnUfKGoDFt
-oo91p9MhsN5YJCQEvO6rIqzLj40BdTgc9opqxVY7CcGl52MvF+uZt69XnLC2Pt+c
-E12CUGZV0AKoGwdoR5oamkrJeaL7KWySYMeGdtTymWhERBm90r15QnvBtrn5v4jY
-MYz3+rTL4EUjsbUU7h61GLQyaw3qAfbm5zdaI6DG+zaQLGJwu6sd/PILHhcnRkOX
-2I1XKAUVOULR4QeGjMGc7Dt/cQOTBmnfKFalWOxPYjVrnXuQ2JpWyxFpJ7p/PJM=
-=GOpe
+iQEcBAEBCAAGBQJQylKqAAoJEEqz6FtPBkyjJ7oIAKDhjO0TRxvlOIYff/XcDU8D
+pWaMExSCTwoKGNdWwifwx8YgL33nozcTM/B/tRHn7nCDu4dVxpFvJhLvESDc3d2i
+0yghZN5LXStwmfoB3JuZqQQJCc1bQZOzYiDrTE1nYc/BVLTRgqzmHtURvzyiMX0w
+m4uQznxJKNDAxkNYCzTrttCO4hVy9BhySYsUvXRCaQJKv6hGWO28DqLKOqLejKjK
+awWkrewOsGoubLT6gdX6dx00xgq63iR4+DglQ8VLPqFxghGMK7D9XvnbPeIQQY3s
+XZGSqmsON9pAWWL5JKnu8MCXToU6g7fe0QJM8b/3RfOGh1dBAmLOk7vaTXk/Bpo=
+=mjRr
 -----END PGP SIGNATURE-----
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],