From 0affb91ea237cd078dfa733711fc475c95d9b884 Mon Sep 17 00:00:00 2001 From: Ian Stakenvicius Date: Fri, 16 Oct 2015 10:17:34 -0400 Subject: x11-wm/windowmaker-0.95.5: fix missing slot dep Cures repoman warnings and ensures correctness of VDB. Package-Manager: portage-2.2.20.1 --- x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild | 109 ------------------------ x11-wm/windowmaker/windowmaker-0.95.5-r2.ebuild | 109 ++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 109 deletions(-) delete mode 100644 x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild create mode 100644 x11-wm/windowmaker/windowmaker-0.95.5-r2.ebuild diff --git a/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild deleted file mode 100644 index ef35c19b70f..00000000000 --- a/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -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 jpeg nls png tiff modelock xinerama xrandr" -KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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 ) - png? ( media-libs/libpng:0= ) - jpeg? ( virtual/jpeg ) - tiff? ( media-libs/tiff:0 ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 ) - !app-i18n/scim-anthy[gtk3] -" - -S=${WORKDIR}/${P/windowm/WindowM} - -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; - - epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch - epatch "${FILESDIR}"/${P}-bsd_crash.patch - eautoreconf -} - -src_configure() { - local myconf - - # image format types - myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)" - - # non required X capabilities - myconf="${myconf} $(use_enable modelock) $(use_enable xrandr) $(use_enable xinerama)" - - if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - 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 \ - --with-nlsdir="${EPREFIX}"/usr/share/locale \ - ${myconf} - - cd ../WindowMaker-extra-0.1 - econf -} - -src_compile() { - emake - - # WindowMaker Extra Package (themes and icons) - cd ../WindowMaker-extra-0.1 - emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ - README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - 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.5-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.95.5-r2.ebuild new file mode 100644 index 00000000000..679ad08672c --- /dev/null +++ b/x11-wm/windowmaker/windowmaker-0.95.5-r2.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +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 jpeg nls png tiff modelock xinerama xrandr" +KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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:0= ) + png? ( media-libs/libpng:0= ) + jpeg? ( virtual/jpeg:0= ) + tiff? ( media-libs/tiff:0 ) + xinerama? ( x11-libs/libXinerama ) + xrandr? ( x11-libs/libXrandr )" +RDEPEND="${DEPEND} + nls? ( >=sys-devel/gettext-0.10.39 ) + !app-i18n/scim-anthy[gtk3] +" + +S=${WORKDIR}/${P/windowm/WindowM} + +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; + + epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch + epatch "${FILESDIR}"/${P}-bsd_crash.patch + eautoreconf +} + +src_configure() { + local myconf + + # image format types + myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)" + + # non required X capabilities + myconf="${myconf} $(use_enable modelock) $(use_enable xrandr) $(use_enable xinerama)" + + if use nls; then + [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" + 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 \ + --with-nlsdir="${EPREFIX}"/usr/share/locale \ + ${myconf} + + cd ../WindowMaker-extra-0.1 + econf +} + +src_compile() { + emake + + # WindowMaker Extra Package (themes and icons) + cd ../WindowMaker-extra-0.1 + emake +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ + README* NEWS TODO + + # WindowMaker Extra + cd ../WindowMaker-extra-0.1 + 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 +} -- cgit v1.2.1