Version bump, precompile python code (fixes bug #471928).

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

3 files changed, 149 insertions, 18 deletions

diff --git a/dev-util/coccinelle/ChangeLog b/dev-util/coccinelle/ChangeLog
index b410c39d29db..1ee73454dd1b 100644
--- a/dev-util/coccinelle/ChangeLog
+++ b/dev-util/coccinelle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/coccinelle
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.32 2013/09/05 18:40:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.33 2013/09/16 17:27:45 radhermit Exp $
+
+*coccinelle-1.0.0_rc18 (16 Sep 2013)
+
+  16 Sep 2013; Tim Harder <radhermit@gentoo.org> +coccinelle-1.0.0_rc18.ebuild:
+  Version bump, precompile python code (fixes bug #471928).
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> coccinelle-1.0.0_rc17.ebuild:
   Clean up PYTHON_COMPAT from old implementations.
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index a765fdfe4e2d..1c25fe9a2279 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -4,25 +4,19 @@ Hash: SHA256
 AUX 50coccinelle-gentoo.el 154 SHA256 66dba99a78fd02b8b232b14b11d6f2b2595dd5bfa867d5bb16be117999fbb4cc SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d WHIRLPOOL 84ee1036e267f8079fc43eff7ea8313f913b96b0a2869e99c3e684c6b73992a2d7fa0a44a030f894557f1e34fa1d1a1f86543dfa5072fbc9f6505be9650de4a2
 AUX coccinelle-1.0.0_rc16-findtool.patch 282 SHA256 aa5291f33134a84900a24527a1090f231e841704c011e2d74c3dac4f8dbb8037 SHA512 aefc8343a370fb3fdad3d63f5bd3367ecd7473658bf06a67472019b7eebafe938d728043e3869f208056043f4fd0459736d29b2430e36408cc8e2a48b6b51e89 WHIRLPOOL 1c5e0fdc5819b4bbe48d2ecc7bdc4c6622f3bb0ad5513c72e47ec829283cdae4f6d9d59a2e3bf56ddb9d346c077405e6f5d89d547836a10a0c4718bd5de43254
 DIST coccinelle-1.0.0-rc17.tgz 2991126 SHA256 628d90650d504aa742e12eb371455bad8468eeed59533d6388366f173a498b61 SHA512 79f7b83458b5229e6a01e9e4a89a47862ca9a9f678e0e599b253449c07d8197194539623049920e8ce23af44d81a91d61052f542bacb40a0eda9c015b1b2e84d WHIRLPOOL dc3c1b839494cd31858bf931f5ef59bfdc3477c7b3577a99b894c99f7991474e2f6d8403b0fe6c856174b93ba8ba551cf0b96c151ebe73d09ea481c7edb2b0c7
+DIST coccinelle-1.0.0-rc18.tgz 3120697 SHA256 e5e66b28f7e91226bef00a3795d4f300bdaca1d381a2384b5d855f60cf595c1f SHA512 e25192a0cbb71cb7cbd5f61a4256890a698635a7fba3017496c729d785a07abda4f39432f519662d9d65d506062a81a92df714a74c34e88c61881ef7e4806b37 WHIRLPOOL b1f7ec2cb812193f669e76a61cfc5f9bbac7226f30ca04092ca5199b4d6a705534d361390fe229a3018a95446adbf032f66166ac6d86983f8fee7f14136898e7
 EBUILD coccinelle-1.0.0_rc17.ebuild 3116 SHA256 edac6df967de165a6298e2204e741fc7cee7c5f0643f6248f2b3662d6be11579 SHA512 2c7d7f6a1eda0c8bf2f9e5f12f7b438a997988d4b673783d00079634e2837920e6f878c08a5f12ad45370246628f98843fcfe0669c3f247fdc443bec74b0cec1 WHIRLPOOL 90dcaa356fa8a01bc176a6fb514fdc2307196008a37b34c940c463b24da347e08ecc82205b5e63776fe90a261d70da05693a9e7b465912c7aba44bec6fb3ea52
-MISC ChangeLog 5262 SHA256 5195e7377bf08624fb5095b657d6f021e48d2cf7ee02c960a61960299d52c389 SHA512 3206339f494b0293ef5464fb524f587e522882ce65d5d5ce6d1462604d407b8e753ffda3c1a64aed073010ea91af052667a18b5f2ae95d4719e01747f0b01c45 WHIRLPOOL 22ef79a008c9e5acc8c95cd06907d34c4eaa6c2b87662d04ebc42d4181ffb7aa97961d5de57adc643f5cc51fdc9a448693c778071f3fa52ec08c7179a9e7a940
+EBUILD coccinelle-1.0.0_rc18.ebuild 3151 SHA256 bf0fef7a04db479360aece2b44a649b5d34d14a1472440d32081c0c0371d8ed9 SHA512 f040142dfdc743b2933746b9b2b5166b396532d3b8ef3925c729bf4c98ec2c46854c68d2c08ad2090d7deb120ed72231e8f1ad73b9f1844a78478af2a2e1587b WHIRLPOOL 1550de343c6e0604a30f3e703fcee4fb59c8cfd2355a20efa628f5364fbff6e1570640d7bb45638a4ff22df58a6ca5c10b409ae4e6fc06ac2707c92a3830dd6f
+MISC ChangeLog 5444 SHA256 0fe0dc655c7fc47776c7b5b8e46872a0e16e16bf478e2ec47633273ac1ed25b4 SHA512 6efa6c16b776d78d9a87aa28b5573b9df1ef8831b34ddc8106bf73408549b34c95e8fa62b850e08931564dcc52290ba4bb5b81f0dec74f51d17eaf4ebc0e0ad0 WHIRLPOOL b76d94d3304504dd6cacff7b50c2b0669af9bf54389a7882825fba70c2d04cc2f46f42fecc6d1202fb9fd6b1c954e5a9e1c5fc9723e4ce8c790eece6a26d80f5
 MISC metadata.xml 246 SHA256 7c41a7e52e792cf6b02e544290706ab0266df8c36214b503083c4daa89a636fe SHA512 2f2e5377658d7b8bb082253b0fb66d54c086e005cbc574f60050b41c039f116e9dc142d1618950f635de7ddd9ab0e7f15c431f660e81bacd01215cbf25be589e WHIRLPOOL f63fe763cf8a07f7c56f0f55a72f1b567d91dbc477654939933178af55edc4687700d0952424669006b301377ccffd3b1510b2290e75b070e1c23b7d9f74f4dd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKNBMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOINQQAKgu30TcRaGCL06EeNyITO0k
-JPOiv8QXLii78PehzQH3SX/2qhlm1/cLdJD2QjuLDWm42ogLogDDWolMMNdbOThm
-vzD8uZe5Mc7r/BaVjXiunjCiVP3YIM1c2b08gdL/+RjUJPWZo7Ek+jzWPkWhU/fe
-StbdrCOE3HoT20a+xKBBSBydDq1kx8tOvux0YOls5sPbXjpACkcAlZadIWKxAgbh
-so3a2wwrX2z1InJLdj6707AZmdkOHHoNyXB21BKNgnCBq5TfbJD0OJerT2WjwduJ
-5hI64gNh0Ew5s5PS0d8FQDhJdhAT3AT5zmmUMW5z4ehi1j8xxzW+Jv9evbLbC4B/
-SoW/2drglneVwTxe6Bf9K0lUJlXRsrdEB3Rtgms8dDRxeBUzbzw5ZWlZCzun0lEx
-8v5P57B0anGYNIdogCjHoEebMYAKbyV2nZ1hqAGmkVdYHhz3w7R5MS6BMF2LQY7Y
-ILmpJ2CTxgA/aW74xDicYk5xmFwu9a8I5vMTEn21LaePBHcOholZ1yr3pWu/avjP
-46dYWHZCx5NstUje3JJIUO2Kpp0xiTOgLH6WX6GBh73BfqeAgTcf0hDSZ5kUqeO9
-7Z7BT6Moh60axaGIZttPSuV6RAtMwYT4PUapiSAuxTciL9ezLdu5SfXKkQfKvmRe
-Iri8osfJBvBdfOSWIzYU
-=mE52
+iQEcBAEBCAAGBQJSNz+TAAoJEEqz6FtPBkyj5A4H/2RrzO0cPsYcuhIEHe2xlZIP
+eaSOGtoSa83TfLxq03JKMBwh0QY8Xb3O7WjZ5/MYIxh0+EDPunlPYgYYsbQeymAq
+t5fCDOK/z+2IVKs9feXwtg8YKZwvlPNnw5dTzd/xoEpYIj8hR6c9sPCPZD+gqedv
+kk864ahWL7QCiol46i4sVruYdLdlIo4A2dUynw4MHT1bwcXDreROxHis1XGzRxHJ
+v4H1xN6yVQNAVL+1e/iwyxxwHsz8QhTQjxOywkyVTKSwYXhtVQQLC600N8Aifo+/
+tBloNWCeSoLu0WDI0HrEkPiQh0Eghxi+jQFzeswfpZA3tkTg9hXH7BDwDmLOlNU=
+=2px4
 -----END PGP SIGNATURE-----
diff --git a/dev-util/coccinelle/coccinelle-1.0.0_rc18.ebuild b/dev-util/coccinelle/coccinelle-1.0.0_rc18.ebuild
new file mode 100644
index 000000000000..1d82416791ea
--- /dev/null
+++ b/dev-util/coccinelle/coccinelle-1.0.0_rc18.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2013 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_rc18.ebuild,v 1.1 2013/09/16 17:27:45 radhermit Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit multilib eutils python-single-r1 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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# 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:= )
+	python? ( ${PYTHON_DEPS} )"
+
+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() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use python ; then
+		# fix python install location
+		sed -e "s:\$(SHAREDIR)/python:$(python_get_sitedir):" \
+			-e "s:PYTHON_TARGET:PYTHON_INSTALL_TARGET:" \
+			-i Makefile || die
+	fi
+
+	sed -i "s:^SHAREDIR=.*:SHAREDIR=/usr/$(get_libdir)/ocaml/${PN}/:" scripts/spatch.sh.in || die
+
+	epatch "${FILESDIR}"/${PN}-1.0.0_rc16-findtool.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable python) \
+		$(use_enable ocaml) \
+		$(use_enable pcre) \
+		$(use_enable pcre pcre-syntax)
+
+	sed -e "s:^LIBDIR=.*:LIBDIR=/usr/$(get_libdir)/ocaml/stublibs/:" \
+		-e "s:^SHAREDIR=.*:SHAREDIR=/usr/$(get_libdir)/ocaml/${PN}/:" \
+		-i 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
+
+	use python && python_optimize
+
+	export STRIP_MASK='*/coccinelle/spatch'
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}