1 |
sping 11/08/31 18:44:34 |
2 |
|
3 |
Modified: ChangeLog gimp-9999.ebuild |
4 |
Log: |
5 |
media-gfx/gimp: Update live ebuild |
6 |
|
7 |
(Portage version: 2.1.10.11/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.331 media-gfx/gimp/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.331&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.331&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?r1=1.330&r2=1.331 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v |
19 |
retrieving revision 1.330 |
20 |
retrieving revision 1.331 |
21 |
diff -u -r1.330 -r1.331 |
22 |
--- ChangeLog 31 Aug 2011 14:44:15 -0000 1.330 |
23 |
+++ ChangeLog 31 Aug 2011 18:44:34 -0000 1.331 |
24 |
@@ -1,6 +1,9 @@ |
25 |
# ChangeLog for media-gfx/gimp |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.330 2011/08/31 14:44:15 sping Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.331 2011/08/31 18:44:34 sping Exp $ |
29 |
+ |
30 |
+ 31 Aug 2011; Sebastian Pipping <sping@g.o> gimp-9999.ebuild: |
31 |
+ Sync and fix live ebuild with 2.7.3 |
32 |
|
33 |
*gimp-2.7.3 (31 Aug 2011) |
34 |
|
35 |
|
36 |
|
37 |
|
38 |
1.36 media-gfx/gimp/gimp-9999.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild?rev=1.36&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild?rev=1.36&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild?r1=1.35&r2=1.36 |
43 |
|
44 |
Index: gimp-9999.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v |
47 |
retrieving revision 1.35 |
48 |
retrieving revision 1.36 |
49 |
diff -u -r1.35 -r1.36 |
50 |
--- gimp-9999.ebuild 4 Apr 2011 19:57:55 -0000 1.35 |
51 |
+++ gimp-9999.ebuild 31 Aug 2011 18:44:34 -0000 1.36 |
52 |
@@ -1,11 +1,11 @@ |
53 |
# Copyright 1999-2011 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.35 2011/04/04 19:57:55 scarabeus Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.36 2011/08/31 18:44:34 sping Exp $ |
57 |
|
58 |
EAPI="3" |
59 |
PYTHON_DEPEND="python? 2:2.5" |
60 |
|
61 |
-inherit git eutils gnome2 fdo-mime multilib python |
62 |
+inherit git-2 eutils gnome2 fdo-mime multilib python |
63 |
|
64 |
EGIT_REPO_URI="git://git.gnome.org/gimp" |
65 |
|
66 |
@@ -13,20 +13,22 @@ |
67 |
HOMEPAGE="http://www.gimp.org/" |
68 |
SRC_URI="" |
69 |
|
70 |
-LICENSE="GPL-3" |
71 |
+LICENSE="GPL-3 LGPL-3" |
72 |
SLOT="2" |
73 |
KEYWORDS="" |
74 |
|
75 |
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf" |
76 |
+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 xpm" |
77 |
|
78 |
-RDEPEND=">=dev-libs/glib-2.18.1:2 |
79 |
- >=x11-libs/gtk+-2.12.5:2 |
80 |
- >=x11-libs/pango-1.18.0 |
81 |
- x11-libs/libXpm |
82 |
+RDEPEND=">=dev-libs/glib-2.28.1:2 |
83 |
+ >=x11-libs/gtk+-2.24.3:2 |
84 |
+ >=x11-libs/gdk-pixbuf-2.22.1:2 |
85 |
+ >=x11-libs/cairo-1.10.2 |
86 |
+ >=x11-libs/pango-1.22.0 |
87 |
+ xpm? ( x11-libs/libXpm ) |
88 |
>=media-libs/freetype-2.1.7 |
89 |
>=media-libs/fontconfig-2.2.0 |
90 |
sys-libs/zlib |
91 |
- dev-libs/libxml2:2 |
92 |
+ dev-libs/libxml2 |
93 |
dev-libs/libxslt |
94 |
x11-misc/xdg-utils |
95 |
x11-themes/hicolor-icon-theme |
96 |
@@ -39,20 +41,27 @@ |
97 |
gnome? ( gnome-base/gvfs ) |
98 |
webkit? ( net-libs/webkit-gtk:2 ) |
99 |
jpeg? ( virtual/jpeg:0 ) |
100 |
+ jpeg2k? ( media-libs/jasper ) |
101 |
exif? ( >=media-libs/libexif-0.6.15 ) |
102 |
- lcms? ( media-libs/lcms:0 ) |
103 |
+ lcms? ( >=media-libs/lcms-1.16:0 ) |
104 |
mng? ( media-libs/libmng ) |
105 |
- pdf? ( >=app-text/poppler-0.12.3-r3[cairo] ) |
106 |
- png? ( >=media-libs/libpng-1.2.2 ) |
107 |
+ pdf? ( >=app-text/poppler-0.12.4[cairo] ) |
108 |
+ png? ( >=media-libs/libpng-1.2.37:0 ) |
109 |
python? ( >=dev-python/pygtk-2.10.4:2 ) |
110 |
tiff? ( >=media-libs/tiff-3.5.7 ) |
111 |
- svg? ( >=gnome-base/librsvg-2.8.0:2 ) |
112 |
- wmf? ( >=media-libs/libwmf-0.2.8 )" |
113 |
+ svg? ( >=gnome-base/librsvg-2.14.0:2 ) |
114 |
+ wmf? ( >=media-libs/libwmf-0.2.8 ) |
115 |
+ x11-libs/libXcursor |
116 |
+ udev? ( sys-fs/udev[gudev] )" |
117 |
DEPEND="${RDEPEND} |
118 |
- >=dev-util/pkgconfig-0.12.0 |
119 |
- >=dev-util/intltool-0.40 |
120 |
+ >=dev-util/pkgconfig-0.22 |
121 |
+ >=dev-util/intltool-0.40.1 |
122 |
>=sys-devel/gettext-0.17 |
123 |
- doc? ( >=dev-util/gtk-doc-1 )" |
124 |
+ >=dev-util/gtk-doc-1 |
125 |
+ >=sys-devel/libtool-1.5 |
126 |
+ >=sys-devel/autoconf-2.54 |
127 |
+ >=sys-devel/automake-1.10 |
128 |
+ dev-libs/libxslt" |
129 |
|
130 |
DOCS="AUTHORS ChangeLog* HACKING NEWS README*" |
131 |
|
132 |
@@ -64,11 +73,10 @@ |
133 |
$(use_enable altivec) \ |
134 |
$(use_with curl libcurl) \ |
135 |
$(use_with dbus) \ |
136 |
- --without-hal \ |
137 |
$(use_with gnome gvfs) \ |
138 |
- --without-gnomevfs \ |
139 |
$(use_with webkit) \ |
140 |
$(use_with jpeg libjpeg) \ |
141 |
+ $(use_with jpeg2k libjasper) \ |
142 |
$(use_with exif libexif) \ |
143 |
$(use_with lcms) \ |
144 |
$(use_enable mmx) \ |
145 |
@@ -80,7 +88,11 @@ |
146 |
$(use_enable sse) \ |
147 |
$(use_with svg librsvg) \ |
148 |
$(use_with tiff libtiff) \ |
149 |
- $(use_with wmf)" |
150 |
+ $(use_with udev gudev) \ |
151 |
+ $(use_with wmf) \ |
152 |
+ --with-xmc \ |
153 |
+ $(use_with xpm libxpm) \ |
154 |
+ --without-xvfb-run" |
155 |
|
156 |
if use python; then |
157 |
python_set_active_version 2 |
158 |
@@ -89,13 +101,16 @@ |
159 |
} |
160 |
|
161 |
src_unpack() { |
162 |
- git_src_unpack |
163 |
+ git-2_src_unpack |
164 |
} |
165 |
|
166 |
src_prepare() { |
167 |
+ epatch "${FILESDIR}"/${PN}-2.7.3-glib-2.29.patch |
168 |
+ |
169 |
echo '#!/bin/sh' > py-compile |
170 |
+ chmod a+x py-compile || die |
171 |
sed -i -e 's:\$srcdir/configure:#:g' autogen.sh |
172 |
- ./autogen.sh |
173 |
+ ./autogen.sh || die |
174 |
gnome2_src_prepare |
175 |
} |