gentoo resync : 02.05.2018

9 files changed, 165 insertions, 17 deletions

diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 50fd7d9062a7..896150388e7f 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -8,11 +8,13 @@ DIST swipl-7.6.3.tar.gz 16772590 BLAKE2B 644be801e290ec9d949a9b7462256a35e11cf9a
 DIST swipl-7.6.4.tar.gz 16777875 BLAKE2B 94409966362e649f4748b94b4ec25415bb827c7742aa39453d8e37db4ce992a65ad2d054ded4e651f2a9abe3a9438285bc9c9c895437c087ae6cf88f4afae9ca SHA512 f0ed16e4f1436115651c38a0bb37008d0dadad5a19b0f09894fcfc51dd3d429f86488e89cce00788c3c36cc2f0cd2957f92df47d5441133a6f8ea9d91ca5470f
 DIST swipl-7.7.10.tar.gz 16800970 BLAKE2B c9d8904734bb5a6d20adad8203cec6682e9bd97a343d887d1c03dfb735f32e5794ab0631a76e69fe5f0c7d2e76cd21be06471c7df6e4bc585882b7de1308ec70 SHA512 55e0b129424c2ba0f7a8151b85eaf3de6ce7e16ed01626fae245eb0ee754dcfa7bfbd3a30d00da7e2df72b8d2899e5354900e27b47ffe0401bc26a0b594f9d30
 DIST swipl-7.7.11.tar.gz 16935711 BLAKE2B 5ccac7b91ef35d132451b101a53b9977067e28d4239ecf25185e4140d728a711a8fd9dfe73bf51c47a2935c51637c0ad61780997e0b9fa13e6298d815c46071a SHA512 28bffdc7d7c431aa59a996faddac941024d3923c22793b890938475f041e2d40d9218b10779e5ad01c91093234dfd21ea3339756950dd8401adeb5783c3e3aa3
