gentoo resync : 28.04.2021

7 files changed, 15 insertions, 9 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 3b48ea34d2cd..bb7624d7c4cd 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/galculator/Manifest b/sci-calculators/galculator/Manifest
index d72a159161dc..333da5d77464 100644
--- a/sci-calculators/galculator/Manifest
+++ b/sci-calculators/galculator/Manifest
@@ -1,4 +1,4 @@
 AUX galculator-2.1.4-fno-common.patch 2030 BLAKE2B 288c04e137cb93da6a7b49e074998621d1f40153ba6b2dfa4cb94f1f6244920a66913d866e5939f84c8a1469576ba3c5138604badcac495d6411a186b0d1e155 SHA512 9cdddad238c0b4c4ee57934cdcd742ee24efb6df80452462f447d0deed6039a6238e48d25933a8c69fe031e1fb5a57d464b7f0913010a3feda275b1ebde85378
 DIST galculator-2.1.4.tar.bz2 472989 BLAKE2B 2fa40aa0d04880e46aad89c79ebb221a13fca815af3540c159205690a65dae6c5ec9e52e48c110ecadc4a18b86d5bd5d363f9d77c162717c8bfd2a60b71d0896 SHA512 ca5f373649d9bf26184e94ba6a501610efbb13e92a8723cda78b83aa495519e82e5b4fcd17f00f615eb702ed186598aecc70ae63a8238c32384b7f608cba4cfa
-EBUILD galculator-2.1.4-r1.ebuild 739 BLAKE2B 1856fbf1bf6deead09b312225115923157860633922fc819dca815e1e2b9ab0a1fe22c833f9c7404fbba6a6bbe76e86d6b963ed4a49e739b225d568b7128a8ff SHA512 3c99f4a04f4b161f403a80fe3a8cb1264e01ceb07e6d4faadbabe4215fd8f9ab4dae236e4fa01b9237234031c676cd18db28c74e88c525ee19974909af8086b7
+EBUILD galculator-2.1.4-r2.ebuild 788 BLAKE2B ccd92ee6365b60b166e0a26e2a799c14d7c3f901fd0d87c8ed026708ae934c40e7564187d7bfdbef184d33ddf03f6964ca3a04db2d9d9227224095ac2161942c SHA512 1e0a63ee2873994b116b554da1f66eb7ba26e06b0b8686471cd4794f48790232db950cfe1179f60b32f898d364d1e86ed3c8e6a12ebd42a104331f28240bc0e7
 MISC metadata.xml 394 BLAKE2B 4fa1374c3ac91ea4c4212455d7ff63a35705444c3df485c6f327d6b5ebae90afcc345030c69e7a256759277f18253a20c3b7ff11036e0cd8ababa918212d9ce5 SHA512 fc850474030836be72c5a81983052b0af11312a3b3ef815b6b5eaf7a95a1b7bdbf5b1f25b5e0b2c32786b6fc5958993ff859bd2c9c818dc7df68dbecb4b61800
