gentoo resync : 03.03.2021

3 files changed, 2 insertions, 32 deletions

diff --git a/app-text/ebook-tools/Manifest b/app-text/ebook-tools/Manifest
index 5db8b3f2d90d..b5e17afc8416 100644
--- a/app-text/ebook-tools/Manifest
+++ b/app-text/ebook-tools/Manifest
@@ -2,6 +2,5 @@ AUX ebook-tools-0.2.2-crashfix.patch 1883 BLAKE2B 957cdf93efefda23074d762992c71e
 AUX ebook-tools-0.2.2-fvisibility-hidden.patch 998 BLAKE2B 3595aecd20dd3e046d76517595f337642e0723ac6fddab9a4f74a9e29b3cc415cafce3688f1fbc395e3b681a90ac88c05124b71c69882e1a3cda25c231d5258a SHA512 ae8c8608335e3d7251f4fca959a9ada267cffed6d7abbf7baf5a053490b80789cff3e9fde76ca6c034bf19760a51d6822e2ead7a4f7d15aaa11d5484c463de6f
 AUX ebook-tools-0.2.2-libzip-cmake.patch 3113 BLAKE2B e3b78d2ab278ff759afec16a57f074a722b3f5ff6aeceac9bd736843981d6de205607a0e89ffad0db4fdc14e3d250959a02b642e07b01a77c24aa494a1b37d8a SHA512 d228d9bd192e5cd46c7a991025d995b33e26049053ecd548ab35edace11e10aef6c7ca24c584680f97bb765d7e3485b5e6ea337a0255dcf1041f804213443b78
 DIST ebook-tools-0.2.2.tar.gz 46889 BLAKE2B 20b6ff048e9e31d2e00db3a02b67e21f3031d74aedfc663331b08f626b1816adecad5039e124462f97ff2ff7dc43f002eb39dd625f031ae42fe2b46338e94fcf SHA512 b4518249835ed7cc672392bf2f8b1c62bc218e41c53663bb26ab34c9e43a99b6b7ae794babdb4bd775e467bb17918703a66ee57c8cf94cb7afc4ba2a7f74816a
-EBUILD ebook-tools-0.2.2-r1.ebuild 649 BLAKE2B d39c7352b72d1b8143468be21df3e4f2c094ea6c0b9380ae69d1ec0b6a20f62d820caa4a618861a61c2f00f0402ca2cb1c2c05b5c31346f0da3e929ef487364d SHA512 4cd37a92486ff8fe5a6f62db6016ddc888dcbe27d7d88579721e3ef2fdf3183131108ecb3defce86189401ef5979a236ecba6368202d7c67facf2e94de626fa1
-EBUILD ebook-tools-0.2.2-r2.ebuild 772 BLAKE2B ae2e425bb7d7348f47409443cb671bf8d5eff96bbed6bd9822824d36fec7ae7ef5c8eb82880692f20a670b80538772c5027741bdbe40f0b4dfc7ca892e25913c SHA512 fddf8b752deb90483450a1726206decb87c3b4ba27a4deaf586ba751445878db915d98f852ede53db2668de832741625316bccb5de247fdb93a0ed6edaa9d332
+EBUILD ebook-tools-0.2.2-r2.ebuild 771 BLAKE2B 51690007a007d3abff3848229196a8023ab1961ccea4d93be0e811a1a10edadd296a032577d83e625b0e1b1ce670992f61ad4f4883e8ae8911d685728420aa31 SHA512 69405488ba54f34652e23c8fb5b907538cf3e03725a2d6562ce628ddf178c4a6d5252adf6b27838f5adc13590dfa6b1c561d6792150208bab2286ddf35ab543e
 MISC metadata.xml 400 BLAKE2B c225e8514134fea3843975618d6bb5b6085785eb71a9b0413bf986d752eff783f973c10fb7e6af504a3efa1c0e05475b421ff4c1f4c24bf51d4a948d485ed103 SHA512 2ab30e14742c63fc54cc75068b57d1c9fa178d6f57fb03b8b15c5649d4bdf35c5068a132c6ee50fe855a2037af67b5c2fd2229cc97b4f3e89f4eecde6d21885b
diff --git a/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
deleted file mode 100644
index 3b018f5a2d63..000000000000
--- a/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Tools for accessing and converting various ebook file formats"
-HOMEPAGE="https://sourceforge.net/projects/ebook-tools/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
-IUSE="+lit2epub"
-
-DEPEND="
-	dev-libs/libxml2
-	dev-libs/libzip:=
-"
-RDEPEND="${DEPEND}
-	lit2epub? ( app-text/convertlit	)
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	use lit2epub || sed -i -e '\|lit2epub|d' -- 'src/tools/CMakeLists.txt' || die
-}
diff --git a/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
index d4268c240f21..5b0050533e9f 100644
--- a/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
+++ b/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="+lit2epub"
 
 DEPEND="