Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/libXfont2/
Date: Sat, 14 Sep 2019 19:15:22
Message-Id: 1568488509.326b958fb92db736428e3927979f42583f4cf233.mattst88@gentoo
1 commit: 326b958fb92db736428e3927979f42583f4cf233
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 14 19:11:09 2019 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 14 19:15:09 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326b958f
7
8 x11-libs/libXfont2: Port to EAPI 7
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 x11-libs/libXfont2/libXfont2-9999.ebuild | 12 ++++++------
13 1 file changed, 6 insertions(+), 6 deletions(-)
14
15 diff --git a/x11-libs/libXfont2/libXfont2-9999.ebuild b/x11-libs/libXfont2/libXfont2-9999.ebuild
16 index 9463d5e1310..cfd74911baa 100644
17 --- a/x11-libs/libXfont2/libXfont2-9999.ebuild
18 +++ b/x11-libs/libXfont2/libXfont2-9999.ebuild
19 @@ -1,11 +1,11 @@
20 # Copyright 1999-2019 Gentoo Authors
21 # Distributed under the terms of the GNU General Public License v2
22
23 -EAPI=5
24 +EAPI=7
25
26 XORG_PACKAGE_NAME=libxfont
27 XORG_DOC=doc
28 -inherit xorg-2
29 +inherit xorg-3
30
31 DESCRIPTION="X.Org Xfont library"
32
33 @@ -15,12 +15,13 @@ IUSE="bzip2 ipv6 truetype"
34 RDEPEND="sys-libs/zlib
35 x11-base/xorg-proto
36 x11-libs/libfontenc
37 - x11-libs/xtrans
38 bzip2? ( app-arch/bzip2 )
39 truetype? ( >=media-libs/freetype-2 )"
40 -DEPEND="${RDEPEND}"
41 +DEPEND="${RDEPEND}
42 + x11-base/xorg-proto
43 + x11-libs/xtrans"
44
45 -src_configure() {
46 +pkg_setup() {
47 XORG_CONFIGURE_OPTIONS=(
48 $(use_enable ipv6)
49 $(use_enable doc devel-docs)
50 @@ -29,5 +30,4 @@ src_configure() {
51 $(use_enable truetype freetype)
52 --without-fop
53 )
54 - xorg-2_src_configure
55 }