x11-wm/windowmaker: drop imagemagick-7 patch in live ebuild

A similar fix is now in upstream git
Also switch git checkout to https

Closes: https://bugs.gentoo.org/678630
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>

diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild
index 5378b5e3d343ffea2a96de6c7db5edef376c82ea..18bfa9f85a4a32fb74d386c6554fe9fd9db656ec 100644 (file)
--- a/x11-wm/windowmaker/windowmaker-9999.ebuild
+++ b/x11-wm/windowmaker/windowmaker-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit autotools eutils git-r3
 DESCRIPTION="The fast and light GNUstep window manager"
 HOMEPAGE="http://www.windowmaker.org/"
 SRC_URI="http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
-EGIT_REPO_URI="git://repo.or.cz/wmaker-crm.git"
+EGIT_REPO_URI="https://repo.or.cz/wmaker-crm.git"
 EGIT_BRANCH="next"
 
 SLOT="0"
@@ -22,7 +22,7 @@ DEPEND="media-libs/fontconfig
        x11-libs/libXt
        x11-libs/libXv
        gif? ( >=media-libs/giflib-4.1.0-r3 )
-       imagemagick? ( media-gfx/imagemagick:0= )
+       imagemagick? ( >=media-gfx/imagemagick-7:0= )
        jpeg? ( virtual/jpeg:0= )
        png? ( media-libs/libpng:0= )
        tiff? ( media-libs/tiff:0 )
@@ -49,10 +49,6 @@ src_prepare() {
                fi;
        done;
 
-       if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-               eapply "${FILESDIR}/${PN}-0.95.8-imagemagick7.patch"
-       fi
-
        default
        eautoreconf
 }