Version bump, migrate to python-single-r1.

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

3 files changed, 146 insertions, 10 deletions

diff --git a/dev-util/coccinelle/ChangeLog b/dev-util/coccinelle/ChangeLog
index 700866738b19..5e41791dc643 100644
--- a/dev-util/coccinelle/ChangeLog
+++ b/dev-util/coccinelle/ChangeLog
@@ -1,6 +1,11 @@
 # 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.27 2012/12/13 22:12:25 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.28 2013/04/24 05:58:22 radhermit Exp $
+
+*coccinelle-1.0.0_rc17 (24 Apr 2013)
+
+  24 Apr 2013; Tim Harder <radhermit@gentoo.org> +coccinelle-1.0.0_rc17.ebuild:
+  Version bump, migrate to python-single-r1.
 
   13 Dec 2012; Tim Harder <radhermit@gentoo.org> -coccinelle-1.0.0_rc14.ebuild,
   -coccinelle-1.0.0_rc15.ebuild:
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index 6ee23cdf54b7..4c67cdc8eeb8 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -6,18 +6,20 @@ AUX coccinelle-1.0.0_rc14-findtool.patch 685 SHA256 c33224288cc3a7c768e5bac7f203
 AUX coccinelle-1.0.0_rc16-findtool.patch 282 SHA256 aa5291f33134a84900a24527a1090f231e841704c011e2d74c3dac4f8dbb8037 SHA512 aefc8343a370fb3fdad3d63f5bd3367ecd7473658bf06a67472019b7eebafe938d728043e3869f208056043f4fd0459736d29b2430e36408cc8e2a48b6b51e89 WHIRLPOOL 1c5e0fdc5819b4bbe48d2ecc7bdc4c6622f3bb0ad5513c72e47ec829283cdae4f6d9d59a2e3bf56ddb9d346c077405e6f5d89d547836a10a0c4718bd5de43254
 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
+DIST coccinelle-1.0.0-rc17.tgz 2991126 SHA256 628d90650d504aa742e12eb371455bad8468eeed59533d6388366f173a498b61 SHA512 79f7b83458b5229e6a01e9e4a89a47862ca9a9f678e0e599b253449c07d8197194539623049920e8ce23af44d81a91d61052f542bacb40a0eda9c015b1b2e84d WHIRLPOOL dc3c1b839494cd31858bf931f5ef59bfdc3477c7b3577a99b894c99f7991474e2f6d8403b0fe6c856174b93ba8ba551cf0b96c151ebe73d09ea481c7edb2b0c7
 EBUILD coccinelle-1.0.0_rc15-r1.ebuild 3127 SHA256 807110f82b5ccff81ddcae016aaadc8b674440b0f95a0499279b1e3173e4e6ca SHA512 5b27613424c942d14f448371397f7a7ec621071450ac8081093c433d16799cfb436680b4882b55e44b2ff44bb8a3a886734012ae0f86e4bd83494c22fcc8ab67 WHIRLPOOL 9b93df357b5856b83f6c3479c74762259a115fdcf4afc5807787ba689c97d55e7a11c35383fe04e76235a9fa9214a490818ddfabafc369af5a62322be5c29553
 EBUILD coccinelle-1.0.0_rc16.ebuild 3043 SHA256 728b72a86c00194ceac1519cf595c490a05be48673aa097448c15b9937f072db SHA512 a1825fca7152016c196494a9fccc14cbbfcd73f0b9332ed9eaab283d86e8aad813a5389f453ecd01fcc126f139dbd8646b7e4ab06d8e9a30eff83802a154fcca WHIRLPOOL d6cc0b05d48eb50272113ba1ce081d7b48ff0ca4e7fb25359118a7f67a64b135c4d682bb8f6c79ec0638c4670a7bfda2cbb5d2342450c6e7f7300160c1e86eea
