Version bump.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

3 files changed, 79 insertions, 15 deletions

diff --git a/app-text/fbreader/ChangeLog b/app-text/fbreader/ChangeLog
index f2579994fca5..fee3d5456baa 100644
--- a/app-text/fbreader/ChangeLog
+++ b/app-text/fbreader/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/fbreader
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.19 2011/03/27 12:17:32 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.20 2011/04/18 15:13:02 scarabeus Exp $
+
+*fbreader-0.12.20 (18 Apr 2011)
+
+  18 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +fbreader-0.12.20.ebuild:
+  Version bump.
 
   27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   fbreader-0.12.10.ebuild:
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index 4669ae9cb78b..76e23eca3262 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -3,23 +3,15 @@ Hash: SHA1
 
 AUX fbreader-0.12.10-gcc45.patch 434 RMD160 bb38ae66203ea8459b40d9c955495bf668d718eb SHA1 4547fc9ce7f4f82e24c20a8781b828f66f9820a4 SHA256 d797728ea96f90e79dd28b57a58aafd8d469f67639947486ad380c3cd5bdc6cc
 DIST fbreader-sources-0.12.10.tgz 2337798 RMD160 63043c9b8e26b5511f4f7bc45637def723c9fef5 SHA1 982f526c9325fc4eaea3c01370580846c4cce7cc SHA256 328aec454db80e225aa0b5c31adef74bf62a14357482947e87e9731686b3c624
+DIST fbreader-sources-0.12.20.tgz 2337798 RMD160 63043c9b8e26b5511f4f7bc45637def723c9fef5 SHA1 982f526c9325fc4eaea3c01370580846c4cce7cc SHA256 328aec454db80e225aa0b5c31adef74bf62a14357482947e87e9731686b3c624
 EBUILD fbreader-0.12.10.ebuild 1944 RMD160 c9346299095b612e48fc945ba3612cf45d1a2c8e SHA1 0d643d3b953cc661d9b5638fb0d2ccbed6d587aa SHA256 e12d08077e299fc2d4df6dfcc678c3c0ee545646fab893d1c080936c596732ef
-MISC ChangeLog 3211 RMD160 ae236e1072aa0dc7eb5c64a760d5a451c6f2da93 SHA1 782e08a2a5dba3466e8ca48bd497bdc54688f22f SHA256 17b75f7092c8ea10b26e1f51174791aec02085b78f24dc85814032fefca1fbb6
+EBUILD fbreader-0.12.20.ebuild 1921 RMD160 c5127e870d7ad6eb5f56da6123b6fa80bcbc91e0 SHA1 6d17ae0b03550100efd0678ec9615dc03ed9348e SHA256 e0f8140ca3de8fa77c4c5e972f5a6acc283e47c40e250eda81bdd1a791abe4dd
+MISC ChangeLog 3345 RMD160 ac92055cda4076f57c8a146e087da353310b67da SHA1 c652c6823c090848a0065bc454eef6da1d83cbb4 SHA256 be8c20d940816efb2d106ab5da4be9405c20fd4242b878752f3c2530907e5b22
 MISC metadata.xml 367 RMD160 a29770dbdf1951d724a3e9f4ff16be579f5748ea SHA1 6f8641392c21ed3963ef9bc96c4a1cc011995bda SHA256 ea449e9ab5b0604e10360c35f9646cf74e15a54bb6e937cea8b0479739e1a25f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNjyriAAoJEO/kOhxWD91k1+sP/3gsWEE+lMi2YAyGuvrX7nWP
-f4XxEQVrWaycQdNj0kL2JOrW2+wmKCUiJN3O8jxYmY0OzJRwr5C3lqquFr8QBs63
-61qWxfszzh7pV5wF92Oo702YZgnv/NdHcAv7RXFCDNkiTp94f0MeK/t3TJbroMo+
-3smVfjLUsrStEr42gI915e0NSfL39DtIFiR0IrTk9twUB+150dXiEzKnvQFIax65
-NsLKS1m8saa8A7PWS/KSJYpbjmceyATGnPUNlgvElw3phBa3BHKpp15gsFdQ2hsy
-nPOWA90cViMO/DpmXjcOhcsXNNu0E1Z8pA2sQDNgh6fhbq2fr2LC+9xzyFO1VQ+v
-BqVYOuHqGQaPAk2XHzujyPBqxldUSm2FgDnsev958Jbq9Dn4GwxsPCR3Z8yBNfCT
-zhp9qHqnQ4MuT+JXIW8pEzDwBkTfY39Tw/DQucC0/mwQfG4FFm7TLGJqn6c1cE7s
-v5KocfWfLwTqfqBtX8TLek9CVnINGsn3x+eS8ifalKSBoGKpIuYV1q6hJNVLNOPg
-oj1XlEc/Ia7toKFK4WP5Veqjpv6wWOn6Zg4mWS1rxZiR5Bav3AhQffyuHDkinHny
-liKNqahDRAMPajzX0Cik9DVAD5PdbrDEkYVEJ8RiKRCy57Qn4iIIT3Yqrq7dnzcm
-MZt1L65SamUwbE1Pb9o8
-=5OeL
+iEYEARECAAYFAk2sVNAACgkQHB6c3gNBRYfJEACfTurcfd4aQAVMvKgG62tDTMbn
+Uk4An0EPTpgb9nW71sHrfuFOZP9Z3yHY
+=0J4r
 -----END PGP SIGNATURE-----
diff --git a/app-text/fbreader/fbreader-0.12.20.ebuild b/app-text/fbreader/fbreader-0.12.20.ebuild
new file mode 100644
index 000000000000..be61ee4f998c
--- /dev/null
+++ b/app-text/fbreader/fbreader-0.12.20.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.12.20.ebuild,v 1.1 2011/04/18 15:13:02 scarabeus Exp $
+
+EAPI=4
+
+inherit eutils
+
+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
+	dosym /usr/bin/FBReader /usr/bin/fbreader
+}