gentoo resync : 02.01.2018

3 files changed, 3 insertions, 92 deletions

diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index af321e2ffc9c..867091d2f2e6 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -5,7 +5,6 @@ AUX fbreader-0.99.4-qreal-cast.patch 950 BLAKE2B ae354d03bf2e6efcdb9f16a0bf2272c
 AUX fbreader-0.99.4-qt5.patch 18697 BLAKE2B 241f103b97b87f084c4f35ffb137cc9b6ea3368ddf6f0b4df2037856c5a3401d3687ed809abb0efc2e224bdb3a8d382930681f7896299421ebb7bd0300e0cbca SHA512 9eb8319308a36cada28d6036ee0537433cea03cb59e648c6ad1dd8f4d10a1b05fb879ebd38b1f9b1e149e6a6544aaafb93c52d6a97f4c9fd8905e89b8cf7ae86
 AUX fbreader-0.99.4.patch 472 BLAKE2B a34f27d9f53f3faed5889dcb7a841a1c045e7bd4080f2ae6ae6a949d76e1bc99e31953cd552a1aa8afbe26d64262aead7463432f407532050db1eda5da1517a9 SHA512 486dc74e3cfc6f94f1bf95269e35e866465095efee0cd31b586592fbd780613d4d5d243b809e494da14a69da8e0c5e47e6dd2ca35619616c4497eb0a053ba09d
 DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
-EBUILD fbreader-0.99.4-r2.ebuild 2144 BLAKE2B 0c4082f8330929dc55d0969f7a862eabb58e8c1f66eb78adfb2efd8e0c101a5dd0c8fdf0d3a77e6fb3bcca4882241780c8ea4ab5b759e075bcf56175573e0c1f SHA512 4219403d355e7b38a04944cb589090a412fcbf1fdf2c21a5f04984f41c6175096bcc9436dd0179e19687f08d5b6326290baadb8b4e641254f627c679b50d09ee
-EBUILD fbreader-0.99.4-r3.ebuild 2280 BLAKE2B 83d3253c6058a5c4613787ec0103cb814e0992c483b4d15fbee6f9ff3658aea8a223b7c67cfdf96532447878a7dedaaff0952463d548f6e7765b97c06d04959e SHA512 a93f212b39da83696e4da0ba372b63459af6f70f99c2750f8ed628447d8396ca937d143489f5c1b8251e62874626b7fcf0258331e5bca85e68117e62adad22b0
+EBUILD fbreader-0.99.4-r3.ebuild 2279 BLAKE2B 1e22f5cbdc916be2543a79ccc95c753726e946c56c85e9dcd53c89b643fea39edefda496de67bc603d8c885858802a89e7d09c5d1a4d635fd5a32ff0333e0e24 SHA512 f93ebe20622e94f54b68ecd62d76520d3455595e3433b875d76654479939f34ba21ed80b580c1b46824473e9f927b4349e8a5df37e4b2f350daf824cb07eb27e
 EBUILD fbreader-0.99.4-r4.ebuild 2111 BLAKE2B 955873c4d80c35e8579e97140bc4eab256cff750ef844a68de99418666bb93f61824486c48983ed366993d8496e1d7396d4e8e2c5ebeb11f1513a3ddefb5e8bc SHA512 28195b8b7d246fd7057ba9c30835e263b37932206d07a26fa3f01d240b44c19a58196e575ffaf8fb4e4cdf76d50682ecf97a4b5bca2dc4c18582fdfdea2eb1a2
 MISC metadata.xml 320 BLAKE2B b537c430018e9035438033df51325115040dc2468f03721c678a60c40654ed99be77a154ba34bb6cc1b7afd54191912906a007a50924cefddb2b6bba908eceb8 SHA512 d215791adfc4cb16e4c25d0dfea7dcf6439fa12916d0c0e51be65d62dd8d48bd63c7e983080027101c6cac1220f4e622c580f7ced4dc895e8b4898f14e921539
diff --git a/app-text/fbreader/fbreader-0.99.4-r2.ebuild b/app-text/fbreader/fbreader-0.99.4-r2.ebuild
deleted file mode 100644
index 347957b53029..000000000000
--- a/app-text/fbreader/fbreader-0.99.4-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-DESCRIPTION="E-Book Reader. Supports many e-book formats"
-HOMEPAGE="http://www.fbreader.org/"
-SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="debug"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/expat
-	dev-libs/liblinebreak
-	dev-libs/fribidi
-	dev-db/sqlite
-	net-misc/curl
-	sys-libs/zlib
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtgui:4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Still use linebreak instead of new unibreak
-	sed -e "s:-lunibreak:-llinebreak:" \
-		-i makefiles/config.mk zlibrary/text/Makefile || die "fixing libunibreak failed"
-
-	# Let portage decide about the compiler
-	sed -e "/^CC = /d" \
-		-i makefiles/arch/desktop.mk || die "removing CC line failed"
-
-	# let portage strip the binary
-	sed -e '/@strip/d' \
-		-i fbreader/desktop/Makefile || die
-
-	# Respect *FLAGS
-	sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
-		-i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
-	sed -e "/^	CFLAGS +=/ d" \
-		-i makefiles/config.mk || die "CFLAGS sed failed"
-	sed -e "/^	LDFLAGS += -s$/ d" \
-		-i makefiles/config.mk || die "sed failed"
-	sed -e "/^LDFLAGS =$/ d" \
-		-i makefiles/arch/desktop.mk || die "sed failed"
-
-	echo "TARGET_ARCH = desktop" > makefiles/target.mk
-	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
-
-	echo "UI_TYPE = qt4" >> makefiles/target.mk
-	sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \
-		-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
-
-	if use debug; then
-		echo "TARGET_STATUS = debug" >> makefiles/target.mk
-	else
-		echo "TARGET_STATUS = release" >> makefiles/target.mk
-	fi
-
-	# bug #452636
-	epatch "${FILESDIR}"/${P}.patch
-	# bug #515698
-	epatch "${FILESDIR}"/${P}-qreal-cast.patch
-	# bug #516794
-	epatch "${FILESDIR}"/${P}-mimetypes.patch
-	# bug #437262
-	epatch "${FILESDIR}"/${P}-ld-bfd.patch
-	# bug #592588
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-}
-
-src_compile() {
-	# bug #484516
-	emake -j1
-}
-
-src_install() {
-	default
-	dosym FBReader /usr/bin/fbreader
-}
diff --git a/app-text/fbreader/fbreader-0.99.4-r3.ebuild b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
index 82e032af33a2..ab2f47419e79 100644
--- a/app-text/fbreader/fbreader-0.99.4-r3.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="debug"
 
 RDEPEND="