gentoo resync : 16.02.1018

6 files changed, 174 insertions, 6 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 9d95e8bc03f4..0eb4f354a5ab 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index b3d9fface7ef..0f791f5cc19f 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,11 +2,13 @@ DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
+DIST llvm-8.0.0rc2.src.tar.xz 30492444 BLAKE2B e7afd3b66e3eb204e07348f0bc77f0ae03d8e9581de4c94cba7c0b43b53f36ecd891c1272ce43ea6c78999fd404a7db105266a2eaca22975133571e1152961af SHA512 9d93197848e9472cc2fef2477897e4f4d74a79b17a164fd43446b0ffb327e7f484cf64f0c294d9a99707c0b46282eb0d16e6ceb5d2d568f25e4235f70ae3c5e7
 EBUILD llvm-ocaml-4.0.1.ebuild 2800 BLAKE2B 2d8d5a7d6c13eaece0f0b98251bb28b5cd2c8257c2057a00810cce6e1f76ce0f1caca21e9ee00419bf335098a32dc7d748699f8032fd54e4e5cf843889129e3d SHA512 9684444e4c92601e7654520fb13f563f7c9f886f9f50363f470b023801d14179c542fdc1fc5a519ce73b33774f7a2180b1109f03eb43d7035a79ed2e5387e08e
 EBUILD llvm-ocaml-5.0.2.ebuild 2984 BLAKE2B 723a1e859c8e35f2ece65cc8dd6fdd4ef13017fa0ea8ded0c2c1e343a996828194097389b6db5fb2fd5f6c62fcfb9f443e72def7c6549037ae51816c3c7d9f64 SHA512 ba6033dab81c3abd7d9fe2e664b229cfa7f2674193287794ac1cf106a31f35db8d31795362787567d6f0703cdd216f36af3997055c594301dc29e93bd7336615
 EBUILD llvm-ocaml-6.0.1.ebuild 3148 BLAKE2B 08a61098a9782694f57d4a56dd450200abdc1fb117ff327e4005c8f81d1b5cb861bba0fdadb19e94e3d4c409b1431a5ce361bc77b0ce590c69b855b1d866e1f5 SHA512 b0cc43ae38254cf01688e4a5b375452c8d17e9a8cae89a43ea1635383516d217850f16e605de3c45c8cef993ec9c95fbcf98f4333e27770000cae6899615e631
 EBUILD llvm-ocaml-7.0.1.ebuild 3145 BLAKE2B f44a8f4a741085912c7e89e6d5c892e0e7d004e9d2a2023016fef717392c2e0437c16ea8904443253f36a2bd16a1224b66309c462ebc43a9383f083542f89603 SHA512 717075157b6d130b9997fba55728a1071a6f4d490266e3e5fc9828dea180423158790b16f94262c94425667c242f7c4217e4b640fbac532ff9b2af2fcb80c62d
 EBUILD llvm-ocaml-7.0.9999.ebuild 3160 BLAKE2B b87ef20af15615aa962f44423b376e54f3c034a3c4e65a9683122f58646303182a71ba7dcaccd5d1c11820171dda1572f21c29cd03cce307cf847de60b350706 SHA512 c62ee53ef2e03f28d5c1ff70ae68f415dcde714481ff0615f276a6a370f193e2682f01dd9add191ed8266ad308a0115cb610197202bda8bb5229305bf546c88f
+EBUILD llvm-ocaml-8.0.0_rc2.ebuild 3148 BLAKE2B ee9cd386427719b80ecb4de3ce01ec4d025b2d3dccb323102870a94ee9ec6626fbf5c32b5664533da01f43106de2ca30dea71907e71e02d31419fdefe468b452 SHA512 7262613522d6d9919d80e31064316361d188b43b3b85ed9bac047001ef022c38da4a163d6d81ffe40ea3d8333ad9ad52917525e94a1dbe82fcf6ffa334e5118e
 EBUILD llvm-ocaml-8.0.9999.ebuild 3157 BLAKE2B 16ef8ac673332d268b27d7f3762d9201b1f57fecab95f28a6d0f76020cb5bb1ada1fc262026c9e7a8bb596f796e7bc8e6202030e4642e8c19b56a450e19d56d0 SHA512 90ea92899bd20841c53e356d1213aeb4beb23c694ebfef057b5df2692b3deef55c0d4f3574a3a4eb4d1a322915ce4b313a486f5019ffcf3e3725b12b51501ee9
 EBUILD llvm-ocaml-9999.ebuild 3386 BLAKE2B a935bebd7fccdf631999ba3be52a70072c5cccf1fdceaf48c72a584f0409afa82c0956913d3682eefed4d01f35afe1b91dd323721bfe0599cdf8f2fdabd3a8b3 SHA512 01fbc7546f9da6aea63888b3b1fb65971555a323dee902611e1c240145d91ce60e46aaed7331797ffde6f7864d0bc270bb9ef8ab3cbaa16dfcff92414aac0e2f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0_rc2.ebuild
