From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- x11-wm/windowmaker/Manifest | 6 +- .../files/windowmaker-0.95.8-imagemagick7.patch | 35 ------- x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild | 113 --------------------- x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild | 108 -------------------- x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild | 2 +- 5 files changed, 2 insertions(+), 262 deletions(-) delete mode 100644 x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch delete mode 100644 x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild delete mode 100644 x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild (limited to 'x11-wm/windowmaker') diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest index 3eddaf7f636b..bb22c7641a45 100644 --- a/x11-wm/windowmaker/Manifest +++ b/x11-wm/windowmaker/Manifest @@ -1,11 +1,7 @@ AUX windowmaker-0.95.8-configure_default_search_paths.patch 2599 BLAKE2B 1b76e547a955e45571860e5a5d87ba6bc0de565cb38355d08019a791965170eb0b5d6f215cd1bcb673f93addfde86485847cc7af987a72bfc02324dd56142f4d SHA512 9c12516dd0a2c3e81f7236e2e0f2f8137710e7f1a54ae84d279850d65afb52cb46cada6e84a0ba1f2c92fdfa8d7a0b4630f703e5a5e24664e0fec5ee718f83ae -AUX windowmaker-0.95.8-imagemagick7.patch 1340 BLAKE2B d3ba22b324a405cba0d0d266e2d25b0b6e41ece01cc42e18d3746c46d9e6f38f3048abe928ade603ec9f90206e19e285445e1de7775b18527602a0557d86aae1 SHA512 90316ffe66fe92f7db43afa504225bdb97ddb8ec8ff742f69760e4e233172e2b2f704449f014935f9851d6bd7ebe91cde97e5ae65dfb73284a21743a44b7492d AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922f18d56a7582fffd1689762f600fa3c69c5b62dd399867c8c1208d393060e734b38a84540143bf79 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b -DIST WindowMaker-0.95.8.tar.gz 3253515 BLAKE2B 225dae9eb10f913931e129fdf78860123a14406ad8e61ba42fe4eadcf5d3f03c88040a2b982e74abaf79088f4a063291ccfb7b7d42f1bf211adb7b02c765a664 SHA512 6ab16ed4304aba20f0f3a4083adf63a47fa674ade7bc39aaa8aa6466c7842e3f10ab73af96e2afce0842b11c57a35eb69f43183a4044d8cd95d4e2a4d2c079a2 DIST WindowMaker-0.95.9.tar.gz 3397167 BLAKE2B ec751fe0139b359933f4388f8dac3f2bf18db1f28fb4cb290d86db1ded9ffdab0cf51b451e28475bc51ee2735cb71c7fd2b01fa7472f5f0f4f1a1e00e1509339 SHA512 ca3ddc863f5b5b782e90f38c0019fe14d1109d6b11d0a3d5d6c728ddc1817747eea92e22e36933d445e72c70661e039ee56efa70f2654657c8980269fd5b4584 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 -EBUILD windowmaker-0.95.8-r1.ebuild 3118 BLAKE2B 426b31a868c8d9dc807eddc211ede8c54928077aef7eeb72e2f264a5d8da95f76f606829237701e383e3a14ec323586301ddd72539525bb9078d7101e32e5186 SHA512 37c1f9604e7811cb025e43054d1848cfa1103fc24921419ed66e17cd4e816c45ecaeffef2ea2a2c11373de35b4ca23124ec400bd60944479307d4dcb13644aa0 -EBUILD windowmaker-0.95.9-r1.ebuild 3079 BLAKE2B 333833e1b61ffe17dc37e19d768a8e29f254c038cfa8dc46c2bec04a8de420769d6b3ec40c669a78c231a72f0a26b270a982b2c3447bfcc43031ce403fd37133 SHA512 0bd1371818c59d3dd4861ad740aabc76e19cbb160acc9a2c56dbd0b1bede9170c29f5d6453e3141fc3c4381ddd4c3c7bb09a173bae58a9c87943b72f9d8bbce3 -EBUILD windowmaker-0.95.9-r2.ebuild 3203 BLAKE2B f034cdbb024931aa4888f87e97423fa797bbc62fb3dd28498e4f6c3ff54c65066a9ef29b96a49a93775f7e10f6e7cddd076d1895c0352024636d7e53f3e175f3 SHA512 efff8fc40b52364cdff6536752ca41cd928dc188d9338eee17e8cb49f56b85dd8794613247f2a24956d04774207a3afc07733f32be13c259c02f42f9a2a48983 +EBUILD windowmaker-0.95.9-r2.ebuild 3202 BLAKE2B 10e65a499404e5da7ab2305365142618c4b8fc2464dd9e3de617e4367b496eb2593e012817b4cdbac87992b1894abe9489354e2569e28132a183b1fa396b5de7 SHA512 e2391c97fc15e87394cd7d0f91e8b44ad65ff73c0908e4d6f837b05573acc3fb4d08dbffc6901362f856e9d2640ad004a1e4b853aa1604a9101cb39336a6a98e EBUILD windowmaker-9999.ebuild 3027 BLAKE2B cbdbe30ce0edf4c903db6d21e16deb64a27d5d6c7b67a72636e58b939e73a6f8c37da29422092d38ca349f4179f3541fb1688321d03afe04bcd35258132eed3a SHA512 550d6fe89f3c4161f9cf40f9298ad178c811d740475b74a139ddc2222c87b920c2677ef066c25c3dba43b0b40f0e8da885dfaa66dc53c69a3f2df792248d5ea4 MISC metadata.xml 490 BLAKE2B a74e46dfe5b90558720726c3a18b9c9cf2752fb90ade60450ae568547c52b807e9dee74d1deb842c11cc3e6f564c0793adc5f8e24686893138808669f6fc9766 SHA512 ae731acb1fe00cfbda949fc9cafad9f861b83fb37103a699157256840c67e4a2cd0023114d30eab0b25f6dcb154c00e2a659a4feffaabad97e8ed7aa2a03e3ca diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch b/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch deleted file mode 100644 index b4cccab5a71e..000000000000 --- a/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch +++ /dev/null @@ -1,35 +0,0 @@ -imagemagick 7.0 now uses MagickWand/ ---- - m4/wm_imgfmt_check.m4 | 2 +- - wrlib/load_magick.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4 -index 5dd9ec7f..14e52bb3 100644 ---- a/m4/wm_imgfmt_check.m4 -+++ b/m4/wm_imgfmt_check.m4 -@@ -312,7 +312,7 @@ AS_IF([test "x$enable_magick" = "xno"], - dnl - dnl The library was found, check if header is available and compiles - wm_save_CFLAGS="$CFLAGS" -- AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"], -+ AS_IF([wm_fn_lib_try_compile "MagickWand/MagickWand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"], - [wm_cv_libchk_magick="$wm_cv_libchk_magick_cflags % $wm_cv_libchk_magick_libs"], - [AC_MSG_ERROR([found MagickWand library but could not compile its header])]) - CFLAGS="$wm_save_CFLAGS"])dnl -diff --git a/wrlib/load_magick.c b/wrlib/load_magick.c -index 3e809ba2..1edbebc3 100644 ---- a/wrlib/load_magick.c -+++ b/wrlib/load_magick.c -@@ -22,7 +22,7 @@ - - #include "config.h" - --#include -+#include - - #include "wraster.h" - #include "imgformat.h" --- -2.13.0 - diff --git a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild deleted file mode 100644 index c3e50292c33d..000000000000 --- a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools desktop eutils - -DESCRIPTION="The fast and light GNUstep window manager" -HOMEPAGE="https://www.windowmaker.org/" -SRC_URI="https://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz - https://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 ~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: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} - -PATCHES=( "${FILESDIR}"/${P}-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; - - if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then - eapply "${FILESDIR}/${P}-imagemagick7.patch" - fi - - 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} - - 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.9-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild deleted file mode 100644 index f7096cff3be4..000000000000 --- a/x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2021 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="https://www.windowmaker.org/" -SRC_URI="https://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz - https://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 ~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-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild index 1ee2d638d3ac..27d0b6ffe5a5 100644 --- a/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild +++ b/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://windowmaker.org/pub/source/release/${P/windowm/WindowM}.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 ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" DEPEND="media-libs/fontconfig >=x11-libs/libXft-2.1.0 -- cgit v1.2.3