Merge branch 'edge' into next

4 files changed, 2 insertions, 48 deletions

diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
index ee63fbd04c26..3c243f9b2a31 100644
--- a/x11-misc/grub2-theme-preview/Manifest
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -1,7 +1,3 @@
-DIST grub2-theme-preview-1.3.1.tar.gz 5064 BLAKE2B 4d67058eb725e6a9a65d9fc1ce6bccabf34bdf8215446a6aeab5f537a05b5e402030f1cc32c6e2d722f9c4a2b189e4db410a2f4a4d82306e6c039b771796b3a9 SHA512 69aed10a2612ea442a94748d3491c2300c83aafd4650dd54e520572c809c7ca3890ff3be42eeff7684ecbbfff425b3f44a651e01b5c682a1d0dc792b33b713fb
-DIST grub2-theme-preview-1.3.2.tar.gz 5486 BLAKE2B ed7e29da586bfe4388dab1b8467aa265b11e6ff9a6ad0890d27c0c4b45ec3615f08a8f1bb5a5d00015dfa83e6dd3a7c718039b9fd398e76211c4f8bda2c8f2bb SHA512 f53c1c5bac1874e8feb70619b3d65505bd083966ac9427ea36de7b218bfc068e52cfd58ffa8cc32f06974e5dcaa3581792301228f7bd56dcbf2ff01373b96885
-DIST grub2-theme-preview-1.4.1.tar.gz 197390 BLAKE2B 166d23a97036e0f6054d2d9d9c6a372769a3d4de5aad76ff1949e860064d891ffb331b6690dfb1395a521468349fc31ffa23c2fd34e5dee6ed1657a546470d00 SHA512 5ff9abad4ab0d60f12affef015e957b0e03ab19eb76addeef9d048264baa20e85c67584fa6f4b9e70c700e8b394fd6be5710c7e5588b185bd660101f4c124ce2
-EBUILD grub2-theme-preview-1.3.1.ebuild 521 BLAKE2B 2bef3ecf893d1f272f126c31686206f3a9f1bf8c9ffcb9207e78ff278d27ec0c6e0279cdc6d11eeb6a42d58561e6306cf664575227b9cc2732b7cff21706daff SHA512 5f3b48e65568400f886938085ee8b55fbb274c13148f327b10ead372584f697c7047b5748661b9d0be46be2c2abdc4c161e34c58c16c8b6de8bdbe1fd8b58878
-EBUILD grub2-theme-preview-1.3.2.ebuild 521 BLAKE2B 3c69bdb85f4ae7bdda2d1064354a7ad176a73753b165cc80997747611919ec273975f0ca6a429cbf7d0c3de9759301d6df9ac54f622f8bf61704fdf33402c588 SHA512 c106a58ddcc8965436b03210eb63322f2a760fcf2269cb53ddd34153001cba91345408766f823da67ed04a53a477ff1f22aef9df197f9221113f54f2fe10ff30
-EBUILD grub2-theme-preview-1.4.1.ebuild 558 BLAKE2B 317dbdc198362cc346ffec5e7bf1e40fd6c878f045e30979c572f0bff1ee49dfeb2a1c189c5a081a8fac7e074cd5b186af57ecc6a41cf333b6b431321d5566f0 SHA512 13b78b3eb848220ca63b40ac1749473a8642d8af0b97a2e4d6868b063045db533bccd3b9c9af982677407118ad41675a355d0f811c48ea66e5fff40b4454422e
+DIST grub2-theme-preview-1.4.2.tar.gz 197383 BLAKE2B e380b63fd700352fa769b86da4aa9204f0f6e375f91134cc306d2bc0b108637c17127cb22ea06259338552cf04c9087a77defa3809c759e6b8931435da79ce98 SHA512 5f53d5da1ac3fa2d6597ee88df28a4e406eb5c824ea126d4386dca3718bfe4350bf399c5a4055479d34d5dd75b947e0f0af19c1533a0ee6474fea550387f676a
+EBUILD grub2-theme-preview-1.4.2.ebuild 558 BLAKE2B 317dbdc198362cc346ffec5e7bf1e40fd6c878f045e30979c572f0bff1ee49dfeb2a1c189c5a081a8fac7e074cd5b186af57ecc6a41cf333b6b431321d5566f0 SHA512 13b78b3eb848220ca63b40ac1749473a8642d8af0b97a2e4d6868b063045db533bccd3b9c9af982677407118ad41675a355d0f811c48ea66e5fff40b4454422e
 MISC metadata.xml 342 BLAKE2B b12306a165fac0714ee6a833ed2b8de2a5f598e36e38e42e521b10d5d432e980d0673266b571986d851b2be319520c020b8fba860c4cd6c28d76a8f3e72ec811 SHA512 3577ddbd08dfb9a7c5f35a5e6b102620985a932cef550f48c32298f44864c385e7fcedda171107285452d242dd3e03f60a3e6bce8c814e933cf35388e942f35f
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.1.ebuild
deleted file mode 100644
index 3c86f369f284..000000000000
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.1.ebuild
+++ /dev/null
@@ -1,21 +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
-
-DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
-HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
-SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-emulation/qemu
-	dev-libs/libisoburn
-	sys-fs/mtools
-	sys-boot/grub:2[grub_platforms_pc]"
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.2.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.2.ebuild
deleted file mode 100644
index 1bcb9c5db84f..000000000000
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
-HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
-SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-emulation/qemu
-	dev-libs/libisoburn
-	sys-fs/mtools
-	sys-boot/grub:2[grub_platforms_pc]"
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.2.ebuild
index 87db4a2d4a93..87db4a2d4a93 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.1.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.2.ebuild