-EBUILD swi-prolog-6.6.6.ebuild 2799 BLAKE2B 47c0d56dae0ce19be9efd09122ef8e6e3655abd3459cd25a9a0cf4734fbb132b8725c79775942da8cb2c5eb40bc35f4c0b5a39064a5e41387d4480379fd71435 SHA512 1d30fcb84653a0cdf7cf4f5a78898d5fb29f939095d19a21324a9587ee6ca98543ae16d564ff8880cdf99c6d5a091c2f0e5dc79074ceadc5a7cd3fe340609d22
-EBUILD swi-prolog-7.2.3-r1.ebuild 3170 BLAKE2B ca7604653a23dbc9158e96e54684482fd1c82e6bea8f9753e73c91d46df95a105d70114c0aae8c86e8b9ef45debf97116755b4fc48ecdae95680045ae60035ba SHA512 fe35661ef51094ddf0aff61659f33de5be0252216b94f45e658215146dd53379881f7077c20ace1ef67b70ad9d7128ccd26e122392a1100ab8db195c9324867a
-EBUILD swi-prolog-7.4.2.ebuild 3395 BLAKE2B 0ab38dbbfbea20db81e516a60163dae56a391bee23cd6a91df98241d684880ae398247a2fb7b42b33680690c74d438d3204e56f42a81935e461a6017bf013a75 SHA512 25ff3ede7c3524a670f9f6cb7e617813826c8ef691141b42f7f07857573a69401f4555e48c98eaff98f4c30bca1938fda4b1f9e9e119ae83d8a71f517a4d0ba2
-EBUILD swi-prolog-7.6.3.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
-EBUILD swi-prolog-7.6.4.ebuild 3392 BLAKE2B 1754139d8ff2862994d2908e2ce845c3c197b74c14522e971ad91b3199ed84f42daf83280287ac51eb03bb53408f1cabfc955bfeb5146918ae51ea4efadca070 SHA512 038d4077bf8733bb57fe8cda0dac04a194f6aac809b30adc21d0b2010750faba4e1db368aff83a766cad6b76853e772b426b9bd76a71ef846964777e90a90c10
-EBUILD swi-prolog-7.7.10.ebuild 3391 BLAKE2B 0593fc8bdac10ee84400ed3e3504e28ac352134adff0344047c5244b11caab0cf04f53e091566c4ba107abb2095d4696966403e2b2427bde48f41e54ee4ea986 SHA512 00971bbad1e54e00f995bbf76839463dfb38e72ec9daa8c16701c47ceacda7a0760d31b8086a14f9c4e52c258f454ab1b1ce9af68bb3cf95f133f8a5cbdce997
-EBUILD swi-prolog-7.7.11.ebuild 3391 BLAKE2B 0593fc8bdac10ee84400ed3e3504e28ac352134adff0344047c5244b11caab0cf04f53e091566c4ba107abb2095d4696966403e2b2427bde48f41e54ee4ea986 SHA512 00971bbad1e54e00f995bbf76839463dfb38e72ec9daa8c16701c47ceacda7a0760d31b8086a14f9c4e52c258f454ab1b1ce9af68bb3cf95f133f8a5cbdce997
+DIST swipl-7.7.12.tar.gz 16935097 BLAKE2B 774bbb34325ed03eb55c71f7f98063ea44012a7069aabe9d77f16252f9f2a1c398a86c16eb47604f271110f63d249f77fdbeeed307ff22f427a61f7beb871df6 SHA512 4c1e6b13f37c16977f6ff384cba119d0fecfe48a20b7cd37b26154587d2abf46ac1619e96f5fdfa85549b72e9077bf73fd2f74b84d9d3f4c37184f0669b0e432
+EBUILD swi-prolog-6.6.6.ebuild 2802 BLAKE2B d84dbba5c1ed23020e067ffd9a0c616dcf0c07a7b1df12d5838b4692813527f328a735463d5f142ce7d7fa8583b62c8a3a5bffbd01a381f85dce1b3e35d8f821 SHA512 f750a9baf473a2e0913613b5e3feabd8fac1b7afb6cab926868154d9089cc57dc9815dcfbd001d929085df585b256903c7df7fbf602c5e0b021fa340973038bd
+EBUILD swi-prolog-7.2.3-r1.ebuild 3173 BLAKE2B 9624fab340ad2ef4ffeb7d91a9ddc4404cbe3e38c1d561d5adc6501041a306519388e9ced37f1c146e923eb2f649643ef2d2d50da2c8e82a31c960d4d4b48d74 SHA512 1b76ecfac0eb5c03d61e25575fea8ea1a58ee511291274dc865c033cac7a796a632057063332e7621be01df7ee550e6f5957386c70a07081a46d9a87ce34b062
+EBUILD swi-prolog-7.4.2.ebuild 3398 BLAKE2B 368ef93ceb17042a28699f9aa469e6b5c39aa29154b810e43fd050ab3bc1079f83680cfac8f4108c7c297a51e9bdd28357a0b6241c08faef3ea5f81ab1605558 SHA512 76d094f62e442ac86d32eaf467179fdcf4d4edf6034f711104e91f8a01b7e343208ef0b6e492ed18c8c0605b96a48f1adef8f3903f861c716e882cb9695b0dd2
+EBUILD swi-prolog-7.6.3.ebuild 3395 BLAKE2B 6445c399d7a7518bcd4ce05b9ea0bf50c7d0297d5a24d9ef84a48c36600077cea8c8b77b010d28e25dfe0766e12d1f560f42e5597a602f6bdfc7351ea6e0fa62 SHA512 830766267d3e4b60897dfcdab5263cee600ccfa2cd80f970ef3b4c3695cc3ddf9989ae85527f45cdf124898210f108a98a32a613de2543a8db813d42482b0687
+EBUILD swi-prolog-7.6.4.ebuild 3395 BLAKE2B 6445c399d7a7518bcd4ce05b9ea0bf50c7d0297d5a24d9ef84a48c36600077cea8c8b77b010d28e25dfe0766e12d1f560f42e5597a602f6bdfc7351ea6e0fa62 SHA512 830766267d3e4b60897dfcdab5263cee600ccfa2cd80f970ef3b4c3695cc3ddf9989ae85527f45cdf124898210f108a98a32a613de2543a8db813d42482b0687
+EBUILD swi-prolog-7.7.10.ebuild 3394 BLAKE2B 1a5f886851042f79ce37b70b4f6d6816a00b470dceb1b4200a519d978ffb631d2766a7c2fffc8597e21ece506f57a7799d5be0c03bce1d87d9adcfac2db88cf3 SHA512 64fb0b657b264cad04e45d704f1c0f0fac346ab81c7e9084b21c40a6cbaff1db1545eb1ba29955f24059df62c38acd66df82f55c5eec3ef33b6f2c0bdab76b5c
+EBUILD swi-prolog-7.7.11.ebuild 3394 BLAKE2B 1a5f886851042f79ce37b70b4f6d6816a00b470dceb1b4200a519d978ffb631d2766a7c2fffc8597e21ece506f57a7799d5be0c03bce1d87d9adcfac2db88cf3 SHA512 64fb0b657b264cad04e45d704f1c0f0fac346ab81c7e9084b21c40a6cbaff1db1545eb1ba29955f24059df62c38acd66df82f55c5eec3ef33b6f2c0bdab76b5c
+EBUILD swi-prolog-7.7.12.ebuild 3394 BLAKE2B 1a5f886851042f79ce37b70b4f6d6816a00b470dceb1b4200a519d978ffb631d2766a7c2fffc8597e21ece506f57a7799d5be0c03bce1d87d9adcfac2db88cf3 SHA512 64fb0b657b264cad04e45d704f1c0f0fac346ab81c7e9084b21c40a6cbaff1db1545eb1ba29955f24059df62c38acd66df82f55c5eec3ef33b6f2c0bdab76b5c
 MISC metadata.xml 367 BLAKE2B 07c7ff161f07b547325566650cd882c90dbe98ac5afc0015d68bc0338cebd678ac82c3a45edd3e4f7e613d5d493324899dc8e3b4ca448f447744f439e60458fd SHA512 bacbb17fc3518d3bf845d097d17dba772a745fd7343ab6e8c751a417a540c8c003f29b86c66374bee538d7a5d96ab95e67b1c619d47f80d0e332482daabee74a
