gentoo resync : 12.01.2019

4 files changed, 9 insertions, 12 deletions

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 38358470eb11..8859cc4d75aa 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -9,7 +9,7 @@ AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5
 DIST qemu-2.12.1-patches-r1.tar.xz 3648 BLAKE2B 07908004d0b56e60274cb59d4163770290d8fa6e31646e7d96db08427a219638ac53bdd988c9557471b95321a72982d740a29778d843652274a126737a0a6c00 SHA512 1c7768c14a8e168053f0322554214ba59932a9fa23c982b06dbb1b8fdcfc280ae1d97b20244600f357485bfbcb9ad8bd7968787550c8a4e5e243ac8502eff05e
 DIST qemu-2.12.1.tar.bz2 41192583 BLAKE2B ff903a5850e406ab542ad1a84300852599fa9c199e0f3290e4d6ddad5284192577351278a18dd5706463b08e817b49340989a35987a04672f7cede2097d1d18d SHA512 4c85e6180bf7ec61c0bdddb20e104a7c93fe6b1de27f6aa50d75633eb78491cb844798a9e3f536245eff7b4ebe9a6227f5f66b418ced44095b8e59c5cb33d4cd
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
-EBUILD qemu-2.12.1.ebuild 24048 BLAKE2B b820aac5d165b1fc474d182909b9fc0e865791439914cfc216ea5aaff99d0077968b4709049f154dc77ba831fefee33c0ee803b7f6903267cad07c8ee290e6d5 SHA512 3ae064edb8998a080941852400971d6a26f70e21ee8c7664ff5b1833cb58f598f2018a491f22d601992083247a199121083536ca1370b726eac51fb4606ac6cd
-EBUILD qemu-3.1.0.ebuild 23787 BLAKE2B 902054fb146802b497e70c80d60d713f60e41be59366d5338c6b532eacd21600cace729739cbb3ed47630cdc26fd80f7b78d87276638b030cb19abd57ede927d SHA512 059cd89df8150c965fc93449f04b4c7520551b34cb88af82f2e84a44d15cf52d89c19c2f26a5a83c3a29681345195153bd01a8bd2b854d8f9fc13d19cde12db8
-EBUILD qemu-9999.ebuild 23578 BLAKE2B d1ef631a6d51721b2ce528f3f6a4a58200ffbeaa7a277cd14fd942a8ade581541bee3514760e1b8b04093ad8e49ba31535fe5fd618c2db495cefa6b29320b472 SHA512 0e94523e40ea50664a7ab9dd1451811b03feb26e67a35f2271aa060d58f1e04e50750f61580a6612fcc12d440b77b458a466ff70049bd514aacecbeaeb28686d
+EBUILD qemu-2.12.1.ebuild 24027 BLAKE2B f4e1bf430fec2697b1342a9396477f6a5cca96873d523a45a7f039d163cec756e63b6f3b20f5698333060cd28c9f16e60ba15709d8b6bc4f150a11a3d91bcc17 SHA512 283808f805122536242bcaccfa4921a4ade19258cae7367c7a3edfb4445e7c82ba72ddac3bbc331ee8b276f89ceb17f9f4cd8ccbf55af4de952cfa5548c5e10b
+EBUILD qemu-3.1.0.ebuild 23753 BLAKE2B 50d710788c9ed85e648ca15e1773a9d3f711a7e9436eb42872a2182bbd33032a4b17d60c36bea37759aa27c461b64fa26da60b72dddbfde2028b22dc6b7bcca0 SHA512 bfcd5972472a97d6269ffd03e8c2f20007515e38714f8bfa3fbb5a8ac4e3d345b30d3bde14b7d2982b27f7345db8dd58a8d8d6ecb5c0b925aa98c41c488033d2
+EBUILD qemu-9999.ebuild 23546 BLAKE2B 2b927a47edb2b6f162722d31c03b71cc5e8b90aa85c69f8f15cb1e3b7df8b4c204641b5a24aa6eb1f0b05a036d52bb985819cede8477449654e14d47deddd805 SHA512 7db8e030f29994fe2c5768d1c0b92dbcf41d014c82a789b669b8fc45a3c1fc602e39fe89a700ea0ec54ad35088fbb47c732118893ff109d36d52655a9963dc72
 MISC metadata.xml 4014 BLAKE2B e3ef3f3da149b756119932e7796ba2daf3327a841776dc64476730f33345e6a10abd45d8a52a45f1881f052d43902c0a6de0f3df02219ab9f8b5ce1fec12b635 SHA512 fd582b65e3eecacef5447b787fb465565fceb84a7fda9cd7079e5ae5b2ef4183ff7cd3187a5e751900bea6877fdda8e8357c792eef5431e76c4d672eb631481b
diff --git a/app-emulation/qemu/qemu-2.12.1.ebuild b/app-emulation/qemu/qemu-2.12.1.ebuild
index 55529b0483c4..2059fa0d44f6 100644
--- a/app-emulation/qemu/qemu-2.12.1.ebuild
+++ b/app-emulation/qemu/qemu-2.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -196,7 +196,6 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	dev-lang/perl
-	=dev-lang/python-2*
 	sys-apps/texinfo
 	virtual/pkgconfig
 	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
diff --git a/app-emulation/qemu/qemu-3.1.0.ebuild b/app-emulation/qemu/qemu-3.1.0.ebuild
index 0e8b2a654e2a..328afccf3466 100644
--- a/app-emulation/qemu/qemu-3.1.0.ebuild
+++ b/app-emulation/qemu/qemu-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
 
 	# Gentoo specific patchsets:
 	#SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz"
@@ -185,7 +185,6 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	dev-lang/perl
-	=dev-lang/python-2*
 	sys-apps/texinfo
 	virtual/pkgconfig
 	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
@@ -757,7 +756,7 @@ src_install() {
 firmware_abi_change() {
 	local pv
 	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${FIRMWARE_ABI_VERSION} ${pv}; then
+		if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
 			return 0
 		fi
 	done
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 00f5573703e1..1c99bc24161a 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -182,7 +182,6 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	dev-lang/perl
-	=dev-lang/python-2*
 	sys-apps/texinfo
 	virtual/pkgconfig
 	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
@@ -749,7 +748,7 @@ src_install() {
 firmware_abi_change() {
 	local pv
 	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${FIRMWARE_ABI_VERSION} ${pv}; then
+		if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
 			return 0
 		fi
 	done