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.0.ebuild (renamed from x11-wm/icewm/icewm-1.9.1.ebuild) | 33 |
2 files changed, 26 insertions, 11 deletions
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest index 0ab22cf5b495..d1ff97b1decd 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.1.tar.lz 1696312 BLAKE2B c2435e2dfa0c8c9ba490299a9c1545c9b45b8c8960bf1a36889c0304882619c7bcff7ab37b1573c82c92b2b0be514527b051d9651832a22c5f9b8334f5391fdc SHA512 75210466110c65f91192c89e6bdecc3a52c8abc953096789861ebdbbd779b892b708b5d1f0bcb9fcfcb59171a61171bbfc718bffaeade69ced3a978409b4ee65 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 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 +EBUILD icewm-2.0.0.ebuild 3010 BLAKE2B 942c8cd13674c6d3e9be00ff0ce71271bd7eb94cd9122f35eb97d0eb5a843aa827c7bb2043e4b514d329dc6eed27385e5af42b9cdd0861b7bcc384e879a0ae03 SHA512 5d26146e561976a571b52d636155d45ee7b062bd7fffa6e278a2932994b7277fd87d390c0431038e09c8b74ce6840c210d7c407a3ff4564ceb227932dbabf2a7 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe diff --git a/x11-wm/icewm/icewm-1.9.1.ebuild b/x11-wm/icewm/icewm-2.0.0.ebuild index cd8d3315fba2..0dfca601ae26 100644 --- a/x11-wm/icewm/icewm-1.9.1.ebuild +++ b/x11-wm/icewm/icewm-2.0.0.ebuild @@ -12,12 +12,13 @@ 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" +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 @@ -60,15 +62,20 @@ RDEPEND=" ) ) !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 ) " @@ -79,10 +86,15 @@ BDEPEND=" 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 } @@ -108,6 +120,7 @@ src_configure() { $(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) @@ -125,8 +138,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() { |