gentoo resync : 29.06.2021

3 files changed, 49 insertions, 2 deletions

diff --git a/dev-lang/gprolog/Manifest b/dev-lang/gprolog/Manifest
index 0b50ba2fe345..21d3bd5d66c3 100644
--- a/dev-lang/gprolog/Manifest
+++ b/dev-lang/gprolog/Manifest
@@ -1,8 +1,9 @@
 AUX gprolog-1.4.5-check-boot.patch 327 BLAKE2B bf0cdf518b9d6c7234cb86b3f16365da28d8aff0a43cae017a88a2d62c262cf661f540e07092f521884e68fed70732d5db707e8d51425cc38f3a9ffafc262a51 SHA512 8b5d56f5330582cb795e9ec1f640227cb7fda08fc259865988d5c0873a0a9c8e84234cf4612cb4d91358583a5450a69e3c9cbd61a5da5c2d3eed82f2f4981df9
 AUX gprolog-1.4.5-ldflags.patch 2018 BLAKE2B 22abb02fd783418b44eed4eac046782185322ff06a905f97f317a8dc19c1861f8939a905ab76ab5dacd92cdf5b8c9b3fafce1d608b24e8cc6c9333e1a96dc6df SHA512 79f20d12b24cb691d8628cf985130c9e133db694886e49bf2d760bab7696ca9bd5a3250f2671486404b37a16b3fee54b25a49175e32df46f533f97376610da98
 AUX gprolog-1.4.5-links.patch 488 BLAKE2B aa6c833c8f6d8a7bf6f2a30ef971efd4389035976be40bd02d0ec06441e17e5153ce40fe7d1fb6e93f5984994d1ecc618217189c1d0a9b8512d4f1363c8d2842 SHA512 556096de1d4fec220e344949a3d05022ddd218dac53774e537f211bd75b5ecfde21b7e1753e58b8870afd3b38501b1fc028c751c4eeaa569d30bdeda8ac723d2
+AUX gprolog-1.4.5-llvm-as.patch 1507 BLAKE2B 37f727d2fb2b38045340715160f80dd00c2cc15b249ad6566ac50495f23992a455ea89b5a865a0d8b2385df2f89c8ad1eb77d59e0fbf484172c7af9870f38bb6 SHA512 a49e2d33a77dcb5c85284df462337cf9a93b4a35c61f6a1c84d1806575a87cf94f07de9cb9ed7e0dbff49dd7675b94f1cf2dd92c1c1406a3f36deb4b33faf27a
 AUX gprolog-1.4.5-nodocs.patch 1117 BLAKE2B 15e65f72506a57dc7b1c549cb4f01c43e9d46f8a78c4a16309599b1db48d192e8aab933dc128ebcea957f77778a321f10d9233676356d52efc7c33e4ed658d13 SHA512 c4aa11081c8c85989e9947b3be25bc74a22456ecf5404b943e9985835319e7c33273bd2b30f003aad4cc3bc842b98069e647b8203a3c4f45f8cf2bed08af9afd
 AUX gprolog-1.4.5-txt-file.patch 578 BLAKE2B 22f4803c19fc4e8266065e457e711df2885d8539325f02bc426d1a351163e3dcf6f339e3f1bb2586e807ebd41b237f7e4f1ca9a139bd3fa71c76db5684c9d37d SHA512 e0cb7ed9c6dd8a394898086335312556ffa313e18dba9c281bcc45749ef9b297f0ec3cfddfd197524be55315c79cf89f370a04f0d6b10a0e95ac6a59ca92fc67
 DIST gprolog-1.4.5.tar.gz 3587361 BLAKE2B c0c73ce249d7c26b914a3f831c6ac93aeb884bded6c5ebbe51223f0685de0be2e746533aade1633a953b93e88a30796fa52ecd5e609d05bc051363cbf34e0477 SHA512 425103bc9e5bdbdb4ae331f5be0cf49524fbdb4f5e2809fb973360de9e7ad9935c1b28f3603e0be696a647153d9f0d3dacdc87251098ac99faf7d0b3c652fc60
