From d40f5bcfebef7e99f426def2805bed3d5bd041fd Mon Sep 17 00:00:00 2001 From: Hanno Boeck Date: Sat, 28 Apr 2007 07:33:27 +0000 Subject: [PATCH] gimp bumps with security fix Package-Manager: portage-2.1.2.5 --- media-gfx/gimp/ChangeLog | 10 +- media-gfx/gimp/Manifest | 46 +++-- media-gfx/gimp/files/digest-gimp-2.2.14 | 3 + media-gfx/gimp/files/digest-gimp-2.3.16 | 3 + .../files/gimp-sunras-bufferoverflow.diff | 49 +++++ media-gfx/gimp/files/gimp.desktop | 81 --------- media-gfx/gimp/gimp-2.2.14.ebuild | 171 ++++++++++++++++++ media-gfx/gimp/gimp-2.3.16.ebuild | 121 +++++++++++++ media-gfx/gimp/gimp-9999.ebuild | 62 ++++--- 9 files changed, 420 insertions(+), 126 deletions(-) create mode 100644 media-gfx/gimp/files/digest-gimp-2.2.14 create mode 100644 media-gfx/gimp/files/digest-gimp-2.3.16 create mode 100644 media-gfx/gimp/files/gimp-sunras-bufferoverflow.diff delete mode 100644 media-gfx/gimp/files/gimp.desktop create mode 100644 media-gfx/gimp/gimp-2.2.14.ebuild create mode 100644 media-gfx/gimp/gimp-2.3.16.ebuild diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog index 783d293e4012..25d5005e8a07 100644 --- a/media-gfx/gimp/ChangeLog +++ b/media-gfx/gimp/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-gfx/gimp # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.186 2007/04/21 04:34:25 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.187 2007/04/28 07:33:27 hanno Exp $ + +*gimp-2.3.16 (28 Apr 2007) +*gimp-2.2.14 (28 Apr 2007) + + 28 Apr 2007; Hanno Boeck -files/gimp.desktop, + +files/gimp-sunras-bufferoverflow.diff, +gimp-2.2.14.ebuild, + +gimp-2.3.16.ebuild, gimp-9999.ebuild: + Bump with security fix for sunras plugin. 21 Apr 2007; Hanno Boeck gimp-9999.ebuild: Change live ebuild from cvs to svn. diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 0eef3a272822..c88fe3e6a2e0 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -1,32 +1,42 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX gimp.desktop 2404 RMD160 bf5d89020602af815b80488a913cd0b031b96a54 SHA1 c1c52c60730583ae6cfd39a8219d1a2ffc5f6f2f SHA256 290030f97e0aa612ec84071e7d1f19d04c0ef98a801ca04a5ee0abe318e6816d -MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404 -RMD160 bf5d89020602af815b80488a913cd0b031b96a54 files/gimp.desktop 2404 -SHA256 290030f97e0aa612ec84071e7d1f19d04c0ef98a801ca04a5ee0abe318e6816d files/gimp.desktop 2404 +AUX gimp-sunras-bufferoverflow.diff 1530 RMD160 a6f50ed18481b698062bfed1316f36d79937e515 SHA1 4c6263b35b7a7324fb896a12cf8fa7bdb8aced94 SHA256 9114422a655884ec0ad64f3af15a39b7d45e8c48c59f3490c20e0b132ffef2f1 +MD5 48de54f51b3b6226fcc6b791a40efb78 files/gimp-sunras-bufferoverflow.diff 1530 +RMD160 a6f50ed18481b698062bfed1316f36d79937e515 files/gimp-sunras-bufferoverflow.diff 1530 +SHA256 9114422a655884ec0ad64f3af15a39b7d45e8c48c59f3490c20e0b132ffef2f1 files/gimp-sunras-bufferoverflow.diff 1530 AUX ltmain_sh-1.5.0-fix-relink.patch 1718 RMD160 dd7bfaef61da7474e003d2ce2cc5dc4fbbe297dc SHA1 7205f8faab869bc68e98d0b20c8015067ddbd014 SHA256 8335de81c1b94ecf25f1f68421af6a76be571a0c131277f165818ab6a37541fe MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718 RMD160 dd7bfaef61da7474e003d2ce2cc5dc4fbbe297dc files/ltmain_sh-1.5.0-fix-relink.patch 1718 SHA256 8335de81c1b94ecf25f1f68421af6a76be571a0c131277f165818ab6a37541fe files/ltmain_sh-1.5.0-fix-relink.patch 1718 DIST gimp-2.2.12.tar.bz2 12875447 RMD160 31a4ee1344f799619dd9b38ea78e8748556fe7cb SHA1 f0368b069e0230e0411a18e7cb6f5fcc30325f1a SHA256 fd8368522f8d5d9db16d930f1ef702c5f052e513ab9801ac1fb91f7f26205baa +DIST gimp-2.2.14.tar.bz2 12836732 RMD160 cf43fb0436a6086a0bc85fd4a33b009bee557aa0 SHA1 cf0926b9f0ca910b31219bafa8188a8b7ebabe10 SHA256 f672f123118b7b52dfce5833ba26512463295e29d542f32d629ba39870112b4f DIST gimp-2.3.15.tar.bz2 16080133 RMD160 8c2017dccf188fe2b76e8a15acdc91c338c3457a SHA1 7447afd00d2940e2dd02edfc92575715d3a52936 SHA256 419f42a6e9b305a6b7870771ef072e64265f9332f8dcfa341ba14f5216aa0ac7 +DIST gimp-2.3.16.tar.bz2 16370057 RMD160 f67d58f48b0997082024088ca37ef52c3b18c6bc SHA1 1987971e620a7b6a40a7f7ac8ac2b505277cce13 SHA256 fdccaed39f868a24ad408b4a84e5f13b2c8448562b17bdc5ca53f0ddda4f96f4 EBUILD gimp-2.2.12.ebuild 4255 RMD160 2fff86c9b59c783b625c41a6a82f38fc2cc28c13 SHA1 0714d66a944d83a2938b0e251e3249c6dc9d7eff SHA256 a446fe6838de1649c5cffd740015fd8edd283e3db3e5fbef63587faf2c1729af MD5 8f3c782856ae97ed5a0be4e29ec4648d gimp-2.2.12.ebuild 4255 RMD160 2fff86c9b59c783b625c41a6a82f38fc2cc28c13 gimp-2.2.12.ebuild 4255 SHA256 a446fe6838de1649c5cffd740015fd8edd283e3db3e5fbef63587faf2c1729af gimp-2.2.12.ebuild 4255 +EBUILD gimp-2.2.14.ebuild 4316 RMD160 442b42538ade08cf06bd22f78113a2ff68074fde SHA1 67ba638016deec0bb26b717d9d6e44ba289527a8 SHA256 e7aeddf3c79064f98a8ef6c77be8efa9dc9e8d3c904aa63c50e8c3d6fea16ff2 +MD5 19da2c537237088d3ca0451c6f649a0d gimp-2.2.14.ebuild 4316 +RMD160 442b42538ade08cf06bd22f78113a2ff68074fde gimp-2.2.14.ebuild 4316 +SHA256 e7aeddf3c79064f98a8ef6c77be8efa9dc9e8d3c904aa63c50e8c3d6fea16ff2 gimp-2.2.14.ebuild 4316 EBUILD gimp-2.3.15.ebuild 3093 RMD160 0ca8c5a0dab68f6cb7bdaeea130c268f37474c1a SHA1 040f687177e1f6b7b3258db37c13894ce1accefe SHA256 318e20ad472405695f05dae5bbd62068d10d803633c8e30111d0ee607d15acf6 MD5 45659ac2ea504124ae8202d00929feca gimp-2.3.15.ebuild 3093 RMD160 0ca8c5a0dab68f6cb7bdaeea130c268f37474c1a gimp-2.3.15.ebuild 3093 SHA256 318e20ad472405695f05dae5bbd62068d10d803633c8e30111d0ee607d15acf6 gimp-2.3.15.ebuild 3093 -EBUILD gimp-9999.ebuild 3172 RMD160 c909ac39ccf2a63ab2eebc0f38a0b99d06e254ec SHA1 5f03e78f4c063de8821971aa7d90a3fe04e62b3a SHA256 f88812b96a57b4d742a8d26c0f0f9ac325b4c5405920a22e3f12b6798febc77f -MD5 02f9080706383bb94b41afc69db05e2d gimp-9999.ebuild 3172 -RMD160 c909ac39ccf2a63ab2eebc0f38a0b99d06e254ec gimp-9999.ebuild 3172 -SHA256 f88812b96a57b4d742a8d26c0f0f9ac325b4c5405920a22e3f12b6798febc77f gimp-9999.ebuild 3172 -MISC ChangeLog 26530 RMD160 46a89a98d4c48e203f613bdf64c8ce132de76e61 SHA1 02fa8219a1678a263e98b25381eae0308c57390b SHA256 8981277107fc5bf43b10811ea00ff1975939abdbb495adf604ee2092f3c44cbb -MD5 0972654db3fd1bfd5e6117762ac23a64 ChangeLog 26530 -RMD160 46a89a98d4c48e203f613bdf64c8ce132de76e61 ChangeLog 26530 -SHA256 8981277107fc5bf43b10811ea00ff1975939abdbb495adf604ee2092f3c44cbb ChangeLog 26530 +EBUILD gimp-2.3.16.ebuild 3251 RMD160 b8a3421aff1c560d2cb16a30b7779a9de1c6fcb0 SHA1 177d4c90ef357c860d1375b92a3f19bd0c7c68fa SHA256 9bf690a9a53a03b29500f910fbc0d8ba898df990e60e559270d0527d657812b0 +MD5 90b5802e29a4fbd8c18c25c4c61b733f gimp-2.3.16.ebuild 3251 +RMD160 b8a3421aff1c560d2cb16a30b7779a9de1c6fcb0 gimp-2.3.16.ebuild 3251 +SHA256 9bf690a9a53a03b29500f910fbc0d8ba898df990e60e559270d0527d657812b0 gimp-2.3.16.ebuild 3251 +EBUILD gimp-9999.ebuild 3238 RMD160 d0a6f75946fcea22d922b157e5eafa0e1961b60e SHA1 7b391e3b2fc9579eefc343553541f2cb3a78b093 SHA256 d2ead1af4aba3709774b6d43955aa02506b6301e7e4379ebadadcbddfa9652dd +MD5 e0f3234ab1cc63e5ac0e6db35e4a7586 gimp-9999.ebuild 3238 +RMD160 d0a6f75946fcea22d922b157e5eafa0e1961b60e gimp-9999.ebuild 3238 +SHA256 d2ead1af4aba3709774b6d43955aa02506b6301e7e4379ebadadcbddfa9652dd gimp-9999.ebuild 3238 +MISC ChangeLog 26801 RMD160 08a0ca6748aabd8a4fb5a6bebeb0d741d27f0426 SHA1 744b0779ea2ec67ad45c8fc4bd83dd8eba92d500 SHA256 8a92d19d0807d6153169e14e5681c8da5155400891be8d5c993e2fa4149de569 +MD5 f2fac126b348e181cb5dc374d8014a75 ChangeLog 26801 +RMD160 08a0ca6748aabd8a4fb5a6bebeb0d741d27f0426 ChangeLog 26801 +SHA256 8a92d19d0807d6153169e14e5681c8da5155400891be8d5c993e2fa4149de569 ChangeLog 26801 MISC metadata.xml 220 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 SHA1 9614887db749b0a3c17016da5b3ec0e42b908ad3 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081 MD5 8fee4c6e0af48517b726cceb49fa580a metadata.xml 220 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 metadata.xml 220 @@ -34,16 +44,22 @@ SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081 metadata MD5 afe22f024af8db30fd2f1dae48976916 files/digest-gimp-2.2.12 244 RMD160 ca2f36da228d744120fbbaa319f8683e463e1615 files/digest-gimp-2.2.12 244 SHA256 32c803f8e8e08342520c9f39803cd758731d2c8c792644e9bf9d2806581dd84a files/digest-gimp-2.2.12 244 +MD5 9afd8c1e90b3fdf2a6433b2719f6b7b0 files/digest-gimp-2.2.14 244 +RMD160 6c125bd082d91a20f3c645a619e47d3c87f37afd files/digest-gimp-2.2.14 244 +SHA256 cf1ffa6f5b69db90627506914fe970ffdfe9c3ddb7663375f32ee03bee2a83c9 files/digest-gimp-2.2.14 244 MD5 fddf11595b6a7e078d2b271151d260f0 files/digest-gimp-2.3.15 244 RMD160 3b318aa9d4fb1ab54a16423889a5b1b59f5d6e4a files/digest-gimp-2.3.15 244 SHA256 15ce5e6b827e78b317cad30d6c499bbf7334b75535a87b15560df1d728840fbc files/digest-gimp-2.3.15 244 +MD5 fb64286ef3cdb0d669d1d9bbd639505b files/digest-gimp-2.3.16 244 +RMD160 6241fa34d1e316c3f99b12ee88f3642dd548ad38 files/digest-gimp-2.3.16 244 +SHA256 9e28c37f77a9046d208921dca60ece4f8833ee211ab18b59d625dc8153df1edf files/digest-gimp-2.3.16 244 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gimp-9999 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gimp-9999 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gimp-9999 0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGMvRSr2QksT29OyARAseXAJ0bWTFjlcYRYd20wFCyNrg0g7b/ogCglOAg -B8rpfMVagQ9y7uvYJfw7XN8= -=Oa4C +iD8DBQFGMvjDr2QksT29OyARAhTeAJ44ijRIt98SIM5FfomIqXWHFT248wCcCNmO +MZyQQYjPn3Q8S1tlFmnmUow= +=mWZA -----END PGP SIGNATURE----- diff --git a/media-gfx/gimp/files/digest-gimp-2.2.14 b/media-gfx/gimp/files/digest-gimp-2.2.14 new file mode 100644 index 000000000000..3edc7b8b8f96 --- /dev/null +++ b/media-gfx/gimp/files/digest-gimp-2.2.14 @@ -0,0 +1,3 @@ +MD5 2f47dd66d714a970356e275dd1d3caac gimp-2.2.14.tar.bz2 12836732 +RMD160 cf43fb0436a6086a0bc85fd4a33b009bee557aa0 gimp-2.2.14.tar.bz2 12836732 +SHA256 f672f123118b7b52dfce5833ba26512463295e29d542f32d629ba39870112b4f gimp-2.2.14.tar.bz2 12836732 diff --git a/media-gfx/gimp/files/digest-gimp-2.3.16 b/media-gfx/gimp/files/digest-gimp-2.3.16 new file mode 100644 index 000000000000..404f216a2577 --- /dev/null +++ b/media-gfx/gimp/files/digest-gimp-2.3.16 @@ -0,0 +1,3 @@ +MD5 00797e627c8a180e5364f334aab27631 gimp-2.3.16.tar.bz2 16370057 +RMD160 f67d58f48b0997082024088ca37ef52c3b18c6bc gimp-2.3.16.tar.bz2 16370057 +SHA256 fdccaed39f868a24ad408b4a84e5f13b2c8448562b17bdc5ca53f0ddda4f96f4 gimp-2.3.16.tar.bz2 16370057 diff --git a/media-gfx/gimp/files/gimp-sunras-bufferoverflow.diff b/media-gfx/gimp/files/gimp-sunras-bufferoverflow.diff new file mode 100644 index 000000000000..6b071497f081 --- /dev/null +++ b/media-gfx/gimp/files/gimp-sunras-bufferoverflow.diff @@ -0,0 +1,49 @@ +--- trunk/plug-ins/common/sunras.c 2006/12/09 21:33:38 21494 ++++ trunk/plug-ins/common/sunras.c 2007/04/27 11:50:00 22355 +@@ -101,8 +101,7 @@ + gint32 image_ID, + gint32 drawable_ID); + +-static void set_color_table (gint32, L_SUNFILEHEADER *, unsigned char *); +- ++static void set_color_table (gint32, L_SUNFILEHEADER *, const guchar *); + static gint32 create_new_image (const gchar *filename, + guint width, + guint height, +@@ -857,19 +856,20 @@ + static void + set_color_table (gint32 image_ID, + L_SUNFILEHEADER *sunhdr, +- guchar *suncolmap) ++ const guchar *suncolmap) + { +- int ncols, j; +- guchar ColorMap[256*3]; ++ guchar ColorMap[256 * 3]; ++ gint ncols, j; + + ncols = sunhdr->l_ras_maplength / 3; +- if (ncols <= 0) return; ++ if (ncols <= 0) ++ return; + +- for (j = 0; j < ncols; j++) ++ for (j = 0; j < MIN (ncols, 256); j++) + { +- ColorMap[j*3] = suncolmap[j]; +- ColorMap[j*3+1] = suncolmap[j+ncols]; +- ColorMap[j*3+2] = suncolmap[j+2*ncols]; ++ ColorMap[j * 3 + 0] = suncolmap[j]; ++ ColorMap[j * 3 + 1] = suncolmap[j + ncols]; ++ ColorMap[j * 3 + 2] = suncolmap[j + 2 * ncols]; + } + + #ifdef DEBUG +@@ -878,6 +878,7 @@ + printf ("%3d: 0x%02x 0x%02x 0x%02x\n", j, + ColorMap[j*3], ColorMap[j*3+1], ColorMap[j*3+2]); + #endif ++ + gimp_image_set_colormap (image_ID, ColorMap, ncols); + } + diff --git a/media-gfx/gimp/files/gimp.desktop b/media-gfx/gimp/files/gimp.desktop deleted file mode 100644 index ea26b6d0f0dd..000000000000 --- a/media-gfx/gimp/files/gimp.desktop +++ /dev/null @@ -1,81 +0,0 @@ -[Desktop Entry] -Name=The GIMP -Name[bg]=GIMP -Name[br]=GIMP -Name[ca]=El GIMP -Name[cs]=GIMP -Name[da]=GIMP'en -Name[de]=GIMP -Name[el]=Ôï GIMP -Name[es]=El GIMP -Name[et]=GIMP -Name[eu]=GIMPa -Name[fi]=GIMP -Name[fr]=The GIMP -Name[ga]=An GIMP -Name[ga]=An GIMP -Name[gl]=O GIMP -Name[hr]=GIMP -Name[hu]=A GIMP -Name[id]=GIMP -Name[is]=GIMP -Name[it]=GIMP -Name[ja]=GIMP -Name[ko]=±èÇÁ -Name[lt]=GIMP -Name[nl]=GIMP -Name[no]=GIMP -Name[pl]=GIMP -Name[pt]=O GIMP -Name[pt_BR]=O GIMP -Name[ro]=GIMP -Name[ru]=GIMP -Name[sk]=GIMP -Name[sv]=GIMP -Name[tr]=GIMP -Name[uk]=GIMP -Name[zh_CN.GB2312]=GIMP -Name[zh_TW.Big5]=GIMP -Comment=GNU Image Manipulation Program -Comment[bg]=Ïðîãðàìà çà Îáðàáîòêà íà Èçîáðàæåíèÿ / GNU -Comment[br]=Goulev GNU Dazverad Skeudennoù -Comment[ca]=El programa de manipulació d'imatges GNU -Comment[cs]=Program pro úpravu obrázkù -Comment[da]=Tegne- og billedbehandlingprogram -Comment[de]=Das GNU-Bildbearbeitungsprogramm -Comment[el]=Ðñüãñáììá Åðåîåñãáóßáò Åéêüíùí GNU -Comment[es]=Programa de manipulación de imágenes GNU -Comment[et]=GNU pilditöötlusprogramm -Comment[eu]=GNU imaginak eraldatzeko programa -Comment[fi]=GIMP-kuvankäsittelyohjelma -Comment[fr]=Le Programme de Manipulation d'Images GNU -Comment[ga]=Ríomhchlar láimhsiú Pictuirí GNC -Comment[ga]=Ríomhchlár láimhsiú íomhá GNU -Comment[gl]=O Programa de Edición de Imaxes de GNU -Comment[hr]=Program za obradu forografija pod GNU licencom -Comment[hu]=GNU képfeldolgozó program -Comment[id]=GNU Image Manipulation Program -Comment[is]=GNU Myndvinnsluforrit -Comment[it]=Programma di Manipolazione Immagini GNU -Comment[ja]=GNU²èÁüÊÔ½¸¥×¥í¥°¥é¥à -Comment[ko]=GNU ±×¸² ÆíÁý ÇÁ·Î±×·¥ -Comment[lt]=GNU atvaizdø apdorojimo programa -Comment[nl]=GNU beeldverwerkingsprogramma -Comment[no]=GNU bildebehandlingsprogram -Comment[pl]=Zaawansowany program graficzny -Comment[pt]=Programa de Edição de Imagens GNU -Comment[pt_BR]=Programa de Edição de Imagens GNU -Comment[ro]=Program GNU pentru manipulare de imagine -Comment[ru]=ðÒÏÇÒÁÍÍÁ ÍÁÎÉÐÕÌÑÃÉÉ ÉÚÏÂÒÁÖÅÎÉÑ GNU -Comment[sk]=GNU Program pre spracovanie obrázkov -Comment[sv]=GNU Image Manipulation Program -Comment[tr]=GNU Resim deðiþtirme uygulamasý -Comment[uk]=ðÒÏÇÒÁÍÁ GNU ÍÁΦÐÕÌÑæ§ ÚÏÂÒÁÖÅÎÎÑÍ -Comment[wa]=Li programe da GNU po-z aspougnî des imådjes -Comment[zh_CN.GB2312]=GNU Ó°Ïó´¦Àí³Ìʽ -Comment[zh_TW.Big5]=GNU ¼v¹³³B²zµ{¦¡ -Icon=gnome-gimp.png -Exec=gimp -Terminal=false -Type=Application -Categories=GNOME;Application;Graphics; diff --git a/media-gfx/gimp/gimp-2.2.14.ebuild b/media-gfx/gimp/gimp-2.2.14.ebuild new file mode 100644 index 000000000000..ea71b25df4ed --- /dev/null +++ b/media-gfx/gimp/gimp-2.2.14.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.14.ebuild,v 1.1 2007/04/28 07:33:27 hanno Exp $ + +inherit flag-o-matic libtool eutils fdo-mime alternatives + +DESCRIPTION="GNU Image Manipulation Program" +HOMEPAGE="http://www.gimp.org/" + +SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="aalib altivec debug doc gtkhtml gimpprint hardened jpeg lcms mmx mng png +python smp sse svg tiff wmf" + +# X? ( virtual/x11 )" +RDEPEND=">=dev-libs/glib-2.4.5 + >=x11-libs/gtk+-2.4.4 + >=x11-libs/pango-1.4 + >=media-libs/freetype-2.1.7 + >=media-libs/fontconfig-2.2 + >=media-libs/libart_lgpl-2.3.8-r1 + sys-libs/zlib + dev-libs/libxml2 + dev-libs/libxslt + + gimpprint? ( =media-gfx/gimp-print-4.2* ) + gtkhtml? ( =gnome-extra/gtkhtml-2* ) + + png? ( >=media-libs/libpng-1.2.10 ) + jpeg? ( >=media-libs/jpeg-6b-r2 + media-libs/libexif ) + tiff? ( >=media-libs/tiff-3.5.7 ) + mng? ( media-libs/libmng ) + + wmf? ( >=media-libs/libwmf-0.2.8.2 ) + svg? ( >=gnome-base/librsvg-2.2 ) + + aalib? ( media-libs/aalib ) + python? ( >=dev-lang/python-2.2 + >=dev-python/pygtk-2 ) + lcms? ( media-libs/lcms ) + doc? ( app-doc/gimp-help )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.12.0 + dev-util/intltool + doc? ( >=dev-util/gtk-doc-1 )" + +src_unpack() { + + unpack "${A}" + cd "${S}" + + epatch ${FILESDIR}/gimp-sunras-bufferoverflow.diff + + # fixes bug #76050, allows for themable icons + sed -i -e s,@gimpdatadir@/images/@GIMP_DESKTOP_ICON@,@GIMP_DESKTOP_ICON@, ${S}/data/misc/gimp.desktop.in.in + + # Fix linking to older version of gimp if installed - this should + # void liquidx's hack, so it is removed. + epatch "${FILESDIR}/ltmain_sh-1.5.0-fix-relink.patch" +} + +src_compile() { + + # Since 1.3.16, fixes linker problems when upgrading + elibtoolize + + # Workaround portage variable leakage + local AA= + + # only use mmx if hardened is not set + local USE_MMX= + + # remove this for now, since I have 3 reports that this is + # not necessary + # replace-flags "-march=k6*" "-march=i586" + + # gimp uses inline functions (plug-ins/common/grid.c) (#23078) + # gimp uses floating point math, needs accuracy (#98685) + filter-flags "-fno-inline" "-ffast-math" + + # this is fixed in HEAD, but apply when using mmx + if use mmx; then + append-flags "-fomit-frame-pointer" + fi + + if use hardened; then + ewarn "hardened use flag suppressing mmx use flag" + HARDENED_SUPPRESS_MMX="--disable-mmx" + elif use x86; then + HARDENED_SUPPRESS_MMX="`use_enable mmx`" + elif use amd64; then + HARDENED_SUPPRESS_MMX="--enable-mmx" + fi + + local myconf + + # Hard enable SIMD assembler code for AMD64. + if use x86; then + myconf="${myconf} `use_enable sse`" + elif use amd64; then + myconf="${myconf} --enable-sse" + fi + + econf \ + --disable-default-binary \ + --with-x \ + "${HARDENED_SUPPRESS_MMX}" \ + ${myconf} \ + `use_enable altivec` \ + `use_enable doc gtk-doc` \ + `use_enable python` \ + `use_enable gimpprint print` \ + `use_with png libpng` \ + `use_with jpeg libjpeg` \ + `use_with jpeg libexif` \ + `use_enable smp mp` \ + `use_with tiff libtiff` \ + `use_with mng libmng` \ + `use_with aalib aa` \ + `use_with lcms` \ + `use_with gtkhtml gtkhtml2` \ + `use_with svg librsvg` \ + `use_enable debug` || die + + # X isn't optional (#58003) atm + # `use_with X x` \ + + emake || die +} + +src_install() { + # Workaround portage variable leakage + local AA= + + # create these dirs to make the makefile installs these items correctly + dodir /usr/share/{applications,application-registry,mime-info} + + make DESTDIR="${D}" install || die + + dodoc AUTHORS ChangeLog* HACKING NEWS README* + + # Create the gimp-remote link, see bug #36648 + dosym gimp-remote-2.2 /usr/bin/gimp-remote +} + +pkg_postinst() { + alternatives_auto_makesym "/usr/bin/gimp" "/usr/bin/gimp-[0-9].[0-9]" + + # fix for bug #76050 + ln -s $(gimptool-2.0 --gimpdatadir)/images/wilber-icon.png \ + ${ROOT}/usr/share/pixmaps/ + + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + einfo "" + einfo "If you want Postscript file support, emerge ghostscript." + einfo "" +} + +pkg_postrm() { + [[ ! -f ${ROOT}/usr/bin/gimp-2.2 ]] && \ + rm -f ${ROOT}/usr/share/pixmaps/wilber-icon.png + + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} diff --git a/media-gfx/gimp/gimp-2.3.16.ebuild b/media-gfx/gimp/gimp-2.3.16.ebuild new file mode 100644 index 000000000000..f0d532e8f383 --- /dev/null +++ b/media-gfx/gimp/gimp-2.3.16.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.16.ebuild,v 1.1 2007/04/28 07:33:27 hanno Exp $ + +inherit fdo-mime flag-o-matic + +DESCRIPTION="GNU Image Manipulation Program" +HOMEPAGE="http://www.gimp.org/" +SRC_URI="mirror://gimp/v2.3/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +IUSE="alsa aalib altivec curl debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf" + +RDEPEND=">=dev-libs/glib-2.12.3 + >=x11-libs/gtk+-2.8.20-r1 + >=x11-libs/pango-1.12.2 + >=media-libs/freetype-2.1.7 + >=media-libs/fontconfig-2.2.0 + >=media-libs/libart_lgpl-2.3.8-r1 + sys-libs/zlib + dev-libs/libxml2 + dev-libs/libxslt + x11-themes/hicolor-icon-theme + aalib? ( media-libs/aalib ) + alsa? ( >=media-libs/alsa-lib-1.0.0 ) + curl? ( net-misc/curl ) + doc? ( app-doc/gimp-help ) + gnome? ( >=gnome-base/gnome-vfs-2.10.0 + >=gnome-base/libgnomeui-2.10.0 + >=gnome-base/gnome-keyring-0.4.5 ) + gtkhtml? ( =gnome-extra/gtkhtml-2* ) + jpeg? ( >=media-libs/jpeg-6b-r2 + >=media-libs/libexif-0.6.0 ) + lcms? ( media-libs/lcms ) + mng? ( media-libs/libmng ) + pdf? ( >=app-text/poppler-bindings-0.3.1 ) + png? ( >=media-libs/libpng-1.2.2 ) + python? ( >=dev-lang/python-2.2.1 + >=dev-python/pygtk-2.8 ) + tiff? ( >=media-libs/tiff-3.5.7 ) + svg? ( >=gnome-base/librsvg-2.8.0 ) + wmf? ( >=media-libs/libwmf-0.2.8 )" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.12.0 + >=dev-util/intltool-0.31 + doc? ( >=dev-util/gtk-doc-1 )" + +pkg_setup() { + if use pdf && ! built_with_use app-text/poppler-bindings gtk; then + eerror + eerror "This package requires app-text/poppler-bindings compiled with GTK+ support." + eerror "Please reemerge app-text/poppler-bindings with USE=\"gtk\"." + eerror + die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"." + fi +} + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/gimp-sunras-bufferoverflow.diff +} + +src_compile() { + # workaround portage variable leakage + local AA= + + # gimp uses inline functions (e.g. plug-ins/common/grid.c) (#23078) + # gimp uses floating point math, needs accuracy (#98685) + filter-flags "-fno-inline" "-ffast-math" + + econf --enable-default-binary \ + --with-x \ + $(use_with aalib aa) \ + $(use_with alsa) \ + $(use_enable altivec) \ + $(use_with curl) \ + $(use_enable debug) \ + $(use_enable doc gtk-doc) \ + $(use_with gnome) \ + $(use_with gtkhtml gtkhtml2) \ + $(use_with jpeg libjpeg) \ + $(use_with jpeg libexif) \ + $(use_with lcms) \ + $(use_enable mmx) \ + $(use_with mng libmng) \ + $(use_with pdf poppler) \ + $(use_with png libpng) \ + $(use_enable python) \ + $(use_enable smp mp) \ + $(use_enable sse) \ + $(use_with svg librsvg) \ + $(use_with tiff libtiff) \ + $(use_with wmf) \ + || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + + dodoc AUTHORS ChangeLog* HACKING NEWS README* +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + + einfo + einfo "If you want Postscript file support, emerge ghostscript." + einfo +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index 8779ca42084d..fb420079874f 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.8 2007/04/21 04:34:25 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.9 2007/04/28 07:33:27 hanno Exp $ inherit subversion fdo-mime flag-o-matic @@ -14,36 +14,37 @@ LICENSE="GPL-2" SLOT="2" KEYWORDS="" -IUSE="alsa aalib altivec debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf" +IUSE="alsa aalib altivec curl debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf" RDEPEND=">=dev-libs/glib-2.12.3 - >=x11-libs/gtk+-2.8.20-r1 - >=x11-libs/pango-1.12.2 - >=media-libs/freetype-2.1.7 - >=media-libs/fontconfig-2.2.0 - >=media-libs/libart_lgpl-2.3.8-r1 - sys-libs/zlib - dev-libs/libxml2 - dev-libs/libxslt - x11-themes/hicolor-icon-theme - aalib? ( media-libs/aalib ) - alsa? ( >=media-libs/alsa-lib-1.0.0 ) - doc? ( app-doc/gimp-help ) - gnome? ( >=gnome-base/gnome-vfs-2.10.0 - >=gnome-base/libgnomeui-2.10.0 - >=gnome-base/gnome-keyring-0.4.5 ) - gtkhtml? ( =gnome-extra/gtkhtml-2* ) - jpeg? ( >=media-libs/jpeg-6b-r2 - >=media-libs/libexif-0.6.0 ) - lcms? ( media-libs/lcms ) - mng? ( media-libs/libmng ) - pdf? ( >=app-text/poppler-bindings-0.3.1 ) - png? ( >=media-libs/libpng-1.2.2 ) - python? ( >=dev-lang/python-2.2.1 - >=dev-python/pygtk-2.8 ) - tiff? ( >=media-libs/tiff-3.5.7 ) - svg? ( >=gnome-base/librsvg-2.8.0 ) - wmf? ( >=media-libs/libwmf-0.2.8 )" + >=x11-libs/gtk+-2.8.20-r1 + >=x11-libs/pango-1.12.2 + >=media-libs/freetype-2.1.7 + >=media-libs/fontconfig-2.2.0 + >=media-libs/libart_lgpl-2.3.8-r1 + sys-libs/zlib + dev-libs/libxml2 + dev-libs/libxslt + x11-themes/hicolor-icon-theme + aalib? ( media-libs/aalib ) + alsa? ( >=media-libs/alsa-lib-1.0.0 ) + curl? ( net-misc/curl ) + doc? ( app-doc/gimp-help ) + gnome? ( >=gnome-base/gnome-vfs-2.10.0 + >=gnome-base/libgnomeui-2.10.0 + >=gnome-base/gnome-keyring-0.4.5 ) + gtkhtml? ( =gnome-extra/gtkhtml-2* ) + jpeg? ( >=media-libs/jpeg-6b-r2 + >=media-libs/libexif-0.6.0 ) + lcms? ( media-libs/lcms ) + mng? ( media-libs/libmng ) + pdf? ( >=app-text/poppler-bindings-0.3.1 ) + png? ( >=media-libs/libpng-1.2.2 ) + python? ( >=dev-lang/python-2.2.1 + >=dev-python/pygtk-2.8 ) + tiff? ( >=media-libs/tiff-3.5.7 ) + svg? ( >=gnome-base/librsvg-2.8.0 ) + wmf? ( >=media-libs/libwmf-0.2.8 )" DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0 >=dev-util/intltool-0.31 @@ -75,8 +76,10 @@ src_compile() { $(use_with aalib aa) \ $(use_with alsa) \ $(use_enable altivec) \ + $(use_with curl) \ $(use_enable debug) \ $(use_enable doc gtk-doc) \ + $(use_with gnome) \ $(use_with gtkhtml gtkhtml2) \ $(use_with jpeg libjpeg) \ $(use_with jpeg libexif) \ @@ -90,6 +93,7 @@ src_compile() { $(use_enable sse) \ $(use_with svg librsvg) \ $(use_with tiff libtiff) \ + $(use_with wmf) \ || die "econf failed" emake || die "emake failed" -- 2.26.2