diff options
Diffstat (limited to 'x11-wm/fvwm3')
| -rw-r--r-- | x11-wm/fvwm3/Manifest | 2 | ||||
| -rw-r--r-- | x11-wm/fvwm3/fvwm3-9999.ebuild | 101 |
2 files changed, 39 insertions, 64 deletions
diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest index 454dba7ea747..ec2878b0292c 100644 --- a/x11-wm/fvwm3/Manifest +++ b/x11-wm/fvwm3/Manifest @@ -5,5 +5,5 @@ DIST fvwm3-1.1.0-docs.tar.xz 230964 BLAKE2B f431011a63a8d190e01e34301e74fd40750d DIST fvwm3-1.1.0.tar.gz 4527424 BLAKE2B ee9a3f190ae7fa1f1dd703e17b0e12f04da63212cade30facdbc8339ded7f598de143d18f17dde39d3af8e24ff2b34855ad3e5b2b6c5ffe466072a7353895cd8 SHA512 47eea05cbdecf4da3313b9183fa938544b451b9f133d7a68062feb222c3c1af3873402f80b60485d603afe8cd23a03f3e86a503fc1f2070e1ad2e6e64d012341 EBUILD fvwm3-1.0.9-r1.ebuild 4808 BLAKE2B 522e96330ee3730704e2544ab34a71816b5616e8565790cabacbb3a0ccfbebcf09d7b0e74acd289b1d092c9e828e58d995d6986257d32db55b58310b6aea866e SHA512 9a10669c760d02ac45339259c8d4c836dcb3cfcfaf368363838ba16bf415afc83bb20db326999d4a45c237771b0c617691d3639292517475b45961fe37174380 EBUILD fvwm3-1.1.0-r1.ebuild 4759 BLAKE2B 562730695d29ac3f1d587ad37803719614107e8332ac96b8faab71e20186d961bd39155057875346aca7bf2c2588db6c104f2b4c84fda52752ef75c85f933176 SHA512 8740a4d2bc9a67d9f1b190f846ab07ce5fc0fb210348450bd9f120ae224d79fb6a1a9e7bb04dc6787dcb25779c760902f90416f9afa7355b01e77668eb01e0c7 -EBUILD fvwm3-9999.ebuild 4716 BLAKE2B f7a1be00bfeb6e7fc6ed8e2dea7d55a25ba9a57998dea8e2b6a95477412b301c1f9d236609217b74f822807b834e808e80aef7777e5081d4a16144182f3c2ecf SHA512 ac53c1eb13bf03a68a0a9f2103cda7928a01939798c553d0eed8050966da8286c4abab617cee31eda8248698d7affc7383de86c7ac209e42ffe91eded5a18317 +EBUILD fvwm3-9999.ebuild 4302 BLAKE2B 2bf0eddd7bdbb748712905cd0f8734d213e04ca4d372a571cf73bdc605a4bbb224c9ba84f0bcddf329394632df265419536316a195df6cb447cb4e547c8d5bbc SHA512 18234690e78758d80c3eaeb94c5e69d974e27c6c86f16b43db935435027f66e4d50a2cc6f6182799298ce103a041e594edc4b5c1c8b9f2f023bbd15aee833f7f MISC metadata.xml 1012 BLAKE2B 5c5d08f16521594e1425ca8efbe5162c72ce6aff0557c0c79f1e2717dfc77ba855f90c493b45ff361d2e75f00b17e549b6853ee660c77c57cdeadce1df223f32 SHA512 a53bdde33366823f867bcff8b6c90e3cae6e0808945278fd02928502fd38df9d699fa4ace2fe66c1524e74d256242202a2b3139deb1331b67ac72f2fd0e9608f diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild index 9a9eba17220d..f4eabc6cad94 100644 --- a/x11-wm/fvwm3/fvwm3-9999.ebuild +++ b/x11-wm/fvwm3/fvwm3-9999.ebuild @@ -8,9 +8,9 @@ EAPI=8 # Scripting for this is in sam-gentoo-scripts. : ${FVWM3_DOCS_PREBUILT:=1} -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) GO_OPTIONAL=1 -inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs +inherit flag-o-matic go-module meson python-single-r1 DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm" HOMEPAGE="https://www.fvwm.org/" @@ -31,9 +31,8 @@ fi LICENSE="GPL-2+ FVWM go? ( Apache-2.0 BSD MIT )" SLOT="0" -IUSE="bidi debug +go netpbm nls perl readline stroke svg tk lock" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE}" +IUSE="bidi +go netpbm nls perl readline svg" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" DOCS=( NEWS ) @@ -83,20 +82,15 @@ RDEPEND="${PYTHON_DEPS} x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender + x11-misc/xlockmore + dev-lang/tk + dev-perl/Tk + >=dev-perl/X11-Protocol-0.56 bidi? ( dev-libs/fribidi ) - lock? ( x11-misc/xlockmore ) - netpbm? ( media-libs/netpbm ) - perl? ( tk? ( - dev-lang/tk - dev-perl/Tk - >=dev-perl/X11-Protocol-0.56 - ) - ) readline? ( sys-libs/ncurses:= sys-libs/readline:= ) - stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg:2 x11-libs/cairo @@ -105,14 +99,6 @@ RDEPEND="${PYTHON_DEPS} DEPEND="${COMMON_DEPEND} x11-base/xorg-proto" -src_prepare() { - default - use go && ( sed -e 's/GOFLAGS=-ldflags="-s -w"/GOFLAGS=/' \ - -i bin/FvwmPrompt/Makefile.am || die ) - - eautoreconf -} - src_configure() { # Recommended by upstream for release. Doesn't really matter for live ebuilds. append-flags -fno-strict-aliasing @@ -122,68 +108,57 @@ src_configure() { use $arch && append-flags -fsigned-chars done - local myconf=( - --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm - --enable-package-subdirs - $(use_enable bidi) - $(use_enable go golang) - $(use_enable nls) - $(use_enable nls iconv) - $(use_enable perl perllib) - $(use_with readline readline-library) - $(use_enable svg rsvg) - --enable-png + local emesonargs=( + "-Dpng=enabled" + "-Dsm=enabled" + "-Dxcursor=enabled" + "-Dxkbcommon=enabled" + "-Dxpm=enabled" + "-Dxrender=enabled" + $(meson_feature bidi) + $(meson_feature go golang) + $(meson_feature nls iconv) + $(meson_feature nls) + $(meson_feature readline) # not required for go but it won't hurt to enable it + $(meson_feature svg cairo) # Pick 1 of 'cairo', 'cairo-svg', or 'libsvg-cairo'; add the appropriate dependency + $(meson_feature svg) + "-Dcairo-svg=disabled" + "-Dlibsvg-cairo=disabled" + "-Ddocdir=${EPREFIX}/usr/share/doc/${PF}" ) if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then - myconf+=( - --enable-mandoc - --enable-htmldoc + emesonargs+=( + "-Dhtmldoc=true" + "-Dmandoc=true" ) else # Probably not required, but let's be safe - myconf+=( - --disable-mandoc - --disable-htmldoc + emesonargs+=( + "-Dhtmldoc=false" + "-Dmandoc=false" ) fi - use readline && myconf+=( --without-termcap-library ) - - econf "${myconf[@]}" -} - -src_compile() { - PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)" + meson_src_configure } src_install() { # Since we're manually handling docs installation, let's do that first - # and then install the rest of the files via emake + # and then install the rest of the files "normally". local HTML_DOCS if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8] HTML_DOCS="${WORKDIR}"/${P}-docs/html/* - else - HTML_DOCS="${S}"/doc/*.html - doman "${S}"/doc/*.[0-8] fi - einstalldocs - emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install - - exeinto /etc/X11/Sessions - newexe - ${PN} <<-EOF - #!/bin/sh - ${PN} - EOF - - python_scriptinto "/usr/bin" - python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop" - - make_session_desktop fvwm3 /usr/bin/fvwm3 + meson_src_install + if ! use go; then + python_scriptinto "/usr/bin" + python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop" + fi } pkg_postinst() { |