Version bump to latest.

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

3 files changed, 14 insertions, 78 deletions

diff --git a/app-text/fbreader/ChangeLog b/app-text/fbreader/ChangeLog
index 0861d71d7bde..649d53ea8676 100644
--- a/app-text/fbreader/ChangeLog
+++ b/app-text/fbreader/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/fbreader
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.28 2012/12/02 10:40:37 maekke Exp $
+# 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 $
+
+*fbreader-0.99.4 (12 Jan 2013)
+
+  12 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> +fbreader-0.99.4.ebuild,
+  -fbreader-0.99.1.ebuild, -fbreader-0.99.2.ebuild:
+  Version bump to latest.
 
   02 Dec 2012; Markus Meier <maekke@gentoo.org> fbreader-0.99.2.ebuild:
   add ~arm, bug #431244
diff --git a/app-text/fbreader/fbreader-0.99.1.ebuild b/app-text/fbreader/fbreader-0.99.1.ebuild
deleted file mode 100644
index 317b4ccf2cc1..000000000000
--- a/app-text/fbreader/fbreader-0.99.1.ebuild
+++ /dev/null
@@ -1,74 +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.99.1.ebuild,v 1.1 2012/09/04 11:18:36 alexxy 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/files/desktop/${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 x11-libs/qt-core:4 )
-	gtk? ( >=x11-libs/gtk+-2.4:2 )
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE=" ^^ ( qt4 gtk )"
-
-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"
-
-	#Tidy up the .desktop file
-	sed -e "s:^Name=E-book reader:Name=FBReader:" \
-		-e "s:^Name\[ru\]=.*$:Name\[ru\]=FBReader:" \
-		-e "s:^Icon=FBReader.png:Icon=FBReader:" \
-		-i fbreader/desktop/desktop || die "tidying desktop 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
-
-	if use qt4; then
-	# qt4
-		echo "UI_TYPE = qt4" >> makefiles/target.mk
-		sed -e 's:CFLAGS =:CFLAGS = $(shell pkg-config --cflags glib-2.0):' \
-			-e 's:UILIBS = -lQtCore:UILIBS = $(shell pkg-config --libs QtCore) -lQtCore:' \
-			-e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \
-			-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
-	elif 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.2.ebuild b/app-text/fbreader/fbreader-0.99.4.ebuild
index 70a70d002f84..90451d1fca25 100644
--- a/app-text/fbreader/fbreader-0.99.2.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.2.ebuild,v 1.3 2012/12/02 10:40:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.99.4.ebuild,v 1.1 2013/01/12 15:50:42 scarabeus Exp $
 
 EAPI=4
 
@@ -38,6 +38,10 @@ 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
 
 	# Respect *FLAGS
 	sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \