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

Collapse All | Expand All

(-)gimp-2.6.11-r2.ebuild (-26 / +22 lines)
Lines 9-26 inherit eutils gnome2 fdo-mime multilib Link Here
9
9
10
DESCRIPTION="GNU Image Manipulation Program"
10
DESCRIPTION="GNU Image Manipulation Program"
11
HOMEPAGE="http://www.gimp.org/"
11
HOMEPAGE="http://www.gimp.org/"
12
SRC_URI="mirror://gimp/v2.6/${P}.tar.bz2"
12
SRC_URI="mirror://gimp/v2.7/${P}.tar.bz2"
13
13
14
LICENSE="GPL-2"
14
LICENSE="GPL-2"
15
SLOT="2"
15
SLOT="2"
16
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
16
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
17
17
18
IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
18
IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xmc xpm"
19
19
20
RDEPEND=">=dev-libs/glib-2.18.1:2
20
RDEPEND=">=dev-libs/glib-2.28.1:2
21
	>=x11-libs/gtk+-2.12.5:2
21
	>=x11-libs/gtk+-2.24.3:2
22
	>=x11-libs/pango-1.18.0
22
	>=x11-libs/pango-1.22.0
23
	x11-libs/libXpm
24
	>=media-libs/freetype-2.1.7
23
	>=media-libs/freetype-2.1.7
25
	>=media-libs/fontconfig-2.2.0
24
	>=media-libs/fontconfig-2.2.0
26
	sys-libs/zlib
25
	sys-libs/zlib
Lines 28-34 RDEPEND=">=dev-libs/glib-2.18.1:2 Link Here
28
	dev-libs/libxslt
27
	dev-libs/libxslt
29
	x11-misc/xdg-utils
28
	x11-misc/xdg-utils
30
	x11-themes/hicolor-icon-theme
29
	x11-themes/hicolor-icon-theme
31
	>=media-libs/gegl-0.0.22
30
	>=media-libs/gegl-0.1.6
32
	aalib? ( media-libs/aalib )
31
	aalib? ( media-libs/aalib )
33
	alsa? ( media-libs/alsa-lib )
32
	alsa? ( media-libs/alsa-lib )
34
	curl? ( net-misc/curl )
33
	curl? ( net-misc/curl )
Lines 36-50 RDEPEND=">=dev-libs/glib-2.18.1:2 Link Here
36
	gnome? ( gnome-base/gvfs )
35
	gnome? ( gnome-base/gvfs )
37
	webkit? ( net-libs/webkit-gtk:2 )
36
	webkit? ( net-libs/webkit-gtk:2 )
38
	jpeg? ( virtual/jpeg:0 )
37
	jpeg? ( virtual/jpeg:0 )
38
	jpeg2k? ( media-libs/jasper )
39
	exif? ( >=media-libs/libexif-0.6.15 )
39
	exif? ( >=media-libs/libexif-0.6.15 )
40
	lcms? ( =media-libs/lcms-1* )
40
	lcms? ( =media-libs/lcms-1* )
41
	mng? ( media-libs/libmng )
41
	mng? ( media-libs/libmng )
42
	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
42
	pdf? ( >=app-text/poppler-0.12.4[cairo]
43
	png? ( >=media-libs/libpng-1.2.2:0 )
43
			>=x11-libs/cairo-1.10.2 )
44
	png? ( >=media-libs/libpng-1.2.37:0 )
44
	python?	( >=dev-python/pygtk-2.10.4:2 )
45
	python?	( >=dev-python/pygtk-2.10.4:2 )
45
	tiff? ( >=media-libs/tiff-3.5.7 )
46
	tiff? ( >=media-libs/tiff-3.5.7 )
46
	svg? ( >=gnome-base/librsvg-2.8.0:2 )
47
	svg? ( >=gnome-base/librsvg-2.14.0:2 )
47
	wmf? ( >=media-libs/libwmf-0.2.8 )"
48
	udev? ( >=sys-fs/udev-167[gudev] )
49
	wmf? ( >=media-libs/libwmf-0.2.8 )
50
	xmc? ( x11-libs/libXcursor )
51
	xpm? ( x11-libs/libXpm )"
48
DEPEND="${RDEPEND}
52
DEPEND="${RDEPEND}
49
	>=dev-util/pkgconfig-0.12.0
53
	>=dev-util/pkgconfig-0.12.0
50
	>=dev-util/intltool-0.40
54
	>=dev-util/intltool-0.40
Lines 56-75 DOCS="AUTHORS ChangeLog* HACKING NEWS RE Link Here
56
pkg_setup() {
60
pkg_setup() {
57
	G2CONF="--enable-default-binary \
61
	G2CONF="--enable-default-binary \
58
		--with-x \
62
		--with-x \
63
		--without-mac-twain \
59
		$(use_with aalib aa) \
64
		$(use_with aalib aa) \
60
		$(use_with alsa) \
65
		$(use_with alsa) \
61
		$(use_enable altivec) \
66
		$(use_enable altivec) \
62
		$(use_with curl libcurl) \
67
		$(use_with curl libcurl) \
63
		$(use_with dbus) \
68
		$(use_with dbus) \
64
		--without-hal \
65
		$(use_with gnome gvfs) \
69
		$(use_with gnome gvfs) \
66
		--without-gnomevfs \
67
		$(use_with webkit) \
70
		$(use_with webkit) \
68
		$(use_with jpeg libjpeg) \
71
		$(use_with jpeg libjpeg) \
72
		$(use_with jpeg2k libjasper) \
69
		$(use_with exif libexif) \
73
		$(use_with exif libexif) \
70
		$(use_with lcms) \
74
		$(use_with lcms) \
71
		$(use_enable mmx) \
75
		$(use_enable mmx) \
72
		$(use_with mng libmng) \
76
		$(use_with mng libmng) \
77
		$(use_with pdf cairo-pdf) \
73
		$(use_with pdf poppler) \
78
		$(use_with pdf poppler) \
74
		$(use_with png libpng) \
79
		$(use_with png libpng) \
75
		$(use_enable python) \
80
		$(use_enable python) \
Lines 77-83 pkg_setup() { Link Here
77
		$(use_enable sse) \
82
		$(use_enable sse) \
78
		$(use_with svg librsvg) \
83
		$(use_with svg librsvg) \
79
		$(use_with tiff libtiff) \
84
		$(use_with tiff libtiff) \
80
		$(use_with wmf)"
85
		$(use_with udev gudev) \
86
		$(use_with wmf)
87
		$(use_with xmc)
88
		$(use_with xpm libxpm)"
81
89
82
	if use python; then
90
	if use python; then
83
		python_set_active_version 2
91
		python_set_active_version 2
Lines 86-103 pkg_setup() { Link Here
86
}
94
}
87
95
88
src_prepare() {
96
src_prepare() {
89
	# security fixes from upstream, see
90
	# https://bugzilla.gnome.org/show_bug.cgi?id=639203
91
	epatch "${FILESDIR}"/gimp-CVE-2010-4540-to-4543.diff
92
93
	# fixes for libpng 1.5 (incomplete), see
94
	# https://bugzilla.gnome.org/show_bug.cgi?id=640409
95
	epatch "${FILESDIR}"/gimp-libpng15-v2.diff
96
97
	# don't use empty, removed header
98
	# https://bugs.gentoo.org/show_bug.cgi?id=377075
99
	epatch "${FILESDIR}"/gimp-curl-headers.diff
100
101
	echo '#!/bin/sh' > py-compile
97
	echo '#!/bin/sh' > py-compile
102
	gnome2_src_prepare
98
	gnome2_src_prepare
103
}
99
}

Return to bug 380483