diff options
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/icewm/Manifest | 2 | ||||
| -rw-r--r-- | x11-wm/icewm/icewm-1.9.2.ebuild | 2 | ||||
| -rw-r--r-- | x11-wm/icewm/icewm-2.0.0.ebuild (renamed from x11-wm/icewm/icewm-1.9.1.ebuild) | 33 |
3 files changed, 26 insertions, 11 deletions
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest index 067c33df1abd..81cee04ea5b9 100644 --- a/x11-wm/icewm/Manifest +++ b/x11-wm/icewm/Manifest @@ -1,3 +1,3 @@ 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 diff --git a/x11-wm/icewm/icewm-1.9.2.ebuild b/x11-wm/icewm/icewm-1.9.2.ebuild index cd8d3315fba2..9ae73f9de010 100644 --- a/x11-wm/icewm/icewm-1.9.2.ebuild +++ b/x11-wm/icewm/icewm-1.9.2.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 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() { |