Stabilise latest on amd64 and x86. Drop older.

(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

3 files changed, 9 insertions, 71 deletions

diff --git a/app-text/fbreader/ChangeLog b/app-text/fbreader/ChangeLog
index 649d53ea8676..333e5cfd1560 100644
--- a/app-text/fbreader/ChangeLog
+++ b/app-text/fbreader/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/fbreader
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.29 2013/01/12 15:50:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.30 2013/01/12 15:52:50 scarabeus Exp $
+
+  12 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> -fbreader-0.12.10.ebuild,
+  fbreader-0.99.4.ebuild:
+  Stabilise latest on amd64 and x86. Drop older.
 
 *fbreader-0.99.4 (12 Jan 2013)
 
diff --git a/app-text/fbreader/fbreader-0.12.10.ebuild b/app-text/fbreader/fbreader-0.12.10.ebuild
deleted file mode 100644
index fce08232c5c9..000000000000
--- a/app-text/fbreader/fbreader-0.12.10.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.12.10.ebuild,v 1.8 2012/06/02 08:04:58 zmedico Exp $
-
-EAPI=4
-
-inherit eutils multilib
-
-DESCRIPTION="E-Book Reader. Supports many e-book formats."
-HOMEPAGE="http://www.fbreader.org/"
-SRC_URI="http://www.fbreader.org/${PN}-sources-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-IUSE="debug gtk +qt4"
-DEPEND="dev-libs/expat
-	dev-libs/liblinebreak
-	net-misc/curl
-	dev-libs/fribidi
-	app-arch/bzip2
-	dev-db/sqlite
-	qt4? ( x11-libs/qt-gui:4 )
-	gtk? ( >=x11-libs/gtk+-2.4:2 )
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE=" ^^ ( qt4 gtk )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc45.patch" # bug 317189
-
-	#Tidy up the .desktop file
-	sed -i "s:^Name=E-book reader:Name=FBReader:" fbreader/desktop/desktop || die "sed failed"
-	sed -i "s:^Name\[ru\]=.*$:Name\[ru\]=FBReader:" fbreader/desktop/desktop || die "sed failed"
-	sed -i "s:^Icon=FBReader.png:Icon=FBReader:" fbreader/desktop/desktop || die "sed failed"
-	sed -i "/^	LDFLAGS += -s$/ d" makefiles/config.mk || die "sed failed"
-	sed -i "/^LDFLAGS =$/ d" makefiles/arch/desktop.mk || die "sed failed"
-
-	echo "TARGET_ARCH = desktop" > makefiles/target.mk
-	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
-
-	if use qt4; then
-	# qt4
-		echo "UI_TYPE = qt4" >> makefiles/target.mk
-
-		sed -i "s:MOC = moc-qt4:MOC = /usr/bin/moc:" makefiles/arch/desktop.mk || die "updating desktop.mk failed"
-		sed -i "s:UILIBS = -lQtGui:UILIBS = -L/usr/lib/qt4 -lQtGui:" makefiles/arch/desktop.mk
-	fi
-	if use gtk; then
-	# gtk
-		echo "UI_TYPE = gtk" >> makefiles/target.mk
-	fi
-
-	if use debug; then
-		echo "TARGET_STATUS = debug" >> makefiles/target.mk
-	else
-		echo "TARGET_STATUS = release" >> makefiles/target.mk
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dosym /usr/bin/FBReader /usr/bin/fbreader
-}
diff --git a/app-text/fbreader/fbreader-0.99.4.ebuild b/app-text/fbreader/fbreader-0.99.4.ebuild
index 90451d1fca25..2b18e933fa33 100644
--- a/app-text/fbreader/fbreader-0.99.4.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.99.4.ebuild,v 1.1 2013/01/12 15:50:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.99.4.ebuild,v 1.2 2013/01/12 15:52:50 scarabeus Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils multilib
 
@@ -12,7 +12,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="
@@ -38,7 +38,7 @@ src_prepare() {
 	# 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