gentoo resync : 08.06.2019

30 files changed, 255 insertions, 205 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index bd3da4c520ab..7499c193bd00 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 6e4eb41d8ca8..6b39700a4bd9 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,5 @@
 DIST bleachbit-2.0.tar.gz 886357 BLAKE2B f63ded34d245df892b2c14683ceaae8b57e786a8ab3111e7f76d484c6d3db404996119ab4114c3ae025848936a784878b3f100cf2ca8737401a6daaaf74a077e SHA512 adf5c2f2382b2eaab0eb2b4a173b392c160af7974f223c74ae51a30423514a15b98f04194b9ccde209b5c067d8481f0f1ee28651896d3002fcfa3927d8db056b
 DIST bleachbit-2.2.tar.gz 1100913 BLAKE2B a16e63a2533f9d9c385d384e2fd65dbb32a8f064e769f99e8a8cab9c4069cc7b21e6896c5fa8d02d8204e8c93da8a5f66605601eb44ecc354d41f1a6d9fe2d0a SHA512 c7661cc64358a6420768c3ee1a6ec97d2fd4f0bf67b393be045ef79cef8b3f8cc273a51a5dd7c79d89b8a14cd1357f7714fc860addc9ae74af48bd8d427b3a5a
 EBUILD bleachbit-2.0.ebuild 1207 BLAKE2B 101fac851806c9de4e20ef8290ff65d5d446f1400bd2f4025d65398d186683df19783bc72f8eece15962dc6f2ecc97375686304d8c187614653aa865f75f7b02 SHA512 d52074b5842dc0fb44610b7fff374ec25855a4e19bfa58f1b8dc709b0b514bd497ea39e7713c2e3f42db8efbb1975ac8f7c763eda0b78e2f01ffa51d63700882
-EBUILD bleachbit-2.2.ebuild 1194 BLAKE2B a5fd7b73e02177b448ed028ea78b64269f04e0378da4e71278ce40b413b0631c0e54a6b980d00854c6a05fe723ae87b012a592e5c889283b6b4928ad63b74e0a SHA512 3f323798258a92bc63120db00ab9db90a50f5142f52afa186970e6e87419af351f3847277e413e97e2d1ffa87e8a791ce7a9177ba42a3bb538543cd90445cc23
+EBUILD bleachbit-2.2.ebuild 1192 BLAKE2B 0bfa92eccb8cd0a08b482870ebfc68bbe09c576d2cb6d2001ca57ed458ef7a3b8e6f9fea3cfd1db07a530363042d3db40bf96e96ad03fd08fc39ed18f6ac9116 SHA512 ce6a55df1b36909d55ef369b4ad61b5097cd3a86702dc9c5606b78386ddbdd90a8048a3d0aedf82955fc025907bc7698949fcf10b00e47ea65a40ea597b327e0
 MISC metadata.xml 526 BLAKE2B f55f30792d579d5fc57553b3aa8a8f97d450778a1813c53e82a0fea4cc01fe3039d249ed89c8097a973c1bd923390e3bd1b85ae1a1d2386ab3373a9baae08623 SHA512 d2179dee28e6bacaa540039b726eb5ab47b87abc73a5c86621de3230f3d6355d082e8189c9e167871fb8c15975815341ce02bbef80195b984728c3b1b0652bf1
diff --git a/sys-apps/bleachbit/bleachbit-2.2.ebuild b/sys-apps/bleachbit/bleachbit-2.2.ebuild
index cb4c5a71633e..79c60771348a 100644
--- a/sys-apps/bleachbit/bleachbit-2.2.ebuild
+++ b/sys-apps/bleachbit/bleachbit-2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gtk"
 
 RDEPEND="gtk? ( dev-python/pygtk:2[$PYTHON_USEDEP] )"
diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest
index 11965ce4724c..4f37cfbe05ab 100644
--- a/sys-apps/collectl/Manifest
+++ b/sys-apps/collectl/Manifest
@@ -12,5 +12,5 @@ EBUILD collectl-4.1.0.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af
 EBUILD collectl-4.1.3.ebuild 884 BLAKE2B 40f696fae933f20b5ec6acb5ab2d5fc465431b343925b01e84978febbdcb62e49e5c4cf7a8cea199757a9d7b3985bcbd4d1092c0a64ba136bfc5bc9f477b3283 SHA512 928f5c5e0df737b8805664a308dc6eeb678e2d44d873a61be1926dfca245dcf4df918b1dc7bb9b45896e55ae0ca47823605a3b3a1ea0b8e5aba2c49926d7ff4b
 EBUILD collectl-4.2.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
 EBUILD collectl-4.3.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
-EBUILD collectl-4.3.1.ebuild 837 BLAKE2B b65a06fa40c461ac56a7121a6d1e61f82b97d2cd8f2f758d497e56f35cb79118a4c8e7190a7a9de65c0ea7b33d5c6b3be0305fd8a3a843f6c958ea02fbe788aa SHA512 c51f80b8d61b7e006672df60f1c23f3e705db714744d2d9f37cb146ad195d1a86da126861f08eb35a8e516d6bfe44d37b9624068104bea9806a468191340f2f0
+EBUILD collectl-4.3.1.ebuild 836 BLAKE2B d95a4cdfce78f2b12542ae7823e27cc1d6d629e410257139204bab6596aa0cfd74709e54165880094b845765985ba80ccd769254867f721f53d5cf7e00a442da SHA512 739ab62d85b653455478e188ef7925010158049ca3ec99d7ed8a90da07178a7023f29e358ed1d89fdb205a0f22548b3ebe73a19ba2dc2df355c89b4f18165cff
 MISC metadata.xml 328 BLAKE2B 88e0f5bbcfc780806551d88a862ff5c86b82f874f77f5c2f7e90fca7dc2c1b177f9c1c11174cb67b48ccf4cf3a3467ac61e56dc4e462cde9bca217ab071da363 SHA512 2eb88e764d55e93183e030d0e4e2e99a53d4e26855e234f47077e812e1108aaca4b44bb7af18f04cebf9b366a2a991e844234c0af9c719399f1c836b091b8622
diff --git a/sys-apps/collectl/collectl-4.3.1.ebuild b/sys-apps/collectl/collectl-4.3.1.ebuild
index 9f1956434ec6..c566f12e7863 100644
--- a/sys-apps/collectl/collectl-4.3.1.ebuild
+++ b/sys-apps/collectl/collectl-4.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
 
 LICENSE="GPL-2 Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 x86"
