summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2012-05-13 17:19:17 +0000
committerFabian Groffen <grobian@gentoo.org>2012-05-13 17:19:17 +0000
commitc2a4383dff4c11aef3843981ef989557ac2ce7e5 (patch)
tree84ce3ec0d881b9f24745f6443325e671c4b17989 /media-gfx/imagemagick
parentVersion bump; Use setarch to workaround >-3.x kernels (diff)
downloadhistorical-c2a4383dff4c11aef3843981ef989557ac2ce7e5.tar.gz
historical-c2a4383dff4c11aef3843981ef989557ac2ce7e5.tar.bz2
historical-c2a4383dff4c11aef3843981ef989557ac2ce7e5.zip
Fix out of Prefix errors, run elibtoolize for Darwin bundles
Diffstat (limited to 'media-gfx/imagemagick')
-rw-r--r--media-gfx/imagemagick/Manifest16
-rw-r--r--media-gfx/imagemagick/imagemagick-6.7.6.9.ebuild12
2 files changed, 9 insertions, 19 deletions
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 464a97b56987..cf749b908bde 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,20 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
DIST ImageMagick-6.7.6-4.tar.xz 7576636 RMD160 f8f75421e62ae9808bf8b1b549b1ec4ee92f40a7 SHA1 e349c0976d87d8897f9d6fc3d9efee6062ec0f4d SHA256 612910aca97c345e21901cb3b2b45b485029f196d02c3c42fc3354fc824b811e
DIST ImageMagick-6.7.6-9.tar.xz 7653436 RMD160 0762ef3b40a7fda5c42ff2a2727ff74104cceae6 SHA1 4577fcabab5e754a777db874692587e26e6a2696 SHA256 4ce906ce36622a864746cf808fd14f9deba0eb6b6890c00e5832323e8c868e5c
EBUILD imagemagick-6.7.6.4.ebuild 4188 RMD160 c8a14f4d5c6b091b9c320e48e0d51b5033f27bc4 SHA1 5120e6e90a54fea0c69d97f9288d1903f0f7cc78 SHA256 e11eb8cda888c670a42396b993c2df7b1a0208c51c6f0d72b6126fb17cc5e148
-EBUILD imagemagick-6.7.6.9.ebuild 4222 RMD160 a0a90a4fd20cc2afd54dfcfac50c016e96267834 SHA1 5268d4a99e56a4955b168d5439be3465ae14f74b SHA256 56f34e6d1b3dc9c399d1b2546b0b4a1b7f99609283c1c9be5238aaebf210ac58
+EBUILD imagemagick-6.7.6.9.ebuild 4306 RMD160 ad611712f23a18eedf87a1d884865195c7dfadd2 SHA1 5c9950d81638a8cd99db6651b2d80da459ab4889 SHA256 cc8958af7eaf01030669e3c94d632cbdf37cfc2cbf69bbabe8e33bd976056c71
MISC ChangeLog 71107 RMD160 62e05d1a74c009b97234a7f1a078e872013ec35d SHA1 8026c535d80929b19fe9c475e5287a206e79f388 SHA256 f759f155396c69a7b191f5c590a6a99420c232c8af323748eedad9e412514260
MISC metadata.xml 1104 RMD160 a1e2500c6057d9aaac9424ec72dc099da042e1ee SHA1 4ad8f34e03f649808dfa3999d60497c56722cee8 SHA256 d6840b362278ffdced22382075ebd20652f1b82470b6b9cbd035c4fc9ece60d3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBAgAGBQJPq8zbAAoJEEdUh39IaPFNfe8H/jRnjrIGqD5Rsw7ZzUUgCUJT
-1mBkQVlRvGPrnshkbzzKOiS88L/goEznHna9YHgX6zJjtsQn1Zfage8EFcwQBCZ9
-wlfzWdLgJitncof5buphtnoz27ZVg3QZYwOeUg6MWqpQHoHtirA17uj3Q2Jvt5W2
-IWqJFScct5VHhJ4O02iHtcrmAYxzHwbUcUZiJB6iZf8nTSk+k8kLKg7up+CxHr6V
-WtgYi6xqaPtWi2y/3LHy1cC14dgAFRHz6fXoDzs/pU5d7jVZaVPb+OsFedam+MH3
-Zz+jFiXG7qIKIEb1Z9o7Xfiyy0ZP7A8Dx3pqpHAfM7RN97XEvquqzB2b03MfUiY=
-=ytJf
------END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.7.6.9.ebuild b/media-gfx/imagemagick/imagemagick-6.7.6.9.ebuild
index db217c357818..6e5da3d1c207 100644
--- a/media-gfx/imagemagick/imagemagick-6.7.6.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.6.9.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.6.9.ebuild,v 1.1 2012/05/10 14:07:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.6.9.ebuild,v 1.2 2012/05/13 17:19:17 grobian Exp $
EAPI=4
-inherit multilib toolchain-funcs versionator
+inherit multilib toolchain-funcs versionator libtool
MY_P=ImageMagick-$(replace_version_separator 3 '-')
@@ -68,6 +68,10 @@ REQUIRED_USE="corefonts? ( truetype )
S=${WORKDIR}/${MY_P}
+src_prepare() {
+ elibtoolize # for Darwin bundles
+}
+
src_configure() {
local depth=16
use q8 && depth=8
@@ -119,7 +123,7 @@ src_configure() {
$(use_with svg rsvg) \
$(use_with tiff) \
$(use_with webp) \
- $(use_with corefonts windows-font-dir /usr/share/fonts/corefonts) \
+ $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) \
$(use_with wmf) \
$(use_with xml) \
--${openmp}-openmp
@@ -136,7 +140,7 @@ src_test() {
src_install() {
emake \
DESTDIR="${D}" \
- DOCUMENTATION_PATH="/usr/share/doc/${PF}" \
+ DOCUMENTATION_PATH="${EPREFIX}/usr/share/doc/${PF}" \
install
dodoc {AUTHORS,NEWS,README}.txt ChangeLog