diff --git a/sci-calculators/galculator/galculator-2.1.4-r1.ebuild b/sci-calculators/galculator/galculator-2.1.4-r2.ebuild
index 25e7913ad37d..9c4543ffa3d2 100644
--- a/sci-calculators/galculator/galculator-2.1.4-r1.ebuild
+++ b/sci-calculators/galculator/galculator-2.1.4-r2.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
@@ -36,4 +36,6 @@ src_prepare() {
 src_install() {
 	default
 	dodoc doc/shortcuts
+
+	mv "${ED}"/usr/share/{appdata,metainfo} || die
 }
diff --git a/sci-calculators/hexcalc/Manifest b/sci-calculators/hexcalc/Manifest
index feb3a0fbecbe..0de5939528b5 100644
--- a/sci-calculators/hexcalc/Manifest
+++ b/sci-calculators/hexcalc/Manifest
@@ -1,5 +1,5 @@
 AUX hexcalc-keypad.diff 3715 BLAKE2B 347de906fa53ffdb9064e997a169e2ec31f519e0ed1d91e7e13c3681eef08abbbd8bce6ba8cd6d98dddd0e56b5aaf1073b1f9da16c2d208b7c6d755edf2f0cdf SHA512 812c6bd3b53a18a75b1ed553f1e58f6a08b48ba264787fa69f9577798b483797871ff47dd5ccd4c075989c9f9f6a6f00b7457deafc463b90e76e78e0507af259
 AUX hexcalc-order.diff 972 BLAKE2B 487e44a612c939879e168fbb67dea418c234197387923e58874e83e484166784ac7c6564b92bbb798b17985438f1d1a51bfe0dd17af223af6660a9e28269d406 SHA512 8a1049372f638822e7197ca56ee336d1b5ac4a0fcf24846705f14f80495c13bad390b7ddd5e43c84e47739521a5fab1a35c435125b4b919aedbd35c09ee583d7
 DIST hexcalc-1.11.tar.Z 18033 BLAKE2B 6f6c8102cd1a2ffdb325bc0805bea02d8e186bc3da7cda3dd4830882f384cfaecc7dc1d0fc8873718bc850f80010a875653864be92edd6519ae4fd5033e53498 SHA512 f684d6d6bd6df3f7f0dd626345d8ef166b12513bb378e74f8c59c2b92970f99c665ca32585217e75d55bf0fd93b5fc5c6a5b73e8b438f4821c13219f8ac74766
-EBUILD hexcalc-1.11-r3.ebuild 681 BLAKE2B e1b16ddd605c75ef5ee817951209f76c390ae013e4aa37e3616c946e84676f7c03d08c7c28a8e2f228fd61ed39821256a434bb6b05a28ffc3989103b4208c439 SHA512 b772b864bd457e5a57ee8be5c5a1366a45f7c77cdabb9089e691749dc6c88063dedc232ad29c9a8a75443a1fb022f1386db57bbce7938f73af86290cb07454da
+EBUILD hexcalc-1.11-r3.ebuild 794 BLAKE2B ea155173487a01e107d7cc60fbc7e02063f1cc4dd99560299c33675b15ddf335fe867b13f328a751adace1f30c3413365c1370ed9588815e3302dc76289e6700 SHA512 64280ed30fb9fadb6708cbb23d12fab5152e49527d6b00d3016216d08a0095447c799554fb41c948da0c374767e2f6d131b9de5fcce23a3ce57247e232741044
 MISC metadata.xml 253 BLAKE2B e769e1636e1375309c31bf26fcfdcb1ef46b7a69346fd59011620907237204b3b7ced37cb3450c502f5b19aa1adf36f291412ee47e242ecbfc18c26bfa478f42 SHA512 819062e1ccefa39fc7f577279b08e781b9631eb14b7794db691ab92263c013ca432d279ac08671b19c80f7effb8c67528e5221278c573dd29dc0354bbff4a77e
diff --git a/sci-calculators/hexcalc/hexcalc-1.11-r3.ebuild b/sci-calculators/hexcalc/hexcalc-1.11-r3.ebuild
index e76181650805..c9740ad088e8 100644
--- a/sci-calculators/hexcalc/hexcalc-1.11-r3.ebuild
+++ b/sci-calculators/hexcalc/hexcalc-1.11-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,15 +16,19 @@ IUSE=""
 
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 	app-text/rman"
 
 S=${WORKDIR}/${PN}
 
 PATCHES=( "${FILESDIR}"/${PN}-{keypad,order}.diff )
 
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+}
+
 src_compile() {
-	xmkmf || die
 	emake \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
diff --git a/sci-calculators/pcalc/Manifest b/sci-calculators/pcalc/Manifest
index 30ea3464a3be..49ec9dd6ec27 100644
--- a/sci-calculators/pcalc/Manifest
+++ b/sci-calculators/pcalc/Manifest
@@ -1,5 +1,5 @@
 DIST pcalc-3.tar.xz 66908 BLAKE2B 40473405f564d5dc5fd43f6f7fc4a80d41d7c9b09f8f6915408313aa45ecaa860b27debe0131fa0450b9b62a7ed4157bc433c7866910211551c6b159113cecc3 SHA512 55b6644300a8eb5224df5a0885907c10847df7ab6296d012eb2bb638876687ddbe23d5b76e31ac6ff4c159e44940d5cf6ba747f2a410943fdc25c9d9855fd60e
 DIST pcalc-4.tar.xz 68948 BLAKE2B f7d17e3ebf76aeccd9b7c74fe6ecfa7de94d8450d302e3b094b57f4050e0be2448887ea131496ab00ee140d0a44b0dd8d5b5564feb8fdc47d2fbbe5010af73d9 SHA512 6492ca89c5f60549f9388d8b7edad21c1c912feea0ee1a1271d730a63832c3b562b1a6bc9f69a0bd3118407906646c8d8fbed6c6d9a62db6a6bbde22579c1fd0
-EBUILD pcalc-3-r1.ebuild 566 BLAKE2B feb0555eb9d81d6c7abd5aaba563440d44c0558ee472f910228849a60415ca508a87ae71ba0623f83d3337aa184306b776a9a5d833618c3dcec594f0d0502971 SHA512 95c50a2b61b974de0c7c5da0bdc91bf9aae1f61ba681ae897bfa9a7d153bf9a1bfb72d18ef86b51b1c799adb803256f04f6ad6297f9b7f5a350c330f87975078
+EBUILD pcalc-3-r1.ebuild 567 BLAKE2B bffe0740f9c9c0b56d60f32247cf43574d6385bcdc905fdf4e015be0b8014ddd75217347bb701b18668517ba4e71a9538a8e698de015ae2eceec8c3e6645c9a5 SHA512 401fc19c238e642aeab0e1e33f3edc42bbb408047e05ca58d908f7357ff352e4d7f9906d661c15c959dc8a74c47bc733a22b537b358ecedea47ddb123abc5d75
 EBUILD pcalc-4.ebuild 574 BLAKE2B 48dc569394ad21fa72897e882f458e63702932079dcbf3ba555ae081b30de8756a151f6bb25a2f00566e09e6607af5cbf3c92c48563ec815f88816a96d4c9bbd SHA512 7493319098c26de588cc54e6d9887f4949108f9e57f92e8bece7cbf080fc28265c03dffc766b0005cba756090cab956364b1fddc0a6169c34f13740b6031df15
 MISC metadata.xml 380 BLAKE2B 966f815d92d6c5680629d5bb6bf5b6124aa1bf6a747d914c94e66148a6e7d8b53e9931e56436a99d0ccc5bbbea1cb6e2a0bb3054fa31a4dd6f7fad54f279893f SHA512 45ac8682dd7d9e8c414354090b2733f3c715e9b76db3ab3e1e852282bf460f3a6881626d49c73b7975fbc238485ed38881187dd4c392469108bad1b15022465a
diff --git a/sci-calculators/pcalc/pcalc-3-r1.ebuild b/sci-calculators/pcalc/pcalc-3-r1.ebuild
index f514c1693805..3c4fa225091f 100644
--- a/sci-calculators/pcalc/pcalc-3-r1.ebuild
+++ b/sci-calculators/pcalc/pcalc-3-r1.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="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pcalc/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="sys-devel/flex"