From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- x11-wm/icewm/Manifest | 10 +-- x11-wm/icewm/icewm-1.7.0.ebuild | 137 -------------------------------------- x11-wm/icewm/icewm-1.8.2.ebuild | 137 -------------------------------------- x11-wm/icewm/icewm-1.8.3.ebuild | 17 +++-- x11-wm/icewm/icewm-1.9.1.ebuild | 143 ++++++++++++++++++++++++++++++++++++++++ x11-wm/icewm/icewm-1.9.2.ebuild | 143 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 302 insertions(+), 285 deletions(-) delete mode 100644 x11-wm/icewm/icewm-1.7.0.ebuild delete mode 100644 x11-wm/icewm/icewm-1.8.2.ebuild create mode 100644 x11-wm/icewm/icewm-1.9.1.ebuild create mode 100644 x11-wm/icewm/icewm-1.9.2.ebuild (limited to 'x11-wm/icewm') diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest index 3321ab9a5d4b..0ab22cf5b495 100644 --- a/x11-wm/icewm/Manifest +++ b/x11-wm/icewm/Manifest @@ -1,8 +1,8 @@ AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0 -DIST icewm-1.7.0.tar.lz 1668130 BLAKE2B 90739f862cf320c43dc2ddbd1a5ecdf2918e6525e45d5732b19adaaeef0f104d9a66d29acab776658f869d7149954d4b531a07e2595a4c80b4dc50dc679473f0 SHA512 1b0faed0e9ead837dcb0d3ce91ad5248d7fca5ad48455c838700c66482a3373bb4e552dbc252b93b0a5613d53e2663cea756e64b3f3fb073d9ba2797e2b69601 -DIST icewm-1.8.2.tar.lz 1686746 BLAKE2B a2dcf77284f5dc2f908ec949c6e1ea792292648fbd5cb8167216ee994706b1a208ca6fe29831f6bf98d2ec02e5e5120eca8f3a93a20a4a75d80d839210d829bd SHA512 3454b9547b7f4857957133cda4436814149bea99886cd4564f947391a1f42d474d56c7cd3208ff2471262c57f623de1ec22e30f0d9b14874f29ac3a4855b9a45 DIST icewm-1.8.3.tar.lz 1686603 BLAKE2B 214cb3c7816ba8d94fa56fb9d4a6c630f49f23f69f99ff1ba7aff38aba6f6b7fbd623a284d4873616486d266a7ec412ba9cf4b29479c5c29f1f7ff27e15d1f48 SHA512 697395ff995b57e043774bae2cce667935879c4deab17d9a9059c1e152a90704ad3af618a2c945ac5afd561754895d4e9805f4fea77d5f1e06cf99a7dfd4c062 -EBUILD icewm-1.7.0.ebuild 2670 BLAKE2B 6fd31e08fe11f8ebb664ff0d11269df39b47433dfafc1058281af3896dcf10a81930707846efc4d2b964d881b9f6c7eef5a21548d50fba58462e101f360d6c95 SHA512 3dfb0a7502141b5916a2bb5d088bd533bc70281dc4c3171a8fbf87e65c94b7b88bf99c592ef3ec3e20994d9913226b760fb9037b2bec7b0aaabdcf679d428eab -EBUILD icewm-1.8.2.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a -EBUILD icewm-1.8.3.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a +DIST icewm-1.9.1.tar.lz 1696312 BLAKE2B c2435e2dfa0c8c9ba490299a9c1545c9b45b8c8960bf1a36889c0304882619c7bcff7ab37b1573c82c92b2b0be514527b051d9651832a22c5f9b8334f5391fdc SHA512 75210466110c65f91192c89e6bdecc3a52c8abc953096789861ebdbbd779b892b708b5d1f0bcb9fcfcb59171a61171bbfc718bffaeade69ced3a978409b4ee65 +DIST icewm-1.9.2.tar.lz 1694602 BLAKE2B cf30a695ba48093b386aa2f3af5120e78a9fcc57da9038bcd546ade0986e1bc359a3da91d2eeeb8d3a105173f5d755223675a84b38cfc8c907269efd2561c706 SHA512 7b4f8c47c636a0113af576bc1bcd9fde111ae70eb0bcf21fb1d906ca43bea4d8b0337a728e5da35bcfeabd56c66fd0d14581d7377f063dd750fdf01362b24be2 +EBUILD icewm-1.8.3.ebuild 2780 BLAKE2B 247c5a39d442164e0b2ed097a9618c0db264c554dc5b9bc2e0f1f2f5eacea089e929414193a85924e081e97ff9a8dc621e1c9e37d2d753533d71835419d6da8d SHA512 2a88275a9f9b1f023f024db5cf79563d5c35c39406f3733a00ec7b5faf822520fe9b8fcb6aa2c4ea17a71c9a3b27858ae8c2ded73106444681cf4ab5ac8a5dd6 +EBUILD icewm-1.9.1.ebuild 2816 BLAKE2B 798b2d1b6ed7881a66bc1d502d7c2a69ef0f8b1cfc8cff4183b432538236541789caf8f6ee4e1c91648acf59af4abf7fb867524342ef067e08909cb8a64a65fd SHA512 ffd7a7e21470e8bea16968ed9fbbec71e988d768800e157220f63f3486a9ef7ffa706115b627ab82c69dcc5fb5adc0bf7b96d6db9ae05899914c50b8f49ae4cb +EBUILD icewm-1.9.2.ebuild 2816 BLAKE2B 798b2d1b6ed7881a66bc1d502d7c2a69ef0f8b1cfc8cff4183b432538236541789caf8f6ee4e1c91648acf59af4abf7fb867524342ef067e08909cb8a64a65fd SHA512 ffd7a7e21470e8bea16968ed9fbbec71e988d768800e157220f63f3486a9ef7ffa706115b627ab82c69dcc5fb5adc0bf7b96d6db9ae05899914c50b8f49ae4cb MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe diff --git a/x11-wm/icewm/icewm-1.7.0.ebuild b/x11-wm/icewm/icewm-1.7.0.ebuild deleted file mode 100644 index fe0e2ed27f4e..000000000000 --- a/x11-wm/icewm/icewm-1.7.0.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools unpacker - -DESCRIPTION="Ice Window Manager with Themes" -HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm" -LICENSE="GPL-2" -SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz" - -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama" - -# Tests broken in all versions, patches welcome, bug #323907, #389533 -RESTRICT="test" - -REQUIRED_USE="|| ( alsa ao )" - -#fix for icewm preversion package names -S="${WORKDIR}/${P/_}" - -# These are the core dependencies of icewm. -# Look into configure.ac and search for PKG_CHECK_MODULES([CORE] -CORE_DEPEND=" - media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrender -" - -RDEPEND=" - ${CORE_DEPEND} - x11-libs/libICE - x11-libs/libSM - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrandr - alsa? ( - media-libs/alsa-lib - media-libs/libsndfile[alsa] - ) - ao? ( - media-libs/libao - media-libs/libsndfile - ) - bidi? ( dev-libs/fribidi ) - gdk-pixbuf? ( - x11-libs/gdk-pixbuf:2[X] - ) - !gdk-pixbuf? ( - media-libs/libpng:0= - virtual/jpeg - ) - xinerama? ( x11-libs/libXinerama ) -" -DEPEND=" - ${RDEPEND} - $(unpacker_src_uri_depends) - dev-libs/glib:2 - gnome-base/librsvg - x11-base/xorg-proto - gdk-pixbuf? ( gnome-base/librsvg:2 ) -" - -BDEPEND=" - app-text/asciidoc - virtual/pkgconfig - nls? ( >=sys-devel/gettext-0.19.6 ) -" - -src_prepare() { - # Fix bug #486710 - TODO: Still needed? - #use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" ) - - default - eautoreconf -} - -src_configure() { - local icesound - if use alsa && use ao ; then - icesound="alsa,ao" - elif use alsa ; then - icesound="alsa" - elif use ao ; then - icesound="ao" - fi - - local myconf=( - --enable-logevents - --enable-xrandr - --with-cfgdir=/etc/icewm - --with-docdir=/usr/share/doc/${PF}/html - --with-icesound="${icesound}" - --with-libdir=/usr/share/icewm - $(use_enable bidi fribidi) - $(use_enable debug) - $(use_enable gdk-pixbuf) - $(use_enable nls i18n) - $(use_enable nls) - $(use_enable xinerama) - ) - if use truetype ; then - myconf+=( - --enable-shape - ) - else - myconf+=( - --disable-xfreetype - --enable-corefonts - ) - fi - - econf "${myconf[@]}" - - sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die - sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed" -} - -src_install() { - local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION ) - - default - - docinto html - dodoc doc/icewm.html - dodoc man/*.html - - exeinto /etc/X11/Sessions - doexe "${FILESDIR}/icewm" -} diff --git a/x11-wm/icewm/icewm-1.8.2.ebuild b/x11-wm/icewm/icewm-1.8.2.ebuild deleted file mode 100644 index f3a5bab3c272..000000000000 --- a/x11-wm/icewm/icewm-1.8.2.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools unpacker - -DESCRIPTION="Ice Window Manager with Themes" -HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm" -LICENSE="GPL-2" -SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama" - -# Tests broken in all versions, patches welcome, bug #323907, #389533 -RESTRICT="test" - -REQUIRED_USE="|| ( alsa ao )" - -#fix for icewm preversion package names -S="${WORKDIR}/${P/_}" - -# These are the core dependencies of icewm. -# Look into configure.ac and search for PKG_CHECK_MODULES([CORE] -CORE_DEPEND=" - media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrender -" - -RDEPEND=" - ${CORE_DEPEND} - x11-libs/libICE - x11-libs/libSM - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrandr - alsa? ( - media-libs/alsa-lib - media-libs/libsndfile[alsa] - ) - ao? ( - media-libs/libao - media-libs/libsndfile - ) - bidi? ( dev-libs/fribidi ) - gdk-pixbuf? ( - x11-libs/gdk-pixbuf:2[X] - ) - !gdk-pixbuf? ( - media-libs/libpng:0= - virtual/jpeg - ) - xinerama? ( x11-libs/libXinerama ) -" -DEPEND=" - ${RDEPEND} - $(unpacker_src_uri_depends) - dev-libs/glib:2 - gnome-base/librsvg - x11-base/xorg-proto - gdk-pixbuf? ( gnome-base/librsvg:2 ) -" - -BDEPEND=" - app-text/asciidoc - virtual/pkgconfig - nls? ( >=sys-devel/gettext-0.19.6 ) -" - -src_prepare() { - # Fix bug #486710 - TODO: Still needed? - #use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" ) - - default - eautoreconf -} - -src_configure() { - local icesound - if use alsa && use ao ; then - icesound="alsa,ao" - elif use alsa ; then - icesound="alsa" - elif use ao ; then - icesound="ao" - fi - - local myconf=( - --enable-logevents - --enable-xrandr - --with-cfgdir=/etc/icewm - --with-docdir=/usr/share/doc/${PF}/html - --with-icesound="${icesound}" - --with-libdir=/usr/share/icewm - $(use_enable bidi fribidi) - $(use_enable debug) - $(use_enable gdk-pixbuf) - $(use_enable nls i18n) - $(use_enable nls) - $(use_enable xinerama) - ) - if use truetype ; then - myconf+=( - --enable-shape - ) - else - myconf+=( - --disable-xfreetype - --enable-corefonts - ) - fi - - econf "${myconf[@]}" - - sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die - sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed" -} - -src_install() { - local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION ) - - default - - docinto html - dodoc doc/icewm.html - dodoc man/*.html - - exeinto /etc/X11/Sessions - doexe "${FILESDIR}/icewm" -} diff --git a/x11-wm/icewm/icewm-1.8.3.ebuild b/x11-wm/icewm/icewm-1.8.3.ebuild index f3a5bab3c272..a9502b12ad78 100644 --- a/x11-wm/icewm/icewm-1.8.3.ebuild +++ b/x11-wm/icewm/icewm-1.8.3.ebuild @@ -11,7 +11,7 @@ LICENSE="GPL-2" SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ppc sparc x86" IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama" # Tests broken in all versions, patches welcome, bug #323907, #389533 @@ -51,7 +51,13 @@ RDEPEND=" ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( - x11-libs/gdk-pixbuf:2[X] + || ( + ( + x11-libs/gdk-pixbuf-xlib + >=x11-libs/gdk-pixbuf-2.42.0:2 + ) +