[gentoo-commits] repo/gentoo:master commit in: x11-libs/libXfont2/

[Matt Turner]

commit:     326b958fb92db736428e3927979f42583f4cf233
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 19:11:09 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 19:15:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326b958f

x11-libs/libXfont2: Port to EAPI 7

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-libs/libXfont2/libXfont2-9999.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/x11-libs/libXfont2/libXfont2-9999.ebuild 
b/x11-libs/libXfont2/libXfont2-9999.ebuild
index 9463d5e1310..cfd74911baa 100644
--- a/x11-libs/libXfont2/libXfont2-9999.ebuild
+++ b/x11-libs/libXfont2/libXfont2-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 XORG_PACKAGE_NAME=libxfont
 XORG_DOC=doc
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org Xfont library"
 
@@ -15,12 +15,13 @@ IUSE="bzip2 ipv6 truetype"
 RDEPEND="sys-libs/zlib
        x11-base/xorg-proto
        x11-libs/libfontenc
-       x11-libs/xtrans
        bzip2? ( app-arch/bzip2 )
        truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+       x11-base/xorg-proto
+       x11-libs/xtrans"
 
-src_configure() {
+pkg_setup() {
        XORG_CONFIGURE_OPTIONS=(
                $(use_enable ipv6)
                $(use_enable doc devel-docs)
@@ -29,5 +30,4 @@ src_configure() {
                $(use_enable truetype freetype)
                --without-fop
        )
-       xorg-2_src_configure
 }