-EBUILD gprolog-1.4.5.ebuild 1852 BLAKE2B 29c80571f694e9e109aa9df990e9b979710c6d8d257f40e3ca59db1b219217e37807ba553b659e0b3f91b4e89bf9d04c877f2ce5c9b422f153d8c1119bb4df77 SHA512 78cf253d27bc3f12d709f33e5d42ce9e6e7848d7e485c84d166f125d477ea27dea36a397d92b2c96f69a760312af60967f91de54111dfdf0d27f941fccfc2600
+EBUILD gprolog-1.4.5.ebuild 1951 BLAKE2B 37e23a1c8d7d01cc21a04940861b13fb0c2963e66eefa912f486fbcccfb61c05aaafb9890cbc95986df3eb1b6b7b3eb8a7d2830f823bdb30f942754845d35b15 SHA512 d1da561b82d64df5a25cdcc5b6762ce5dcb44c8cc7ad842639656b033faeaf3b94e26f0421f54552dd3d758706b170eae71eaef79bf5c81c02453ebace21297e
 MISC metadata.xml 236 BLAKE2B 665f3de6dc90f46a18379b3416063a49b1a79ddd7ef89eaed9be78f9adc5b234e9693cd31d6cf2d3477fc7dc00055492bef7de78da6c901c4a6e55eb0e781325 SHA512 e776224736bd575412c7b5b799f649c6b2947a70e6a9aea580063d9da7d09a8144e5ebaf7ac3ef131d578486cf05dec814dce11b2aeb884cded3be3cab70fcec
diff --git a/dev-lang/gprolog/files/gprolog-1.4.5-llvm-as.patch b/dev-lang/gprolog/files/gprolog-1.4.5-llvm-as.patch
new file mode 100644
index 000000000000..6adc8feb2720
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.5-llvm-as.patch
@@ -0,0 +1,38 @@
+--- gprolog-1.4.5.orig/src/configure.in	2018-07-14 08:19:12.000000000 -0000
++++ gprolog-1.4.5/src/configure.in	2021-06-27 10:13:31.004977355 -0000
+@@ -334,15 +334,26 @@
+ dnl we use AS0 instead of AS else AC_CHECK_TOOL does not work 
+ dnl (instead of testing a prefix like x86_64-w64-mingw32- it will
+ dnl think the user wants to override the test)
+-    AS0=as
+-    case "$host" in
+-        sparc64*bsd*)    ASFLAGS='-Av9a -64 -K PIC';;
+-        i*86*darwin1*)   ASFLAGS='-arch i686';;
+-        i*86*linux*)     ASFLAGS='--32';;
+-        x86_64*solaris*) AS0=gas; ASFLAGS='--64';;
+-        x86_64*darwin*)  ASFLAGS='-arch x86_64';;
+-        x86_64*linux*)   ASFLAGS='--64';;
+-        *)               if test "$with_gas" = yes; then AS0=gas; fi;;
++    case "$CC" in
++        *cc)
++            AS0=as
++            case "$host" in
++                sparc64*bsd*)    ASFLAGS='-Av9a -64 -K PIC';;
++                i*86*darwin1*)   ASFLAGS='-arch i686';;
++                i*86*linux*)     ASFLAGS='--32';;
++                x86_64*solaris*) AS0=gas; ASFLAGS='--64';;
++                x86_64*darwin*)  ASFLAGS='-arch x86_64';;
++                x86_64*linux*)   ASFLAGS='--64';;
++                *)               if test "$with_gas" = yes; then AS0=gas; fi;;
++            esac
++            ;;
++        *clang)
++            AS0=$CC
++            ASFLAGS='-c'
++            ;;
++        *)
++            AC_MSG_ERROR([unsupported compiler $CC])
++            ;;
+     esac
+     AC_CHECK_TOOL([AS],[$AS0])
+     AC_PROG_RANLIB
diff --git a/dev-lang/gprolog/gprolog-1.4.5.ebuild b/dev-lang/gprolog/gprolog-1.4.5.ebuild
index 5892e1fbf171..46ecd24130e8 100644
--- a/dev-lang/gprolog/gprolog-1.4.5.ebuild
+++ b/dev-lang/gprolog/gprolog-1.4.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="A native Prolog compiler with constraint solving over finite domains (FD)"
 HOMEPAGE="http://www.gprolog.org/"
@@ -21,8 +21,16 @@ PATCHES=(
 	"${FILESDIR}"/${P}-nodocs.patch
 	"${FILESDIR}"/${P}-txt-file.patch
 	"${FILESDIR}"/${P}-check-boot.patch
+	"${FILESDIR}"/${P}-llvm-as.patch
 )
 
+src_prepare() {
+	default
+
+	cd "${S}"/src
+	eautoconf
+}
+
 src_configure() {
 	CFLAGS_MACHINE="`get-flag -march` `get-flag -mcpu` `get-flag -mtune`"