gentoo resync : 08.06.2019

3 files changed, 88 insertions, 4 deletions

diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 3a91f83257be..a7e3f2d47c5b 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,4 +1,6 @@
+DIST gnatcoll-bindings-2019-20190430-1928C-src.tar.gz 138935 BLAKE2B c72398b51bf383b163ac10000c4dd5441334a6f24d7ad075d8115f25c030b43bc1dace6a1121e1e69add1eead93a5389aff09ef013deb4682ccb1d31bb85313f SHA512 6db1d35a1cdf5188001084750f7aa32b193768f8c3dfb6d7db8a8314c745fc054b0a6d2234a6dd64c5acd4b1bafffa7ce7f1080bd51fbb8bc88edfcc855b7a48
 DIST gnatcoll-bindings-gpl-2018-src.tar.gz 100068 BLAKE2B 7e5fe106d421d853135ddaea04b7bf2b306e7d0f054379b4c66b58844ac73270d7c82de549e9440f4ecc672ed7e9df6e2b3c1fea55b67403aaa33b09c124bb9b SHA512 2d42e904ab7324d958b34b103ceb2cf7d9bf620f324578b8d3537c18bcc2b4ba73d553bbec773cde5d57979c3e68bc9eef69f97dd55a3b21e43d464881676295
-EBUILD gnatcoll-bindings-2018-r1.ebuild 2176 BLAKE2B 72cb896359627f2e9e2f129f7160ce7f0f8728a7594ea78661f7d0432420d9e262d4268b1cbce8ff3064f6dbc311622f43bc4c0f5b33f38edddf2f8bd1a63887 SHA512 a53aa84d5846aa308e624afbd06a5966750bd4ece2a1efa648628d460f1923fc3a2e1e8aa2d4a5bd41f462ca5a8c5f7c0efd818dc8874b6e790c855d3d280fda
+EBUILD gnatcoll-bindings-2018-r1.ebuild 2248 BLAKE2B a993d10786af11f28309c092ab9fbeafefa51ead53f8f78b07b672034306fdb202b10cda2fd0a8d1913a192fb0eb6d1a9ed061f9dc131adec38db9a0266f0c49 SHA512 f3c6d4029a8d08d3d74f9c3602f0399e3f12e942346f6a6a8a9545ddefce63b54b86e5d2d89281f5a04230e87346b2e0bc472be65c2618a5636316ea95e7ba7e
 EBUILD gnatcoll-bindings-2018.ebuild 2142 BLAKE2B 8ee5521ae2b74c65a8adff85ae19459c5dfb993184c436d05813236cc8c2bad0b7df87f46e9c1c7efb614020d51cae95f717d0be60fab88229cbfe65d9dc88e9 SHA512 16a17b64f31fbb362c58325efa18da979193befbc642270b240e0b6b36bfe243c1aef67e3b91efba097cb55097ee0b1dadc61bf8faf153d5431a6ceff1d22118
+EBUILD gnatcoll-bindings-2019.ebuild 2252 BLAKE2B e6c1d076c3983d155ec133d42718a58f52b0ab435c46a5ec53666b898182893577b5317c5100a30e44b7f65e0ed94c42bfd02f52134e89f711789b55b2e0b7f7 SHA512 39bf1d9214961bb7087d9bd04dc8e984b71d9572711f2d91d5cfa3c8ee4aa0766f08900f93e49befe3940f16589335cd155736325c9aa1d69eea61199d8883fc
 MISC metadata.xml 1385 BLAKE2B 4c67538a9b8292aa6db271d52fe30461523040a100c44b5f7c0f9450d32691796640613b6275e2d11ba2d95c913e7beb85027beadf1854ff10d211c4e3fec9ba SHA512 23592d21bac06f63bac379a582f6f58b32a1a4477d6f4b5a4cc801417c1f34a74cc7a3ef42d13b682741ccb6dbc4718d8c933f773f410184166e462c925c1490
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
index dcebe0e138eb..e4b95d410d3e 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
@@ -20,13 +20,14 @@ IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gmp iconv python readline +shared
 	static-libs static-pic syslog"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
-	dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+	dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
 	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
 	gmp? ( dev-libs/gmp:* )"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
 S="${WORKDIR}"/${MYP}-src
 
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild
new file mode 100644
index 000000000000..60a73d35f0d0
--- /dev/null
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit multilib multiprocessing python-single-r1
+
+MYP=${P}-20190430-1928C
+
+DESCRIPTION="GNAT Component Collection"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8afa31e87a8f1d425054
+	-> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019 gmp iconv python readline +shared
+	static-libs static-pic syslog"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
+	gmp? ( dev-libs/gmp:* )"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
+
+S="${WORKDIR}"/${MYP}-src
+
+src_compile() {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v \
+			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
+			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
+			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in gmp iconv python readline syslog ; do
+				if use $dir; then
+					build $dir $lib
+				fi
+			done
+		fi
+	done
+}
+
+src_install() {
+	build () {
+		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
+			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in gmp iconv python readline syslog ; do
+				if use $dir; then
+					build $dir $lib
+				fi
+			done
+		fi
+	done
+	if use iconv; then
+		sed -i \
+			-e "s:GNATCOLL_ICONV_BUILD:LIBRARY_TYPE:" \
+			"${D}"/usr/share/gpr/gnatcoll_iconv.gpr \
+			|| die
+	fi
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}