summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2008-01-21 00:32:26 +0000
committerMarkus Meier <maekke@gentoo.org>2008-01-21 00:32:26 +0000
commitd3d352c4afb50c30af88c129016e299f879a8c00 (patch)
tree0120615a85d330b2eb02b79a25e55e41d0facca2 /media-gfx/imagemagick
parentx86 stable, bug #206737 (diff)
downloadgentoo-2-d3d352c4afb50c30af88c129016e299f879a8c00.tar.gz
gentoo-2-d3d352c4afb50c30af88c129016e299f879a8c00.tar.bz2
gentoo-2-d3d352c4afb50c30af88c129016e299f879a8c00.zip
fix doc installation dir, bug #91911
(Portage version: 2.1.4)
Diffstat (limited to 'media-gfx/imagemagick')
-rw-r--r--media-gfx/imagemagick/ChangeLog6
-rw-r--r--media-gfx/imagemagick/files/imagemagick-6.3.7.9-doc.patch12
-rw-r--r--media-gfx/imagemagick/imagemagick-6.3.7.9.ebuild9
3 files changed, 25 insertions, 2 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index bd60753ead8a..3295b4753898 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/imagemagick
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.260 2008/01/12 14:16:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.261 2008/01/21 00:32:26 maekke Exp $
+
+ 21 Jan 2008; Markus Meier <maekke@gentoo.org>
+ +files/imagemagick-6.3.7.9-doc.patch, imagemagick-6.3.7.9.ebuild:
+ fix doc installation dir, bug #91911
12 Jan 2008; Markus Meier <maekke@gentoo.org> imagemagick-6.3.7.9.ebuild:
remove useless mpeg USE-flag, add fontconfig USE-flag and correct freetype
diff --git a/media-gfx/imagemagick/files/imagemagick-6.3.7.9-doc.patch b/media-gfx/imagemagick/files/imagemagick-6.3.7.9-doc.patch
new file mode 100644
index 000000000000..5019579a2d5d
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.3.7.9-doc.patch
@@ -0,0 +1,12 @@
+diff -ur ImageMagick-6.3.7-orig/configure ImageMagick-6.3.7/configure
+--- ImageMagick-6.3.7-orig/configure 2008-01-21 00:51:35.000000000 +0100
++++ ImageMagick-6.3.7/configure 2008-01-21 00:52:02.000000000 +0100
+@@ -40179,7 +40179,7 @@
+ #
+ # Path to ImageMagick documentation files
+ DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+-DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}"
++DOCUMENTATION_PATH="/usr/share/doc/${PF}"
+ DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/"
+ if test "$native_win32_build" = 'yes'; then
+ DEFINE_DOCUMENTATION_PATH=`$WinPathScript "$DEFINE_DOCUMENTATION_PATH" 1`
diff --git a/media-gfx/imagemagick/imagemagick-6.3.7.9.ebuild b/media-gfx/imagemagick/imagemagick-6.3.7.9.ebuild
index dba937368e16..e288564e8a93 100644
--- a/media-gfx/imagemagick/imagemagick-6.3.7.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.3.7.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.7.9.ebuild,v 1.3 2008/01/12 14:16:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.7.9.ebuild,v 1.4 2008/01/21 00:32:26 maekke Exp $
inherit eutils multilib perl-app
@@ -60,6 +60,13 @@ pkg_setup() {
fi
}
+src_unpack() {
+ unpack ${A}
+
+ # fix doc dir, bug 91911
+ epatch "${FILESDIR}"/${P}-doc.patch
+}
+
src_compile() {
local quantum
if use q32 ; then