Stabilise latest on amd64 and x86. Drop older.

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 24 insertions, 88 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/Manifest b/app-text/fbreader/Manifest
index dd6a208d0955..d285536b792c 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -2,26 +2,24 @@
 Hash: SHA256
 
 AUX fbreader-0.12.10-gcc45.patch 434 SHA256 d797728ea96f90e79dd28b57a58aafd8d469f67639947486ad380c3cd5bdc6cc SHA512 31c949cafc6240b47e52be41f618ad5d00d9f9a4c60981b3ee361b7515fdb397ac5606b6ab4e5761b6cb3d72b0c2bcb2416843bd09467824a36d16cb3d0162f4 WHIRLPOOL 5408bd5eaa2b18d95e413b2dd04ce10ecf36d60bea4bc9351eee5a4a13029ec0622145beb3fcf87d7b8be94b9fed4e8807264cf278cb4cfbb44d99698604de91
-DIST fbreader-sources-0.12.10.tgz 2337798 SHA256 328aec454db80e225aa0b5c31adef74bf62a14357482947e87e9731686b3c624 SHA512 b764d63133feece68e19128f09111303f87aef01a17dcd103def99a84f5392b82c5d1461f604024a587fd631a390b7c169aa2eac40c9d0643ed823f14577685f WHIRLPOOL b2944c6cbfe43169eb5c807ed378bf473bc639b67d267f4eb799ccd7fe213d459d77952d597c054b1cd592ef0bec3ae7502a56a5d792a4b7ef44d5487bb5bde0
 DIST fbreader-sources-0.99.4.tgz 2345664 SHA256 3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7 WHIRLPOOL 1d25ff39bcd93d3b0445abc76d3bbaf5e376385303fd71c98e3844123c85b9edd413f18c8d89a95807391ee2fb9c044d4dfc4b5898484548a011ecc22993e3d9
