diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-12-15 17:14:26 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-12-15 17:14:26 +0000 |
| commit | dfda0c794e29d8a546f91f345ec128e10bed246c (patch) | |
| tree | 8d6ecdf3babe6f5022585c26798aa9f0af38dba5 | |
| parent | Fix brightness set on t61, #221955 by Jacek (diff) | |
| download | gentoo-2-dfda0c794e29d8a546f91f345ec128e10bed246c.tar.gz gentoo-2-dfda0c794e29d8a546f91f345ec128e10bed246c.tar.bz2 gentoo-2-dfda0c794e29d8a546f91f345ec128e10bed246c.zip | |
Fix imagemagick/graphicsmagick dep, #314217 by Wojciech Porczyk
(Portage version: 2.1.11.37/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
| -rw-r--r-- | app-mobilephone/obex-data-server/ChangeLog | 5 | ||||
| -rw-r--r-- | app-mobilephone/obex-data-server/obex-data-server-0.4.6.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app-mobilephone/obex-data-server/ChangeLog b/app-mobilephone/obex-data-server/ChangeLog index ac13611a18fd..9792f5489d55 100644 --- a/app-mobilephone/obex-data-server/ChangeLog +++ b/app-mobilephone/obex-data-server/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-mobilephone/obex-data-server # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obex-data-server/ChangeLog,v 1.37 2012/11/20 08:12:17 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obex-data-server/ChangeLog,v 1.38 2012/12/15 17:14:26 pacho Exp $ + + 15 Dec 2012; Pacho Ramos <pacho@gentoo.org> obex-data-server-0.4.6.ebuild: + Fix imagemagick/graphicsmagick dep, #314217 by Wojciech Porczyk *obex-data-server-0.4.6 (20 Nov 2012) diff --git a/app-mobilephone/obex-data-server/obex-data-server-0.4.6.ebuild b/app-mobilephone/obex-data-server/obex-data-server-0.4.6.ebuild index 83b4961abeee..b54a0fd2c8a2 100644 --- a/app-mobilephone/obex-data-server/obex-data-server-0.4.6.ebuild +++ b/app-mobilephone/obex-data-server/obex-data-server-0.4.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obex-data-server/obex-data-server-0.4.6.ebuild,v 1.1 2012/11/20 08:12:17 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obex-data-server/obex-data-server-0.4.6.ebuild,v 1.2 2012/12/15 17:14:26 pacho Exp $ EAPI="4" @@ -19,7 +19,7 @@ RDEPEND="dev-libs/glib:2 sys-apps/dbus >=net-wireless/bluez-4.31 >=dev-libs/openobex-1.3 - imagemagick? ( !gtk? ( media-gfx/imagemagick ) ) + imagemagick? ( !gtk? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) ) gtk? ( x11-libs/gtk+:2 ) usb? ( virtual/libusb:0 ) !app-mobilephone/obexd[server]" |