diff options
Diffstat (limited to 'x11-wm/icewm')
| -rw-r--r-- | x11-wm/icewm/Manifest | 4 | ||||
| -rw-r--r-- | x11-wm/icewm/icewm-2.0.1.ebuild (renamed from x11-wm/icewm/icewm-1.8.3.ebuild) | 40 |
2 files changed, 30 insertions, 14 deletions
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest index eedd1cdf1cd6..449e9b226d85 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.8.3.tar.lz 1686603 BLAKE2B 214cb3c7816ba8d94fa56fb9d4a6c630f49f23f69f99ff1ba7aff38aba6f6b7fbd623a284d4873616486d266a7ec412ba9cf4b29479c5c29f1f7ff27e15d1f48 SHA512 697395ff995b57e043774bae2cce667935879c4deab17d9a9059c1e152a90704ad3af618a2c945ac5afd561754895d4e9805f4fea77d5f1e06cf99a7dfd4c062 DIST icewm-1.9.2.tar.lz 1694602 BLAKE2B cf30a695ba48093b386aa2f3af5120e78a9fcc57da9038bcd546ade0986e1bc359a3da91d2eeeb8d3a105173f5d755223675a84b38cfc8c907269efd2561c706 SHA512 7b4f8c47c636a0113af576bc1bcd9fde111ae70eb0bcf21fb1d906ca43bea4d8b0337a728e5da35bcfeabd56c66fd0d14581d7377f063dd750fdf01362b24be2 DIST icewm-2.0.0.tar.lz 1694653 BLAKE2B 36feb02d653256b4d6755618da89400c3925279757da32695d6b8c2206d69228bcf392852eaba8b9096d06b60b5f021a0b6b474140a7754c4865d575d8a868dc SHA512 58b9a62d15add73c9c535e8602711636058b67b5e89b6189656a2d0668d2e647b9a59c45b5602f634ffd89abe7fb8a03be094524f3ff6d2b136bb8e21bc79fa3 -EBUILD icewm-1.8.3.ebuild 2719 BLAKE2B f420c9d85bef2b93851fa1d59412b2e95f52e19970c1957e6a6ee62b49454f8c42ef9253a6da6748db0be781fd9f7bf847d81f27a6c96b233b5e4012ac5a8ebc SHA512 289fa93b96464189a1c2fb70a2d2b4a980f511e4a698db62ba8c62b22aceb0ed3a3031b6a07a52640ecbd3d922dbd5db25cc1b20acf97593adbac39bbef4a2c8 +DIST icewm-2.0.1.tar.lz 1694439 BLAKE2B 1476f33fa7350a98b7eca8c5c265455d0a78b28bcbd35ab78969b528ae02d3c960fb73cf2b24ea999ee5e08c9f0641d3502c7d5ed8b285777162c334d645b6db SHA512 ac4126b38d592aed60d2269f58c5a1612b61e871565e3c3e51bc2b430e4da6a4708f78e86c16091fa4dfb9eefd4109ae89102ab708e3bce9a44f1e5fe1970c59 EBUILD icewm-1.9.2.ebuild 2751 BLAKE2B ffbbde71ff1e7e055de75878203dfcfe4ddf47e0883f9c51d9ed4a68d007c1d294d2bc33ce0009b0fb4b5b8c679a341aefc30252fe3fd3cc0a963574a3b31955 SHA512 42c3df4c4709f963e23264785acb1e56df30fb1b580fbdc06029e86cb7c7fe1b78b4dc46d250cae50195404ccd166582d2560940076f7823e368e36de333e333 EBUILD icewm-2.0.0.ebuild 2949 BLAKE2B e8e0ac64383edd04cbe752917c001dade85ba729d440d6711cd9f80f2506dbd6565fbd0fcd70ab4e0d8051df82c4597040882dc79ff4056762d020bbe25e9e6d SHA512 14ea2d985d54b32c8788a0b35f4ddfeccfbe6edbd45f751992340127575bcecdee972543c37d339541fe24daf3b5b8f828c6918af4a79f11fbd0b2ec8792a323 +EBUILD icewm-2.0.1.ebuild 2949 BLAKE2B 7cbb263b4244bc2112c5dd6ac91a0b970d31e3ce36034a31d036e1fd77d34923da8de8bfe64ef4d212984640d932727a9b362bf7f2ff6ecea10a9ae57db15906 SHA512 96ef7961a4754b355678b222b1c99f5ea7efc2cf2ec5badf951458fadee580c26a5614dccb540b9685d118e6761cf20df14b71b7ce7ef98f84b8df8bfb596e19 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe diff --git a/x11-wm/icewm/icewm-1.8.3.ebuild b/x11-wm/icewm/icewm-2.0.1.ebuild index acff330bc419..ec1d0545c005 100644 --- a/x11-wm/icewm/icewm-1.8.3.ebuild +++ b/x11-wm/icewm/icewm-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,13 +11,14 @@ 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" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama" # Tests broken in all versions, patches welcome, bug #323907, #389533 RESTRICT="test" REQUIRED_USE="|| ( alsa ao )" +#?? ( gdk-pixbuf imlib ) #fix for icewm preversion package names S="${WORKDIR}/${P/_}" @@ -36,6 +37,7 @@ CORE_DEPEND=" RDEPEND=" ${CORE_DEPEND} + dev-libs/glib:2 x11-libs/libICE x11-libs/libSM x11-libs/libXft @@ -55,15 +57,20 @@ RDEPEND=" >=x11-libs/gdk-pixbuf-2.42.0:2 ) !gdk-pixbuf? ( - media-libs/libpng:0= - virtual/jpeg + imlib? ( + gnome-base/librsvg:2 + media-libs/imlib2 + ) + !imlib? ( + media-libs/libpng:0= + virtual/jpeg + ) ) xinerama? ( x11-libs/libXinerama ) " DEPEND=" ${RDEPEND} $(unpacker_src_uri_depends) - dev-libs/glib:2 x11-base/xorg-proto gdk-pixbuf? ( gnome-base/librsvg:2 ) " @@ -71,13 +78,18 @@ DEPEND=" BDEPEND=" app-text/asciidoc virtual/pkgconfig - nls? ( >=sys-devel/gettext-0.19.6 ) + nls? ( >=sys-devel/gettext-0.19.8 ) " -src_prepare() { - # Fix bug #486710 - TODO: Still needed? - #use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" ) +pkg_pretend() { + if use gdk-pixbuf && use imlib ; then + einfo 'Confilcting USE flags have been enabled:' + einfo '"gdk-pixbuf" and "imlib" exclude each other!' + einfo 'Using "gdk-pixbuf".' + fi +} +src_prepare() { default eautoreconf } @@ -101,7 +113,9 @@ src_configure() { --with-libdir="${EPREFIX}"/usr/share/icewm $(use_enable bidi fribidi) $(use_enable debug) + $(use_enable debug logevents) $(use_enable gdk-pixbuf) + $(use_enable imlib imlib2) $(use_enable nls i18n) $(use_enable nls) $(use_enable xinerama) @@ -119,8 +133,10 @@ src_configure() { econf "${myconf[@]}" - sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die - sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed" + sed \ + -e "s:/icewm-\$(VERSION)::" \ + -e "s:ungif:gif:" \ + -i src/Makefile || die } src_install() { |