Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/aldumb/
Date: Mon, 16 Jul 2018 22:26:19
Message-Id: 1531779956.951c4636254e58a2c531ebee00d47c45ee719dea.asturm@gentoo
1 commit: 951c4636254e58a2c531ebee00d47c45ee719dea
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 16 18:35:15 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 16 22:25:56 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=951c4636
7
8 media-libs/aldumb: EAPI-6 bump
9
10 Package-Manager: Portage-2.3.43, Repoman-2.3.10
11
12 media-libs/aldumb/aldumb-0.9.3.ebuild | 25 +++++++++++++++----------
13 1 file changed, 15 insertions(+), 10 deletions(-)
14
15 diff --git a/media-libs/aldumb/aldumb-0.9.3.ebuild b/media-libs/aldumb/aldumb-0.9.3.ebuild
16 index b6fd72d59ff..38c75c096e8 100644
17 --- a/media-libs/aldumb/aldumb-0.9.3.ebuild
18 +++ b/media-libs/aldumb/aldumb-0.9.3.ebuild
19 @@ -1,8 +1,7 @@
20 -# Copyright 1999-2011 Gentoo Foundation
21 +# Copyright 1999-2018 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI=2
25 -inherit eutils
26 +EAPI=6
27
28 DESCRIPTION="Allegro support for DUMB (an IT, XM, S3M, and MOD player library)"
29 HOMEPAGE="http://dumb.sourceforge.net/"
30 @@ -13,27 +12,33 @@ SLOT="0"
31 KEYWORDS="amd64 ppc x86"
32 IUSE="debug"
33
34 -DEPEND=">=media-libs/dumb-0.9.3
35 - <media-libs/allegro-5"
36 -
37 +DEPEND="
38 + >=media-libs/dumb-0.9.3
39 + media-libs/allegro:0
40 +"
41 RDEPEND="${DEPEND}"
42
43 S="${WORKDIR}/${P/aldumb/dumb}"
44
45 +PATCHES=(
46 + "${FILESDIR}"/${P}-PIC-as-needed.patch
47 + "${FILESDIR}"/${P}_CVE-2006-3668.patch
48 +)
49 +
50 src_prepare() {
51 + default
52 +
53 cat << EOF > make/config.txt
54 include make/unix.inc
55 ALL_TARGETS := allegro allegro-examples allegro-headers
56 PREFIX := /usr
57 EOF
58 - epatch "${FILESDIR}"/${P}-PIC-as-needed.patch
59 - epatch "${FILESDIR}"/${P}_CVE-2006-3668.patch
60 sed -i '/= -s/d' Makefile || die "sed failed"
61 - cp -f Makefile Makefile.rdy
62 + cp -f Makefile Makefile.rdy || die
63 }
64
65 src_compile() {
66 - emake OFLAGS="${CFLAGS}" all || die "emake failed"
67 + emake OFLAGS="${CFLAGS}" all
68 }
69
70 src_install() {