Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/monica/
Date: Wed, 31 Aug 2016 21:15:48
Message-Id: 1472678135.b91c2507b3798609d347625f07345b82ad551379.soap@gentoo
1 commit: b91c2507b3798609d347625f07345b82ad551379
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Aug 31 17:23:28 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 31 21:15:35 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91c2507
7
8 media-gfx/monica: Fix bug 588452 by removing src_prepare()
9
10 Gentoo-bug: 588452
11
12 Closes: https://github.com/gentoo/gentoo/pull/2173
13
14 Signed-off-by: David Seifert <soap <AT> gentoo.org>
15
16 media-gfx/monica/monica-3.7.ebuild | 17 ++++++++---------
17 1 file changed, 8 insertions(+), 9 deletions(-)
18
19 diff --git a/media-gfx/monica/monica-3.7.ebuild b/media-gfx/monica/monica-3.7.ebuild
20 index dcb74b1..6e79a91 100644
21 --- a/media-gfx/monica/monica-3.7.ebuild
22 +++ b/media-gfx/monica/monica-3.7.ebuild
23 @@ -3,7 +3,8 @@
24 # $Id$
25
26 EAPI=6
27 -inherit eutils toolchain-funcs
28 +
29 +inherit toolchain-funcs
30
31 DESCRIPTION="Monica is a Monitor Calibration Tool"
32 HOMEPAGE="http://freecode.com/projects/monica"
33 @@ -18,13 +19,11 @@ DEPEND=">=x11-libs/fltk-1.1:1"
34 RDEPEND="${DEPEND}
35 x11-apps/xgamma"
36
37 -src_prepare() {
38 - epatch \
39 - "${FILESDIR}"/${PN}-3.6-makefile-cleanup.patch \
40 - "${FILESDIR}"/${P}-gcc44.patch
41 -
42 - emake clean
43 -}
44 +DOCS=( authors ChangeLog news readme )
45 +PATCHES=(
46 + "${FILESDIR}"/${PN}-3.6-makefile-cleanup.patch
47 + "${FILESDIR}"/${P}-gcc44.patch
48 +)
49
50 src_compile() {
51 emake \
52 @@ -36,5 +35,5 @@ src_compile() {
53
54 src_install() {
55 dobin monica
56 - dodoc authors ChangeLog news readme
57 + einstalldocs
58 }