1 |
hanno 08/06/21 18:53:45 |
2 |
|
3 |
Modified: gimp-2.4.6.ebuild ChangeLog |
4 |
Log: |
5 |
change gimp ebuild to use gnome2 eclass and fix automagic on curl |
6 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.4 i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 media-gfx/gimp/gimp-2.4.6.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: gimp-2.4.6.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- gimp-2.4.6.ebuild 2 Jun 2008 13:28:21 -0000 1.1 |
22 |
+++ gimp-2.4.6.ebuild 21 Jun 2008 18:53:45 -0000 1.2 |
23 |
@@ -1,8 +1,8 @@ |
24 |
# Copyright 1999-2008 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild,v 1.1 2008/06/02 13:28:21 hanno Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild,v 1.2 2008/06/21 18:53:45 hanno Exp $ |
28 |
|
29 |
-inherit fdo-mime flag-o-matic multilib python eutils autotools |
30 |
+inherit gnome2 fdo-mime flag-o-matic multilib python eutils autotools |
31 |
|
32 |
DESCRIPTION="GNU Image Manipulation Program" |
33 |
HOMEPAGE="http://www.gimp.org/" |
34 |
@@ -52,6 +52,8 @@ |
35 |
>=sys-devel/gettext-0.17 |
36 |
doc? ( >=dev-util/gtk-doc-1 )" |
37 |
|
38 |
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*" |
39 |
+ |
40 |
pkg_setup() { |
41 |
if use pdf && ! built_with_use app-text/poppler-bindings gtk; then |
42 |
eerror "This package requires app-text/poppler-bindings compiled with GTK+ support." |
43 |
@@ -61,40 +63,13 @@ |
44 |
eerror "This package requires media-libs/alsa-lib compiled with midi support." |
45 |
die "Please reemerge media-libs/alsa-lib with USE=\"midi\"." |
46 |
fi |
47 |
-} |
48 |
- |
49 |
-src_unpack() { |
50 |
- unpack ${A} |
51 |
- cd "${S}" |
52 |
- epatch "${FILESDIR}/gimp-web-browser.patch" |
53 |
- |
54 |
- # Workaround for MIME-type, this is fixed in gimp trunk, so we can |
55 |
- # remove this with >= 2.5 |
56 |
- use svg && epatch "${FILESDIR}/gimp-svg.diff" |
57 |
- |
58 |
- eautoreconf |
59 |
-} |
60 |
- |
61 |
-src_compile() { |
62 |
- # workaround portage variable leakage |
63 |
- local AA= |
64 |
- |
65 |
- # gimp uses inline functions (e.g. plug-ins/common/grid.c) (#23078) |
66 |
- # gimp uses floating point math, needs accuracy (#98685) |
67 |
- filter-flags "-fno-inline" "-ffast-math" |
68 |
- # gimp assumes char is signed (fixes preview corruption) |
69 |
- if use ppc || use ppc64; then |
70 |
- append-flags "-fsigned-char" |
71 |
- fi |
72 |
|
73 |
- econf --enable-default-binary \ |
74 |
+ G2CONF="--enable-default-binary \ |
75 |
--with-x \ |
76 |
$(use_with aalib aa) \ |
77 |
$(use_with alsa) \ |
78 |
$(use_enable altivec) \ |
79 |
- $(use_with curl) \ |
80 |
- $(use_enable debug) \ |
81 |
- $(use_enable doc gtk-doc) \ |
82 |
+ $(use_with curl libcurl) \ |
83 |
$(use_with dbus) \ |
84 |
$(use_with hal) \ |
85 |
$(use_with gnome gnomevfs) \ |
86 |
@@ -111,21 +86,37 @@ |
87 |
$(use_enable sse) \ |
88 |
$(use_with svg librsvg) \ |
89 |
$(use_with tiff libtiff) \ |
90 |
- $(use_with wmf) \ |
91 |
- || die "econf failed" |
92 |
+ $(use_with wmf)" |
93 |
+} |
94 |
+ |
95 |
+src_unpack() { |
96 |
+ gnome2_src_unpack |
97 |
+ epatch "${FILESDIR}/gimp-web-browser.patch" |
98 |
|
99 |
- emake || die "emake failed" |
100 |
+ # Workaround for MIME-type, this is fixed in gimp trunk, so we can |
101 |
+ # remove this with >= 2.5 |
102 |
+ use svg && epatch "${FILESDIR}/gimp-svg.diff" |
103 |
+ |
104 |
+ eautoreconf |
105 |
} |
106 |
|
107 |
-src_install() { |
108 |
- make DESTDIR="${D}" install || die "make install failed" |
109 |
+src_compile() { |
110 |
+ # workaround portage variable leakage |
111 |
+ local AA= |
112 |
+ |
113 |
+ # gimp uses inline functions (e.g. plug-ins/common/grid.c) (#23078) |
114 |
+ # gimp uses floating point math, needs accuracy (#98685) |
115 |
+ filter-flags "-fno-inline" "-ffast-math" |
116 |
+ # gimp assumes char is signed (fixes preview corruption) |
117 |
+ if use ppc || use ppc64; then |
118 |
+ append-flags "-fsigned-char" |
119 |
+ fi |
120 |
|
121 |
- dodoc AUTHORS ChangeLog* HACKING NEWS README* |
122 |
+ gnome2_src_compile |
123 |
} |
124 |
|
125 |
pkg_postinst() { |
126 |
- fdo-mime_desktop_database_update |
127 |
- fdo-mime_mime_database_update |
128 |
+ gnome2_pkg_postinst |
129 |
|
130 |
elog |
131 |
elog "If you want Postscript file support, emerge ghostscript." |
132 |
@@ -136,8 +127,7 @@ |
133 |
} |
134 |
|
135 |
pkg_postrm() { |
136 |
- fdo-mime_desktop_database_update |
137 |
- fdo-mime_mime_database_update |
138 |
+ gnome2_pkg_postrm |
139 |
python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \ |
140 |
/usr/$(get_libdir)/gimp/2.0/plug-ins |
141 |
} |
142 |
|
143 |
|
144 |
|
145 |
1.256 media-gfx/gimp/ChangeLog |
146 |
|
147 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.256&view=markup |
148 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.256&content-type=text/plain |
149 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/gimp/ChangeLog?r1=1.255&r2=1.256 |
150 |
|
151 |
Index: ChangeLog |
152 |
=================================================================== |
153 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v |
154 |
retrieving revision 1.255 |
155 |
retrieving revision 1.256 |
156 |
diff -u -r1.255 -r1.256 |
157 |
--- ChangeLog 2 Jun 2008 13:28:21 -0000 1.255 |
158 |
+++ ChangeLog 21 Jun 2008 18:53:45 -0000 1.256 |
159 |
@@ -1,6 +1,9 @@ |
160 |
# ChangeLog for media-gfx/gimp |
161 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
162 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.255 2008/06/02 13:28:21 hanno Exp $ |
163 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.256 2008/06/21 18:53:45 hanno Exp $ |
164 |
+ |
165 |
+ 21 Jun 2008; Hanno Boeck <hanno@g.o> gimp-2.4.6.ebuild: |
166 |
+ Use gnome2 eclass and fix automagic curl dep. |
167 |
|
168 |
*gimp-2.4.6 (02 Jun 2008) |
169 |
|
170 |
|
171 |
|
172 |
|
173 |
-- |
174 |
gentoo-commits@l.g.o mailing list |