+KEYWORDS="alpha amd64 ia64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.8.8
diff --git a/sys-apps/ibm-powerpc-utils/Manifest b/sys-apps/ibm-powerpc-utils/Manifest
index 746a60ba573f..0a36defc01f9 100644
--- a/sys-apps/ibm-powerpc-utils/Manifest
+++ b/sys-apps/ibm-powerpc-utils/Manifest
@@ -1,5 +1,8 @@
 AUX ibm-powerpc-utils-1.3.5-docdir.patch 265 BLAKE2B 2ec9b24404a6e6c78a75a8a29a002eba6b30180883a3cc0ebd3610d202188ec6aabfd2830eacf42f9e8c57c961f6aa097a12bcc92d04fd85ade63e3ef083257f SHA512 69a6545e1e29778d4ea31c7bc90be678b8f78c1d897f6bfa9a2f8ed3b223d4b5894663ffb10dc409c334754152c1f28a0c0d7a1991c65186488116a1cd983aa8
 DIST ibm-powerpc-utils-1.3.5.tar.gz 318046 BLAKE2B cb154dd6203aea2f95c8cce96e3ea5f40c0c4d9f8c649c988d0d66adfc475bb15764554160faeeebddd5569de39502c149bf93f08fa433e8e309498fff59cae1 SHA512 a01f8fc45abd91d0629f8f48e3c2877a863aa1f244907bb65fcc457c2c933e7043181666c237956723f956b7c3d7ce7a0cedc36eaf26ce3cf777aa8f0525244d
+DIST ibm-powerpc-utils-1.3.6.tar.gz 320582 BLAKE2B cce656ca7eefda3912f26c6df99112ceef831cac834af4edaf507c28c63d6bbca0d6ae0dd096474b7d3ac45daffb37dbc1068cb33b83f676922e4f27ca46ae2e SHA512 a30516ccdfe19a198cd5c1a7ad3646d15b599fb40f772cbc7ac95c6d3b364575a3ebb16708022886ba3bcd3184070a3f4d72b649427879fcdd2655406470e977
 EBUILD ibm-powerpc-utils-1.3.5-r1.ebuild 727 BLAKE2B d5958f614d3ca69504200a36d9b7bfd4d5f9d8b7462c20ed6a3d794fa7a8333ac57493530a7fd5a15b420dc28af16ee961c7d5970c2d95f63623be6a221fdf08 SHA512 4de5262ca50752af6474abf137f859ff7d0b3fdc604f34713446c998719a70a83a13b22f05629822dd89bb3bef291929ac4a76b8569311eeee70c9f253a175e9
 EBUILD ibm-powerpc-utils-1.3.5.ebuild 681 BLAKE2B 787ff813b26d9c29c0620906dabe88ec8f05f246ad0452d506f0a6205f5fa22be15775773ac92d5163ecdb44ea6bbfee100d446f79bcb23b00f52c5d6911aa80 SHA512 ab7c70d113eb8922251d8d455afda1ee22f54d6c5493c710a15c6f436b907c258dce3ced75d6f618011877fef2e24aaa5b6ee8c92a20bcd78a237bac25bf6633
+EBUILD ibm-powerpc-utils-1.3.6.ebuild 720 BLAKE2B ba6938a6c17d19e4b207bef8a768a4f4874e319a3167858725296cb07f3c5bee40d61cdfe1f0520d8995413e53027e2825e46ab947c5d8282815f4afd64ef947 SHA512 373c8a77f3b545df3d5044f794f9f0754bd537fad851bd41f8c0f2896c39272143ffca6af3411eedba8c6715fa67c3509b9784b5ae987c09dfa5c74d128b47d6
+EBUILD ibm-powerpc-utils-99999.ebuild 619 BLAKE2B 0af4588dfa5d37dfa6d7300d40e9431a0c0644b9bdfc184f9559cc4043e5003520f483388b7ec217ab623a4e62d58af20e2458bdf6d0616ecc1975eece2c4342 SHA512 67b5061004b0084a8c4600ff6422ecadb3c72bc9146a65554598acf8611209f64efa6c0cb94ccf6c0b5688ef4d309d4ae174790b479b0847266413ee8d7cab54
 MISC metadata.xml 445 BLAKE2B 959df80121329addf838d5f9e087b0f325cfb7103e961089bbe019f6222ab43ebeb097280e57ff88baafd3b0bec5943158beb1e258e892f0dd5794653f8d4516 SHA512 8b125cee61a590d597b86ad8cb744725c8fff2cb2e5606ca9db69492dec4ff8ae4b1aa37b438e332ccea15be76834890ca835d6d18a652b043c30158e20302e3
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.6.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.6.ebuild
new file mode 100644
index 000000000000..a7cd32918d9a
--- /dev/null
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms"
+HOMEPAGE="https://github.com/ibm-power-utilities/powerpc-utils"
+SRC_URI="https://github.com/ibm-power-utilities/${PN//ibm-}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE="+rtas"
+
+S="${WORKDIR}/${P//ibm-}"
+
+SLOT="0"
+LICENSE="IBM"
+KEYWORDS="~ppc ~ppc64"
+
+DEPEND="
+	sys-devel/bc
+"
+RDEPEND="
+	${DEPEND}
+	!sys-apps/powerpc-utils
+	rtas? ( >=sys-libs/librtas-2.0.2 )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.5-docdir.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with rtas librtas)
+}
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild
new file mode 100644
index 000000000000..de8638eefe23
--- /dev/null
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3
+
+DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms"
+HOMEPAGE="https://github.com/ibm-power-utilities/powerpc-utils"
+EGIT_REPO_URI="${HOMEPAGE}"
+IUSE="+rtas"
+
+SLOT="0"
+LICENSE="IBM"
+KEYWORDS=""
+
+DEPEND="
+	sys-devel/bc
+"
+RDEPEND="
+	${DEPEND}
+	!sys-apps/powerpc-utils
+	rtas? ( >=sys-libs/librtas-2.0.2 )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.5-docdir.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with rtas librtas)
+}
diff --git a/sys-apps/idle3-tools/Manifest b/sys-apps/idle3-tools/Manifest
index fb75402ba1fb..8c455d2639c9 100644
--- a/sys-apps/idle3-tools/Manifest
+++ b/sys-apps/idle3-tools/Manifest
@@ -1,4 +1,4 @@
 AUX makefile.patch 951 BLAKE2B 945ce0da10772695815b4ee6620dc27faafe232f696e3a11fa2e3f172b8e51095dfa2e034fa8f870871f9f0bc000b9aa7a1ab22659f6b0641b6223e5f87524e9 SHA512 544dfc040211706ca15272625ac95c876749670a6d7919e37651bb076bf7911682943ea621c6022e7a216c8fbe434f9fc74c44e3c737489297541bf2d8d29d3e
 DIST idle3-tools-0.9.3_pre20120123.tar.bz2 19842 BLAKE2B 09095a1382e116c6171cf38c2d9cbdba32e38b3890f5169ed966b707bcd27f70e78efaef8c3500499fc261347c1cc228a8b39d910d719451cc11cc40fcb71b1a SHA512 309a6e500b71d64d569729f44b597fd218f983b9018373a4871a62137b32bd540524b757648fe9e873d949de772f26428cb82d16b367212e6d1fb592aa7bfbf1
