gentoo resync : 28.04.2021

4 files changed, 17 insertions, 17 deletions

diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 645074acb29b..cdb0559ab8bc 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,11 +1,11 @@
 AUX pari-2.11.2-Makefile-LDFLAGS.patch 394 BLAKE2B 534fcd325397a388545acbce5d96bd5417c31005512ee8f256283921fb64ec4a9ec27fb7e721648b117d3be1000816d1e9bc5ae5adc5df63afe1b0490db020c6 SHA512 de3283be39cff0bba916b314eb9e112324626513f30b5c0e0340617535d8e66ee93fdd9613839633bf7e85244caff6fa1379cc5d0c0a7f9484d028a650eb8845
 AUX pari-2.11.2-Makefile-docinstall.patch 867 BLAKE2B e8b83357ef42ebcb00abfe7bb5adc30414d1975fbde128ffe84c42898374969c608cd6f3b8b0061023681f6416e86552c80552ac51aa884e260d716f79b750c1 SHA512 089ab09532b2e888a272495606f5c0eeb6e12f764f3605c268a3e4e20e707d87c33feea2a745f7441e2cff6e7402df64f17f7b118350a8d4a0972ad8a5a82c69
-AUX pari-2.11.2-no-automagic.patch 2626 BLAKE2B 3be495852655cf47cab2ebfc544477707ab9274329a4fc7f380bd683236968e0bafd9f91b9c45289912b2a634aa9ba38f3130e0192cacfb6dc383765803eb5ad SHA512 ff8c00f028da9e782256ad9f6af87a194286cf198e8639bd737663db9b4898903993a9ef01f9084bcd658913f3d639509f89cca9b77963790ede9bb998845821
+AUX pari-2.11.2-no-automagic.patch 2349 BLAKE2B 6c2cdda84342109bad0cbfb3d5188eedbbfc08e5b40bce3f045309cef936f88356324b6d721c5cdb458a2343fb4ee6473238571dd779b74506e7e2b7d835e0c7 SHA512 549acaeaa393b0b42818e3648c21fdba3162abfefef147a1429d0e39f58ece0a46e94a6ee953435549c23d62b115b2dab0ee261eda2eb7fd0a2b430223f5f59c
 AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83fa92623903dd1e056bda29c6735eb01013e7937f66d6ffff42d0de83f7ed104c7f933d232ee37be7c4351788e76f8daa SHA512 2ec0d8035a87b693ee6a4dfa913f0b24eed20bb4db7f8cd1a47db444310d33d19e6651d475c635be747e79a02df2705e42f6f7032b60dc763583cf9fa8633b29
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
 DIST pari-2.11.4.tar.gz 4445000 BLAKE2B e910783186eeb71e74a369681c113b77271abd7f87d7a9f366aea83f36ab984f02e312cd451fad7ee6efb2fa285780e8fa78540bb1fd4b135a62d265176c80e0 SHA512 1312f452244cd1d814a1e43e108378c956669b614845f21199b7039fe6462881168983d4badb8a80bb1bac202cd82d92788a2b4f3c23d16f993cae6e251c4fe1
 DIST pari-2.13.0.tar.gz 4758091 BLAKE2B 21a008fbca9af60c7298daf2db5c596cf881fbf4748899f417e317b2e2c0a951d152ffdab061a5f7da73db65345134a90d91e57069d9f0d0ac6eb2ad470a7a98 SHA512 671bed101be0ba0eef2c4aa4d9580477f2492f2cd354f04773df00c2fa1456d1d6d8e568d617675dc4adce3e6d1f8cbaafae45452891ceb10eba60cd669b529f
