gentoo resync : 15.12.2019

5 files changed, 130 insertions, 9 deletions

diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index d707982e8713..49cadb38ba1e 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -1,6 +1,8 @@
 AUX 50coccinelle-gentoo.el 154 BLAKE2B debbfe7a00bf6195db370b33430d18fb7121123da26f97c01703704918f977f886090abfa0b6f226f8d713bca566ff6e39fabefb07e098a2bfd7cbd64eaebe6a SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d
 DIST coccinelle-1.0.5.tgz 5660596 BLAKE2B 9707e4773d165718b973e004e3359608428d8405d560d7013da66e2b1f0205f003ae0905c02a4f13c9725b39dc94710e5ccbc6b5b11ace66d7e87c3a303363c5 SHA512 0fee450554abc40feac9e745a252c1679f8016c82f04236e642e32e129618a950bb9657f1c447d62543289e95bbd4b1a8b0c6030373025c32a37068f82d30678
 DIST coccinelle-1.0.6.tgz 6684278 BLAKE2B b5b390488e818ce05c364f27782bd1c4dc63657a01c7564764d64faea8ff302c8409bb2ef172ce7ab7c2e00ae1a6f2c3bea76a1148eaf5a977f897d39a9fb23c SHA512 b667762ddf5ad30b126e93572cd8a8b3ffc21a790cd9d6df586e421c5db0a8d049af9587c6e5cb8f7a13f2c090ab2a9cca59ecba69069f9d3fe67b6f75dfe539
-EBUILD coccinelle-1.0.5.ebuild 2502 BLAKE2B 497c1c18a0e7a43185d2c9bc0ad261035e92b2fced0ca1219121aca1f8bbb188e041b9a0b1fe2d4f457268dcb664836ce347a92ea1a473f6922c43ad8399c50a SHA512 263c21c8829b259eda468cc94d1734cf0b9f24b259a70f0732226fd0fc5740e60534937e661810ca5c355be9d52a7a7c196908c3b3dab33cdf0e5d3e241857b9
-EBUILD coccinelle-1.0.6.ebuild 2510 BLAKE2B 0abd80374f80c8a963821c235d62d3f082ab8ed3873fe9ca3fb703f100db24bd3c852ca3c17326042e6e04fefa2c8228480d2830d600e5cfbb201b39d0ad9141 SHA512 bfefe6e28eeac5dd282c1a7ec65d6b9df8b14b4843ea4a85574f03e724cda8cd87e5ffda28a612486a841dc4387568d22e9506e2505374f63f5f6d13f8b32258
-MISC metadata.xml 245 BLAKE2B c68c7955a5435c284156875457d29684d1cf51160052aed21a27ddb02547e8c6c8b07a1732bca5a03815e9d080c4e7aa63407161cc651e993452b11c7fb209cb SHA512 d39bd1064bd876d0d1b68d1b84c86f1a2fc2bfd6cf52e7adb9fa6904c13bf09fce9761607d48e55b806fbf0af351c7cf1ad3f158c7f5571868702876960e6b29
+DIST coccinelle-1.0.8.tar.gz 2670961 BLAKE2B 0a11d325f8e39a76111bb9b14afb5dc6c1de07b94fce7904b6be021b17a9346f1b2e09550e6de221280fa9ff57e6e4a41b2e733189e16cc3a460065844015901 SHA512 496b1632c92cc026fbe28f784f56d4cd78f89a8ccd28dc7db1069c0c6b2b239675a10da305e37ed2a03c605668ecd3399aeed522f12ec3fbbf3ca07277ab7bce
+EBUILD coccinelle-1.0.5.ebuild 2520 BLAKE2B 21cb2b17924095a0bb34801e54e875acc1d5ecfc4a44ebe5d9c3839d987531d61393aaeea42413e367dd146e6287f66f18e309ec8b466f8de7d154f2d950f77d SHA512 8d9bdf6cac91445949df576c86ebb5008c4701c89d8f79e31289353d4d587386dd1ac3a0a089406d630585e98f685b9cd968023ee96441283547f9c72bb461b3
+EBUILD coccinelle-1.0.6.ebuild 2528 BLAKE2B 9918cee1c9c44938a4b40368ad83fef14e48864d6d74fcfa41f2e0943ce2acbf636177cd795ad36c4e229e2b4bab474e3d352e2526acc6203fc3b27ed54e3042 SHA512 7ba4005a4753c72059fb82d1b10f1c03d82bb56fbdc82b3c227986b3f87dfddc168fed3e7206740184f3e3fba2664d8635b558f0b9fde78b5ac4dda371555ac3
+EBUILD coccinelle-1.0.8.ebuild 2542 BLAKE2B 760cc934166f8fac65a5e172e9c71d2c5cab85ce3fbb3cffc10ab590a5c24e1e1e2a7bf395eac3abd5bff337ba57ab049ce9e41e5d7ea102ddc47134c1de1179 SHA512 e8a3d8090981eeed3b4b56c5260815934be39801d55e98e27871587aebfc3ded34292254252a7131e12a62fb7bcbe6aec12d3a3c4e5a2d9415e78458f8285a70
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/coccinelle/coccinelle-1.0.5.ebuild b/dev-util/coccinelle/coccinelle-1.0.5.ebuild
index 598e875c240b..cc744143db9d 100644
--- a/dev-util/coccinelle/coccinelle-1.0.5.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.5.ebuild
@@ -42,7 +42,7 @@ DEPEND="${CDEPEND}
 
 DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
 
