diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-05-16 10:31:14 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-05-16 10:31:14 +0000 |
| commit | 39975b289f9e412809083b76439e7176f878756c (patch) | |
| tree | 0705eb6464ecf5e755ea1661cba186c3cc2d53ca /media-gfx/imagemagick | |
| parent | Version bump (diff) | |
| download | historical-39975b289f9e412809083b76439e7176f878756c.tar.gz historical-39975b289f9e412809083b76439e7176f878756c.tar.bz2 historical-39975b289f9e412809083b76439e7176f878756c.zip | |
Missing SLOT operator in conditional patching re: has_version.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'media-gfx/imagemagick')
| -rw-r--r-- | media-gfx/imagemagick/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/imagemagick/Manifest | 18 | ||||
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild | 4 |
3 files changed, 16 insertions, 12 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog index 788d0c67c8ba..6649cf46eeef 100644 --- a/media-gfx/imagemagick/ChangeLog +++ b/media-gfx/imagemagick/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/imagemagick # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.557 2014/05/14 17:15:20 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.558 2014/05/16 10:31:09 ssuominen Exp $ + + 16 May 2014; Samuli Suominen <ssuominen@gentoo.org> + imagemagick-6.8.8.10-r1.ebuild: + Missing SLOT operator in conditional patching re: has_version. 14 May 2014; Samuli Suominen <ssuominen@gentoo.org> -imagemagick-6.8.8.10.ebuild: diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index a704a3d4a1df..656158a82ef8 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -4,17 +4,17 @@ Hash: SHA256 AUX imagemagick-6.8.8.10-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch 727 SHA256 02eaec5b5815d253d4acd126a0dfe46859bbbd7fa7c39bfdb4a59f6ef0c30e5a SHA512 6dfcc14e6026a37b05071158f5da973c8be5877cb068bd9c85bdb2f94690d531c04a2298e59ac860cfb1df7cfeda4c91e890b5f3fce56ff39ebcc892029701e5 WHIRLPOOL ea1a019c144d8b9111ae693ef2b2d2ef2bea238c53d65239be121c16b99f6b10abd4b76e688ff13301ef85ba69af5e96176555c6fdcf087515425acd5e88a034 AUX imagemagick-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch 2317 SHA256 7e50934e70666b14956d90f2054f246eba36479d6def83ae4b378f8fefb0082a SHA512 83404ba9c240a8d911567beb894ebfc42887a06f06e91f0346adab6e8c1b1a50114819c0dd902452a1cad3c92dbbde50a1888fdc15e79367bb8f8a32fa477cd9 WHIRLPOOL 420bd8a9825220875cae3f692590d37935ddf44dafac48ab951b779add88b0ed1fdf0ad79b444f14a38ead4e8797c4929bede5fa0699bc02a052752b64b19865 DIST ImageMagick-6.8.8-10.tar.xz 7530504 SHA256 f31c7771ed0b8050837289f0c7b55303172e31acc005b0ee0d120727e2572d33 SHA512 2f4a9c5297b025ac78332843b8cfa81ef498c038edff6f91cc80a1e762492a933892ab38c81671ba7f57453213d37addf98e875253c5c328162983c1d89c5825 WHIRLPOOL e2572ba553f6fcf0de9adcbbaa82ccdd5b6d748cac9f9d8c07e5eb940083fd9aba9ac8cba3a2efa11aa4db53705905019931d45b13b8587451f97eed01415ee0 -EBUILD imagemagick-6.8.8.10-r1.ebuild 5064 SHA256 ec7eff91d78ec883e36d54e05b367f3eaca926db693bd782db0925d625912092 SHA512 3f8fcfb21a233efb78a0411540cf6d50bdda999a272ac02855cd1ec5d9d1d48da4dc528b94db851fe6a708daeeb32f4682d92b2d888fad368cd942f389dba3df WHIRLPOOL 7e682b7e8f9d39a7c475502227d3950008b0d895254b7a9a99871e03dd2791d37e36b6462922adc9d9d13f54cd0c92f0399787cfc9e95445798cff8fc8cc044c -MISC ChangeLog 82215 SHA256 2b8f74df63f8b4de2245369f3f5253fd8039c728a1b7a83f541ac9a50ce7979a SHA512 53789f068c23ba92dd40406e4ede8a18a57d7f21838ef7ddde6f06caa12a04f3a7430d0a2e6a309bd64d89d94a1fc218de093654f14826d10d05e6ffc3d2a3c9 WHIRLPOOL 78fb81c2669c3e09cfbde26b504a04cb38671e7384dfa53ec1ef69b0105bacb28c16ae94f5faafac9533cfdbafcd6aa119422d3742c801820e492b71543c5c60 +EBUILD imagemagick-6.8.8.10-r1.ebuild 5066 SHA256 8c68208a40a936df20a9dbd1069f87ce9e7428eeb42869e191d690c61752867d SHA512 d69705bfe47fcd73b65f87ae4a661fbcb6d9202f0722514e72a1b6b961d16d8a59e97a387af04c5feaba0e262931a7e0e4c8c07e0159be408bd9c612d5141920 WHIRLPOOL 01563850364dab2ea856736e6c999ff1a1e875b89057122838bdd8ee8aa09b1a2060f4a2b4bf93cd91da12a7b1863a6c46ca40090de5b6aab9df841eacaf3e16 +MISC ChangeLog 82369 SHA256 0e03a64f9249a105f2258865c8729b5470495f9ebfcc902c16862014b78ae811 SHA512 9286e2cbaad54c1bb8133dca5d587e7a6bce716bc78e6d8117deff68da2e695665a324583fc9b2653e33e763db67c88731aaeebd0b7ff3a0ffa98c1749692e4e WHIRLPOOL 8f9b844f53e8374a72612b6e6e48e6357505361885e86023895f0ebbb8a1f4d57a69f8d8028f14a4db3f43ce50bf28cc1541093f4b39db7ab5bc2dd7f2ccd2c9 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJTc6RqAAoJEEdUh39IaPFNAf0H/R8QUyw///iDcZdzKn6FXi1F -qbSe3kSzv94r4D+lqldQO85TjsiqyQFaed0004ar7r52P7gG2z7pyXmKOvZxbmk9 -Z1cw5Q7KPCGCVmh+usLKrWC0i+iSnw3IYM79UudadZKL8Op958TRWCzDBoYz31LJ -NCCx1p/u3A5hoLeih/lyQmlPYgE/yJpA5WilwxStzOPbo0Ibdan9zBejnS8Jmtdo -QuJA93mWSJEUPxDvzN7qLZLSKP3iRizPHM/8aCRr/PDUsBatseM/Y2dq2q2o371t -Ud4UWJRyhmH8anGd8vCm32NHB59CB9RZIbmY1/JNL4Okr7YfpV2SQGkaqEneC0o= -=jmef +iQEcBAEBCAAGBQJTdeiqAAoJEEdUh39IaPFNYwMIAKCn3maIvnFB9+I4M5CoRyCm +s/GJz2O3dxsZ0xCWRHYpRh1VNIIoU9dTODOzNeF1YNipbbM3qEo7qC6TdnH6+GH4 +AWI5FjD3RmyvezgOQU+R+Kw9LR3gC3ZEBkTylQeg4CAbMPSYnfuzGlLFgvOUWIxW +9eTakGOd/eokCwBhFyqG7nDgAzAiABNytbY7BWAAhvDwUd/n2RB4GoNffcVDCrs3 +c7uiYCw9XcHj7gpuAoUpXUBSQED9ZLmDOZynT6PKdC0ffGw+kQHZFermqeSbScDr +49n+LfTCEDgQl+KVlrxdBh8f4MbvnV0gGRJ6U11ktAvwEWAZRCLrvC+KNV2N/SY= +=infZ -----END PGP SIGNATURE----- diff --git a/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild index 6295dc45b370..2da4b90bff6c 100644 --- a/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.3 2014/05/14 17:13:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.4 2014/05/16 10:31:08 ssuominen Exp $ EAPI=5 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator @@ -68,7 +68,7 @@ S=${WORKDIR}/${MY_P} src_prepare() { # These both have been accepted by upstream: - if use jpeg2k && has_version '<media-libs/openjpeg-2.1.0'; then + if use jpeg2k && has_version '<media-libs/openjpeg-2.1.0:2'; then epatch "${FILESDIR}"/${PN}-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch fi epatch "${FILESDIR}"/${P}-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch |