summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2011-05-17 20:46:09 +0000
committerUlrich Müller <ulm@gentoo.org>2011-05-17 20:46:09 +0000
commit80c3d6278cb9e51ef5d66f6b72f33a8dc81fb042 (patch)
tree5b6ca2d0644d0021053f0e79d54198069bf941c7 /app-emacs/thumbs
parentx86 stable wrt bug #367271 (diff)
downloadhistorical-80c3d6278cb9e51ef5d66f6b72f33a8dc81fb042.tar.gz
historical-80c3d6278cb9e51ef5d66f6b72f33a8dc81fb042.tar.bz2
historical-80c3d6278cb9e51ef5d66f6b72f33a8dc81fb042.zip
Depend on imagemagick or graphicsmagick, bug 314207.
Package-Manager: portage-2.1.9.49/cvs/Linux x86_64
Diffstat (limited to 'app-emacs/thumbs')
-rw-r--r--app-emacs/thumbs/ChangeLog7
-rw-r--r--app-emacs/thumbs/Manifest12
-rw-r--r--app-emacs/thumbs/thumbs-2.0.ebuild8
3 files changed, 16 insertions, 11 deletions
diff --git a/app-emacs/thumbs/ChangeLog b/app-emacs/thumbs/ChangeLog
index 5ea7ff50ece9..885c09c085c7 100644
--- a/app-emacs/thumbs/ChangeLog
+++ b/app-emacs/thumbs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-emacs/thumbs
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/thumbs/ChangeLog,v 1.23 2010/10/12 22:36:11 ulm Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/thumbs/ChangeLog,v 1.24 2011/05/17 20:46:09 ulm Exp $
+
+ 17 May 2011; Ulrich Mueller <ulm@gentoo.org> thumbs-2.0.ebuild:
+ Depend on imagemagick or graphicsmagick, bug 314207.
12 Oct 2010; Ulrich Mueller <ulm@gentoo.org>
-files/thumbs.el-gentoo.patch:
diff --git a/app-emacs/thumbs/Manifest b/app-emacs/thumbs/Manifest
index 7e41f8c9fe6a..c19ffae77b6c 100644
--- a/app-emacs/thumbs/Manifest
+++ b/app-emacs/thumbs/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
AUX 50thumbs-gentoo.el 583 RMD160 af736db6363bd607f770950c8c0a57e745c4e07b SHA1 36a4e75038813a80bfdb72e1cf2518c7034c15de SHA256 a95e5048165139dcf8e976246a84f2808751504b609bb564af67a45be4825b80
DIST thumbs-2.0.el.bz2 6521 RMD160 c7c17b67618f5c5972e11a015debd500fa767688 SHA1 dc69835e22ad3174ddfe0fe2bcf8fcbf94fa724c SHA256 e7f788f4e19c21b535024cdc49185e922fe91e39f7502486cca09a0125bb6935
-EBUILD thumbs-2.0.ebuild 505 RMD160 7354d89937873100d6942f5c49b6a44e62977dc8 SHA1 5d68b6d2b00e36f409b14a9cdb35f964a04ae2f3 SHA256 2c118c96e95e38ee476016cc8c1da4cfde15e8faa52ec3bdf5d89625e41b8a9e
-MISC ChangeLog 2680 RMD160 6a8053d54cb7b09e6104f859324c8ab437c54cca SHA1 2e9d4ab4ea8a392c1beccce04e659e816aed4ebe SHA256 54721fd52b1821803079680207181f141239efe1fd981f4a3093e42816fabb4c
+EBUILD thumbs-2.0.ebuild 558 RMD160 0ad961e465b2f7f94d04fa4a484c5e2ea9b8e6a3 SHA1 a44b741b0dbebbd98a70d0e6e13e6d51a206d9b9 SHA256 18f85a115c5d9067dcd0b9c31570304c0f58c26664f5639b35244308bc91ce49
+MISC ChangeLog 2802 RMD160 20d7706133e7db694c2f3c0a8465d5d451c6a39c SHA1 38b33afe12a9b98277a80c5ed0f3c5fedca21169 SHA256 cc16ce45a925391c1ab2442a3cefa59495a366028ef4055525b99e60c353152c
MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAky041UACgkQOeoy/oIi7uz2MwCdF0znmoD+zKTdzxMElTPFmB+g
-OzgAoIGvq3X/xuZhQzxh0SX6BioD/gc+
-=2Llz
+iEYEARECAAYFAk3S3zsACgkQOeoy/oIi7uwU+ACgutAN28+b7dXwisAingxS38le
+64gAoJbYwe3XnZ32LRvi3MlZ2UCPFSp+
+=LK1B
-----END PGP SIGNATURE-----
diff --git a/app-emacs/thumbs/thumbs-2.0.ebuild b/app-emacs/thumbs/thumbs-2.0.ebuild
index 5608fc72a8aa..eb9daed45b80 100644
--- a/app-emacs/thumbs/thumbs-2.0.ebuild
+++ b/app-emacs/thumbs/thumbs-2.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/thumbs/thumbs-2.0.ebuild,v 1.8 2010/05/22 15:30:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/thumbs/thumbs-2.0.ebuild,v 1.9 2011/05/17 20:46:09 ulm Exp $
+
+EAPI=4
inherit elisp
@@ -13,6 +15,6 @@ SLOT="0"
KEYWORDS="amd64 ~ppc sparc x86"
IUSE=""
-RDEPEND="media-gfx/imagemagick"
+RDEPEND="|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
SITEFILE="50${PN}-gentoo.el"