From 6b0c2a341139f0d80594400530839a39e18e654a Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Fri, 29 May 2020 22:31:20 +0200 Subject: x11-wm/windowmaker: add desktop eclass For make_desktop_entry call Closes: https://bugs.gentoo.org/724826 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Bernard Cafarelli --- x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild | 2 +- x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild | 108 ++++++++++++++++++++++++ x11-wm/windowmaker/windowmaker-0.95.9.ebuild | 108 ------------------------ x11-wm/windowmaker/windowmaker-9999.ebuild | 2 +- 4 files changed, 110 insertions(+), 110 deletions(-) create mode 100644 x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild delete mode 100644 x11-wm/windowmaker/windowmaker-0.95.9.ebuild (limited to 'x11-wm') diff --git a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild index 8b2e811ea5bb..759d0ce688c5 100644 --- a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild +++ b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils +inherit autotools desktop eutils DESCRIPTION="The fast and light GNUstep window manager" HOMEPAGE="http://www.windowmaker.org/" diff --git a/x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild new file mode 100644 index 000000000000..c33eb6226490 --- /dev/null +++ b/x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools desktop eutils + +DESCRIPTION="The fast and light GNUstep window manager" +HOMEPAGE="http://www.windowmaker.org/" +SRC_URI="http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz + http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + +DEPEND="media-libs/fontconfig + >=x11-libs/libXft-2.1.0 + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt + x11-libs/libXv + gif? ( >=media-libs/giflib-4.1.0-r3 ) + imagemagick? ( >=media-gfx/imagemagick-7:0= ) + jpeg? ( virtual/jpeg:0= ) + png? ( media-libs/libpng:0= ) + tiff? ( media-libs/tiff:0 ) + webp? ( media-libs/libwebp ) + xinerama? ( x11-libs/libXinerama ) + xrandr? ( x11-libs/libXrandr )" +RDEPEND="${DEPEND} + nls? ( >=sys-devel/gettext-0.10.39 )" + +S=${WORKDIR}/${P/windowm/WindowM} + +DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL INSTALL-WMAKER FAQ + NEWS README README.definable-cursor README.i18n TODO ) +PATCHES=( "${FILESDIR}"/${PN}-0.95.8-configure_default_search_paths.patch ) + +src_prepare() { + # Fix some paths + for file in WindowMaker/*menu* util/wmgenmenu.c; do + if [[ -r $file ]] ; then + sed -i -e "s|/usr/local/GNUstep/Applications/WPrefs.app|${EPREFIX}/usr/bin/|g;" "$file" || die + sed -i -e "s|/usr/local/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die + sed -i -e "s|/opt/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die + fi; + done; + + default + eautoreconf +} + +src_configure() { + local myconf + + # image format types + myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)" + + # non required X capabilities + myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)" + + if use nls; then + [[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)" + else + myconf="${myconf} --disable-locale" + fi + + # default settings with $myconf appended + econf \ + --sysconfdir="${EPREFIX}"/etc/X11 \ + --with-x \ + --enable-usermenu \ + --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ + --localedir="${EPREFIX}"/usr/share/locale \ + ${myconf} + + pushd ../WindowMaker-extra-0.1 || die + econf +} + +src_compile() { + emake + + # WindowMaker Extra Package (themes and icons) + pushd ../WindowMaker-extra-0.1 || die + emake +} + +src_install() { + default + + # WindowMaker Extra + pushd ../WindowMaker-extra-0.1 || die + emake DESTDIR="${D}" install + + newdoc README README.extra + + # create wmaker session shell script + echo "#!/usr/bin/env bash" > wmaker + echo "${EPREFIX}/usr/bin/wmaker" >> wmaker + exeinto /etc/X11/Sessions/ + doexe wmaker + + insinto /usr/share/xsessions + doins "${FILESDIR}"/wmaker.desktop + make_desktop_entry /usr/bin/wmaker +} diff --git a/x11-wm/windowmaker/windowmaker-0.95.9.ebuild b/x11-wm/windowmaker/windowmaker-0.95.9.ebuild deleted file mode 100644 index a11fcfdcd365..000000000000 --- a/x11-wm/windowmaker/windowmaker-0.95.9.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools eutils - -DESCRIPTION="The fast and light GNUstep window manager" -HOMEPAGE="http://www.windowmaker.org/" -SRC_URI="http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz - http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -DEPEND="media-libs/fontconfig - >=x11-libs/libXft-2.1.0 - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - x11-libs/libXv - gif? ( >=media-libs/giflib-4.1.0-r3 ) - imagemagick? ( >=media-gfx/imagemagick-7:0= ) - jpeg? ( virtual/jpeg:0= ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0 ) - webp? ( media-libs/libwebp ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 )" - -S=${WORKDIR}/${P/windowm/WindowM} - -DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL INSTALL-WMAKER FAQ - NEWS README README.definable-cursor README.i18n TODO ) -PATCHES=( "${FILESDIR}"/${PN}-0.95.8-configure_default_search_paths.patch ) - -src_prepare() { - # Fix some paths - for file in WindowMaker/*menu* util/wmgenmenu.c; do - if [[ -r $file ]] ; then - sed -i -e "s|/usr/local/GNUstep/Applications/WPrefs.app|${EPREFIX}/usr/bin/|g;" "$file" || die - sed -i -e "s|/usr/local/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die - sed -i -e "s|/opt/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die - fi; - done; - - default - eautoreconf -} - -src_configure() { - local myconf - - # image format types - myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)" - - # non required X capabilities - myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)" - - if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)" - else - myconf="${myconf} --disable-locale" - fi - - # default settings with $myconf appended - econf \ - --sysconfdir="${EPREFIX}"/etc/X11 \ - --with-x \ - --enable-usermenu \ - --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ - --localedir="${EPREFIX}"/usr/share/locale \ - ${myconf} - - pushd ../WindowMaker-extra-0.1 || die - econf -} - -src_compile() { - emake - - # WindowMaker Extra Package (themes and icons) - pushd ../WindowMaker-extra-0.1 || die - emake -} - -src_install() { - default - - # WindowMaker Extra - pushd ../WindowMaker-extra-0.1 || die - emake DESTDIR="${D}" install - - newdoc README README.extra - - # create wmaker session shell script - echo "#!/usr/bin/env bash" > wmaker - echo "${EPREFIX}/usr/bin/wmaker" >> wmaker - exeinto /etc/X11/Sessions/ - doexe wmaker - - insinto /usr/share/xsessions - doins "${FILESDIR}"/wmaker.desktop - make_desktop_entry /usr/bin/wmaker -} diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild index 7078f87e0428..3ce59498cbfa 100644 --- a/x11-wm/windowmaker/windowmaker-9999.ebuild +++ b/x11-wm/windowmaker/windowmaker-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools eutils git-r3 +inherit autotools desktop eutils git-r3 DESCRIPTION="The fast and light GNUstep window manager" HOMEPAGE="http://www.windowmaker.org/" -- cgit v1.2.3-65-gdbad