diff --git a/dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild b/dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild
index 0969747fad20..e1429546e28b 100644
--- a/dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses:=
 		x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
 S="${WORKDIR}/pl-${PV}"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
index 5ff022070d03..6c67f53b8051 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -39,7 +39,7 @@ RDEPEND="sys-libs/ncurses:=
 		x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
 S="${WORKDIR}/swipl-${PV}"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild b/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild
index 848c0aa426ce..9b30d3fd846b 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild
@@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:=
 		x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
 S="${WORKDIR}/swipl-${PV}"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.6.3.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.3.ebuild
index ac17db45d196..f745720052e3 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.6.3.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:=
 		x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
 S="${WORKDIR}/swipl-${PV}"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild
index c714e15e3b0a..f745720052e3 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild
@@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:=
 		x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
 S="${WORKDIR}/swipl-${PV}"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild
index b3c8e67bc2e8..420bd6d9fb12 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild
@@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:=
 		x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
 S="${WORKDIR}/swipl-${PV}"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild
index b3c8e67bc2e8..420bd6d9fb12 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild
@@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:=
 		x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
 S="${WORKDIR}/swipl-${PV}"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.12.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.12.ebuild
new file mode 100644
index 000000000000..420bd6d9fb12
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.12.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses:=
+	archive? ( app-arch/libarchive )
+	berkdb? ( >=sys-libs/db-4:= )
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	java? ( >=virtual/jdk-1.7:= )
+	uuid? ( dev-libs/ossp-uuid )
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		epatch "${WORKDIR}"/${PV}
+	fi
+
+	if ! use uuid; then
+		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+	fi
+
+	# OSX/Intel ld doesn't like an archive without table of contents
+	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use ppc && append-flags -mno-altivec
+	use hardened && append-flags -fno-unit-at-a-time
+	use debug && append-flags -DO_DEBUG
+
+	# ARCH is used in the configure script to figure out host and target
+	# specific stuff
+	export ARCH=${CHOST}
+
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+	cd "${S}"/src || die
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable gmp) \
+		$(use_enable static-libs static) \
+		--enable-shared \
+		--enable-custom-flags COFLAGS="${CFLAGS}"
+
+	if ! use minimal ; then
+		local jpltestconf
+		if use java && use test ; then
+			jpltestconf="--with-junit=$(java-config --classpath junit)"
+		fi
+
+		cd "${S}/packages" || die
+		econf \
+			--libdir="${EPREFIX}"/usr/$(get_libdir) \
+			$(use_with archive) \
+			$(use_with berkdb bdb ) \
+			$(use_with java jpl) \
+			${jpltestconf} \
+			$(use_with libedit) \
+			$(use_with pcre) \
+			$(use_with odbc) \
+			$(use_with readline) \
+			$(use_with ssl) \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			COFLAGS='"${CFLAGS}"'
+	fi
+}
+
+src_compile() {
+	cd "${S}"/src || die
+	emake
+
+	if ! use minimal ; then
+		cd "${S}/packages" || die
+		emake
+		./report-failed || die "Cannot report failed packages"
+	fi
+}
+
+src_test() {
+	cd "${S}/src" || die
+	emake check
+
+	if ! use minimal ; then
+		unset DISPLAY
+		cd "${S}/packages" || die
+		emake \
+			USE_PUBLIC_NETWORK_TESTS=false \
+			USE_ODBC_TESTS=false \
+			check
+		./report-failed || die
+	fi
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install
+
+	if ! use minimal ; then
+		emake -C packages DESTDIR="${D}" install
+		if use doc ; then
+			emake -C packages DESTDIR="${D}" html-install
+		fi
+		./packages/report-failed || die "Cannot report failed packages"
+	fi
+
+	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
+}