-EBUILD pari-2.11.4.ebuild 3294 BLAKE2B 8656b6ec3b21763250c075f024c27786756a693c4ba365aa216547134734f91103c5ad38a03cf1ee0ee34c6564823d3f8deb2f75b1c3dd35aed1bf33ced1ee2b SHA512 fcc513c16a48d2d8cdc4b47f7f5d8799fe59b03fe593379b8c4b5f4ab60d9d5d6f6bd75de09cfccbd5a04783b36ef7ad93ccbfd0c8a57d0cca29ceb69db4cb07
-EBUILD pari-2.13.0.ebuild 3391 BLAKE2B 98ea133d0afa58bf2a2327d139a73567900fc52d93b98f579e34df1a879157f9559fcf2f4885401b9b50cc7555910b7dcdff9801e62650a5097de3d805e2570e SHA512 74235c32b2eb4731d62f603427aa1c031f8205a765173ae4814973b204c2a17ce343eaae4df912880497def8af75096d8cfbf7f9f9e853969819f6248aa863d2
+EBUILD pari-2.11.4.ebuild 3327 BLAKE2B 8117499dc50d8146bd3988fbaf4c18ccf719cd482372687bc58eaadec09011ec29b1324d58df2669d0fbc6dcbf3985e3dedf8bb20ad6793bfbc496913d467d6d SHA512 39034792b1b133599cba2eb89d7c459a6eb39da7db0f3ee0793b0941f5be9c992e5b4a1a0a58ad0e272fdf00b5b7e24ade75f7d2e7a2b2691d565eceefeff05a
+EBUILD pari-2.13.0.ebuild 3424 BLAKE2B 5d6bd25923c72ee36a037ca56f26fe71491ad3d2d1d98a3249291fc7ad50efdae7d9b170dd66691345f6e2c5080dc945fef06ed14174a89f3376e31faeca281e SHA512 ef976b96b5ad8600d96d9892ca24e449b1be11542ad531734fadec759b00188ac4afd9114fec76aace0f40e129e71e75acdc839b402cd31dd6bc93b6005898a9
 MISC metadata.xml 1764 BLAKE2B 8c5ad974148c99e21c30630ef1866a3ca7d34c87c214973c4025977130393a055de729bba4fda75d5e2ee288f439b1fc71e44bd3b68d09255f2ed3c81909f6fe SHA512 752c757e7b38995d44af25595da8626e773cb6083a0f9aafe7f3b6af1203b7da743b04b51bbc3f023e5e09c0620fe64fec1d44da7d84c88c4ef4619cbe347565
diff --git a/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch b/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch
index d4044cc426d8..80f000c5f43e 100644
--- a/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch
+++ b/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch
@@ -1,5 +1,3 @@
-diff --git a/config/Makefile.SH b/config/Makefile.SH
-index 6cf5e59ee..7487941f9 100644
 --- a/config/Makefile.SH
 +++ b/config/Makefile.SH
 @@ -74,12 +74,12 @@ case "$which_graphic_lib" in
@@ -8,8 +6,8 @@ index 6cf5e59ee..7487941f9 100644
  Qt4)
 -  PLOTCFLAGS="\$(QTINC)"
 -  PLOTLIBS="\$(QTLIB) $QTLIBS"
-+  PLOTCFLAGS="`pkg-config --cflags QtGui`"
-+  PLOTLIBS="`pkg-config --libs QtGui`"
++  PLOTCFLAGS="`${PKG_CONFIG} --cflags QtGui`"
++  PLOTLIBS="`${PKG_CONFIG} --libs QtGui`"
    graph=plotQt4;;
  fltk)
 -  PLOTCFLAGS=
@@ -27,8 +25,6 @@ index 6cf5e59ee..7487941f9 100644
  QTINC      = $QTINC
  QTLIB      = $QTLIB
  PLOTCFLAGS = $PLOTCFLAGS
-diff --git a/config/get_config_options b/config/get_config_options
-index 4078d2720..5c12bd491 100644
 --- a/config/get_config_options
 +++ b/config/get_config_options
 @@ -86,6 +86,7 @@ while test $# -gt 0; do
@@ -60,8 +56,6 @@ index 4078d2720..5c12bd491 100644
  
  Miscellaneous
    --with-runtime-perl[=path-to-perl-binary] for gphelp / tex2mail
-diff --git a/config/get_graphic_lib b/config/get_graphic_lib
-index 4591f2aad..4808aab90 100644
 --- a/config/get_graphic_lib
 +++ b/config/get_graphic_lib
 @@ -7,6 +7,7 @@ FLTK_LIBS QTDIR QTLIB"
diff --git a/sci-mathematics/pari/pari-2.11.4.ebuild b/sci-mathematics/pari/pari-2.11.4.ebuild
index 83c7847848a6..ed86287930f9 100644
--- a/sci-mathematics/pari/pari-2.11.4.ebuild
+++ b/sci-mathematics/pari/pari-2.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,10 @@ KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-l
 IUSE="data doc fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
-BDEPEND="doc? ( virtual/latex-base )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )
+"
 DEPEND="
 	sys-libs/readline:0=
 	data? ( sci-mathematics/pari-data )
@@ -45,7 +48,7 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-export CC CXX
+	tc-export CC CXX PKG_CONFIG
 
 	# Workaraound to "asm operand has impossible constraints" as
 	# suggested in bug #499996.
diff --git a/sci-mathematics/pari/pari-2.13.0.ebuild b/sci-mathematics/pari/pari-2.13.0.ebuild
index af9b5c717ca8..bc5709ab3388 100644
--- a/sci-mathematics/pari/pari-2.13.0.ebuild
+++ b/sci-mathematics/pari/pari-2.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x
 IUSE="data doc fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
-BDEPEND="doc? ( virtual/latex-base )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )
+"
 DEPEND="
 	sys-libs/readline:0=
 	data? ( sci-mathematics/pari-data )
@@ -48,7 +51,7 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-export CC CXX
+	tc-export CC CXX PKG_CONFIG
 
 	# Workaraound to "asm operand has impossible constraints" as
 	# suggested in bug #499996.