-RESTRICT=strip
+RESTRICT="strip !test? ( test )"
 S=${WORKDIR}/${MY_P}
 
 SITEFILE=50coccinelle-gentoo.el
diff --git a/dev-util/coccinelle/coccinelle-1.0.6.ebuild b/dev-util/coccinelle/coccinelle-1.0.6.ebuild
index 2ccd550333b9..18640ff2a4fb 100644
--- a/dev-util/coccinelle/coccinelle-1.0.6.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.6.ebuild
@@ -42,7 +42,7 @@ DEPEND="${CDEPEND}
 
 DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
 
-RESTRICT=strip
+RESTRICT="strip !test? ( test )"
 S=${WORKDIR}/${MY_P}
 
 SITEFILE=50coccinelle-gentoo.el
diff --git a/dev-util/coccinelle/coccinelle-1.0.8.ebuild b/dev-util/coccinelle/coccinelle-1.0.8.ebuild
new file mode 100644
index 000000000000..a25a3d05e8f4
--- /dev/null
+++ b/dev-util/coccinelle/coccinelle-1.0.8.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools multilib eutils python-single-r1 bash-completion-r1 elisp-common
+
+DESCRIPTION="Program matching and transformation engine"
+HOMEPAGE="http://coccinelle.lip6.fr/"
+SRC_URI="https://github.com/coccinelle/coccinelle/archive/1.0.8.tar.gz -> ${P}.tar.gz"
+
+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.12:=[ocamlopt?]
+	dev-ml/sexplib:=[ocamlopt(+)?]
+	dev-ml/menhir:=[ocamlopt?]
+	dev-ml/camlp4:=[ocamlopt?]
+	dev-ml/parmap:=[ocamlopt?]
+	emacs? ( virtual/emacs )
+	ocaml? ( dev-ml/findlib:= )
+	pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] )
+	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
+	)"
+
+DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
+
+RESTRICT="strip !test? ( test )"
+
+SITEFILE=50coccinelle-gentoo.el
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+	if use python ; then
+		# fix python install location
+		sed -e "s:\$(LIBDIR)/python:$(python_get_sitedir):" \
+			-i Makefile || die
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable python) \
+		$(use_enable ocaml) \
+		$(use_enable pcre) \
+		$(use_enable pcre pcre-syntax) \
+		$(use_enable ocamlopt opt)
+}
+
+src_compile() {
+	emake -j1
+
+	if use ocamlopt ; then
+		emake all.opt
+	else
+		emake TARGET_SPATCH=byte-only all-dev
+	fi
+
+	if use doc ; then
+		VARTEXFONTS="${T}"/fonts emake docs
+	fi
+
+	if use emacs ; then
+		elisp-compile editors/emacs/cocci.el || die
+	fi
+}
+
+src_test() {
+	emake check
+	use python && emake pycocci-check
+}
+
+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
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/coccinelle/metadata.xml b/dev-util/coccinelle/metadata.xml
index 5d11763c17ea..6f49eba8f496 100644
--- a/dev-util/coccinelle/metadata.xml
+++ b/dev-util/coccinelle/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>ml@gentoo.org</email>
-  <name>Gentoo ML Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>