-EBUILD idle3-tools-0.9.3_pre20120123-r1.ebuild 457 BLAKE2B 5b814451cddddc60dba2270ad595380331de52c948cdb75ee80b71d1950d18737f64ba5a24d12a379c206886ec96431a4d339a2a4af43592bcb46b418b04de77 SHA512 327aed77725bff2f43d87be7bf080a950b6de36b45c0a30aeb128140ebd52945c7c616e7105b9e065a7ba8377189ec5651cbe75aedca0dc402e0feddbd199627
+EBUILD idle3-tools-0.9.3_pre20120123-r1.ebuild 456 BLAKE2B 954d74938dd4e552a902becab3cb668ee12df6760c1062735d49ef3ee7a4766fbb22088dc3e4e6565b8d7ac132b8887abc14cea7195d6fccb99a558d9e7d4da5 SHA512 d5dc866ed03f67e925aae40ee6db3a346fc919c3bd4686002ab5473b9477a95c9af64beeb2c8298fd826e9e681e1be68355105f343619c82792d6872696842ab
 MISC metadata.xml 952 BLAKE2B e4123a25039cf4653b5e0818fde19ad2827923f013b0ca8c345f2ed204b9e0a38e49da2185c42b8507b5c053801f84ebce62ce4efd91d7bfdd302ebbe5c94632 SHA512 a7e419e6421ab02ad87c430ead433738aa3043249deb164e51b81674661fd4b8edaf9da11b679cd098373f5cb627a95979525c0bfb8d60ab8b691fd541e3a061
diff --git a/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r1.ebuild b/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r1.ebuild
index 0941e99e3fda..c9e89fb8094b 100644
--- a/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r1.ebuild
+++ b/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 PATCHES=( "${FILESDIR}"/makefile.patch )
 
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 3d14447c5577..7c5cb23ee659 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -4,7 +4,9 @@ AUX logwatch-7.4.3+-openssh-hpn.patch 885 BLAKE2B 2a381c8b321ae4e545e8620e1ad3ad
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
 DIST logwatch-7.4.3.tar.gz 462552 BLAKE2B 98ecba949d9fa2737da6b22ff2cced14d384ff4f119a7a8e613a66869102ea76ce1093ef5f0b38e6d4e948a8e9e0dafe8b4071e028c5f5f5be2ee48e9b1f186b SHA512 716d87238f487010f2bdf230fc66c16f3c3fe769e6bef04b0e7881c6b0563e1a4b4741235b8a40a16ab21d3803562e87e6bcf5cfbd0ace42414f1d1feae7a13a
 DIST logwatch-7.4.3_p20171025.zip 704529 BLAKE2B 12f4e34d9cd044f677b1b4cbe473c425e9b3ab2f222e781a0a3df95b9cbc088cf16321ccd67ec9acaa4c21b8da3deac4d58d84cba2259b272717337c5c87c3ff SHA512 aeaf57aa8d4e89b716766bf89a6b58dcb18f1ba6de864b913d93474f784f382e322b6dbfdf9671c8b91404d399d770146ead9959b1202e91b4672e70f6abb268
+DIST logwatch-7.5.1.tar.gz 469715 BLAKE2B 706352c60370d13b4f72047d08965ab0dd36837194a03bf44e08ec43641eddb8d80d655c783d4f25c8fa757853a4e069997b80676b781561c5e0a23b44a393c9 SHA512 945e66192a9e198169426497f7b5167fcbec2af9565dfead728aa91bfdac5f7e1b2ce2f5f404b6f03841fe6b978f70fb969b47d4f60f02f9a8ccea865c5c782c
 EBUILD logwatch-7.4.3.ebuild 2054 BLAKE2B e7ae5b810b3bc55e481fa4dbd35c923f3c8737b14aa2c52e166c86dc55165a1977a21b33d2e8c518f21f24ac16f206263e5ccc0ce4655bbdd17fd1d03faff755 SHA512 975fe721a5bee017d9da2efb98914749ae4f6a1a52e0563dedab92cf6c5b029fbb2b0ce880849f3ea143796cc06dd7001101ffe0fede0d07ffa6597dddd5fd69
 EBUILD logwatch-7.4.3_p20171025.ebuild 2836 BLAKE2B 8a7aad2786d4c7509e60106ccc5e00949416753103d986921f7964321972cf3cf6500e1a76e0570b5c71f63290774b718fe34b89aa3e69650c59e570a2f4f624 SHA512 0979e2451fbadb4a60f6c7b418dc31e00fb1d825f818ed13320225e8f026fa8cbf4ac90285dc16c78f4964ba568c53826b91fedc33f0923d7b42bd33e456ce45
-EBUILD logwatch-9999.ebuild 2430 BLAKE2B 02706b7a5c947f58f5d27eb3df8cf6f6f146b9943070ff22dd9015daf64968d07a6d9338b3718867e214fe971c5647e106b3c624d7b7bae60d4c3b67cc9bfb0c SHA512 9bce4d3643241d6214d0dca3290574e1fcb7fc560ad2d4e55d889b6faa72b09a51b1f921db8e7a1c95c7ade42db21b8e512402ddb10344e09784d1a4307478b1
+EBUILD logwatch-7.5.1.ebuild 2430 BLAKE2B f0273cf44e1c7abe6059bcc3ce949263a4cadf57e1e84c46b7255be4d64626b1520b45e85762c3b0bd56f5750165762bbb1a15ce1b28a6967c375736be0b3dec SHA512 312d6634eaced0149f9d6a70cc62241f2273dc4476db468e1d71a19dbde7f8ebcd5e542a41c0fce78313b902d1a5858193e5e624016461bf9d5c6e14d5bf8a21
+EBUILD logwatch-9999.ebuild 2430 BLAKE2B f0273cf44e1c7abe6059bcc3ce949263a4cadf57e1e84c46b7255be4d64626b1520b45e85762c3b0bd56f5750165762bbb1a15ce1b28a6967c375736be0b3dec SHA512 312d6634eaced0149f9d6a70cc62241f2273dc4476db468e1d71a19dbde7f8ebcd5e542a41c0fce78313b902d1a5858193e5e624016461bf9d5c6e14d5bf8a21
 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7
