From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 51B51139695 for ; Sun, 12 Feb 2017 23:35:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69419E0CC1; Sun, 12 Feb 2017 23:35:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 344B1E0CF3 for ; Sun, 12 Feb 2017 23:35:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 056D43412B7 for ; Sun, 12 Feb 2017 23:35:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6D6545C2 for ; Sun, 12 Feb 2017 23:35:37 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1486942520.c21d86862e276807a96f83b2362069ba4ab20b5a.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmudmount/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild x11-plugins/wmudmount/wmudmount-2.2.ebuild X-VCS-Directories: x11-plugins/wmudmount/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: c21d86862e276807a96f83b2362069ba4ab20b5a X-VCS-Branch: master Date: Sun, 12 Feb 2017 23:35:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3fb12a8e-e11a-4e7f-aaee-833615377a27 X-Archives-Hash: c6cbdb71cc8db27537cd52dd60aca591 commit: c21d86862e276807a96f83b2362069ba4ab20b5a Author: Bernard Cafarelli gentoo org> AuthorDate: Sun Feb 12 23:22:11 2017 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Sun Feb 12 23:35:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c21d8686 Revert "x11-plugins/wmudmount: Depend on virtual/imagemagick-tools" This reverts commit 66db7e0ca3dd9acdcf2682794939e26780cbc95d. x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild | 10 +++++----- .../{wmudmount-2.2-r2.ebuild => wmudmount-2.2.ebuild} | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild b/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild index ee477870d1..4a317efe82 100644 --- a/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild +++ b/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils gnome2-utils +EAPI=6 +inherit eutils gnome2-utils xdg DESCRIPTION="A filesystem mounter that uses udisks to handle notification and mounting" HOMEPAGE="https://sourceforge.net/projects/wmudmount/" @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="gnome-keyring libnotify" RDEPEND="sys-fs/udisks:2 @@ -20,7 +20,7 @@ RDEPEND="sys-fs/udisks:2 libnotify? ( >=x11-libs/libnotify-0.7 )" DEPEND="${RDEPEND} virtual/pkgconfig - virtual/imagemagick-tools[png]" + || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )" DOCS="ChangeLog" diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild b/x11-plugins/wmudmount/wmudmount-2.2.ebuild similarity index 80% rename from x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild rename to x11-plugins/wmudmount/wmudmount-2.2.ebuild index 32e4f34064..bfdfa9dc1e 100644 --- a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild +++ b/x11-plugins/wmudmount/wmudmount-2.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=6 -inherit eutils gnome2-utils xdg +EAPI=5 +inherit eutils gnome2-utils DESCRIPTION="A filesystem mounter that uses udisks to handle notification and mounting" HOMEPAGE="https://sourceforge.net/projects/wmudmount/" @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnome-keyring libnotify" RDEPEND="sys-fs/udisks:2 @@ -20,7 +20,7 @@ RDEPEND="sys-fs/udisks:2 libnotify? ( >=x11-libs/libnotify-0.7 )" DEPEND="${RDEPEND} virtual/pkgconfig - virtual/imagemagick-tools[png]" + || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )" DOCS="ChangeLog"