-EBUILD fbreader-0.12.10.ebuild 1950 SHA256 672bbcea99cf231ac2e2e3cb2a915aea7d9b70c3ee6cf38c34cf36ecc6210444 SHA512 a003727d44de77525e570d3e33d67c3b4559a5a68eb1816a444bb79dd52e82bcfc986517b6e79c7e4ba99e093913ae6c274f6318b8629fe0cd6f305d6bc046ad WHIRLPOOL 991dd21032fb034fe50df88fcab24bf1a0708788addf4a1eb7910f22349196e5ee73cec7fd155ace3e6fa86585e249219c2b3233352681d7ff828b84c73d8197
-EBUILD fbreader-0.99.4.ebuild 1957 SHA256 acf82c148f8e14bd626a7eb07cfc2d8a74d0869741ce9475d8fcf17f87cde0bb SHA512 df692b7477d434e71616c03b21270d45da516739a1359c3a2b2b38580057191d8b004aecefa803df346828230dd03bb8e739147effa29eabdc2c94aa634e293c WHIRLPOOL 4534435c5e1cb0ac2df3ee9e83c196aac6b312d7bd828bcb71d732e409efb68e6486eabc5f2ca76ac52f3343ecc68b6cd20b07048ce90b229d73454cfb55ae77
-MISC ChangeLog 4648 SHA256 7ebf5d0a2e983907b63e8ba96cd97dc1cfcdd821c3ea61b5925a253aef523a29 SHA512 66ddad1abc341359da2f7b31781a519d5d0bf69db414fe2f203b8664fa43510088f551e7ddab6c181bf5a73331e3d456012098dc020cebec47e0a44b44ff47f2 WHIRLPOOL 4917d65c92f1d92e365dfe22ea723a6ac966658dffce82b7af73f92323333618f8c40a421653c826ea1a0be1768e3769ae2fc66aac5d4488b3f4b4e6c6bac3a3
+EBUILD fbreader-0.99.4.ebuild 1954 SHA256 82ebdafda8a65de96bd8d480f231f88332dceb4b526b3e53fbafed3e95cae566 SHA512 d712a6f70b47ce94e3309ef8c707556080ede734151fdc2a7703c8e0f6ef919067c7fb6a780368497aabe70d8c6d2163271baeaa2deae2ca6e1e794873424062 WHIRLPOOL 82de5b0b9b374c89a9de432cfd4743e0ba032045e83aec6e42fc46019b05cebc040bb916b8abe93ee99567e33630b4e5910f9102e6a60efa2b51a10052a5316d
+MISC ChangeLog 4805 SHA256 da51770a82b224333469a39b5634cb550836b035e99f619e1bcc494facc2c5a4 SHA512 eec82185a4782512faa4d5b80ad6483ad5c3ba582aab0dd7fb9810b5766bb437b4e8c02902f745538677b2e76837def12ed04deced1b4e0df71820e8f4b4914c WHIRLPOOL 7ab41c48f54a74a75af4328ace9e3b1946b00969aa9436253412f31bb5887b0fbe1cb98d376d807e9209a11f5b9b278b1596d82b4bf13386d30c7fc1a374e94f
 MISC metadata.xml 367 SHA256 ea449e9ab5b0604e10360c35f9646cf74e15a54bb6e937cea8b0479739e1a25f SHA512 68f9b5b01c0bf0737c10bb95d929ce35fba13c21ebf231ace312cea9c3a6ff4bda15ecfa10e38a2791dff81584c438a4d29614c1cce83edb7b93a5312cb2d1da WHIRLPOOL 6d0146fcce4b6a9c93403e533c452cfd9a2029da5e17b209661bd181b248031cb92f42c569ad4920063f746c84f5e9f3be99191f8f830aad36ac8c3583017482
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ8YZUAAoJEOSiRoyO7jvoQ6cP+gMS/CEKNtqV2Uf4OrS8Qn1A
-ISriM02cZNkt+iU2cL7ncmDf3I5KMRgDV66r0ufIuGoQQWuyZQXZkH2L2a2zUVpT
-1mlyenPcpYR2qmn08J23qNXu9lLcasPEWyAKlAfEwu8eUouTiIEiFSnCY8e2Bra3
-4v6RQ2nx2ce6sxdlWHwfOACqynNGwenxv/dYxvsplRICy5wDMlAHZahEtPSIBC3+
-JZOc6dZIZlivLNVpbsurUbfuYKQWX/WyugCBpehAbt5M8lXu9HsEWgB766Un//SC
-dC1U7448YgebrZU7C8CB/K0AIe3r8A1Jam7nQuoiEsEit9qLTMpzvq4tgorvnQ/O
-OFMZpQhgiGc2XmkWCkI8YGTxxT1J5UZFf/e567NM1nbEnezfqeqZ9EiDB7wR2ZTr
-Dy4rhI6du+secAxDK1uJS2QUMGD9cD3XnjKb7ZsBe50QUVgEfnswKzjUAZKq3liz
-ENY+y+dFDf4oiiRM+VuEf+UGRIFDPvcRfM9on670NwDzcUlbpSs5I7BoOZPTbgHA
-ma+qmnAHSc0fuAIqGfGLkkdW+O+FVJ0BVTosFVcGWBMG0SR58T7cGKR6j2LDtSzM
-XC/r91xaHTicWHJLaSM8sohtoOXPrZeAEYC7T90p1kCPuedUYj/EurW3VlwMVuqO
-7RQhZwgmAG78ASNTIhCk
-=9ypO
+iQIcBAEBCAAGBQJQ8YbTAAoJEOSiRoyO7jvo01QP/2P3Uvl4UukYIWpi67511+tp
+zXEMAyICSZjLWp/dY0ONe75ysE1aHAS4cerQmBID2SFA7uY0+LpbsStZXh0niy3V
+cDPdzcC4lGUOnurCYZAwf6FvQqGPd5RhfKjtaUyKWXw4NVCl/qYg/9/i8yrAAJka
+bp1pXnFHEN0cqE/TSKDl5kGN8OjHRWgK1qH7vL+Cm3X0DtvrYiFovIaHJ60Ipw8a
+GCQ/8TXWj4rgFdm/WqDOjuTiGItyS2o55e260y3aqIpLm1EE2uxqEtXUlOD6R/tu
+DbA7yZcLKtJq5Ldu1ujW1E8RkiZplA9MhNYMEloT9jOqINVe3ZCfez5aaIvCon93
+HxCXSgEJFP8RE0o5mTBJ7nzOpXLcvc10SK0YVu0DcKjahq383X1ITbIUG+gtPSCu
+bu0J7nCp5mAF5u3U01MGoPvexQm24NFLLNvj9XkeKoB4tXwn9EHEE6xXpv2T9OyI
+PKlWIZdXA4oVrqDeb+v5RnYHz7RqbEO5rEXYOU1UKbu92nz+D0LnlyXFaztJg95Z
+sGbxBA/i/uOSfCXspUXFJVvtUrSS9zsqWiZOZwrV4Ru3A0Sw47t9C6xzjB1O1hNt
+T3ZuEvHy8wtu+J3TfKsups27vPNBlcAFH1qYXmMTy3qw7GawoOYZyaXMAvwEnWbJ
+eMbw3KuWDWDPTFIKSXXC
+=mxfv
 -----END PGP SIGNATURE-----
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