diff --git a/sys-apps/logwatch/logwatch-7.5.1.ebuild b/sys-apps/logwatch/logwatch-7.5.1.ebuild
new file mode 100644
index 000000000000..eefc16389fc7
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.5.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit tmpfiles
+
+PATCHES=()
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="http://www.logwatch.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/cron
+	virtual/mta
+	virtual/mailx
+	dev-lang/perl
+	dev-perl/Date-Calc
+	dev-perl/Date-Manip
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo"
+
+src_install() {
+	dodir /usr/share/logwatch/lib
+	dodir /usr/share/logwatch/scripts/services
+	dodir /usr/share/logwatch/scripts/shared
+	dodir /usr/share/logwatch/default.conf/logfiles
+	dodir /usr/share/logwatch/default.conf/services
+	dodir /usr/share/logwatch/default.conf/html
+	keepdir /etc/logwatch
+
+	# logwatch.pl requires cache dir (bug #607668)
+	newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
+
+	newsbin scripts/logwatch.pl logwatch.pl
+
+	exeinto /usr/share/logwatch/lib
+	doexe lib/*.pm
+
+	exeinto /usr/share/logwatch/scripts/services
+	doexe scripts/services/*
+
+	exeinto /usr/share/logwatch/scripts/shared
+	doexe scripts/shared/*
+
+	insinto /usr/share/logwatch/default.conf
+	doins conf/logwatch.conf
+
+	insinto /usr/share/logwatch/default.conf/logfiles
+	doins conf/logfiles/*
+
+	insinto /usr/share/logwatch/default.conf/services
+	doins conf/services/*
+
+	insinto /usr/share/logwatch/default.conf/html
+	doins conf/html/*
+
+	# Make sure logwatch is run before anything else #100243
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/logwatch 00-logwatch
+
+	doman logwatch.8
+	dodoc README HOWTO-Customize-LogWatch
+
+	# Do last due to insopts modification.
+	insinto /usr/share/logwatch/scripts/logfiles
+	insopts -m755
+	doins -r scripts/logfiles/*
+}
+
+pkg_postinst() {
+	# Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
+	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
+		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
+		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
+			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
+			|| ewarn "You have two logwatch files in /etc/cron.daily/"
+	fi
+
+	# Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
+	tmpfiles_process ${PN}.conf
+}
diff --git a/sys-apps/logwatch/logwatch-9999.ebuild b/sys-apps/logwatch/logwatch-9999.ebuild
index 971e5d621f38..eefc16389fc7 100644
--- a/sys-apps/logwatch/logwatch-9999.ebuild
+++ b/sys-apps/logwatch/logwatch-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit tmpfiles
 
diff --git a/sys-apps/onerng/Manifest b/sys-apps/onerng/Manifest
index 6b960d131ac2..828443351ba1 100644
--- a/sys-apps/onerng/Manifest
+++ b/sys-apps/onerng/Manifest
@@ -1,3 +1,3 @@
 DIST onerng-3.6.tar.gz 108126 BLAKE2B 717fc2b795aa991fdca28e2032da0a7729c487cb684361799421f806f60ae4cb70e8d29cd72de2eec9bdf38e4bf1d530261fc19bfbee6e95360a7648b8a45858 SHA512 d2f2bceb458e1441c4321526e5477ecb26df9f84e8554df723b97c3f09ad4c04149ac844bb88a182abf5350566cd5762c35137ba3c6b71685671a69ba12ccc58
-EBUILD onerng-3.6-r1.ebuild 745 BLAKE2B 04a0c6a5ef21754f4803729b089d2d0125ac1b7d19177487f3f9469f52978ed04874f8cd43452a29a4073ac48f8ad55970947e280abe367f285a9f92059e6fbe SHA512 fda21c90fbd856d0422e15bba6faa8df7f876412eba52333f2d2b9000458be43281a6a683a94060fd9c091abb2bc0a47d1e9f964b528fc2ed02d77d2760ded24
+EBUILD onerng-3.6-r1.ebuild 744 BLAKE2B e5ee1f17acac8c343dbcf64f73ee41193f2942f0e0de953d5a6e9db26769a87a49bb16c6c6f6cebe6933f7a957415dccf0a422ba5725a16a0714a0653b1b9155 SHA512 a1591d8bf1dadaed0f63fd981ebdf0a2cd613c2866212cff69746e5d24e91a9b091666a3453c8dc3a65806591dad17cad7e27ea5e187d936b0bcfcc9d67be314
 MISC metadata.xml 834 BLAKE2B 8aba260b830ee41c11c1e843ecfd3130768366ab46a89b838b8c846c48699e0e570d99005d775d8560f4de179a4cf6ef0833294ae1699faabb550a1c0862585c SHA512 8fe1f05b03c98ee95f3fd6d81cb52165d96a6a8385b9c988a667f9b0f714875bb3bc291706ee5e53daf022c2cbd4d16f52bf4e7abfafa94d9cd0481ebb58fc1d
diff --git a/sys-apps/onerng/onerng-3.6-r1.ebuild b/sys-apps/onerng/onerng-3.6-r1.ebuild
index 918f7245cdbb..21cb0ffbf449 100644
--- a/sys-apps/onerng/onerng-3.6-r1.ebuild
+++ b/sys-apps/onerng/onerng-3.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/OneRNG/onerng.github.io/raw/master/sw/${MY_P}.orig.t
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index 6986a0473a30..a73386f370f2 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -2,6 +2,5 @@ AUX pmount-0.9.19-testsuite-missing-dir.patch 1354 BLAKE2B cebe20a80f929f1104fc8
 AUX pmount-0.9.99_alpha-locale-regex.patch 749 BLAKE2B d1e777c57ba8b261f6fdf461200a980149b417022dd0fb78cd1f366be2001850956fede8677859a952c9b961668488f8bb2ef0302816f72e41f71b0191d3b336 SHA512 9009544a6d424dc6449d8f1ba53521802741b904129e1f4cd729a1051735fda3d6fcfe85d5aa49f6fbc5df62abbcb21fd7ab578cee667efaf3e4c00dc1b8131c
 AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924
 DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9
-EBUILD pmount-0.9.99_alpha-r3.ebuild 2018 BLAKE2B 68a02931e5df37140b5afbf5d1059096e7c329d395ed8684042de47d2b192a055338cc11ed79d63ea30f60fb976ee878c9da3a9939791e5c5a4505a5852c067e SHA512 179c2588a00cb8b856899f99078dc21970664407f5b1fb278b91733577d72687429986270db4ea94dcd7cefbfbf9f886be3884a5a1fb4baa3e0d39cfc6a32b06
-EBUILD pmount-0.9.99_alpha-r5.ebuild 2124 BLAKE2B 2073f3ad217e3363e5975a5de8aaa0ed6ac8986ae2e1bb03ced2ae89769c9754e808ff78e4d326f45bf31f95f766eb97c19f93b59f43fb92b1e9f7c2bf830095 SHA512 2de42f2e6b51de2cd968342fba847af8c12aab377065aed9fb7baf32bdfa64235165717f041f3aa82a88eb536dccadf064158bb4ba766c36dbbdea15ea5dc741
+EBUILD pmount-0.9.99_alpha-r5.ebuild 2123 BLAKE2B 445da8ad07774a1755a544fef6f4e749ec07f74a1c0355d3812ae28cb68f47817312bf0d19b35700be276bc372143845eb2d29761e0c03276b3197b572d2e384 SHA512 380fa21be7f0f51bac4b9f374652664133dd3d6177533fefca1ad308e56f719a9b939a18b8e51485cbeefc4478493101ab2b0c6f978f9b94f155951516d13dbb
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r3.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r3.ebuild
deleted file mode 100644
index 7f24b703357e..000000000000
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Policy based mounter that gives the ability to mount removable devices as a user"
-HOMEPAGE="http://pmount.alioth.debian.org/"
-SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV/_/-}.orig.tar.bz2"
-#SRC_URI="http://alioth.debian.org/frs/download.php/3530/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
-IUSE="crypt"
-
-RDEPEND=">=sys-apps/util-linux-2.17.2
-	crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext"
-
-S=${WORKDIR}/${P/_/-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	# Restore default value from pmount <= 0.9.23 wrt #393633
-	sed -i -e '/^not_physically_logged_allow/s:=.*:= yes:' etc/pmount.conf || die
-
-	cat <<-EOF > po/POTFILES.skip
-	src/conffile.c
-	src/configuration.c
-	src/loop.c
-	EOF
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch \
-		"${FILESDIR}"/${P}-locale-regex.patch
-}
-
-src_configure() {
-	econf --disable-hal
-}
-
-src_test() {
-	local testdir=${S}/tests/check_fstab
-
-	ln -s $testdir/a $testdir/b && ln -s $testdir/d $testdir/c && \
-		ln -s $testdir/c $testdir/e \
-		|| die "Unable to create fake symlinks required for testsuite"
-
-	emake check
-}
-
-src_install () {
-	# Must be run SETUID+SETGID, bug #250106
-	exeinto /usr/bin
-	exeopts -m 6710 -g plugdev
-	doexe src/{p,pu}mount
-
-	dodoc AUTHORS ChangeLog TODO
-	doman man/{{p,pu}mount.1,pmount.conf.5}
-
-	insinto /etc
-	doins etc/pmount.{allow,conf}
-
-	keepdir /media #501772
-}
-
-pkg_postinst() {
-	elog
-	elog "This package has been installed setuid and setgid."
-
-	elog "The permissions are as such that only users that belong to the plugdev"
-	elog "group are allowed to run this. But if a script run by root mounts a"
-	elog "device, members of the plugdev group will have access to it."
-	elog
-	elog "Please add your user to the plugdev group to be able to mount USB drives"
-}
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
index c4a9fda505b5..910f62d410bd 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV/_/-}.orig.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE="crypt"
 
 RDEPEND=">=sys-apps/util-linux-2.17.2
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ccbb7ceedac8..e7544a17ce55 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,7 +5,7 @@ DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B dc378b714101b287fa33defeb778e586da83
 DIST portage-2.3.67.tar.bz2 1025172 BLAKE2B 4557f11eca511766532214630b948f884149a6cae2e7110813a2a3700be448c057500c1708daeca5419e4bcdfcdf4a26e8002a2437f5c0a7731e20d201124021 SHA512 921b8647bd6cb879320b5ca3edf42cbff1e64bdb13a922a4fc2be6e2868dc94966734c1c2b508c75552b95f7e9b970a2ec8f93d02602ce6c351bd700613392d9
 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c SHA512 0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12
 EBUILD portage-2.3.62-r2.ebuild 8240 BLAKE2B 929e062620f7e1e6f6fbd33940341e81eef5c18b18898cc8d5ecc942b15e97b77833118a63fbc146d486f2d3e4a6a273d1998f145e0603380489d895f7d35470 SHA512 2875ecf940c0b413ab50daefeb04e74a7436a0d519a1746f0fe58c4e69dfcbfc7bb803435cff8418c38491e154a56335bc8833670548c05fc90157518a44df19
-EBUILD portage-2.3.66-r1.ebuild 8237 BLAKE2B dc383ccc99383d6bae6d1f9c6b9df81575818738b147ba322d3164935675d0ee8265d5257e0b4662af6bf1b3c2a6536ad82666f0004a90eca2013c1612160e52 SHA512 bebdc7d49bc5d831799d7741203e22736ce03f613c2e150a3461699ef23f36005e40a30a31fab8b5e04cc40ef3f62f0e5fe6d637a234f06bf3c53103ba002be5
+EBUILD portage-2.3.66-r1.ebuild 8236 BLAKE2B 267d95be18d526d497840eee77dbd566150791a46927aba5a0ae56d3024999a54c57d47248bcafaab919d0571dfef866757bba0ad9ef3cebae78f86da7224291 SHA512 c81b1b8c7cf3d6a0ed0705e75aa876bef05f6c0161adcbd33bd26c76909c74375138bb2c15265c8d6030b594e73ed74fb873fb81dd455ef5bb8424f8184f6381
 EBUILD portage-2.3.67.ebuild 8050 BLAKE2B 599ed6a44c6fb522b30a439610bc210df555065d7ba080683bc54ae86662385fb637e20e71d2142d1e45fe48e68216d74afc24da46e77d6ad6e3004636f2e6d8 SHA512 4edabd7c51886fe033a5cda8096c664e9712e624710d72029064223ab228ccb8a4021f52f20f4d436da8702edf5234d40d1d92f04593cb2e2f6f171f1a7541f7
 EBUILD portage-9999.ebuild 7909 BLAKE2B 1116fee5fe17096e2a5b33cce164c6dd8e1f7a8cb04716e0218d001df4a09e957541b8267f0bf92e2b7f80a868aa0aeb081a4f83d8fa9529e619e682b8f4b480 SHA512 8b0b42bf555c092fc43aedc3c38f9eb78f7ea77b315dda867aacaddae4f7eba05434accfad2aa91e4d1a31d9ebeb9453483d3a5d6e5cdb785bb4c30ef6aaaa79
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.66-r1.ebuild b/sys-apps/portage/portage-2.3.66-r1.ebuild
index 1a381bdcdbc7..b6a5c9a8d0e0 100644
--- a/sys-apps/portage/portage-2.3.66-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.66-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
diff --git a/sys-apps/powerpc-utils/Manifest b/sys-apps/powerpc-utils/Manifest
index 375d8f6b19a3..1a7ecdb79819 100644
--- a/sys-apps/powerpc-utils/Manifest
+++ b/sys-apps/powerpc-utils/Manifest
@@ -1,5 +1,5 @@
 DIST powerpc-utils-cleanup.patch.bz2 7255 BLAKE2B 9a82fccd717072ff2065e0257df66f9f151dea6968fa9ae8c8d70686246b890d53cd36f7280caf333f4c0d0dc4afde280304822bb050c23f0c0009398a48e908 SHA512 7ed3202f0ce1c78f9fe37f1a37add40f9a54b287318312fa50874e5d6cd14e0feb53c8f802fe821e62cecd9cafe292b0bcd05ac6e7eb3df7bbad5f0053763154
 DIST powerpc-utils_1.1.3-18.diff.gz 27252 BLAKE2B f9302fc7f01086746b008f92fab1773f22edc43d2665c42d194e14a8d3e16e5947f72507d20e0d1f1e1360a5f3b74e0af11e9a176ba9eda8c28a7ed61653cd98 SHA512 b9995113f98e5660464c89b2a0e4893433deb58055a286137a199eb25bec579eb14ae251b70ac35e8b7656c4471492611645f5640061be923cb528e6e57e9824
 DIST powerpc-utils_1.1.3.orig.tar.gz 25104 BLAKE2B 0402d6bc0e9641dc5c74bdc6174af3b7c6e6f964cb7f4fdff81a59d904d07faeea2721c098723f3cde77f6c96d61b74dc06e28e7a1bb05619df2426ce8dcc58e SHA512 56b704f3371fa65150e25a5e0a54f3e23331f8f8ee9cd1e5cd3b482814394e6e131f42c262c45ca2ee684fa0ec67b5726a63b85fe2fe83117156b6627028ffbb
-EBUILD powerpc-utils-1.1.3.18-r2.ebuild 1597 BLAKE2B e7a300bb83eeee99bd2dc55116e7c50262da4e90ad0f3289b4be325228fc0bcf1cc35180df071d8335fe8cec5a79a6690d836711ecbe7550edcc4c700b40ff9e SHA512 82d2217dad8e344fdcadd653f2fd635750b2ae36024f92bcc01aee8249f7eac57868e708e6a22151ccc5a72f55b20c6f1dc044f0a081c0111f8d9fd27cfdc6b3
+EBUILD powerpc-utils-1.1.3.18-r3.ebuild 1414 BLAKE2B 2da169d9dbb460e017f9aac397bfc5f60c6843ffe555bd4c04033edc0b3298f3f2c6acad1f4e6fc8b6fa42de40266a4e4cd3fb13ed949b21bc224ded4895ad9b SHA512 9bc32b82f275ef0c8684b039bf26d69245bd07e87c168a1a3b09053be4dd9cf316161c659f56f60e19ce49846511b7c75d57588d037c7aaa5be05550a2df9262
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r2.ebuild b/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r3.ebuild
index c356821dabf7..09eeef791f37 100644
--- a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r2.ebuild
+++ b/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=7
 
-inherit eutils versionator toolchain-funcs
+inherit toolchain-funcs
 
-BASEVER=$(get_version_component_range 1-3)
-DEBREV=$(get_version_component_range 4)
+BASEVER=$(ver_cut 1-3)
+DEBREV=$(ver_cut 4)
 
 DESCRIPTION="PowerPC utilities including nvsetenv, and additional OldWorld apps"
 SRC_URI="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${PN}_${BASEVER}.orig.tar.gz
@@ -23,9 +23,13 @@ LICENSE="GPL-2"
 
 S="${WORKDIR}/pmac-utils"
 
+PATCHES=(
+	"${WORKDIR}"/${PN}_${BASEVER}-${DEBREV}.diff
+	"${WORKDIR}"/${PN}-cleanup.patch
+)
+
 src_prepare() {
-	epatch "${WORKDIR}"/${PN}_${BASEVER}-${DEBREV}.diff
-	epatch "${WORKDIR}"/${PN}-cleanup.patch
+	default
 
 	# use users CFLAGS, LDFLAGS and CC, bug 280400
 	sed -i -e "/LDFLAGS =/d" -e "/CC\t=/d" -e "s/CFLAGS\t=/CFLAGS +=/" \
@@ -34,19 +38,16 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
-	emake || die "emake failed"
+	emake
 }
 
 src_install() {
 	into /usr
-	dosbin autoboot backlight bootsched clock fblevel fdeject fnset \
-		|| die "dosbin failed"
-	dosbin macos mousemode nvsetenv nvsetvol nvvideo sndvolmix trackpad \
-		|| die "dosbin failed"
-	doman autoboot.8 bootsched.8 clock.8 fblevel.8 fdeject.8 macos.8 \
-		|| die "doman failed"
-	doman mousemode.8 nvsetenv.8 nvsetvol.8 nvvideo.8 sndvolmix.8 trackpad.8 \
-		|| die "doman failed"
+	dosbin autoboot backlight bootsched clock fblevel fdeject fnset
+	dosbin macos mousemode nvsetenv nvsetvol nvvideo sndvolmix trackpad
+
+	doman autoboot.8 bootsched.8 clock.8 fblevel.8 fdeject.8 macos.8
+	doman mousemode.8 nvsetenv.8 nvsetvol.8 nvvideo.8 sndvolmix.8 trackpad.8
 
 	ewarn "The lsprop utility has been moved into the ibm-powerpc-utils package."
 }
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 34a7e532fe43..93081a9f3042 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -6,7 +6,7 @@ AUX rngd-confd-4.1 562 BLAKE2B 8fe0147a1f9e67541c709f793ed1f34ed173204739973abbb
 AUX rngd-confd-6 2038 BLAKE2B 0f239923693d167a6a53609822d15a92e0c0e98d9c090c17ea3a73ad4a187528cd9a5d4bf071ec544592ef3ce801c2c364ccba193c22940411629b14a486cd69 SHA512 fe58599105fbcf8e1bf5f584aeefa54681dfa9fa2cd73cd682acd348f170ca825b692a1a8d153b438096c580a4b0cdab56a03b32b5f9ae8e73f06c3535c1ea46
 AUX rngd-confd-6.7 2245 BLAKE2B 7643525d9a57479ba1b725ea6f976421c3df990c56d9f694b6fd2d3283c51ccf42e1be403a2208be70bc09dbd946c0cb803bfb303ae3999e97b3c3baa1162aaf SHA512 f16c5bc417e7bae86311397b3bf51927cc2cfbb0b4ee14a835fff5b62f4d12ab194329942e21cae4eec56953e4271b1fc655dcfa0be4ccbff1df1f1defdc70d8
 AUX rngd-initd-6-r1 1577 BLAKE2B be6d70877e840c8d95a029057e03f533219e7b45d87d493af80f9a88df72b3eb272e9565e238a05665ed50c2b417815aed96be82c739ba1ab8de26ee463d0a1d SHA512 5e133f0572920b48a56734bc86edece5f655c6dde11b669307e3c49591e2678fcf9135017aafbc3b37f2af8d6c9c5cf8e52217ee50ff68abc2a7bf2330576f37
-AUX rngd-initd-6.7 1687 BLAKE2B 0d597acedd2e37f2c2a455773aaf882c7e26af5ccb997f5d78391ada2f3c7fedf9ae00cbfe76188d20643d88f34db9ccea44576578010b5be6f5057f02360930 SHA512 22658113020cc1f0e73a2d30960e92211a3f939f87807992a88e5c226ac578da090d3509c3ff78eb3298d7ee40b0d0bba85c10956dc758049aa45d8be39dd5c8
+AUX rngd-initd-6.7-r1 1683 BLAKE2B 34bea128a94f2fc8479ebd8e8a398a01bb96dcbe8dd74876f8b8725f701862908448deca3768437d1cd98b138c9203106c199942910f63e7c95598d3e1b27818 SHA512 c1e3d94509d5cd3301836961598e221ef0db2e7310386f0467a4f3068eada8ad4010b063202b8a8c3d163d39799aea7d6a4dcb4d8ca569fe7b51f5c870100b6d
 AUX rngd-initd-r1-4.1 494 BLAKE2B 1f11526717fcc9b88125e89474e1f06fc11621435811f4997e9e6197f634794df681ef698ab08d3f7c610dfb47c156231a157cfda05c804a6293a27dc276322f SHA512 8bf9a0bd25bcc9c1cc4eacdf875077208ba0899c626a55e57f055cc93b62e23a427e0622859c5b4a31c3aebe550b180777528b43942a3efb2e2c0b4243c3c9c6
 AUX rngd.service 133 BLAKE2B 1c3059e7ee924b42bc6567f5142973d550282248b3e49053b96782039ebd63096a0a8960d3e5a43cfac1d505c57e71015ad706099f06ac2809adf52c0b108d7c SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2
 AUX test-for-argp.patch 1245 BLAKE2B eb60f4d921f395d713e0ab9f132e47ce8783a096600f050c45212bae6929dc9546ff5f7b5ddf92d66570d82041b1e31ca3d690abd1e17d1c0fc688629a462e06 SHA512 0fe4b37eb3d2e93ff9ce17aed8cfcaa29c7f04289ba692d10fd0f8ef6d9b1e5f64a5734a508aea548f13fd00217972a68bcbeaf6977e763087ad20c19d456ed6
@@ -15,5 +15,5 @@ DIST rng-tools-6.6.tar.gz 51468 BLAKE2B 47231c60d78a48ade07855dfe8a807d6c10b8e27
 DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a94ab456db61dc45c69ac5e4849a1e74abbe0f7640827ffb4bb20675c1f639a5be852d21d0d1a3c6b2e96bb5e SHA512 2f09edacb5448087041257326faf570c303b42f90bb695a1999b2c7543f20a28b15cdf705a2eca55cae8e9cf9fb5205c056fc26cfaf6af958bcda2cde1952b4d
 EBUILD rng-tools-5-r2.ebuild 1144 BLAKE2B 071f7d226fb3c5585be712206d4397c248501e1fb54122c01119444472b8888e7bc95cd21bfc7663bca9c0d40364361b012ef7dde824718918c6e8334436c74f SHA512 dfdbc4425a776b799c873948453091c4cfb674a190626b0d5035d872e31deb9255850f73f73e4e9f664c3e8d72ea316aff9dc0f8a0e70d5d676449aaf81e0339
 EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492
-EBUILD rng-tools-6.7.ebuild 1898 BLAKE2B d86004a5599ee6df5b092dcbbe49a81613a08dd549052d0d8f29af4f5c0ac545e36cd8da5ff9423deed540aa1cd9340064c0d2c2ce5f60941cb8c6c207b07e18 SHA512 afa4b56582c89c04bb813cfd7574d17c6eb63bbacd4118f6a973689b7c0fbeed97cc45dd5ebd56c3ed35552f3851b3025f168380d527de44693bc8d4b87a9f4f
+EBUILD rng-tools-6.7-r1.ebuild 2123 BLAKE2B 7cb287d94fd1c92539155843f003a4fec3ada1617f27fb1977d3cfbabc7efba53c66f1e0d3421eeb72b96a8e942e61a03a41663f1ac495ef2f3ab716b84ee123 SHA512 dd7656d6a00c3c723d6efd5f24986060ef47a0333df13f30f8893b91509b72e382600b6f4960ad0a4261c060ee5f1ca8f2bbf96f98f65fa35ba90374682a6ab6
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/files/rngd-initd-6.7 b/sys-apps/rng-tools/files/rngd-initd-6.7-r1
index e85581ba6cb4..4a284b4f505f 100644
--- a/sys-apps/rng-tools/files/rngd-initd-6.7
+++ b/sys-apps/rng-tools/files/rngd-initd-6.7-r1
@@ -10,7 +10,7 @@ depend() {
 
 command="/usr/sbin/rngd"
 description="Check and feed random data from hardware device to kernel entropy pool."
-pidfile="/var/run/${RC_SVCNAME}.pid"
+pidfile="/run/${RC_SVCNAME}.pid"
 command_args=""
 command_args_background="--pid-file ${pidfile} --background"
 start_stop_daemon_args="--wait 1000"
diff --git a/sys-apps/rng-tools/rng-tools-6.7.ebuild b/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild
index e674b8de1d30..c112d9e0d3f6 100644
--- a/sys-apps/rng-tools/rng-tools-6.7.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild
@@ -45,6 +45,14 @@ PATCHES=(
 
 src_prepare() {
 	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+
+	# rngd_pkcs11.c needs to be linked against -lcrypto #684228
+	# See: https://github.com/nhorman/rng-tools/pull/61
+	if use pkcs11; then
+		sed -e '/rngd_pkcs11.c$/ a rngd_LDADD\t+= -lcrypto' \
+			-i Makefile.am || die
+	fi
+
 	default
 
 	mv README.md README || die
@@ -67,7 +75,7 @@ src_configure() {
 
 src_install() {
 	default
-	newinitd "${FILESDIR}"/rngd-initd-6.7 rngd
+	newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd
 	newconfd "${FILESDIR}"/rngd-confd-6.7 rngd
 	systemd_dounit "${FILESDIR}"/rngd.service
 
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 2c169d35e658..86cd4fa1dea2 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,9 +1,6 @@
-AUX texinfo-6.5-escape-braces-in-regex.patch 1082 BLAKE2B 3498fdc85f506d1107d1101304f4d7a3da69ebda3532f21b30d670dd2c968b2f13f8aedcd1e47a50f91b909d7d2847919e5d8325c991fb0e8910e701d31142c1 SHA512 250a33570834e5bc1557d600461d194fdc5c80e99d0a4eeecede8b6e21d235fd60d4bcd8e516ea4fa1940b01b7856ba2f1a6310dd24ac26f6d04f89e7dba8835
-AUX texinfo-6.5-perl-5.28-thread-safe-locales.patch 1239 BLAKE2B f42337e49d6530db6706e9867db9211b91be17a9e5744b350a124dbe95e7ea39e208b7a31a81f656b9a53d51dd4d7ea0b155924753288bbbf6db33d0d38a5b13 SHA512 aca40e7fa4acb9df90efa169d40c1d76b797c334a09472fb9d72e2f577f12628c5425b64b25c8d3940fa178254249de628f7ac84bae7fc887c4deaebe21c4602
 DIST texinfo-6.3.tar.xz 4468048 BLAKE2B ef255225e1f66dc5e6646761d78dcf3e7ba9c79aa2654dbb527ef10db54b8417af9e1a58a270683956624049c2fb624b29bc2f22763c79bab9858cdcf5e2edce SHA512 ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4
-DIST texinfo-6.5.tar.xz 4503048 BLAKE2B 9e194115a252500fe6048614a96c6992b6fbf9f3557265d8bdda143e10f781769ca5e97ded2d330da7c0ae1581bfdebbf2dbde736689412980b098ea935d9580 SHA512 06831b4c74a1ba7a9cff937069e40ab26db1204aa8761d63254651ffacf6b0cb95d7078ba1cc59d95427239ab7e4f4aedf582967854281bfea3850b1ed5b1fdc
 DIST texinfo-6.6.tar.xz 4946900 BLAKE2B bd33297549d5285d7a4a65041b6025c489c6b436e9591eaf5187ef34f6e869bf7a2a82a00ebe11adc1c4b2904119e9e3f25d2496b5507f91f4b9ba548ba98604 SHA512 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0
 EBUILD texinfo-6.3.ebuild 1110 BLAKE2B d3bdfaa29efc4c4eb951f78c4cbf9de4d4259dfc769867ef75c243d768b6ccb226467229328d7b07f1fd50b12150a0d18fe659b621662375f68fa58b9a66d9ff SHA512 634274842a789f5d906c553f413a8775b3050a7fc9c86a9c0a8320c8fe5f342354522e56fa0cefb15b42169c9503d9e851182ad98b93b5c7351d388750a0f738
-EBUILD texinfo-6.5-r1.ebuild 1275 BLAKE2B d399088d9d49722b741100f467c74eed8c324dc7225b8480c2288e3a8c3729e59d8458cf17ecde7e3f2dad30c6d53d7dbd313fc6ff0d946776ee41fa5656f30b SHA512 d6a1a676d23d39e42f3054988b64bb6b02d024b8fc4579c6315214f7e2450084039d6f3ab22cba266b8ac908a304dc03be33c4b15b1a393573dcd3a474eebb69
 EBUILD texinfo-6.6-r1.ebuild 1367 BLAKE2B 716ff075cd4174f822d08f270086326f6c664078d152e146fab04c4fd05323f4a3fd78fadacd1dee801f1add66abc576d90e0cc2dcf742a52280ea40b0a15a4a SHA512 96f85073fc80f08a94a7a2ca8bf73ec20fd441e36bd158ad7336e39f919f6f8b52f851b6641b450167b35fd02d03fc4acfb840d735f987063d6543b78fa39d88
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+EBUILD texinfo-6.6-r3.ebuild 1698 BLAKE2B f26539f4f66bbdd1a627ec0b3e3bc950c664eeb608bc0139e3a189bd77b9cf507a06e4aca81f723f78aaab5eae0a62d494e64ba29dd07096a427e8cae4534d44 SHA512 3f8ff94cd57d506654b352577f21737d0717f1d04cc268e39c8e7604f78a4fd1b9994fe6f7464ea9c0499305384c8929ae3d9df846242f2d516d9a9d0993cdc4
+MISC metadata.xml 462 BLAKE2B 2e3c58437bda45610f7a2ed95cc8a1ec38c64b256e980816946e02ed6edaf69f20b152a1bda59f8d58f5af6aa7afe1e6dce219a2ba1624aa3f00c36028dfbe4c SHA512 b2015a2dc9e82b7284df86fe013d12f846d19246153526a8b48d1e5124682fd823ad1fb9b6276896b8f4e991efd3daead9e5d02cc43662e6f5be0cf11dbb6260
diff --git a/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch b/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch
deleted file mode 100644
index 72f1288393ac..000000000000
--- a/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From efde0da129154376bebcfff6a47424669bb849df Mon Sep 17 00:00:00 2001
-From: Gavin Smith <gavinsmith0123@gmail.com>
-Date: Fri, 13 Jul 2018 15:31:28 +0000
-Subject: [PATCH] escape braces in regex
-
-git-svn-id: svn://127.0.0.1/svn_repo/texinfo/trunk@8007 39fee189-59d7-47db-b5d4-205258b72aed
-
-diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
-index ba1cd423d..b5eece680 100644
---- a/tp/Texinfo/Parser.pm
-+++ b/tp/Texinfo/Parser.pm
-@@ -5531,11 +5531,11 @@ sub _parse_special_misc_command($$$$)
-     }
-   } elsif ($command eq 'clickstyle') {
-     # REMACRO
--    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
-+    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) {
-       $args = ['@'.$1];
-       $self->{'clickstyle'} = $1;
-       $remaining = $line;
--      $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
-+      $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
-       $has_comment = 1 if (defined($4));
-     } else {
-       $self->line_error (sprintf($self->__(
--- 
-2.20.1
-
diff --git a/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch b/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch
deleted file mode 100644
index 2d33abe78c72..000000000000
--- a/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a028ef47353b03177aab3facb4b2b74f7c3823e2 Mon Sep 17 00:00:00 2001
-From: Gavin Smith <gavinsmith0123@gmail.com>
-Date: Fri, 13 Jul 2018 15:39:29 +0000
-Subject: [PATCH] perl 5.28 thread-safe locales
-
-git-svn-id: svn://127.0.0.1/svn_repo/texinfo/trunk@8008 39fee189-59d7-47db-b5d4-205258b72aed
-
-diff --git a/tp/Texinfo/Convert/XSParagraph/xspara.c b/tp/Texinfo/Convert/XSParagraph/xspara.c
-index 51eea4a30..f2d6d1ccd 100644
---- a/tp/Texinfo/Convert/XSParagraph/xspara.c
-+++ b/tp/Texinfo/Convert/XSParagraph/xspara.c
-@@ -248,6 +248,11 @@ xspara_init (void)
- 
-   dTHX;
- 
-+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
-+  /* needed due to thread-safe locale handling in newer perls */
-+  switch_to_global_locale();
-+#endif
-+
-   if (setlocale (LC_CTYPE, "en_US.UTF-8")
-       || setlocale (LC_CTYPE, "en_US.utf8"))
-     goto success;
-@@ -320,6 +325,10 @@ failure:
-     {
- success: ;
-       free (utf8_locale);
-+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
-+      /* needed due to thread-safe locale handling in newer perls */
-+      sync_locale();
-+#endif
-       /*
-       fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n");
-       fprintf (stderr, "character encoding is: %s\n",
--- 
-2.20.1
-
diff --git a/sys-apps/texinfo/metadata.xml b/sys-apps/texinfo/metadata.xml
index 56c124413057..b4920fb24a29 100644
--- a/sys-apps/texinfo/metadata.xml
+++ b/sys-apps/texinfo/metadata.xml
@@ -5,4 +5,11 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<maintainer type="project">
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
+<use>
+	<flag name="standalone">Build standalone version that survives all Portage bugs</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-apps/texinfo/texinfo-6.5-r1.ebuild b/sys-apps/texinfo/texinfo-6.6-r3.ebuild
index fb321453e23e..a7c47ef6f93a 100644
--- a/sys-apps/texinfo/texinfo-6.5-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-6.6-r3.ebuild
@@ -7,7 +7,7 @@
 
 EAPI=6
 
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="The GNU info program and utilities"
 HOMEPAGE="https://www.gnu.org/software/texinfo/"
@@ -16,32 +16,45 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="nls static"
+IUSE="nls +standalone static"
 
 RDEPEND="
 	!=app-text/tetex-2*
 	>=sys-libs/ncurses-5.2-r2:0=
-	dev-lang/perl:=
-	dev-perl/libintl-perl
-	dev-perl/Unicode-EastAsianWidth
-	dev-perl/Text-Unidecode
+	standalone? ( dev-lang/perl )
+	!standalone?  (
+		dev-lang/perl:=
+		dev-perl/libintl-perl
+		dev-perl/Unicode-EastAsianWidth
+		dev-perl/Text-Unidecode
+	)
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	nls? ( >=sys-devel/gettext-0.19.6 )"
 
-PATCHES=(
-	"${FILESDIR}/${P}"-escape-braces-in-regex.patch
-	"${FILESDIR}/${P}"-perl-5.28-thread-safe-locales.patch
-)
-
 src_configure() {
+	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions. #622576
+	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
+
 	use static && append-ldflags -static
-	local myeconfargs=(
-		--with-external-libintl-perl
-		--with-external-Unicode-EastAsianWidth
-		--with-external-Text-Unidecode
-		$(use_enable nls)
-	)
+	local myeconfargs
+	if use standalone ; then
+		myeconfargs=(
+			--without-external-libintl-perl
+			--without-external-Unicode-EastAsianWidth
+			--without-external-Text-Unidecode
+			$(use_enable nls)
+			--disable-perl-xs
+		)
+	else
+		myeconfargs=(
+			--with-external-libintl-perl
+			--with-external-Unicode-EastAsianWidth
+			--with-external-Text-Unidecode
+			$(use_enable nls)
+			--enable-perl-xs
+		)
+	fi
 	econf "${myeconfargs[@]}"
 }