new file mode 100644
index 000000000000..75111b867fb7
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0_rc2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm multiprocessing python-any-r1
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+	!sys-devel/llvm[ocaml(-)]"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-ml/findlib
+	test? ( dev-ml/ounit )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Python is needed to run tests using lit
+	python_setup
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DWITH_POLLY=OFF
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/ocaml-mysql/Manifest b/dev-ml/ocaml-mysql/Manifest
index 2a699eff82a2..1989ea4a5d58 100644
--- a/dev-ml/ocaml-mysql/Manifest
+++ b/dev-ml/ocaml-mysql/Manifest
@@ -1,5 +1,6 @@
 DIST ocaml-mysql-1.2.1.tar.gz 99250 BLAKE2B 576eb7cc7ccf9e747f207faa100adb7f10a17be2083dbd4f1fb352f8a023425eb7917d7bd4756ddafd663657375324207596e97d959f69c704fb1f5126b7d63d SHA512 bf9b4a1bfcc1a8d356a2d74ea9d8de8dd201973b9dc89c06349e814c2368871f5f6ccc2eca25b33fa5fabf4b6d19a5b4b436a1e055b90468f16f575257121e64
 DIST ocaml-mysql-1.2.2.tar.gz 99136 BLAKE2B dcc18b51514d7a9bd7bfdf97c3f410aa959cf1b2285bd6d347cd1ebdd51952f687222b16c250d8553f7b2235bff7201978bc8debe22996566412925373c3d9d7 SHA512 2af13de017b73a31c23e0536fd10679eaf5c0692741d19729b08ab58f4d2585f8f7faf0cfac1e3ccc3d3ceffcbd1740f62621ba678c50f545fc3a3a36a17742f
+EBUILD ocaml-mysql-1.2.1-r1.ebuild 663 BLAKE2B 55d8cee043dee7e5f290abfec1ee1f75f524949f55409190da240e224a1262ba1b4c112d54749c89826e9d880a3239d2edf27032e332cc5ff27f90eec85cd463 SHA512 9c58f3ff92bf81428ee3351675c913e0fc4f4369c622558502664ad16f05fe73d9ae77210ae5ca638558c3bafae67a9254a3be665bd1cfc8f9243e71a456e3cf
 EBUILD ocaml-mysql-1.2.1.ebuild 670 BLAKE2B 29f9378548b7e97f2f3195458dc2d6513c55b98e5d5f4c000ef4cabcb6d332a3673abed39cd550a9bfe0b5f449fad891b64413ebcc694ed8e9ad59830f976d00 SHA512 fdb0a2a4e5aba6379382541a7bcbbec6266945720b64f2b698eb62e566ba8461de2cc4d8a247629dd7256e7f97a6f1ce2846c8607923aaebed3fecbb1d41692e
-EBUILD ocaml-mysql-1.2.2.ebuild 676 BLAKE2B e45d2790293307cdce31965748534d0b820dd4e4a48828137ac92eb762082afbe54aaa2ddc7689f34433bad60501f4bdb2b1ca892407bdda0f327a149179d9b7 SHA512 51bd1d5048c591f4040ca00355b4af0c0c4382ff03254f03da0b47fe25bfd8ea189838038af65b124c7e552bbe6ed741f2cb117b8ca0348c58e15d2d33f71e10
+EBUILD ocaml-mysql-1.2.2-r1.ebuild 667 BLAKE2B 4ab7269e8cc87c13f1a3b5e40f4306c69e0ad4d883d383dc563786fbe7f3da699aa2c1e54704ce31dcf70e5ca4833835b27f9b767233b6f8ab2e26256dee50da SHA512 d6065ddf86f669fe20a856ff22d2fc5eea9b70a61d53f4181ca3e4332fafb992524f16c1dc44ca17e1b2ddf2b984d476e0a1489338db8361b5ca1d43e947ff5a
 MISC metadata.xml 253 BLAKE2B c787c1044c3f674eb5d2d7a0e830965ad53c7a2c8cdfcd95bece6b0557e35237f62afe28464ebe4c88468cd1fd543627349fd41a0aa760fceed1a7d52386eda2 SHA512 9285e04d22e8e41631e6de00e0ba02842cf0e772cd17a1d7ba3864e50eeea50abb06077ea4f9ac920eab3d520bfe28d389b3d04d5c3529af23a68ca68b6857d4
diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1-r1.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..74bddd8f624a
--- /dev/null
+++ b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+IUSE="+ocamlopt"
+
+DESCRIPTION="A package for ocaml that provides access to mysql databases"
+SRC_URI="http://ygrek.org.ua/p/release/ocaml-mysql/${P}.tar.gz"
+HOMEPAGE="http://ocaml-mysql.forge.ocamlcore.org/"
+
+DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+	sys-libs/zlib
+	dev-db/mysql-connector-c:0="
+
+RDEPEND="$DEPEND"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_compile()
+{
+	emake all
+	if use ocamlopt; then
+		emake opt
+	fi
+}
+
+src_install()
+{
+	findlib_src_preinst
+	emake install
+
+	dodoc CHANGES README VERSION
+}
diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.2.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.2-r1.ebuild
index a1afca457cf1..87b9fd21e32f 100644
--- a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.2.ebuild
+++ b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit findlib eutils
+inherit findlib
 
 IUSE="+ocamlopt"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://ocaml-mysql.forge.ocamlcore.org/"
 
 DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 	sys-libs/zlib
-	>=virtual/mysql-4.0"
+	dev-db/mysql-connector-c:0="
 
 RDEPEND="$DEPEND"
 
@@ -34,5 +34,5 @@ src_install()
 	findlib_src_preinst
 	emake install
 
-	dodoc CHANGES README VERSION || die
+	dodoc CHANGES README VERSION
 }