diff --git a/Manifest b/Manifest
index aa3ab7370757..cdab4300b7f4 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29421 BLAKE2B f84a170f7c09d30ce1ec9da2c9bd323a4c22904f6ea25813d77d1c2e6269d0d94b4b1fec6aa30f692a9b9673ddbf4d694d34422a2f0175049db3214a0951de0f SHA512 697b2075bb0cea251bccdde4f789591efbac601f406f10d07133ed143436db878e345a94180454eca910db0c431d983da7d275b243f5aa05fdf7f401def561b1
-TIMESTAMP 2020-07-10T09:08:23Z
+MANIFEST Manifest.files.gz 29459 BLAKE2B b1a9a17186dda4b2ca07a6e05e97d87ac9505bc556758957624bb5c68b21df0cd155680496c75ed7a6282b343857fe5f2585042726640b2ef2ceab8e0f604944 SHA512 de179daed517ef0b98591e3fc414501c1ad3e97a087c5006d1b55c8f40a4d8ad10552cbb55a5280c292c0e1b67c9a6169fc37258a09637237f147246ca224078
+TIMESTAMP 2020-07-12T06:38:23Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8IMAdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8Kr99fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBWrQ/9FepYaoeJjIW6PzwA6GNxro1LpSHOyp58Rfv+I49Tjpe9NSzCnQSSCQ12
-Ihjj64+9zUsSSgpr4CfWhNHf7zHlRdoDEgCScJcsmrJlOkNrIYb0eS/dYrwt43p1
-2jtbd4KnjpxvdmcyObxGY+n4+QMdLVieYOMjTXA8eJxiE66/wqD8h2pv+4J8KYKn
-VNQuKW906Werko/VEPSg75Il4TqikBelea9DduL9qVgfW3NFMRJc38K6WEZE8Nly
-0io/FfJU+f5RZHPSowj81+fiT1NA+voxtyMujpkk4TIgidVyBck2DJ7ha5Fcn9LF
-86kXn3P/NkJGR5QiSU651AaVifBhHwYxfrqPsB0j6Ocf+wl0e55OBxZjvNmZiSWH
-1cv8LcuWmQ7yDq59XVo7Mp1PxDPW59rR0YosN4FusXE9L/1wQjRwHMU35Ucz2Pr0
-JC0qiTI10ugRjg8hCIR4aCE0ybg/rUJxD5IhL/fb4I4cYsJOMeqbTdri61v0WQHE
-xzf+Pol3MqsxsRkBI4oFXGVJ/DojMltLb70WVEdBuvqnehXwToCKaN07caaKWAbs
-w44+goaJERPwSLtHtc4MAKqrr2qhln/D36wsyobY2BdFI2foed5cB/+xxfwJkfkh
-OvR4jNAHk1uG1yjvzAJsOobSmmUIxn6KR17a34YVFl/x3jVxUvc=
-=Rxeb
+klDQQQ//U/Sqdg62ts8tJ7S/1duxO8id12lhGyitnNGXQ75w6nUpLyRypvgTAIuP
+qkrwF1a6jKaD4GqcMLM42uSC/3Ixs7E7Gw8ZSQrFY61fkgSTy7+VNvuJ/s6mIw0F
+OqQCw7SnV4AdfHBqFCLONCF8BAToxz7+fkbDeEBp4clFcR1JfwmBApDsDpxelh+b
+8M1V3K7BEhaVMOjeIphG7t/jwgBOl1q6CkPIc0VKE5+Y7WK4aA/W4nAMx5IxqLPR
+L4siJ+2IYO7AVyClhNdwN6n4g/aaXZXrOAm93yQiqutzZ02PazGUpyUsMyvDaC9B
+xGFZumE+1D+fKNKLy/SuRc8s6cWlfaYuGQUfsq750y7gYLvq0pA7Ls7yQ5nTj/I1
+B7LglNcOD9ToLerrAaipNckruQ+yowmPDZlVfvqr6oriN57f6GZ7KXb/lxFAJ3/v
+YnXU3aPb67++WcBGGtlkG00uObIc0dKNde0iBvgQ17wmhlE15LtBtBlJ2tooJCmU
+B+huWHbcPcQDQLwoNsU7AnixW0IvsYKTzzu6gMrBUJy0iIz5bdY6lce+EqYxmsmT
+k1sqHvOIlp3k28kPn7pKT/h552+8hwg/wDnfd6PWRI+hzj5CTYTEf3SOg+ax9BdT
+PSkxuIOP27KoIC+DuZCiiBKTJbvsR5mGCD4jBKFjQ+UluTYkzhM=
+=zKQI
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 240d1917d8fc..6a40f7cab002 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 1a986c0ef522..7403f3f2092d 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/dnscrypt-proxy/Manifest b/acct-group/dnscrypt-proxy/Manifest
index 851b14d530f6..9c715a7138b4 100644
--- a/acct-group/dnscrypt-proxy/Manifest
+++ b/acct-group/dnscrypt-proxy/Manifest
@@ -1,2 +1,2 @@
EBUILD dnscrypt-proxy-0.ebuild 193 BLAKE2B dd8271fcdb848bcb9088c3edce788f94f350a6d71daf19f51be020b7418538a2644832aaddca7bbdcb6633f3c968fbfa5ca12d5420e0908964c9163b86dea915 SHA512 f4b370766925062f07cc35bb7f90190289b8516bd283cf0fbea80d7c137aa3f4329028cd56f4cd1483ac5e984b44d1fdaeb9dedee5442e4e1ab22dc1ba5a165d
-MISC metadata.xml 351 BLAKE2B ff2b8229c82ecfa30b5bbdc8eba1a4da58a77bb9cbbf60bc079d9ecb668cdfaabe97a6a89e27cb5430929429ceec0d46b9b9c0dbfdb8f072b0f571600114d29f SHA512 9038ed6c278b96614b1c7e82d2573ae5eeb9811043e0f384f96d35297df123a0ff801aa25dd6aef27a47e1480fcafea7436fd5becea47300b84e4970d8320bd6
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/acct-group/dnscrypt-proxy/metadata.xml b/acct-group/dnscrypt-proxy/metadata.xml
index fd9e2163ba5d..979bcc7aec93 100644
--- a/acct-group/dnscrypt-proxy/metadata.xml
+++ b/acct-group/dnscrypt-proxy/metadata.xml
@@ -5,8 +5,4 @@
sam@gentoo.org
Sam James
-
- gyakovlev@gentoo.org
- Georgy Yakovlev
-
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 9b4090e96129..15188693b2bd 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/dnscrypt-proxy/Manifest b/acct-user/dnscrypt-proxy/Manifest
index a9528a863d88..ac01afdbf081 100644
--- a/acct-user/dnscrypt-proxy/Manifest
+++ b/acct-user/dnscrypt-proxy/Manifest
@@ -1,2 +1,2 @@
EBUILD dnscrypt-proxy-0.ebuild 246 BLAKE2B 4366f7c575543915b0f2b880532c19ec002463c0ed31360f31c860cfecc035e7c01b4c499847ebbddb728cf4e4d6a8931ed5107a52732f092007ea4544154f4c SHA512 15103f157e400714709efe4c5bdb2e74a07687ed93703ad0ff6e56c6ee7efd02df068d4b73c519c674ec2ded2734c9e697f604c230a7cb1be7110a0a24030f84
-MISC metadata.xml 351 BLAKE2B ff2b8229c82ecfa30b5bbdc8eba1a4da58a77bb9cbbf60bc079d9ecb668cdfaabe97a6a89e27cb5430929429ceec0d46b9b9c0dbfdb8f072b0f571600114d29f SHA512 9038ed6c278b96614b1c7e82d2573ae5eeb9811043e0f384f96d35297df123a0ff801aa25dd6aef27a47e1480fcafea7436fd5becea47300b84e4970d8320bd6
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/acct-user/dnscrypt-proxy/metadata.xml b/acct-user/dnscrypt-proxy/metadata.xml
index fd9e2163ba5d..979bcc7aec93 100644
--- a/acct-user/dnscrypt-proxy/metadata.xml
+++ b/acct-user/dnscrypt-proxy/metadata.xml
@@ -5,8 +5,4 @@
sam@gentoo.org
Sam James
-
- gyakovlev@gentoo.org
- Georgy Yakovlev
-
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 51a0c30af019..29be2d8d44bf 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest
index 73369056820a..74dcd3712bba 100644
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@@ -1,3 +1,5 @@
DIST accerciser-3.22.0.tar.xz 3060756 BLAKE2B a648c764c5f101f323458c692cb4171704b7b710558f4103b57d87ca58c2d0d9c03cad72de1d3be9483d317ad94c95e43bb2437515093d6ffd93089a58e5fab1 SHA512 980db5dcd0bdc78314ab87cce95cfcfa018bf302acc66ea2dd1bddfb61de5bfe2e64344cff63740c38be33124ff49c75699aa6867d5e85b25d422b5af1b025c1
+DIST accerciser-3.36.2.tar.xz 1995756 BLAKE2B 14d569f159cda685bb5217cb650d64c473c296e6c0e74bf2d6290908ea4aef06fd736aa8bdb7782a7bbd5231895a53e85fa362382fd15cf0554721fe46c8cbe9 SHA512 fb2ecb35826f1a868a8badcefcb4941258273bfc639996b8d4cecbd5d9700cb48e102891105842fcf3b0cb5f7a53df28de3283a80130d83695528db06ff0f268
EBUILD accerciser-3.22.0.ebuild 1431 BLAKE2B ff37785fb67fb66c82d04b93d6c08953cabdd67d84e86a36ec69b30a99a1d6aa6a62812deb1a6d020b1e87ed31d818fe051e313684ed2b22c52a32f4e9d08384 SHA512 96f8f708ec564fef31f3ef0c0234cf94d1883a38c8327795fd534df5738b3135fbab2a70e1f15c4c43575ee689b39dfb16f468859ac19daa8fedb756da47db1f
+EBUILD accerciser-3.36.2.ebuild 1146 BLAKE2B c54220fb3dfc935ad75ff5d1e30050288c1aed7da0ef13455dcc2ed32b75aac9ea1ddb45a41f9ca097dabc287fc3282279d646727803451c3a68528b3072e10c SHA512 54185299f8cb8fa1301cc11fc3348a4aaed1767536bd9d0adf383066ab5536e4ebb1b3e2f4df2d555fbe4a09abdd479483775d1809f045ae8497b6c4874935cf
MISC metadata.xml 738 BLAKE2B 916b10f5cb4aba612767ff5a617c091a36573681418c15973fbbff3328e00311306b162f504e9a12e17f04dc582f72bae21508847fec79a8d8cad4f3e18c9cb5 SHA512 78780d3254a608f95d3532de8a7438e891bd2e194ac8a255f2d224e8f4b41c2928b2efe04ae16050d0092f9e25f77800728f0be9b7cb3bcb955455532d4154e6
diff --git a/app-accessibility/accerciser/accerciser-3.36.2.ebuild b/app-accessibility/accerciser/accerciser-3.36.2.ebuild
new file mode 100644
index 000000000000..b9c382d195a4
--- /dev/null
+++ b/app-accessibility/accerciser/accerciser-3.36.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Interactive Python accessibility explorer"
+HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser"
+
+LICENSE="BSD CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ >=app-accessibility/at-spi2-core-2.5.2:2
+ >=x11-libs/gtk+-3.1.13:3[introspection]
+ $(python_gen_cond_dep '
+ >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+ >=dev-python/ipython-0.11[${PYTHON_USEDEP}]
+ >=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/python-xlib[${PYTHON_USEDEP}]
+ ')
+
+ dev-libs/atk[introspection]
+ >=dev-libs/glib-2.28:2
+ dev-libs/gobject-introspection:=
+ x11-libs/gdk-pixbuf[introspection]
+ x11-libs/libwnck:3[introspection]
+ x11-libs/pango[introspection]
+ gnome-base/librsvg[introspection]
+ ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_install() {
+ gnome2_src_install
+ python_optimize
+}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2796119d716a..99b35fe1330e 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/denyhosts/Manifest b/app-admin/denyhosts/Manifest
index 2d2d7b072467..1d0a2fd1a153 100644
--- a/app-admin/denyhosts/Manifest
+++ b/app-admin/denyhosts/Manifest
@@ -1,12 +1,8 @@
-AUX denyhosts-2.6-hostname.patch 664 BLAKE2B b86f74d9eee9e47f96a1894eda227d0c437d45e4d2615d14f350179245a953022d3dd6e401babf6b9474092c77362f6aa56b1ec51b57310b5fed75d843945703 SHA512 0fc512f4a1691a90aba7d95b4757a363f3ff6bb893fdc719277c5dbec1904828be923f5ab21c5ba20e03a5e6bf61a5f7d35c6675b9ccfafd32dbd9e108dd5095
AUX denyhosts-3.0-python2.7.patch 1502 BLAKE2B 7057613a62ebe718a6712e06b4ef1b3c875a644380ef97398cc9c2dd4d7e84d8887d3783cc853aaa7d04d97bf05bdb6f0929b2eb4a72d20ca5e63369bed22e04 SHA512 ee3c4f7f6a8126e4a9c30531cce2673f8c0eb4c4d2a011aa22a3aa4f0b9ee58f8278334cf9253619d999b8dadf4370d6c02f2535a0b6d794243e3050f3927e8f
AUX denyhosts.init-r2 646 BLAKE2B b52a481376656aab7525e3f04ea7712137c132605e62e011f41b8c006341e223487a4702e7aa8dd8f2a1faa6f52d33937557eb2bc130c97c6e9e2333cfe0a9bd SHA512 ea20958c74ec34d4f8e2f165cda9d0c3e27d94fe7eef374548d74275d35dc7fc7c89395e36b0a00dfc7d2a83b198f179fd44e16f7dc51419f9af1e907616382c
AUX denyhosts.logrotate-r2 272 BLAKE2B 9dd9bad7fd6d1b3fac06a331d2b2246697b70ebf7bef84fda0917d3cf925b3b7f6a30a66c67a7ef52c466096a2860ee8f177097ab44c3000169d879306668ae2 SHA512 43d379b5909937913ca78a11581f577a5d9fe52bb16627441311cdac7281f59a1f05fdb308f722f9c376d2e446111021d225b2033c5fe5f3399ab88771be2569
AUX denyhosts.service 265 BLAKE2B 4ecccdf6f605936ffb7339c2ec2510f14b0817cf3ed3cf51b540456216b3877e561044973f1eda4a743f717bc4e0f36e9f8492b3fd2b365a243f5f7449ea575c SHA512 601b10e999dd2e16cec57035d025a883df77df272c6a72b4d39f2c118d983f308984aa9edd296f334e0e5062e8ca5ea21ba25ef58b606c9c7e4c09ed7b3ad4be
-DIST denyhosts-2.9.tar.gz 49472 BLAKE2B 94f18da3db9dd7e0d979d4fb536160114fe1dc95ac43ad1f7bf3f235702698210e62b3872bf7f3360945228b187d97a274797d535a9b12b552bddf649b5d1fdf SHA512 f41e2985e84f0eeaa493def6b8609de934889d02b124962b0bfd02ebe5e41d0670822124eb50ed84eb1c3b8a2a96775fbe09386cef48a3c3e04949fd6b1452c1
DIST denyhosts-3.0.tar.gz 56283 BLAKE2B 1ecb8a13ec9511cb4ac65579aa8f88117264f231b586c30a61ad9c78abd17aeebc5642e70f162fa7e73fe81a99821d494efca213b1bf864fd0e2043fa4374e6a SHA512 8a1c796c259049ffab2c88cef780b175ec75c94216841421f831dfbf45f4ba0cdbcfbb0e3dab7200aa79eeb2416db5234ad5016d5770d8ab2f28ef4c9754e70d
-EBUILD denyhosts-2.9.ebuild 1858 BLAKE2B cb836ef7bc0d26d96f873d13c3adcd2c6b7f7a86b464ea41bc20ac4165dabc64554fe95e3404c80be89286da66448375450771cfce0415f3ddee873201e411e6 SHA512 bc389dd61b4b0e305284473160bcc16e4f0e4885d83438652280912375a058d3b2e33d1aab65b6a70767bdebe61ff8c6adcab1de8717e89c271fccc72a1d69cf
EBUILD denyhosts-3.0-r1.ebuild 1762 BLAKE2B 419fdb0a943cd4e6bacb78675cef19ccd6d73709b0a980c8547a01b9d1cc8077992db61553ec46b270e637659f0ffe53509865edb5ff5f3fdb65d3b97ce4b0fc SHA512 b63ffa7964dc8c1b3d659803f2038005aa098a7b62a3022d6aba7fd7716cc271cc2df7424137be0085def3be663b43bf2d1f71b1520be6cd61db14772880b93e
EBUILD denyhosts-3.0-r2.ebuild 1774 BLAKE2B 1644ee1f25043685d8ed488604167a143d7330653c45313df6abcddaba6d46847d92586d55ca2b2f81f3d2d0dd6deae9ddf8ca2db0f540cacbd5898bc11f99c9 SHA512 0c64f20fdd92e5fcdd4b7d6baf18f849cc6a678cb34b9e1714ab100402d857fc4e6e2f161f41d7fb8dd7b5e506281c5f8695c2c7ab96751e95a7018b666e3be5
-EBUILD denyhosts-3.0.ebuild 1672 BLAKE2B ffce8305ca9db71a456c8163a7bb1fdfcf7187b4433988c93e01f94407dcc0edf577b8d187ad017ff4e357e56d907aa4d34cd4f4d8b292365d46ea2a079be6aa SHA512 660bca4d0ca9fd4eea074cdfde7629d06cb4c6c48f3b0cf9674d6ad62ac931cf51624b67e52862b6b284157643f634495bbce7c6b927bc1b80274ed497a9aad0
-MISC metadata.xml 405 BLAKE2B 78e4aa249eb769b94479816826f18e7005a20cf59f476be51ea5513f6e1a035b3f46ee7fc6c40c7010e07700d9479088f8281b1a84fff47d79d73dd24bc6c954 SHA512 06a687f8daeda5e4d48fcf9887a13f515ef52e47cfad3285c67907d9d17a59d32ce1eaf679b8b8f4f3832295173268cd548a2e493b0663468fb91603b0c6d8ad
+MISC metadata.xml 311 BLAKE2B 90916be5ccfc00c53ac800cd6ee0430e9b4a7c9b5b89d3543db09d5d66c335999382792732cd7dd9c4b5ab36c1c941b2131ff83a8a9771f639c1d3b80f3c7862 SHA512 04f625af3e09e5503a84970d84e5eda16fe15b17b384d1cd73eda04e292065de20e1cf3bfd43af2aa79ede60348b98aece9ac6984eac2c86e1a8897ab10d45d0
diff --git a/app-admin/denyhosts/denyhosts-2.9.ebuild b/app-admin/denyhosts/denyhosts-2.9.ebuild
deleted file mode 100644
index 7711a19aa6d9..000000000000
--- a/app-admin/denyhosts/denyhosts-2.9.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils readme.gentoo systemd
-
-DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
-HOMEPAGE="http://denyhost.sourceforge.net/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
->=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
-(see bug#531156) that means you either have patch openssh or use
-denyhosts' iptables feature to get any protection.
-
-You can configure DenyHosts to run as a daemon by running:
-# rc-update add denyhosts default
-or:
-# systemctl enable denyhosts.service
-(if you use systemd)
-
-To run DenyHosts as a cronjob instead of a daemon add the following
-to /etc/crontab
-# run DenyHosts every 10 minutes
-*/10 * * * * root /usr/bin/denyhosts.py -c /etc/denyhosts.conf
-
-More information can be found at ${HOMEPAGE}faq.html"
-
-src_prepare() {
- #systemd needs HOSTNAME
- epatch "${FILESDIR}"/${PN}-2.6-hostname.patch
-
- sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
- -e '/^SECURE_LOG/s/^/#/' \
- -e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
- -i denyhosts.conf || die "sed failed"
-
- distutils-r1_src_prepare
-}
-
-src_install() {
- readme.gentoo_create_doc
-
- dodoc CHANGELOG.txt README.txt PKG-INFO
- distutils-r1_src_install
-
- dodir /etc/logrotate.d
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
-
- newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- keepdir /var/lib/denyhosts
-}
-
-pkg_postinst() {
- [[ -f "${EROOT}etc/hosts.deny" ]] || touch "${EROOT}etc/hosts.deny"
-
- readme.gentoo_print_elog
-}
diff --git a/app-admin/denyhosts/denyhosts-3.0.ebuild b/app-admin/denyhosts/denyhosts-3.0.ebuild
deleted file mode 100644
index cd2c9fdeea38..000000000000
--- a/app-admin/denyhosts/denyhosts-3.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils readme.gentoo systemd
-
-DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
-HOMEPAGE="https://github.com/denyhosts/denyhosts"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
->=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
-(see bug#531156) that means you either have patch openssh or use
-denyhosts' iptables feature to get any protection.
-
-You can configure DenyHosts to run as a daemon by running:
-# rc-update add denyhosts default
-or:
-# systemctl enable denyhosts.service
-(if you use systemd)
-
-To run DenyHosts as a cronjob instead of a daemon add the following
-to /etc/crontab
-# run DenyHosts every 10 minutes
-*/10 * * * * root /usr/bin/denyhosts.py -c /etc/denyhosts.conf
-
-More information can be found at ${HOMEPAGE}faq.html"
-
-src_prepare() {
- sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
- -e '/^SECURE_LOG/s/^/#/' \
- -e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
- -i denyhosts.conf || die "sed failed"
-
- distutils-r1_src_prepare
-}
-
-src_install() {
- readme.gentoo_create_doc
-
- dodoc CHANGELOG.txt README.md
- distutils-r1_src_install
-
- dodir /etc/logrotate.d
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
-
- newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- keepdir /var/lib/denyhosts
-}
diff --git a/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch b/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch
deleted file mode 100644
index 56d881319c5f..000000000000
--- a/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up ./denyhosts.py.orig ./denyhosts.py
---- ./denyhosts.py.orig 2012-01-30 13:14:41.146715839 -0600
-+++ ./denyhosts.py 2012-01-30 14:45:14.372539341 -0600
-@@ -1,5 +1,6 @@
- #!/usr/bin/env python
- import os
-+import platform
- import sys
-
- import DenyHosts.python_version
-@@ -107,6 +108,10 @@ if __name__ == '__main__':
- print "DenyHosts version:", VERSION
- sys.exit(0)
-
-+ # This is generally expected to be in the environment, but there's no
-+ # non-hackish way to get systemd to set it, so just hack it in here.
-+ os.environ['HOSTNAME'] = platform.node()
-+
- prefs = Prefs(config_file)
-
- first_time = 0
diff --git a/app-admin/denyhosts/metadata.xml b/app-admin/denyhosts/metadata.xml
index 3e89d981c937..463b166d5858 100644
--- a/app-admin/denyhosts/metadata.xml
+++ b/app-admin/denyhosts/metadata.xml
@@ -1,10 +1,7 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
denyhosts/denyhosts
denyhost
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 8cfb6c7b2a0d..9a43f0fac76c 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,5 +1,5 @@
DIST hcloud-1.16.1.tar.xz 649100 BLAKE2B a019f21d8c87dd47fc3c2eb069576fd367c1dd6dac7a5909f76a9c31fe9922e93ba4e1fdde3bd86dcbdb25bb2cf84b1eaddd9c7e6b62bb08647ba9d7a804e06a SHA512 e8a4e3d9c883b009eea98443716264115d55b93b212b0a0df64316f63310210a3812b3948d16f822b6f8f32d029029da5b51be7b7561d9396f28a406061a507c
-DIST hcloud-1.16.2.tar.xz 678408 BLAKE2B 01d10032b93295ac5e255103b38023b323b545cb30f78cbd9e6a0dc392579c94142b9c7575e383c5dbd5e88fb17ca1b51419df014782d517f4392683e987c9a5 SHA512 74902f212ebd432d4bec8c566a13daddf38349989e3329b62d75f332941930b55839392efcb7d9e8081700352505def9912220b228f45b92a4a3e853b8091722
+DIST hcloud-1.17.0.tar.xz 687880 BLAKE2B c83530946dd04afc59d45a2bbb12b6a4034dfe5b8c3826e4e78f29e88891672c21e896fd9d24394ce943f9b6574928ae144a564abde3fec8a243cc5fc87e8bdb SHA512 5025357392e9b7661876f059a416e6d6f9eea89e16a9abaacaeb72506aaa5d4d6a193e266d23f01cd0f5d32048f66a3f6e22a1c9c042c2e3183a1e164da2ccc6
EBUILD hcloud-1.16.1.ebuild 575 BLAKE2B 4432457e8824363aa6bc32d8d21a9e7c22c71f5fffc858a1fafef0a08466c18db4e2c6f196b5bc3d620ce1b0bc53fea19870aa9a416d104f7fd90a4c5e067b88 SHA512 d9486ff215bbf69d438aa36fb1d3ad387f958697096835134961b4a7ea3b0b191138848c65d660f796be3eb8a154b54bcf4d677479cc14fcedaec181d336293f
-EBUILD hcloud-1.16.2.ebuild 713 BLAKE2B 64b198fe517c5b6d22fb6024249e86236336cdb4cd7dda78f252cb3bad4af5e7f279358f8370d00fc4013b03331515ff8439aa82cf42f12cc05cafb532d07247 SHA512 dfdddb5e8356d7bfa8a641ea6f2e75747f0e0812a924f9b0e2517c5b6cf7f1e59769d336a37de8eba4eb03230746cc0bb15cab76e47957795a69ae465a96d978
+EBUILD hcloud-1.17.0.ebuild 713 BLAKE2B 64b198fe517c5b6d22fb6024249e86236336cdb4cd7dda78f252cb3bad4af5e7f279358f8370d00fc4013b03331515ff8439aa82cf42f12cc05cafb532d07247 SHA512 dfdddb5e8356d7bfa8a641ea6f2e75747f0e0812a924f9b0e2517c5b6cf7f1e59769d336a37de8eba4eb03230746cc0bb15cab76e47957795a69ae465a96d978
MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/hcloud/hcloud-1.16.2.ebuild b/app-admin/hcloud/hcloud-1.17.0.ebuild
similarity index 100%
rename from app-admin/hcloud/hcloud-1.16.2.ebuild
rename to app-admin/hcloud/hcloud-1.17.0.ebuild
diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index 2beea80a4908..36682311f857 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -1,3 +1,3 @@
DIST puppet-lint-2.4.2.gem 93184 BLAKE2B 5170bd9c30f6e2f5b30120b6edc74550e697c3243d2f5c7249f27a2d61ca2f5612d96efdc0f6be8d065e7d7a4460b9cf6e6dad13a5b24c4ce100d4e6df2f0425 SHA512 ee846688b13536b7d146ea50c0efe5083babf1ca09b77182437ec93be754ae076d54ac34f8082867a26b6df12a09bcd316e5b1aaa9c98150f9411a0c8b007c71
-EBUILD puppet-lint-2.4.2.ebuild 586 BLAKE2B 60d694ebd57c1112b3a76a4da7ec2efb3e72da48ffad9eb0fb284db50fa7185cc885bb19c3cb6f69b15c6f2ae24fdc1ee0078c570bd4d5a39ba2afcad29ffef6 SHA512 241c69280163c708f3c251d1f840aa851db3fb90ca0a5c433a95ef6b04c7f78b57d4db95ccb17332a8122cf80644d1b0de893998851b4992ab5b9587ace3be5e
+EBUILD puppet-lint-2.4.2.ebuild 593 BLAKE2B b60d9b263fd5f9198e83be47999405f5a0e9c7f7580c2843f9ce3c3b0c1e7a92f58c88504344630a8bd48e5402327d968088c1db74ba4cfb0ffd1f38b2a39e44 SHA512 0641317a2707859c73189e80b0b2863390b4703fd51826b027313b61aac09c08ae54997ea302b3ddd3966ea8e79b928db7e9f1b5585716759f4d8621c55fb0c4
MISC metadata.xml 453 BLAKE2B 4fb00983f98c8c178fa1dc667f966b0f1fd54861ef71e37211fb46edceb8f91c15d55add637a50eda53ccaff8a1d3a6dcbdd02afe2ae32cf0f69797427897d6a SHA512 bd9238c56ddcdcb124df5d7530343756b865d2f279b719fb0ce7bf4e37565709194cb7f564811be6376fd4d3b61403d76eb9542aac3a267c2eb08f1bade21524
diff --git a/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild b/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild
index 738798f64b2f..78d9bfa89e77 100644
--- a/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index fc7e580ab987..7ce3c77a0d1f 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/fastjar/Manifest b/app-arch/fastjar/Manifest
index 1f10b9a19693..494abfab5c28 100644
--- a/app-arch/fastjar/Manifest
+++ b/app-arch/fastjar/Manifest
@@ -1,4 +1,4 @@
AUX 0.98-traversal.patch 3010 BLAKE2B 76450d561450aa9c7d5386f53328c0037d6ce9df2d6aac79deb1e47cee7651723cf2863a0d27cb6431a58525a9d0d3c554820b4f22a3099d1fe43b2ea7bec0d1 SHA512 7bfcfebd681f9556e8231786da3326d12ee7ab071e2cadf9a4c17ba4e4e750aeb7e3d7cd78634c36e05179df4a369aae2e04a22533d1954668ada95f1d53d311
DIST fastjar-0.98.tar.gz 717984 BLAKE2B 1715f1917076799fc58c6c6cea8fb53fc3261a694fa2392c0dc6e30101a7d42de0c5c55cd593627b4d2d0ffa45e3d44ef220c9579caec669721c6b1b9996e43c SHA512 c0f9fca7b58d6acd00b90a5184dbde9ba3ffc5bf4d69512743e450649a272baf1f6af98b15d79d2b53990eaf84ef402c986035e6b615a19e35ed424348143903
-EBUILD fastjar-0.98-r3.ebuild 515 BLAKE2B dae7a41a20e0de287b9d4b4e25a7403f73c87241d1e819797b9676cdfaef8a4b01fbadd5eb294a64d297b9e20724c0cf3daee3801c07c33a951d973462e28bf5 SHA512 a7f88602931712be65b24e158805d67a5b72dd8cf0fc544f622181e43b47f48e63426dc334a61b1dcf2777d28e289c859f439159432a6f528f05933dc824eff6
+EBUILD fastjar-0.98-r3.ebuild 522 BLAKE2B abb6f9204ae4b36d6017182f1b5b0a972a90ca4892d3e319b28e08ffe1f9c9e019fb4088ff9af2ca7648b38805b22713c363ce52893dc0433f310691f76e45a9 SHA512 3e92039ed773aa5e2c329081c9492867a34ae45e16b2d7704e5ceb4a42e1a77a87985c2ccd8c4dd5c27d3651f46d07dc1a433ee238b08a3d5754da7a4ee987ef
MISC metadata.xml 478 BLAKE2B 91d7ee00197567dc201739072627c34a8a7073a28b89c5761793ce628d1f62432d91b36b13a65fb95f821101249697a041af339823bb26fe132873c4a20a7b54 SHA512 3b1f8a2998d8496947b8e6c60698db4311ca1afe7ddcd0fe9d4f7ae762acf4204a87f8ebcb9e0b0677727eb82fdda22a299cf3cafcdf83bd348d98ba16ff4214
diff --git a/app-arch/fastjar/fastjar-0.98-r3.ebuild b/app-arch/fastjar/fastjar-0.98-r3.ebuild
index 34ca86e5a0bd..c33c9d06c5b7 100644
--- a/app-arch/fastjar/fastjar-0.98-r3.ebuild
+++ b/app-arch/fastjar/fastjar-0.98-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
IUSE=""
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 0432a7c1198f..28c3994fb4b9 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1,4 @@
+AUX 2.4-trailing-junk.patch 916 BLAKE2B 1487b9fc75bafe50cd00aac14e867f073c8d8db22067a645ed67aec9ebf46c1599d174679a56a23806d546b3a43739f6f5137dc9dd3f7e62b8b0aaaf61e0dd99 SHA512 8159a6b8c5c7086269dbaa06f73262fb53125edbb360ad22526d47364e8006735e72650d869f81335620177a78eb828aa87198905ec0e7ac41dea731261b10dc
DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
-EBUILD pigz-2.4.ebuild 959 BLAKE2B ee8e0f81c1ec39d88cd57cc514f563e844ecaa59e7edad334faac77a160b7ceba3632b9c62e631085a2f4a3da1b7aba38542874feecc67d096a43031a083db58 SHA512 91e673c6cdcab6f888fa0321a5914f5767c273dd234b8c748b9e691a79a3a541dfa54eede8869a298f52e31ed4265823084d6ab12d8d02a73f68f7e09bff1d2b
+EBUILD pigz-2.4-r1.ebuild 1012 BLAKE2B 7266a3fd4be5134e3876ce16ff1149e4ed3edfef522344dd00911375da5fe68d0b5461e358d94d1454de6267360ca27b0f04392d18e00dc1075fccbbdb0b9996 SHA512 1bb48dfa233655425306a5bc5399279c0934e59fe2402775965253682d56df4d753553878504563bdd008063218f6f030cba6db16527ea5c575a10799a2b096a
MISC metadata.xml 688 BLAKE2B 4dc6a54347303d0af5b2d77712a6bcbf4f02e81ebf2daf070f7820d0ea4e99896a5ca7e8134d4ecd6e14cf55d2fb178e9d4e95f6db15bf884d9a68d9c0f5b15a SHA512 f9f5fb0cb1f972ba85a2d80642eee5b061b7d81e4e20a4e2cd1abf958aa5702905b06dca8db65f7ed906ac08c0576e89f01e8a8630f8bd97fda6b5f6b0bb718d
diff --git a/app-arch/pigz/files/2.4-trailing-junk.patch b/app-arch/pigz/files/2.4-trailing-junk.patch
new file mode 100644
index 000000000000..eb5585b7d362
--- /dev/null
+++ b/app-arch/pigz/files/2.4-trailing-junk.patch
@@ -0,0 +1,27 @@
+From 1414ff3eb0b1ac9e5f096b0a28efa459cb8be1cd Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev
+Date: Fri, 10 Jul 2020 19:46:10 -0700
+Subject: [PATCH] Ignore trailing junk on .gz by default, to emulate gzip.
+
+backport of
+https://github.com/madler/pigz/commit/9696c84cb1963651707e649978afb07d0c11b254
+---
+ pigz.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pigz.c b/pigz.c
+index bbbfd2c..f2e79d7 100644
+--- a/pigz.c
++++ b/pigz.c
+@@ -3368,7 +3368,7 @@ local void infchk(void) {
+ cat();
+ else if (was > 1 && get_header(0) != -5)
+ complain("warning: %s: entries after the first were ignored", g.inf);
+- else if ((was == 0 && ret != -1) || (was == 1 && (GET(), !g.in_eof)))
++ else if (( g.verbosity > 1 && was == 0 && ret != -1) || (was == 1 && (GET(), !g.in_eof)))
+ complain("warning: %s: trailing junk was ignored", g.inf);
+ }
+
+--
+2.27.0
+
diff --git a/app-arch/pigz/pigz-2.4.ebuild b/app-arch/pigz/pigz-2.4-r1.ebuild
similarity index 94%
rename from app-arch/pigz/pigz-2.4.ebuild
rename to app-arch/pigz/pigz-2.4-r1.ebuild
index fe1190bc3a3f..29c9951c6bfa 100644
--- a/app-arch/pigz/pigz-2.4.ebuild
+++ b/app-arch/pigz/pigz-2.4-r1.ebuild
@@ -21,6 +21,8 @@ DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )
test? ( app-arch/ncompress )"
+PATCHES=( "${FILESDIR}/${PV}-trailing-junk.patch" )
+
src_compile() {
use static && append-ldflags -static
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 37dd088fc248..97ddffcdc082 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index c4583ad62fa2..05235b9a3607 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -12,6 +12,6 @@ DIST doxygen-1.8.16.src.tar.gz 5497317 BLAKE2B ec1ba4242bd3ef669f92101044049f10a
DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75
EBUILD doxygen-1.8.15.ebuild 3233 BLAKE2B a93bd53bf77ef393c5bc970d20d381f332011a7372337d1d82d08e6b979924e89d03a23ff79a94d869aeb36591255bcc0e064a497dabe47a247affaefa9b3a1e SHA512 81db790474ec2f7d5ca3402aa2d0d63d1db555ea7d667602651bd2b770b6ff9dc737e71c9551bd97f7a84b2cbf4ef4cb413ff789fb9d845a401df49f5b6265ab
EBUILD doxygen-1.8.16-r1.ebuild 3339 BLAKE2B e1961eb2643f4d171593a854da3360eba8029617100e879b93fbbee3a666edc209b60b4ab0b997f93188ce838a407e78b360e5a7d09b6c6e12e546b5dccefa0a SHA512 722ea09c9a797dc5ed60b4b198764202ec114357155ed4f30ae89a32506019df3b2f7db95da04f16044ce9c256a30ad9161d86dbf653886d8ef58012fcc5351d
-EBUILD doxygen-1.8.17.ebuild 3230 BLAKE2B 7c934f062d20f8ddb5bfc7c764a9e8538a4a31241ec6c0243b3fd020fadef904f7ff7cbf82f49743bff1802019668c8aa8b736279c9f0a7cda61eab37cde627a SHA512 c622c840699d5f9ecfed5e9cb99a7681a572155911305bcaa6aa00b8dbf46b10854d807c32d58d0c1983072bc9485dcc7a65938dbe19ef245b67960730ceb0c6
+EBUILD doxygen-1.8.17.ebuild 3229 BLAKE2B bbefd6742c5dc0d21eca4636aa57f189c4cc150cb50211d0e7a80137348a811697dd89622dfe7b281417ebd9ed0397d8a03fb284e6ff92c7b29ad8216c6ca483 SHA512 b15e9ff7a4730d34dfc94bbc25a667d58a2a8db91434b3989b08393b896a1473f1c4cfbf1309253adf794c50515a2553ddf2ae593553536b130727f165d6f705
EBUILD doxygen-9999.ebuild 2892 BLAKE2B d9fa09ab0c9ea4d8771ec6e6a4f290aab7ca37ded9281469a1035e3d3fda477d60f7241f0ac8f40ada6ca643b308b2048c11477d5bfd737f20983bb4031bef00 SHA512 6781ed49e6a4020ab732b7ff69aead2127660d51f37150eec6c97a4231d3c266c7dc51f66918f52ed35f5b37e9d1ec376dab75a046872efb206fb1ef5661f7ad
MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.17.ebuild b/app-doc/doxygen/doxygen-1.8.17.ebuild
index ec9079cd682c..bf7d60e1406b 100644
--- a/app-doc/doxygen/doxygen-1.8.17.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.17.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI=""
else
SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 617805927ad2..791cc6ecd46e 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index c211a59a101c..ac49dcbbc1b0 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,6 +1,6 @@
AUX protontricks-1.4.1_no-setuptools-scm.patch 1291 BLAKE2B 8d97cc8ab7d7dcdba72a3245d7bbd6965d0e0da1f22e290babe6a967057c0ddd6ba85920799f3fa85de4e395f29ea6362472380d3888f2a59bd7c1c167151337 SHA512 730180ce050a81ad42680bb884e3b86b4cc7c2d0efadc07f3a0708f55ab0158b8257e3528ce748d4be830d728e9a238c6d5deef15bc2c926b13ce1c7a1f9a4f2
DIST protontricks-1.4.1.gh.tar.gz 40029 BLAKE2B 3937f69ad1113c0a368117db38cf8bf1b66feea5cc7c509eaee2f7adabdeea724368baa15f51134a5a9749171a34f439878bfda3fc6b813caba11faf7be76373 SHA512 96d4b3aa5b1ca8f7f9bad0859f5984eb29a0bed01f420d108e537deef0436af314e73fcfaccfd58b5b1dc912698404bd4b0157e69ab6a055d65eb3701a60d00b
DIST protontricks-1.4.1.tar.gz 31838 BLAKE2B b8c94a1b96fa7df14eaf1cc6d11cb96e43ae4e8c7bd232687a50cae9c79cf2d0e7864b1af0e1dc4cc20086952e1fcefeb16cb71a9c3a977f6feafad1b17d6857 SHA512 7635c9830afa3c64617514cd86edc7d7f9f33e6e81a1da995ec8bee70adc1cf8b5d9de92036c372134e408d735615b267b46a9afc9246f14ff161cb2ee1fc8f9
-EBUILD protontricks-1.4.1-r1.ebuild 1455 BLAKE2B 08cf533f9d3e45273b9450d16cd342683444deddeec242acd7d7122b55396ebf6b639a6a3219832b9dbbaad6aef24cfdcb25c73d3c04c594588481a479fa6872 SHA512 6e5bd0d386cb4848367c26422c94603b60a45003f6cb7f89d5c29bed88802b82b209ec65816cc391ef515d4b3f9d51681fc38c49b05a58d266f08d5556ce868a
+EBUILD protontricks-1.4.1-r1.ebuild 1461 BLAKE2B 84c308caaedaa8b06e2426b2590504ae59c9662dcb9df2bd31a86a8879aafd30a2f055d613905ec088d6ae0e09bf81e572d9545fa9f7e4b663e417695633d135 SHA512 49375b5379e8ead5f3c638d239b9c99a3f540bd86ecdf8f21866d4de516d3fd5e25bf27f9bd8cba25a9272036e7c391e22380366d383efc208d0f50fd994fe9b
EBUILD protontricks-1.4.1.ebuild 1415 BLAKE2B fd3e09407cfac634bc86a26df6d107ecd07abbfd097ff74a2ea7baaeba40cd8db95460d7b37004b4e54a79ec99c46b3c1ccd162e7d40d4c8ff89b8370b28c3aa SHA512 74bc259a1c1ec202540a36a3d402c1dd71d3350ed9c2c048390c501e4e7c84fd83c7c259a2481d70f83d211821097a560460bb530b96fd0db1fd6b01427353ba
MISC metadata.xml 784 BLAKE2B 37e795944e32ef3f17022efa4ad352e3ee2d1819f3e7ee4ccf02f2366156c999290b4b309c924f54dfde4a5ffc017628c36ead987da2101d2eb38c1eaa767e3e SHA512 6bccb95acbe4cf3b64b4734f98dc4495bd20df294efa0b628f08f4c2ee6bb6c5d103bd323ac29dddb02d2a7ff4ac88ccccdce8a8c01b856aef051eaae6cdb0ae
diff --git a/app-emulation/protontricks/protontricks-1.4.1-r1.ebuild b/app-emulation/protontricks/protontricks-1.4.1-r1.ebuild
index e8c4edf44be5..aff61b39a84c 100644
--- a/app-emulation/protontricks/protontricks-1.4.1-r1.ebuild
+++ b/app-emulation/protontricks/protontricks-1.4.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/app-emulation/qemu-riscv64-bin/Manifest b/app-emulation/qemu-riscv64-bin/Manifest
index d9f62ca356c1..3cbc9573b27b 100644
--- a/app-emulation/qemu-riscv64-bin/Manifest
+++ b/app-emulation/qemu-riscv64-bin/Manifest
@@ -1,3 +1,5 @@
DIST qemu-riscv64-bin-3.1.0-r4.tar.xz 889764 BLAKE2B 888fef2f27f44be098e9b834b083558ce18d98337612b4de2278ffe5d6599248d9ed4e99153ad9b2c1a5b773131c420bb23ce6d080943af744df34464660bc42 SHA512 bc92110f6730c61bd39056d0bf3f84b35ed340a47af51b28b27554f9f2f72409221d2c81826b718742475d0fc48040c81e8f051e29b4f13412c3a39e282471e0
+DIST qemu-riscv64-bin-5.0.0.tar.xz 922240 BLAKE2B d4ff41c8e45ca99bc1b9e795d9e218b05be283b32d179e8ab88d07bd333a52fce7893739e6572219083d5d56a7abb7cc1870df7c585ca41af15b56a5dc30369d SHA512 1ba28679ce4bf1f11b77059dae8cb76f0095cc4427159d769947b8a1b1212c9de0a25a236c69ff9780dd111a22fa6e01519a3017b0b0a5d29069575501552f40
EBUILD qemu-riscv64-bin-3.1.0-r4.ebuild 489 BLAKE2B c8c05afb49827fc776fc4569f51fbcc18a43519241dc580afc58b6e8cac09e31e3a82224fc6ebce7beef913a3794da1a9f9ddb86b2b01c4c5a8254f2e07e9ecb SHA512 a93aadc16237a744e0edd22ba11787b3867a25a402b560ea5ed5ec6e5104d9e1f88c66ce3b562fb936f416bd4088e4e74d687b418e40377cc8485a341e09dba1
+EBUILD qemu-riscv64-bin-5.0.0.ebuild 489 BLAKE2B c8c05afb49827fc776fc4569f51fbcc18a43519241dc580afc58b6e8cac09e31e3a82224fc6ebce7beef913a3794da1a9f9ddb86b2b01c4c5a8254f2e07e9ecb SHA512 a93aadc16237a744e0edd22ba11787b3867a25a402b560ea5ed5ec6e5104d9e1f88c66ce3b562fb936f416bd4088e4e74d687b418e40377cc8485a341e09dba1
MISC metadata.xml 479 BLAKE2B 9073a68b14d921d5557835e3f3518f3e35688452310d8d9c89233abca25277588a67eee0641e0cfb8afb7951fd29281ca7add9a20ff45acae1f3532ad051e862 SHA512 78d7fa09208d0cb1c6bad33a92d059858d94939821147fa2f095b961bee64ea29db6dedba6e68dac9db6ae2b985e3c8462d56bbe079fbe074c623257a830b6ff
diff --git a/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-5.0.0.ebuild b/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-5.0.0.ebuild
new file mode 100644
index 000000000000..650e2af57e19
--- /dev/null
+++ b/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-5.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Statically linked x86-64 binary of app-emulation/qemu, riscv64 emulator"
+
+HOMEPAGE="http://www.qemu.org"
+SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}.tar.xz"
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="!app-emulation/qemu[qemu_user_targets_riscv64]"
+
+QA_PREBUILT="*"
+
+S=${WORKDIR}
+
+src_install() {
+ dobin qemu-riscv64
+}
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 71383b3ec7ac..a973bdf348ee 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -9,6 +9,7 @@ AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a
AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
EBUILD qemu-5.0.0-r1.ebuild 24608 BLAKE2B 6c63be1c37a004208e2c4342ede1b35b6b85dc150bfb3112192a557e6b89bd21193e63e5e789494b6ee3a22a642cbb6ba10db299e812f5a889e60e372ab40f0f SHA512 99595f2e7a5aec01b8750a4ae1b4f61be5b5967e2c58b9aaae044ff80a6cb5efa4393281e9b461f09f99ceef3ed40c6543c6b298e7f2449e74d6cd59015f9146
+EBUILD qemu-5.0.0-r2.ebuild 24674 BLAKE2B f76e9bd8d06398bc36aeec6661b51360d2466324d21f6e8b86023a69d66646cb3027ece401954ef4846bc3cf475169733c0913e550793937414bbe386aade01c SHA512 6e0c6f910df145a847f666e87457db81af308f4f4f95f69e9ddd6c72afd038f8b409ea714dcbd86188d7e908501dbf686ce0517e405bda2125361c467ac5e4b9
EBUILD qemu-5.0.0.ebuild 24539 BLAKE2B 556790420f61cbc42129e0996b0f95a90faa1053469bdc4c6b006fdb9f76233267e899fafc58c1c64baf947d5239638fae9198ef4604f1cb7f6bcc5d005a0ee2 SHA512 83c7093c429fcbf8a1b582f8672c486f79f76e1fdf94c1014b4f3e895c8c08bf294dac511ea8bd46554758a0b8d2ec8d9d3d8fbc76f9b60613056810b53dc896
-EBUILD qemu-9999.ebuild 24498 BLAKE2B 0cbeeb6404826492304577500e9eec52fb4468ff68f2693e1d7688d764fafeba7e4dd25e59fcfe618f16c76cf0e7ba8fd514d1467eba5d8252dc31d52d493137 SHA512 6fb2d3e54e38c821ee123c63d71c6f68b4a6e650d0a53e47711510c3d599fb12cd9cd2c04cc21950d295abc062e039e2a82ee4e226ccf0d9f7bb16c72037bd52
-MISC metadata.xml 4465 BLAKE2B ef8f4fcd42539604fd5d05228dc89b9bebe56490c20da6cd3244a9b9d8c5c66036562ff64e4a740c824a80f2fbfa70b6540873d223f4bb9f901337fe78e3012c SHA512 103ee38332f04a84527e177e9efc36847daa0bcdb6ea90a33ed8656139b7464f8d99dd6cdf7cc33460c87701786e8573cac532af2f84d5ae53d1b78c750ef770
+EBUILD qemu-9999.ebuild 24564 BLAKE2B 59a04907ea6e28983d3b79c2aeca72f8425da04800b067799450abcc3f0796889bf39d2ce7763a4b115f084860ee16a34f72a9466c8ced6a3a72945c8ebabe80 SHA512 46498642d0fe9f90999155436bfa2b52e911ba4440c01aa9b25359cd7f7d5a78a88e3c2662491acd24576262d5655d4110660bb6b305b90a7414ef56903ae543
+MISC metadata.xml 4552 BLAKE2B da4e95aba5cc8b47df692698d32f03a3ba788527172bdd45593ac5bc4aa0ba37626b968a06ffa95731d00917bd2f7490bd4b5181ff0fba8b98e22196543c65b2 SHA512 cbfd366e646eac523950aba8b4af87f3fb25753277fbbd43c9a9dffb411c35650d56ac9eba10051218b6f847884284c497f9f60095551dafe506446e10b808df
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 0c30c4582643..eda19489ec96 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -40,6 +40,7 @@
Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD
Enable the SDL-based console
SDL Image support for icons
+ Enable TCP/IP in hypervisor via net-libs/libslirp
Enable Spice protocol support via app-emulation/spice
Enable SSH based block device support via net-libs/libssh2
Build the User targets as static binaries
@@ -58,8 +59,7 @@
Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup
Enable terminal support (x11-libs/vte) in the GTK+ interface
Add support for getting and setting POSIX extended attributes, through
- sys-apps/attr. Requisite for the virtfs backend.
-
+ sys-apps/attr. Requisite for the virtfs backend.
Enables support for Xen backends
Support xfsctl() notification and syncing for XFS backed
virtual disks.
diff --git a/app-emulation/qemu/qemu-5.0.0-r2.ebuild b/app-emulation/qemu/qemu-5.0.0-r2.ebuild
new file mode 100644
index 000000000000..dd30807e9857
--- /dev/null
+++ b/app-emulation/qemu/qemu-5.0.0-r2.ebuild
@@ -0,0 +1,840 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_REQ_USE="ncurses,readline"
+
+PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
+
+FIRMWARE_ABI_VERSION="4.0.0-r50"
+
+inherit eutils linux-info toolchain-funcs multilib python-r1 \
+ udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
+ EGIT_SUBMODULES=(
+ tests/fp/berkeley-{test,soft}float-3
+ ui/keycodemapdb
+ )
+ inherit git-r3
+ SRC_URI=""
+else
+ SRC_URI="https://download.qemu.org/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
+ +fdt glusterfs gnutls gtk infiniband iscsi io-uring
+ jemalloc +jpeg kernel_linux
+ kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
+ plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+ slirp
+ smartcard snappy spice ssh static static-user systemtap tci test usb
+ usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
+ xfs +xkb zstd"
+
+COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
+ mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
+ sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
+ lm32 moxie rx tricore unicore32"
+IUSE_USER_TARGETS="${COMMON_TARGETS}
+ aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
+ tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+RESTRICT="!test? ( test )"
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ qemu_softmmu_targets_arm? ( fdt )
+ qemu_softmmu_targets_microblaze? ( fdt )
+ qemu_softmmu_targets_mips64el? ( fdt )
+ qemu_softmmu_targets_ppc64? ( fdt )
+ qemu_softmmu_targets_ppc? ( fdt )
+ qemu_softmmu_targets_riscv32? ( fdt )
+ qemu_softmmu_targets_riscv64? ( fdt )
+ static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy )
+ static-user? ( !plugins )
+ virtfs? ( xattr )
+ vte? ( gtk )
+ plugins? ( !static !static-user )
+"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected). This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+ >=dev-libs/glib-2.0[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ python? ( ${PYTHON_DEPS} )
+ systemtap? ( dev-util/systemtap )
+ xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+ dev-libs/libxml2[static-libs(+)]
+ xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ accessibility? (
+ app-accessibility/brltty[api]
+ app-accessibility/brltty[static-libs(+)]
+ )
+ aio? ( dev-libs/libaio[static-libs(+)] )
+ alsa? ( >=media-libs/alsa-lib-1.0.13 )
+ bzip2? ( app-arch/bzip2[static-libs(+)] )
+ capstone? ( dev-libs/capstone:= )
+ caps? ( sys-libs/libcap-ng[static-libs(+)] )
+ curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+ fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
+ glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+ gnutls? (
+ dev-libs/nettle:=[static-libs(+)]
+ >=net-libs/gnutls-3.0:=[static-libs(+)]
+ )
+ gtk? (
+ x11-libs/gtk+:3
+ vte? ( x11-libs/vte:2.91 )
+ )
+ infiniband? (
+ sys-fabric/libibumad:=[static-libs(+)]
+ sys-fabric/libibverbs:=[static-libs(+)]
+ sys-fabric/librdmacm:=[static-libs(+)]
+ )
+ iscsi? ( net-libs/libiscsi )
+ io-uring? ( sys-libs/liburing[static-libs(+)] )
+ jemalloc? ( dev-libs/jemalloc )
+ jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+ lzo? ( dev-libs/lzo:2[static-libs(+)] )
+ ncurses? (
+ sys-libs/ncurses:0=[unicode]
+ sys-libs/ncurses:0=[static-libs(+)]
+ )
+ nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+ numa? ( sys-process/numactl[static-libs(+)] )
+ opengl? (
+ virtual/opengl
+ media-libs/libepoxy[static-libs(+)]
+ media-libs/mesa[static-libs(+)]
+ media-libs/mesa[egl,gbm]
+ )
+ png? ( media-libs/libpng:0=[static-libs(+)] )
+ pulseaudio? ( media-sound/pulseaudio )
+ rbd? ( sys-cluster/ceph )
+ sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+ sdl? (
+ media-libs/libsdl2[video]
+ media-libs/libsdl2[static-libs(+)]
+ )
+ sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
+ seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+ slirp? ( net-libs/libslirp )
+ smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+ snappy? ( app-arch/snappy:= )
+ spice? (
+ >=app-emulation/spice-protocol-0.12.3
+ >=app-emulation/spice-0.12.0[static-libs(+)]
+ )
+ ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+ usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+ usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+ vde? ( net-misc/vde[static-libs(+)] )
+ virgl? ( media-libs/virglrenderer[static-libs(+)] )
+ virtfs? ( sys-libs/libcap )
+ xen? ( app-emulation/xen-tools:= )
+ xfs? ( sys-fs/xfsprogs[static-libs(+)] )
+ zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
+"
+
+X86_FIRMWARE_DEPEND="
+ pin-upstream-blobs? (
+ ~sys-firmware/edk2-ovmf-201905[binary]
+ ~sys-firmware/ipxe-1.0.0_p20190728[binary]
+ ~sys-firmware/seabios-1.12.0[binary,seavgabios]
+ ~sys-firmware/sgabios-0.1_pre8[binary]
+ )
+ !pin-upstream-blobs? (
+ sys-firmware/edk2-ovmf
+ sys-firmware/ipxe
+ >=sys-firmware/seabios-1.10.2[seavgabios]
+ sys-firmware/sgabios
+ )"
+PPC64_FIRMWARE_DEPEND="
+ pin-upstream-blobs? (
+ ~sys-firmware/seabios-1.12.0[binary,seavgabios]
+ )
+ !pin-upstream-blobs? (
+ >=sys-firmware/seabios-1.10.2[seavgabios]
+ )
+"
+
+BDEPEND="
+ $(python_gen_impl_dep)
+ dev-lang/perl
+ sys-apps/texinfo
+ virtual/pkgconfig
+ doc? ( dev-python/sphinx )
+ gtk? ( nls? ( sys-devel/gettext ) )
+ test? (
+ dev-libs/glib[utils]
+ sys-devel/bc
+ )
+"
+CDEPEND="
+ !static? (
+ ${ALL_DEPEND//\[static-libs(+)]}
+ ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+ )
+ qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+ qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+ qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
+"
+DEPEND="${CDEPEND}
+ kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+ static? (
+ ${ALL_DEPEND}
+ ${SOFTMMU_TOOLS_DEPEND}
+ )
+ static-user? ( ${ALL_DEPEND} )"
+RDEPEND="${CDEPEND}
+ acct-group/kvm
+ selinux? ( sec-policy/selinux-qemu )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
+ "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
+ "${FILESDIR}"/${PN}-4.2.0-cflags.patch
+ "${FILESDIR}"/${PN}-5.0.0-epoll-strace.patch
+ "${FILESDIR}"/${PN}-5.0.0-ipv6-slirp-CVE-2020-10756.patch #731992
+)
+
+QA_PREBUILT="
+ usr/share/qemu/hppa-firmware.img
+ usr/share/qemu/openbios-ppc
+ usr/share/qemu/openbios-sparc64
+ usr/share/qemu/openbios-sparc32
+ usr/share/qemu/palcode-clipper
+ usr/share/qemu/s390-ccw.img
+ usr/share/qemu/s390-netboot.img
+ usr/share/qemu/u-boot.e500"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+ usr/bin/qemu-x86_64
+ usr/bin/qemu-alpha
+ usr/bin/qemu-arm
+ usr/bin/qemu-cris
+ usr/bin/qemu-m68k
+ usr/bin/qemu-microblaze
+ usr/bin/qemu-microblazeel
+ usr/bin/qemu-mips
+ usr/bin/qemu-mipsel
+ usr/bin/qemu-or1k
+ usr/bin/qemu-ppc
+ usr/bin/qemu-ppc64
+ usr/bin/qemu-ppc64abi32
+ usr/bin/qemu-sh4
+ usr/bin/qemu-sh4eb
+ usr/bin/qemu-sparc
+ usr/bin/qemu-sparc64
+ usr/bin/qemu-armeb
+ usr/bin/qemu-sparc32plus
+ usr/bin/qemu-s390x
+ usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+ For AMD CPUs the module is called 'kvm-amd'.
+ For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+ $ gpasswd -a kvm
+then have re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it. You can tell udev to reset ownership/perms:
+ $ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+ # rc-update add qemu-binfmt
+For systemd:
+ # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+ if use kernel_linux && kernel_is lt 2 6 25; then
+ eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+ elif use kernel_linux; then
+ if ! linux_config_exists; then
+ eerror "Unable to check your kernel for KVM support"
+ else
+ CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+ ERROR_KVM="You must enable KVM in your kernel to continue"
+ ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+ ERROR_KVM_AMD+=" your kernel configuration."
+ ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+ ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+ ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+ ERROR_TUN+=" into your kernel or loaded as a module to use the"
+ ERROR_TUN+=" virtual network device if using -net tap."
+ ERROR_BRIDGE="You will also need support for 802.1d"
+ ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+ use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+ ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+ ERROR_VHOST_NET+=" support"
+
+ if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+ if grep -q AuthenticAMD /proc/cpuinfo; then
+ CONFIG_CHECK+=" ~KVM_AMD"
+ elif grep -q GenuineIntel /proc/cpuinfo; then
+ CONFIG_CHECK+=" ~KVM_INTEL"
+ fi
+ fi
+
+ use python && CONFIG_CHECK+=" ~DEBUG_FS"
+ ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+ # Now do the actual checks setup above
+ check_extra_config
+ fi
+ fi
+
+ if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+ eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+ eerror "instances are still pointing to it. Please update your"
+ eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+ eerror "and the right system binary (e.g. qemu-system-x86_64)."
+ die "update your virt configs to not use qemu-kvm"
+ fi
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+ local var=$1 mak=$2
+ local detected sorted
+
+ pushd "${S}"/default-configs >/dev/null || die
+
+ # Force C locale until glibc is updated. #564936
+ detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+ sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+ if [[ ${sorted} != "${detected}" ]] ; then
+ eerror "The ebuild needs to be kept in sync."
+ eerror "${var}: ${sorted}"
+ eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+ die "sync ${var} to the list of targets"
+ fi
+
+ popd >/dev/null
+}
+
+handle_locales() {
+ # Make sure locale list is kept up-to-date.
+ local detected sorted
+ detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+ sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+ if [[ ${sorted} != "${detected}" ]] ; then
+ eerror "The ebuild needs to be kept in sync."
+ eerror "PLOCALES: ${sorted}"
+ eerror " po/*.po: ${detected}"
+ die "sync PLOCALES"
+ fi
+
+ # Deal with selective install of locales.
+ if use nls ; then
+ # Delete locales the user does not want. #577814
+ rm_loc() { rm po/$1.po || die; }
+ l10n_for_each_disabled_locale_do rm_loc
+ else
+ # Cheap hack to disable gettext .mo generation.
+ rm -f po/*.po
+ fi
+}
+
+src_prepare() {
+ check_targets IUSE_SOFTMMU_TARGETS softmmu
+ check_targets IUSE_USER_TARGETS linux-user
+
+ default
+
+ # Use correct toolchain to fix cross-compiling
+ tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB
+ export WINDRES=${CHOST}-windres
+
+ # Verbose builds
+ MAKEOPTS+=" V=1"
+
+ # Run after we've applied all patches.
+ handle_locales
+
+ # Remove bundled copy of libfdt
+ rm -r dtc || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ local buildtype=$1
+ local builddir="${S}/${buildtype}-build"
+
+ mkdir "${builddir}"
+
+ local conf_opts=(
+ --prefix=/usr
+ --sysconfdir=/etc
+ --bindir=/usr/bin
+ --libdir=/usr/$(get_libdir)
+ --datadir=/usr/share
+ --docdir=/usr/share/doc/${PF}/html
+ --mandir=/usr/share/man
+ --with-confsuffix=/qemu
+ --localstatedir=/var
+ --disable-bsd-user
+ --disable-guest-agent
+ --disable-strip
+ --disable-werror
+ # We support gnutls/nettle for crypto operations. It is possible
+ # to use gcrypt when gnutls/nettle are disabled (but not when they
+ # are enabled), but it's not really worth the hassle. Disable it
+ # all the time to avoid automatically detecting it. #568856
+ --disable-gcrypt
+ --python="${PYTHON}"
+ --cc="$(tc-getCC)"
+ --cxx="$(tc-getCXX)"
+ --host-cc="$(tc-getBUILD_CC)"
+ $(use_enable debug debug-info)
+ $(use_enable debug debug-tcg)
+ $(use_enable doc docs)
+ $(use_enable plugins)
+ $(use_enable tci tcg-interpreter)
+ $(use_enable xattr attr)
+ )
+
+ # Disable options not used by user targets. This simplifies building
+ # static user targets (USE=static-user) considerably.
+ conf_notuser() {
+ if [[ ${buildtype} == "user" ]] ; then
+ echo "--disable-${2:-$1}"
+ else
+ use_enable "$@"
+ fi
+ }
+ conf_opts+=(
+ $(conf_notuser accessibility brlapi)
+ $(conf_notuser aio linux-aio)
+ $(conf_notuser bzip2)
+ $(conf_notuser capstone)
+ $(conf_notuser caps cap-ng)
+ $(conf_notuser curl)
+ $(conf_notuser fdt)
+ $(conf_notuser glusterfs)
+ $(conf_notuser gnutls)
+ $(conf_notuser gnutls nettle)
+ $(conf_notuser gtk)
+ $(conf_notuser infiniband rdma)
+ $(conf_notuser iscsi libiscsi)
+ $(conf_notuser io-uring linux-io-uring)
+ $(conf_notuser jemalloc jemalloc)
+ $(conf_notuser jpeg vnc-jpeg)
+ $(conf_notuser kernel_linux kvm)
+ $(conf_notuser lzo)
+ $(conf_notuser ncurses curses)
+ $(conf_notuser nfs libnfs)
+ $(conf_notuser numa)
+ $(conf_notuser opengl)
+ $(conf_notuser png vnc-png)
+ $(conf_notuser rbd)
+ $(conf_notuser sasl vnc-sasl)
+ $(conf_notuser sdl)
+ $(conf_notuser sdl-image)
+ $(conf_notuser seccomp)
+ $(conf_notuser slirp slirp system)
+ $(conf_notuser smartcard)
+ $(conf_notuser snappy)
+ $(conf_notuser spice)
+ $(conf_notuser ssh libssh)
+ $(conf_notuser usb libusb)
+ $(conf_notuser usbredir usb-redir)
+ $(conf_notuser vde)
+ $(conf_notuser vhost-net)
+ $(conf_notuser vhost-user-fs)
+ $(conf_notuser virgl virglrenderer)
+ $(conf_notuser virtfs)
+ $(conf_notuser vnc)
+ $(conf_notuser vte)
+ $(conf_notuser xen)
+ $(conf_notuser xen xen-pci-passthrough)
+ $(conf_notuser xfs xfsctl)
+ $(conf_notuser xkb xkbcommon)
+ $(conf_notuser zstd)
+ )
+
+ if [[ ${buildtype} == "user" ]] ; then
+ conf_opts+=( --disable-libxml2 )
+ else
+ conf_opts+=( --enable-libxml2 )
+ fi
+
+ if [[ ! ${buildtype} == "user" ]] ; then
+ # audio options
+ local audio_opts=(
+ # Note: backend order matters here: #716202
+ # We iterate from higher-level to lower level.
+ $(usex pulseaudio pa "")
+ $(usev sdl)
+ $(usev alsa)
+ $(usev oss)
+ )
+ conf_opts+=(
+ --audio-drv-list=$(printf "%s," "${audio_opts[@]}")
+ )
+ fi
+
+ case ${buildtype} in
+ user)
+ conf_opts+=(
+ --enable-linux-user
+ --disable-system
+ --disable-blobs
+ --disable-tools
+ )
+ local static_flag="static-user"
+ ;;
+ softmmu)
+ conf_opts+=(
+ --disable-linux-user
+ --enable-system
+ --disable-tools
+ )
+ local static_flag="static"
+ ;;
+ tools)
+ conf_opts+=(
+ --disable-linux-user
+ --disable-system
+ --disable-blobs
+ --enable-tools
+ )
+ local static_flag="static"
+ ;;
+ esac
+
+ local targets="${buildtype}_targets"
+ [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+ # Add support for SystemTAP
+ use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+ # We always want to attempt to build with PIE support as it results
+ # in a more secure binary. But it doesn't work with static or if
+ # the current GCC doesn't have PIE support.
+ if use ${static_flag}; then
+ conf_opts+=( --static --disable-pie )
+ else
+ tc-enables-pie && conf_opts+=( --enable-pie )
+ fi
+
+ echo "../configure ${conf_opts[*]}"
+ cd "${builddir}"
+ ../configure "${conf_opts[@]}" || die "configure failed"
+
+ # FreeBSD's kernel does not support QEMU assigning/grabbing
+ # host USB devices yet
+ use kernel_FreeBSD && \
+ sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+ local target
+
+ python_setup
+
+ softmmu_targets= softmmu_bins=()
+ user_targets= user_bins=()
+
+ for target in ${IUSE_SOFTMMU_TARGETS} ; do
+ if use "qemu_softmmu_targets_${target}"; then
+ softmmu_targets+=",${target}-softmmu"
+ softmmu_bins+=( "qemu-system-${target}" )
+ fi
+ done
+
+ for target in ${IUSE_USER_TARGETS} ; do
+ if use "qemu_user_targets_${target}"; then
+ user_targets+=",${target}-linux-user"
+ user_bins+=( "qemu-${target}" )
+ fi
+ done
+
+ softmmu_targets=${softmmu_targets#,}
+ user_targets=${user_targets#,}
+
+ [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+ [[ -n ${user_targets} ]] && qemu_src_configure "user"
+ qemu_src_configure "tools"
+}
+
+src_compile() {
+ if [[ -n ${user_targets} ]]; then
+ cd "${S}/user-build"
+ default
+ fi
+
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ default
+ fi
+
+ cd "${S}/tools-build"
+ default
+}
+
+src_test() {
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ pax-mark m */qemu-system-* #515550
+ emake check
+ fi
+}
+
+qemu_python_install() {
+ python_domodule "${S}/python/qemu"
+
+ python_doscript "${S}/scripts/kvm/vmxcap"
+ python_doscript "${S}/scripts/qmp/qmp-shell"
+ python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+ local out="${T}/qemu-binfmt"
+ local out_systemd="${T}/qemu.conf"
+ local d="${T}/binfmt.d"
+
+ einfo "Generating qemu binfmt scripts and configuration files"
+
+ # Generate the debian fragments first.
+ mkdir -p "${d}"
+ "${S}"/scripts/qemu-binfmt-conf.sh \
+ --debian \
+ --exportdir "${d}" \
+ --qemu-path "${EPREFIX}/usr/bin" \
+ || die
+ # Then turn the fragments into a shell script we can source.
+ sed -E -i \
+ -e 's:^([^ ]+) (.*)$:\1="\2":' \
+ "${d}"/* || die
+
+ # Generate the init.d script by assembling the fragments from above.
+ local f qcpu package interpreter magic mask
+ cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+ for f in "${d}"/qemu-* ; do
+ source "${f}"
+
+ # Normalize the cpu logic like we do in the init.d for the native cpu.
+ qcpu=${package#qemu-}
+ case ${qcpu} in
+ arm*) qcpu="arm";;
+ mips*) qcpu="mips";;
+ ppc*) qcpu="ppc";;
+ s390*) qcpu="s390";;
+ sh*) qcpu="sh";;
+ sparc*) qcpu="sparc";;
+ esac
+
+ # we use 'printf' here to be portable across 'sh'
+ # implementations: #679168
+ cat <>"${out}"
+ if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+ printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+ fi
+EOF
+
+ echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+ done
+ cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+ if [[ -n ${user_targets} ]]; then
+ cd "${S}/user-build"
+ emake DESTDIR="${ED}" install
+
+ # Install binfmt handler init script for user targets.
+ generate_initd
+ doinitd "${T}/qemu-binfmt"
+
+ # Install binfmt/qemu.conf.
+ insinto "/usr/share/qemu/binfmt.d"
+ doins "${T}/qemu.conf"
+ fi
+
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ emake DESTDIR="${ED}" install
+
+ # This might not exist if the test failed. #512010
+ [[ -e check-report.html ]] && dodoc check-report.html
+
+ if use kernel_linux; then
+ udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
+ fi
+
+ if use python; then
+ python_foreach_impl qemu_python_install
+ fi
+ fi
+
+ cd "${S}/tools-build"
+ emake DESTDIR="${ED}" install
+
+ # Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+ pushd "${ED}"/usr/bin >/dev/null
+ pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+ popd >/dev/null
+
+ # Install config file example for qemu-bridge-helper
+ insinto "/etc/qemu"
+ doins "${FILESDIR}/bridge.conf"
+
+ cd "${S}"
+ dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+ newdoc pc-bios/README README.pc-bios
+
+ # Disallow stripping of prebuilt firmware files.
+ dostrip -x ${QA_PREBUILT}
+
+ if [[ -n ${softmmu_targets} ]]; then
+ # Remove SeaBIOS since we're using the SeaBIOS packaged one
+ rm "${ED}/usr/share/qemu/bios.bin"
+ rm "${ED}/usr/share/qemu/bios-256k.bin"
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+ dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+ fi
+
+ # Remove vgabios since we're using the seavgabios packaged one
+ rm "${ED}/usr/share/qemu/vgabios.bin"
+ rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+ rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+ rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+ rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+ rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+ # PPC64 loads vgabios-stdvga
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
+ dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+ dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+ dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+ dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+ dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+ dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+ fi
+
+ # Remove sgabios since we're using the sgabios packaged one
+ rm "${ED}/usr/share/qemu/sgabios.bin"
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+ fi
+
+ # Remove iPXE since we're using the iPXE packaged one
+ rm "${ED}"/usr/share/qemu/pxe-*.rom
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+ dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+ dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+ dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+ dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+ dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+ fi
+ fi
+
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+ local pv
+ for pv in ${REPLACING_VERSIONS}; do
+ if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
+ return 0
+ fi
+ done
+ return 1
+}
+
+pkg_postinst() {
+ if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+ udev_reload
+ fi
+
+ xdg_icon_cache_update
+
+ [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+ fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
+
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_print_elog
+
+ if use pin-upstream-blobs && firmware_abi_change; then
+ ewarn "This version of qemu pins new versions of firmware blobs:"
+ ewarn " $(best_version sys-firmware/edk2-ovmf)"
+ ewarn " $(best_version sys-firmware/ipxe)"
+ ewarn " $(best_version sys-firmware/seabios)"
+ ewarn " $(best_version sys-firmware/sgabios)"
+ ewarn "This might break resume of hibernated guests (started with a different"
+ ewarn "firmware version) and live migration to/from qemu versions with different"
+ ewarn "firmware. Please (cold) restart all running guests. For functional"
+ ewarn "guest migration ensure that all"
+ ewarn "hosts run at least"
+ ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+ fi
+}
+
+pkg_info() {
+ echo "Using:"
+ echo " $(best_version app-emulation/spice-protocol)"
+ echo " $(best_version sys-firmware/edk2-ovmf)"
+ if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+ echo " USE=binary"
+ else
+ echo " USE=''"
+ fi
+ echo " $(best_version sys-firmware/ipxe)"
+ echo " $(best_version sys-firmware/seabios)"
+ if has_version 'sys-firmware/seabios[binary]'; then
+ echo " USE=binary"
+ else
+ echo " USE=''"
+ fi
+ echo " $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 8b929852984f..cf78c79fb472 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -16,7 +16,6 @@ inherit eutils linux-info toolchain-funcs multilib python-r1 \
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
EGIT_SUBMODULES=(
- slirp
tests/fp/berkeley-{test,soft}float-3
ui/keycodemapdb
)
@@ -38,6 +37,7 @@ IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
jemalloc +jpeg kernel_linux
kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+ slirp
smartcard snappy spice ssh static static-user systemtap tci test usb
usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
xfs +xkb zstd"
@@ -146,6 +146,7 @@ SOFTMMU_TOOLS_DEPEND="
)
sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+ slirp? ( net-libs/libslirp )
smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
snappy? ( app-arch/snappy:= )
spice? (
@@ -468,6 +469,7 @@ qemu_src_configure() {
$(conf_notuser sdl)
$(conf_notuser sdl-image)
$(conf_notuser seccomp)
+ $(conf_notuser slirp slirp system)
$(conf_notuser smartcard)
$(conf_notuser snappy)
$(conf_notuser spice)
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 4f87f101695d..0378b37cec4c 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -3,4 +3,4 @@ DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b517
DIST vagrant-2.2.9.tar.gz 2215868 BLAKE2B 6d40827c91c86f6b11865d9949e5313c419456c573686944ecd0d1874323aa81d6f26178d5b7a16fee701c513a98b3483dbea0531d9d77dee7b7e284004e17b3 SHA512 15e230bcf336615f0d49a2c40db36f7f26a9f0f6fd42d2ce801f28afc663aadded4fa373e33f9102b21ee70d98563fc68e2b24ffa6c3eec321f58b2c42b0d260
EBUILD vagrant-2.2.7-r1.ebuild 2559 BLAKE2B dcb267f7c75f4bd744f2a83e416aa7005c8576f8d36326efd38b6dc634034b366ddf99016f24b5ced6a8ee87d8b7247db5c16e362f171be98ecd81c46d7d133f SHA512 e4f0a36c8b36625ad0ae660ed1eb4987f1a12f0d9c96316734cdcc31975f75621ea1e3f7a18162d780dc3d33e266e66f4fdd9014be557d50fbc1894ba602d852
EBUILD vagrant-2.2.9-r1.ebuild 2561 BLAKE2B 4b510524099dddaa98fcc3a5df7a92b16e5ec2bc9983e55699a3d31689a5b1cc83c9467c248f25309ca9d9f226763664a33b4f9e4594a7e7459894586d1697a2 SHA512 e7ca458227e86b43cf01d3c76bd20342560256f8f35a483767a0e65ebd0a34d513de35d93f1b83c3e94441b5657c7bf5185127f85061eadaaeafbf0798a1eec5
-MISC metadata.xml 413 BLAKE2B 1b57ae29cf2bcdf4bd7d97071e081818e114104bd5a22438e0fe47bd4bce9b2fc1b831c544579cc8b652860c9637caa9134e6f1a4abcb21216e39e62fa058862 SHA512 417deb9af12420ac037b15b526d77ea3fdad12d047c4ea9ede5465ea9ea772fe96ee1625714e74e6dbad6ee224916e9b9304c38293aec4c5e2a52555e1c9f4e8
+MISC metadata.xml 329 BLAKE2B 9bd92975f5ac2c34e47cbb532ef809d366cfdab4d76d31fde5d256b9b6b257a71fc516d8cd0975bdc52c7929d9a789094a7dad83aad106104340537b2e10861d SHA512 939b3f253fdb9b5479faec858d37e39c79c9fd6e31381d4f6bfe019c46c3bfd8bf7d94aac80f55a59e68f981cab6a452f7f1485bd36606898bbb563d92777855
diff --git a/app-emulation/vagrant/metadata.xml b/app-emulation/vagrant/metadata.xml
index b63908369576..4f92768cfae5 100644
--- a/app-emulation/vagrant/metadata.xml
+++ b/app-emulation/vagrant/metadata.xml
@@ -1,10 +1,7 @@
-
- gyakovlev@gentoo.org
- Georgy Yakovlev
-
+