[gentoo-commits] repo/gentoo:master commit in: x11-wm/icewm/files/, x11-wm/icewm/

[Lars Wendler]

commit:     fe1744daf4456a2a38f52bbbc7ca522220d4e251
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 22:54:49 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 22:55:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe1744da

x11-wm/icewm: Removed old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 x11-wm/icewm/Manifest                            |   1 -
 x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch |  37 ------
 x11-wm/icewm/icewm-2.1.0-r1.ebuild               | 157 -----------------------
 3 files changed, 195 deletions(-)

diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 40211e254e6..e000a5cdeb0 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,5 +1,4 @@
 DIST icewm-1.9.2.tar.lz 1694602 BLAKE2B cf30a695ba48093b386aa2f3af5120e78a9fcc57da9038bcd546ade0986e1bc359a3da91d2eeeb8d3a105173f5d755223675a84b38cfc8c907269efd2561c706 SHA512 7b4f8c47c636a0113af576bc1bcd9fde111ae70eb0bcf21fb1d906ca43bea4d8b0337a728e5da35bcfeabd56c66fd0d14581d7377f063dd750fdf01362b24be2
 DIST icewm-2.0.1.tar.lz 1694439 BLAKE2B 1476f33fa7350a98b7eca8c5c265455d0a78b28bcbd35ab78969b528ae02d3c960fb73cf2b24ea999ee5e08c9f0641d3502c7d5ed8b285777162c334d645b6db SHA512 ac4126b38d592aed60d2269f58c5a1612b61e871565e3c3e51bc2b430e4da6a4708f78e86c16091fa4dfb9eefd4109ae89102ab708e3bce9a44f1e5fe1970c59
-DIST icewm-2.1.0.tar.lz 1696214 BLAKE2B ba91eac4ea425fc9979d1c64fbc2a4c59f1d8004138f31b1e184484cfcaaca7c1a550cd160ff3683a4f663e54efdd5f8ded001317765485259a1f19b8de794a3 SHA512 a57ebbf76640b5296c90c105bdc9b9b2cc55546d324fa18b2e7bfc6bee4442b56176bda4a584d6a73b2297203e1966d7646354bb6e0baaf64fdf0acdb357ee58
 DIST icewm-2.1.1.tar.lz 1695855 BLAKE2B 81903735a71e13953635a4d70547f2518983b5e58fd9e90124e4aecb6b9b53827d48f77bbff3cec59b929456f4c1ab14fde999bbc45f90c8916bbb1017b8eb20 SHA512 7d0acd655f505755fe0b1186b7422a254805bd1c56f00170ecac90272c31c1c0673f781e4e89e04682515b7313dd57b78797398a81edc62b86abc6991abfc45c
 DIST icewm-2.1.2.tar.lz 1694969 BLAKE2B 640af2b7afb34ebcf6fc4f1762161bd8cae124e58735ad3e5af3f8a12723ead71e491fbef9e9119792c54e4e116c7cc491847da1e103b2c46765044bfda71f2d SHA512 92c52b057c7ac1c81eb72cb01d4041715fae2b1c221ecc0e5286a9bfad87e1607a3d7c60dde125436ad32c9a72dac01ee82a3bfe4b671b2d458ba3ce4c0c5a62

diff --git a/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch b/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch
deleted file mode 100644
index d159e4d38e3..00000000000
--- a/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1d28361a69d773ba0d026119ff197d38900eac0a Mon Sep 17 00:00:00 2001
-From: Bert Gijsbers <gijsbers@×××××××××××.nl>
-Date: Sat, 23 Jan 2021 16:02:21 +0100
-Subject: [PATCH] Don't unarm menu popup buttons for issue #527.
-
----
- src/ybutton.cc | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/ybutton.cc b/src/ybutton.cc
-index 1c11756d..745a8f21 100644
---- a/src/ybutton.cc
-+++ b/src/ybutton.cc
-@@ -58,7 +58,7 @@ YButton::~YButton() {
-     }
-     popdown();
-     if (fPopup && fPopup->isShared() == false) {
--        delete fPopup;
-+        delete fPopup; fPopup = nullptr;
-     }
-     if (--buttonObjectCount == 0) {
-         normalButtonFont = null;
-@@ -289,8 +289,13 @@ void YButton::handleButton(const XButtonEvent &button) {
-             setSelected(false);
-         }
-     }
-+    bool unarm = fEnabled && fArmed
-+              && button.type == ButtonRelease
-+              && button.button == Button1
-+              && getClickCount() == 1
-+              && dragging();
-     YWindow::handleButton(button);
--    if (fEnabled && button.type == ButtonRelease && button.button == Button1) {
-+    if (unarm && !fPopupActive) {
-         setArmed(false, false);
-     }
- }

diff --git a/x11-wm/icewm/icewm-2.1.0-r1.ebuild b/x11-wm/icewm/icewm-2.1.0-r1.ebuild
deleted file mode 100644
index 57f469f48b7..00000000000
--- a/x11-wm/icewm/icewm-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2021 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 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/_}"
-
-# 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}
-	dev-libs/glib:2
-	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-xlib
-		>=x11-libs/gdk-pixbuf-2.42.0:2
-	)
-	!gdk-pixbuf? (
-		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)
-	x11-base/xorg-proto
-	gdk-pixbuf? ( gnome-base/librsvg:2 )
-"
-
-BDEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.8 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-appmenu_fix.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
-}
-
-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="${EPREFIX}"/etc/icewm
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-		--with-icesound="${icesound}"
-		--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)
-	)
-	if use truetype ; then
-		myconf+=(
-			--enable-shape
-		)
-	else
-		myconf+=(
-			--disable-xfreetype
-			--enable-corefonts
-		)
-	fi
-
-	econf "${myconf[@]}"
-
-	sed \
-		-e "s:/icewm-\$(VERSION)::" \
-		-e "s:ungif:gif:" \
-		-i src/Makefile || die
-}
-
-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"
-}