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 a5172d77bb8d5..4373389cdfc57 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" }