[gentoo-commits] repo/gentoo:master commit in: dev-util/plan9port/

[Sam James]

commit:     e8076c08482bae16dc99c53a7590603de560f29d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  6 07:09:27 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun  6 07:09:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8076c08

dev-util/plan9port: X always needs fontconfig/freetype now

Closes: https://bugs.gentoo.org/907941
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...0230331.ebuild => plan9port-0_pre20230331-r1.ebuild} | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/dev-util/plan9port/plan9port-0_pre20230331.ebuild 
b/dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild
similarity index 95%
rename from dev-util/plan9port/plan9port-0_pre20230331.ebuild
rename to dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild
index a5172d77bb8d..4373389cdfc5 100644
--- a/dev-util/plan9port/plan9port-0_pre20230331.ebuild
+++ b/dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild
@@ -19,14 +19,14 @@ LICENSE="
 "
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="X aqua freefonts truetype"
+IUSE="X aqua freefonts"
 REQUIRED_USE="?? ( X aqua )"
 
 DEPEND="
-       X? ( x11-apps/xauth )
-       truetype? (
+       X? (
                media-libs/freetype
                media-libs/fontconfig
+               x11-apps/xauth
        )
 "
 RDEPEND="${DEPEND}"
@@ -94,7 +94,10 @@ src_configure() {
        )
 
        if use X; then
-               myconf+=( WSYSTYPE=x11 )
+               myconf+=(
+                       WSYSTYPE=x11
+                       FONTSRV=fontsrv
+               )
        elif use aqua; then
                local wsystype="$(awk '{if ($1 > 10.5) print "osx-cocoa"; else 
print "osx"}' \
                        <<< "${MACOSX_DEPLOYMENT_TARGET}")"
@@ -103,12 +106,6 @@ src_configure() {
                myconf+=( WSYSTYPE=nowsys )
        fi
 
-       if use truetype; then
-               myconf+=( FONTSRV=fontsrv )
-       else
-               myconf+=( FONTSRV= )
-       fi
-
        printf '%s\n' "${myconf[@]}" >> LOCAL.config ||
                die "cannot create configuration"
 }