Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
Date: Thu, 14 Dec 2017 13:27:22
Message-Id: 1513257972.84a4f3fc5416a190ed657a582a0abbbfb3d5b846.whissi@gentoo
1 commit: 84a4f3fc5416a190ed657a582a0abbbfb3d5b846
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 14 13:26:12 2017 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 14 13:26:12 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a4f3fc
7
8 Revert "app-text/fbreader: depend on libunibreak instead of liblinebreak"
9
10 This reverts commit d48fe8e5437ba8b011bb615a66544e395fb6a6c0.
11
12 Required because commit 8b4ea0f6d2bed140116f69855d1d3100ea0cf020 was reverted due to QA issues.
13
14 app-text/fbreader/fbreader-0.99.4-r4.ebuild | 91 -----------------------------
15 1 file changed, 91 deletions(-)
16
17 diff --git a/app-text/fbreader/fbreader-0.99.4-r4.ebuild b/app-text/fbreader/fbreader-0.99.4-r4.ebuild
18 deleted file mode 100644
19 index a828ea2670c..00000000000
20 --- a/app-text/fbreader/fbreader-0.99.4-r4.ebuild
21 +++ /dev/null
22 @@ -1,91 +0,0 @@
23 -# Copyright 1999-2017 Gentoo Foundation
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=6
27 -
28 -inherit eutils multilib flag-o-matic
29 -
30 -DESCRIPTION="E-Book Reader. Supports many e-book formats"
31 -HOMEPAGE="http://www.fbreader.org/"
32 -SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
33 -
34 -LICENSE="GPL-2"
35 -SLOT="0"
36 -KEYWORDS="~amd64 ~arm ~ppc ~x86"
37 -IUSE="debug"
38 -
39 -RDEPEND="
40 - app-arch/bzip2
41 - dev-libs/expat
42 - dev-libs/libunibreak
43 - dev-libs/fribidi
44 - dev-db/sqlite
45 - net-misc/curl
46 - sys-libs/zlib
47 - dev-qt/qtcore:5
48 - dev-qt/qtgui:5
49 - dev-qt/qtwidgets:5
50 - dev-qt/qtnetwork:5[ssl]
51 -"
52 -DEPEND="${RDEPEND}
53 - virtual/pkgconfig
54 -"
55 -
56 -src_prepare() {
57 - # Let portage decide about the compiler
58 - sed -e "/^CC = /d" \
59 - -i makefiles/arch/desktop.mk || die "removing CC line failed"
60 -
61 - # let portage strip the binary
62 - sed -e '/@strip/d' \
63 - -i fbreader/desktop/Makefile || die
64 -
65 - # Respect *FLAGS
66 - sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
67 - -i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
68 - sed -e "/^ CFLAGS +=/ d" \
69 - -i makefiles/config.mk || die "CFLAGS sed failed"
70 - sed -e "/^ LDFLAGS += -s$/ d" \
71 - -i makefiles/config.mk || die "sed failed"
72 - sed -e "/^LDFLAGS =$/ d" \
73 - -i makefiles/arch/desktop.mk || die "sed failed"
74 -
75 - echo "TARGET_ARCH = desktop" > makefiles/target.mk
76 - echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
77 -
78 - echo "UI_TYPE = qt4" >> makefiles/target.mk
79 - sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \
80 - -i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
81 -
82 - if use debug; then
83 - echo "TARGET_STATUS = debug" >> makefiles/target.mk
84 - else
85 - echo "TARGET_STATUS = release" >> makefiles/target.mk
86 - fi
87 -
88 - # bug #452636
89 - eapply "${FILESDIR}"/${P}.patch
90 - # bug #515698
91 - eapply "${FILESDIR}"/${P}-qreal-cast.patch
92 - # bug #516794
93 - eapply "${FILESDIR}"/${P}-mimetypes.patch
94 - # bug #437262
95 - eapply "${FILESDIR}"/${P}-ld-bfd.patch
96 - # bug #592588
97 - eapply -p0 "${FILESDIR}"/${P}-gcc6.patch
98 -
99 - eapply "${FILESDIR}"/${P}-qt5.patch
100 - append-cflags -std=c++11
101 -
102 - eapply_user
103 -}
104 -
105 -src_compile() {
106 - # bug #484516
107 - emake -j1
108 -}
109 -
110 -src_install() {
111 - default
112 - dosym FBReader /usr/bin/fbreader
113 -}