Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 630468 | Differences between
and this patch

Collapse All | Expand All

(-)../../../gentoo/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild (-5 / +14 lines)
Lines 14-24 Link Here
14
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
14
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
15
SLOT="0"
15
SLOT="0"
16
LICENSE="GPL-2 LGPL-2"
16
LICENSE="GPL-2 LGPL-2"
17
IUSE=""
17
IUSE="graphicsmagick"
18
18
19
RDEPEND="
19
RDEPEND="
20
	dev-python/pycairo[${PYTHON_USEDEP}]
20
	dev-python/pycairo[${PYTHON_USEDEP}]
21
	media-gfx/imagemagick:=
21
	!graphicsmagick? ( media-gfx/imagemagick:= )
22
	graphicsmagick? ( media-gfx/graphicsmagick:= )
22
	media-libs/lcms:2
23
	media-libs/lcms:2
23
	dev-python/pillow[${PYTHON_USEDEP}]"
24
	dev-python/pillow[${PYTHON_USEDEP}]"
24
DEPEND="${RDEPEND}
25
DEPEND="${RDEPEND}
Lines 33-39 Link Here
33
34
34
python_prepare_all() {
35
python_prepare_all() {
35
	local wand
36
	local wand
36
	wand=$(pkg-config --libs MagickWand | sed -e "s:^ *::g" -e "s: *$::g" -e "s:-l:\':g" -e "s: :',:g" -e "s:$:':g" -e "s:,'$::g")
37
	if use graphicsmagick ; then
38
		wand=$(pkg-config --libs GraphicsMagickWand)
39
	else
40
		wand=$(pkg-config --libs MagickWand)
41
	fi
42
	wand=$(echo "${wand}" | sed -e "s:^ *::g" -e "s: *$::g" -e "s:-l:\':g" -e "s: :',:g" -e "s:$:':g" -e "s:,'$::g")
37
43
38
	distutils-r1_python_prepare_all
44
	distutils-r1_python_prepare_all
39
45
Lines 43-50 Link Here
43
		-e "/libraries/s:'MagickWand':${wand}:g" \
49
		-e "/libraries/s:'MagickWand':${wand}:g" \
44
		-i setup.py || die
50
		-i setup.py || die
45
51
46
	# https://bugs.gentoo.org/581816
52
	if use graphicsmagick ; then
47
	if has_version ">=media-gfx/imagemagick-7.0" ; then
53
		sed  -e "s:ImageMagick-6:GraphicsMagick:" -i setup.py || die
54
		eapply "${FILESDIR}"/${P}-graphicsmagick.patch
55
	elif has_version ">=media-gfx/imagemagick-7.0" ; then
56
		# https://bugs.gentoo.org/581816
48
		sed  -e "s:ImageMagick-6:ImageMagick-7:" -i setup.py || die
57
		sed  -e "s:ImageMagick-6:ImageMagick-7:" -i setup.py || die
49
		eapply "${FILESDIR}"/${P}-ImageMagick7.patch
58
		eapply "${FILESDIR}"/${P}-ImageMagick7.patch
50
	fi
59
	fi

Return to bug 630468