| 1 |
commit: c21d86862e276807a96f83b2362069ba4ab20b5a |
| 2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 12 23:22:11 2017 +0000 |
| 4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 12 23:35:20 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c21d8686 |
| 7 |
|
| 8 |
Revert "x11-plugins/wmudmount: Depend on virtual/imagemagick-tools" |
| 9 |
|
| 10 |
This reverts commit 66db7e0ca3dd9acdcf2682794939e26780cbc95d. |
| 11 |
|
| 12 |
x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild | 10 +++++----- |
| 13 |
.../{wmudmount-2.2-r2.ebuild => wmudmount-2.2.ebuild} | 10 +++++----- |
| 14 |
2 files changed, 10 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild b/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild |
| 17 |
index ee477870d1..4a317efe82 100644 |
| 18 |
--- a/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild |
| 19 |
+++ b/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild |
| 20 |
@@ -1,9 +1,9 @@ |
| 21 |
-# Copyright 1999-2017 Gentoo Foundation |
| 22 |
+# Copyright 1999-2016 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
# $Id$ |
| 25 |
|
| 26 |
-EAPI=5 |
| 27 |
-inherit eutils gnome2-utils |
| 28 |
+EAPI=6 |
| 29 |
+inherit eutils gnome2-utils xdg |
| 30 |
|
| 31 |
DESCRIPTION="A filesystem mounter that uses udisks to handle notification and mounting" |
| 32 |
HOMEPAGE="https://sourceforge.net/projects/wmudmount/" |
| 33 |
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 34 |
|
| 35 |
LICENSE="GPL-2" |
| 36 |
SLOT="0" |
| 37 |
-KEYWORDS="amd64 x86" |
| 38 |
+KEYWORDS="~amd64 ~x86" |
| 39 |
IUSE="gnome-keyring libnotify" |
| 40 |
|
| 41 |
RDEPEND="sys-fs/udisks:2 |
| 42 |
@@ -20,7 +20,7 @@ RDEPEND="sys-fs/udisks:2 |
| 43 |
libnotify? ( >=x11-libs/libnotify-0.7 )" |
| 44 |
DEPEND="${RDEPEND} |
| 45 |
virtual/pkgconfig |
| 46 |
- virtual/imagemagick-tools[png]" |
| 47 |
+ || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )" |
| 48 |
|
| 49 |
DOCS="ChangeLog" |
| 50 |
|
| 51 |
|
| 52 |
diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild b/x11-plugins/wmudmount/wmudmount-2.2.ebuild |
| 53 |
similarity index 80% |
| 54 |
rename from x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild |
| 55 |
rename to x11-plugins/wmudmount/wmudmount-2.2.ebuild |
| 56 |
index 32e4f34064..bfdfa9dc1e 100644 |
| 57 |
--- a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild |
| 58 |
+++ b/x11-plugins/wmudmount/wmudmount-2.2.ebuild |
| 59 |
@@ -1,9 +1,9 @@ |
| 60 |
-# Copyright 1999-2017 Gentoo Foundation |
| 61 |
+# Copyright 1999-2015 Gentoo Foundation |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
# $Id$ |
| 64 |
|
| 65 |
-EAPI=6 |
| 66 |
-inherit eutils gnome2-utils xdg |
| 67 |
+EAPI=5 |
| 68 |
+inherit eutils gnome2-utils |
| 69 |
|
| 70 |
DESCRIPTION="A filesystem mounter that uses udisks to handle notification and mounting" |
| 71 |
HOMEPAGE="https://sourceforge.net/projects/wmudmount/" |
| 72 |
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 73 |
|
| 74 |
LICENSE="GPL-2" |
| 75 |
SLOT="0" |
| 76 |
-KEYWORDS="~amd64 ~x86" |
| 77 |
+KEYWORDS="amd64 x86" |
| 78 |
IUSE="gnome-keyring libnotify" |
| 79 |
|
| 80 |
RDEPEND="sys-fs/udisks:2 |
| 81 |
@@ -20,7 +20,7 @@ RDEPEND="sys-fs/udisks:2 |
| 82 |
libnotify? ( >=x11-libs/libnotify-0.7 )" |
| 83 |
DEPEND="${RDEPEND} |
| 84 |
virtual/pkgconfig |
| 85 |
- virtual/imagemagick-tools[png]" |
| 86 |
+ || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )" |
| 87 |
|
| 88 |
DOCS="ChangeLog" |
Archives