-MISC ChangeLog 4548 SHA256 14f9a79494894ae3d0eaa5bde6908178f16630a49c710e32f0f11e5ebd3b5f6a SHA512 7011f8e205aca7ab2fa357f3128097b0ebd0210ae57bb192d7d9c53b73523ec4b02ef473dec7b1e9d96802f9701b89a4ae2df47f013c1d79fdecb25736978628 WHIRLPOOL 45ea35a6313a0a302f0dc0b9d637f8cf99fee05e2dc47f0f254d51170d4115c3483b265bda314c5d0c29f24ef0feb007e4335102588d787fb65c240940b255c1
+EBUILD coccinelle-1.0.0_rc17.ebuild 3077 SHA256 cd44560a9162b5c8d55191096bb0986d756f9ec97b5c5d80015b061c0c73cf4a SHA512 fe841b37e36ead35b052c343e76bf896c824aa0e7da2777ef9dad76b822d8fbb1bdfb63bafd540b6b70bf3899046b5a97aa31dc0d6e98a8c7723df38a39050f8 WHIRLPOOL 930b423a3683adf959a130cb16151456b71fe24bf8e34a834e6f2e42f3034c50757b246724b809c6de6be654010b7c41cc50de7af7750b4fdf7865b402947909
+MISC ChangeLog 4712 SHA256 844c3ea965ff9ffc4d3d1b57124b91b79a049b4c740de9ac90379f1849bde929 SHA512 30b50a0e1edc9c63a39dac61ffe6fbb39d57bddaf9095273b1c1f1c74b1d363b30da363562ee74be38073a7fe259b6cc50534a1235e4b3c73da9ea8c200e59e7 WHIRLPOOL 00b3e40ab0a443f1cc1f45ea98644f04e12b20dc726bedc677a6cb2a9197fbca2c606e08b961e8a217dfa00b2e86689845c1ca735ed504134730c6e9f528c3e5
 MISC metadata.xml 246 SHA256 7c41a7e52e792cf6b02e544290706ab0266df8c36214b503083c4daa89a636fe SHA512 2f2e5377658d7b8bb082253b0fb66d54c086e005cbc574f60050b41c039f116e9dc142d1618950f635de7ddd9ab0e7f15c431f660e81bacd01215cbf25be589e WHIRLPOOL f63fe763cf8a07f7c56f0f55a72f1b567d91dbc477654939933178af55edc4687700d0952424669006b301377ccffd3b1510b2290e75b070e1c23b7d9f74f4dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQylLKAAoJEEqz6FtPBkyjygIH/ArvVNYnGDxEhls80XZexO4x
-Rz/E4+PSKzn7qIIetQUiPLW8zZfD+S6twyMjoZ7qyOGdPczfMdPQ9jSTVQX+kZvO
-7h4cSGV506ThIPS34bjySVB9a1UwPEtq7LJvwbSjUCGORYmk5Gb4e+m5gM4MvYEP
-4nWjPRM4TaD1VAwecfuAtxXuOJPgHo+pY6EF61rUYVhxr+bFrIlgoCV3ZKydjJYE
-mkQzrcobXoejyQ66NXi0eNWjfz7MGRp9C2E8+rgCLXr7W3mxx+9pzH7KrXcxjST0
-2H47voarfMK22n3kpc5dz16Xen3rDtO/h/0ZcXZzaxj/c20U59ebsROguQjPzrg=
-=1TrC
+iQEcBAEBCAAGBQJRd3SCAAoJEEqz6FtPBkyjBxQH/2FPyPrmyryeRpVINXozEq03
+mJEsrnx5T2w76rDBTHCi20gDYWboPZxFDK9fxAk7Qy5r6zgukTD5QjIsAel2y0SB
+xCNrGsFRX5lIF7URLmavyO1rKUM6JiTPtF5mlu2R09yDbpHmkivI5VLFCgydihaH
+6u4X7kThaWyp2bzKDK2TjSgyJ+10XNffEv1HPGfWD0W7atlVYash9lJrs0/pWLHK
+Ipqizt/HCiXmUOZEvfbSwmH2pJjRtnwTFEWmtcC9w7sQbXr0unoNzW4FflvsP+f7
+S7aMJfPWC6iPAcbd/xtaZWyH4qQi/ymupuZcZVOTv3sHn3Icq8Lm1jOtJ5DxHWE=
+=jc3Z
 -----END PGP SIGNATURE-----
diff --git a/dev-util/coccinelle/coccinelle-1.0.0_rc17.ebuild b/dev-util/coccinelle/coccinelle-1.0.0_rc17.ebuild
new file mode 100644
index 000000000000..f9b3afd3f4d8
--- /dev/null
+++ b/dev-util/coccinelle/coccinelle-1.0.0_rc17.ebuild
@@ -0,0 +1,129 @@
+# 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_rc17.ebuild,v 1.1 2013/04/24 05:58:22 radhermit Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,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"
+
+# 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
+
+	export STRIP_MASK='*/coccinelle/spatch'
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}