diff options
| -rw-r--r-- | media-gfx/gimp/ChangeLog | 10 | ||||
| -rw-r--r-- | media-gfx/gimp/Manifest | 29 | ||||
| -rw-r--r-- | media-gfx/gimp/files/digest-gimp-2.2.7 | 2 | ||||
| -rw-r--r-- | media-gfx/gimp/files/gimp-2.2.7-configure-fix.patch | 82 | ||||
| -rw-r--r-- | media-gfx/gimp/gimp-2.2.7.ebuild | 183 |
5 files changed, 292 insertions, 14 deletions
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog index e88f67749a27..a5d541f8c715 100644 --- a/media-gfx/gimp/ChangeLog +++ b/media-gfx/gimp/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-gfx/gimp # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.113 2005/05/21 08:10:16 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.114 2005/05/24 01:06:16 allanonjl Exp $ + +*gimp-2.2.7 (24 May 2005) + + 24 May 2005; John N. Laliberte <allanonjl@gentoo.org> + +files/gimp-2.2.7-configure-fix.patch, +gimp-2.2.7.ebuild: + fixes bug #51263, bug #61581, bug #92176, bug #41885, bug #76050, bug + #76974, bug #92008, bug #93018, bug #92498, updated help, use alternatives + eclass, and various other changes. 21 May 2005; Markus Rothe <corsair@gentoo.org> gimp-2.2.6-r1.ebuild: Stable on ppc64 diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 67ca15567b0d..196c443520e2 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -1,15 +1,23 @@ -MD5 6df39428e011934cc74ff5e5f6c6d59e ChangeLog 16355 -MD5 77ea6e18335093980ca0521510f64183 gimp-1.2.5.ebuild 3202 MD5 b3fb5e1d6f43034d0b9182f097b2df11 gimp-2.0.0.ebuild 2654 +MD5 6e30693ee2b8125d5dfadf3a72625397 gimp-2.2.6.ebuild 3660 MD5 0c8f35412e83518ba717b652b05e4c85 gimp-2.0.2.ebuild 2569 +MD5 405d2674bac45813485d5abed39d6eb3 gimp-2.2.3.ebuild 3740 +MD5 77ea6e18335093980ca0521510f64183 gimp-1.2.5.ebuild 3202 MD5 f4ee70356bf8aa8f588d0d41e194c584 gimp-2.0.4.ebuild 3203 -MD5 7878202fbf35cdba9a2907b735cbf90c gimp-2.0.5.ebuild 3216 -MD5 23321eb2aa740463c9181ddcacb2c9bd gimp-2.0.6.ebuild 3247 MD5 542c10ced4b60c3b5f6d181da2c008d4 gimp-2.2.0.ebuild 3512 -MD5 405d2674bac45813485d5abed39d6eb3 gimp-2.2.3.ebuild 3740 -MD5 6e30693ee2b8125d5dfadf3a72625397 gimp-2.2.6.ebuild 3660 -MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 23321eb2aa740463c9181ddcacb2c9bd gimp-2.0.6.ebuild 3247 +MD5 47d0860f7bec42009f72a1c9b3bd780d gimp-2.2.7.ebuild 4359 MD5 555c54d2b6919e76f10110879f24e490 gimp-2.2.6-r1.ebuild 4225 +MD5 deb392f40e143a02f638034f55ecd4c8 ChangeLog 16686 +MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 7878202fbf35cdba9a2907b735cbf90c gimp-2.0.5.ebuild 3216 +MD5 be326cb198ec1f1f6c21a5a5a1460415 files/gimp-2.0.0-gcc34.patch 1148 +MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151 +MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718 +MD5 ff17b80bceb6bd818e20556c23647b0f files/gimp-2.2.7-configure-fix.patch 2423 +MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404 +MD5 8bf83fb83ce1c66006a27a7d9ec29dd7 files/pygimp-logo.png 19823 +MD5 5bd6fc067eba3828be1e3a49b4aa1c44 files/digest-gimp-2.2.6-r1 134 MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65 MD5 568ba885fc51613466e3b0039e21946c files/digest-gimp-2.0.0 65 MD5 1f2afa6b0785b0547e956d5aff63cf4d files/digest-gimp-2.0.2 65 @@ -19,9 +27,4 @@ MD5 bbe7cd6ece5455900adcaeed9b467679 files/digest-gimp-2.0.6 134 MD5 204a8065e28141810fbda423e4118b9e files/digest-gimp-2.2.0 134 MD5 675541af3f64fc4acdd1bd3e759b607d files/digest-gimp-2.2.3 134 MD5 5bd6fc067eba3828be1e3a49b4aa1c44 files/digest-gimp-2.2.6 134 -MD5 be326cb198ec1f1f6c21a5a5a1460415 files/gimp-2.0.0-gcc34.patch 1148 -MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404 -MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718 -MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151 -MD5 8bf83fb83ce1c66006a27a7d9ec29dd7 files/pygimp-logo.png 19823 -MD5 5bd6fc067eba3828be1e3a49b4aa1c44 files/digest-gimp-2.2.6-r1 134 +MD5 2162d2ea38409b9e373a4086797a4c49 files/digest-gimp-2.2.7 134 diff --git a/media-gfx/gimp/files/digest-gimp-2.2.7 b/media-gfx/gimp/files/digest-gimp-2.2.7 new file mode 100644 index 000000000000..cb5b67314b31 --- /dev/null +++ b/media-gfx/gimp/files/digest-gimp-2.2.7 @@ -0,0 +1,2 @@ +MD5 fb2871717998e5958a84f4c26d143d95 gimp-2.2.7.tar.bz2 13975346 +MD5 2058eb88fe7a9d230bf3284546445c65 gimp-help-2-0.8.tar.gz 19038567 diff --git a/media-gfx/gimp/files/gimp-2.2.7-configure-fix.patch b/media-gfx/gimp/files/gimp-2.2.7-configure-fix.patch new file mode 100644 index 000000000000..f68df2bf1d1b --- /dev/null +++ b/media-gfx/gimp/files/gimp-2.2.7-configure-fix.patch @@ -0,0 +1,82 @@ +--- gimp-2.2.7/configure.in 2005-04-11 05:42:07.000000000 -0400 ++++ gimp-2.2.7.new/configure.in 2005-05-23 19:50:07.000000000 -0400 +@@ -1095,11 +1095,20 @@ + # Check for gtkhtml2 + #################### + ++AC_ARG_ENABLE(gtkhtml, ++ AC_HELP_STRING([--enable-gtkhtml], ++ [build with gtkhtml (by default disabled)]),, ++ [enable_gtkhtml=no]) ++if test "x$enable_gtkhtml" = xno; then ++ have_gtkhtml2=no ++else + PKG_CHECK_MODULES(GTKHTML2, libgtkhtml-2.0 >= gtkhtml2_required_version, + have_gtkhtml2=yes, + AC_MSG_WARN([*** Help browser plug-in will not be built (GtkHtml2 not found) ***])) + AC_SUBST(GTKHTML2_CFLAGS) + AC_SUBST(GTKHTML2_LIBS) ++fi ++ + AM_CONDITIONAL(BUILD_HELPBROWSER, test x$have_gtkhtml2 = xyes) + + +@@ -1107,10 +1116,17 @@ + # Check for librsvg + ################### + ++AC_ARG_ENABLE(svg, ++ AC_HELP_STRING([--enable-svg], ++ [build with librsvg library (by default disabled)]),, ++ [enable_svg=no]) ++ ++if test "x$enable_svg" != xno; then + PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version, + SVG='svg$(EXEEXT)' + LIBSVG=$SVG_LIBS, + AC_MSG_WARN([*** SVG import plug-in will not be built (librsvg not found) ***])) ++fi + AC_SUBST(SVG) + AC_SUBST(SVG_CFLAGS) + AC_SUBST(LIBSVG) +@@ -1183,23 +1199,26 @@ + # Check for lcms + ################ + ++AC_ARG_ENABLE(lcms, [ --disable-lcms build without color proof support (requires lcms)]) ++ + have_lcms=no +-AC_CHECK_LIB(lcms, cmsCreate_sRGBProfile, [ +- AC_CHECK_HEADER(lcms.h, +- have_lcms=yes, [ +- AC_CHECK_HEADER(lcms/lcms.h, +- have_lcms=yes +- AC_DEFINE(HAVE_LCMS_LCMS_H, 1, +- [Define to 1 if the lcms header must be included as lcms/lcms.h])) +- ]) +-]) ++if test "x$enable_lcms" != "xno"; then ++ AC_CHECK_LIB(lcms, cmsCreate_sRGBProfile, [ ++ AC_CHECK_HEADER(lcms.h, ++ have_lcms=yes, [ ++ AC_CHECK_HEADER(lcms/lcms.h, ++ have_lcms=yes ++ AC_DEFINE(HAVE_LCMS_LCMS_H, 1, ++ [Define to 1 if the lcms header must be included as lcms/lcms.h])) ++ ]) ++ ]) + +-if test $have_lcms = yes; then +- LCMS_LIBS="-llcms" +-else +- AC_MSG_WARN([*** color proof module will not be built (lcms not found or unuseable) ***]) ++ if test $have_lcms = yes; then ++ LCMS_LIBS="-llcms" ++ else ++ AC_MSG_WARN([*** color proof module will not be built (lcms not found or unuseable) ***]) ++ fi + fi +- + AC_SUBST(LCMS_LIBS) + AM_CONDITIONAL(HAVE_LCMS, test $have_lcms = yes) + diff --git a/media-gfx/gimp/gimp-2.2.7.ebuild b/media-gfx/gimp/gimp-2.2.7.ebuild new file mode 100644 index 000000000000..5c68e06c41ff --- /dev/null +++ b/media-gfx/gimp/gimp-2.2.7.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.7.ebuild,v 1.1 2005/05/24 01:06:16 allanonjl Exp $ + +inherit flag-o-matic libtool eutils fdo-mime alternatives + +DESCRIPTION="GNU Image Manipulation Program" +HOMEPAGE="http://www.gimp.org/" +LICENSE="GPL-2" + +P_HELP="gimp-help-2-0.8" +S_HELP="$WORKDIR/${P_HELP}" +SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2 + doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )" + +SLOT="2" +KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64 ~ppc64" +IUSE="aalib altivec debug doc gtkhtml gimpprint hardened jpeg lcms mmx mng png +python scanner smp sse svg tiff wmf" + +# X? ( virtual/x11 )" +RDEPEND="virtual/x11 + >=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/libgtkhtml-2* ) + + png? ( >=media-libs/libpng-1.2.1 ) + 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 ) + + scanner? ( media-gfx/xsane + media-gfx/sane-backends + media-gfx/sane-frontends + )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.12.0 + dev-util/intltool + doc? ( >=dev-util/gtk-doc-1 )" + +src_unpack() { + + unpack ${A} + + cd ${S} + + # 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 + epatch ${FILESDIR}/${P}-configure-fix.patch + + # fix for configure patch + aclocal + libtoolize --force --copy + autoconf +} + +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= + + replace-flags "-march=k6*" "-march=i586" + + # gimp uses inline functions (plug-ins/common/grid.c) (#23078) + filter-flags "-fno-inline" + + 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 + use doc || myconf="${myconf} --disable-devel-docs" + + # 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_enable lcms` \ + `use_enable gtkhtml` \ + `use_enable debug` || die + + # X isn't optional (#58003) atm + # `use_with X x` \ + + emake || die + + if use doc; then + cd ${S_HELP} + econf --without-gimp || die + emake || die + fi +} + +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* + + if use doc; then + cd ${S_HELP} + make DESTDIR=${D} install || die + fi + + # Create the gimp-remote link, see bug #36648 + dosym gimp-remote-2.2 /usr/bin/gimp-remote + + # if use scanner, create the symlink see bug #93018 + dosym /usr/bin/xscanimage /usr/lib/gimp/2.0/plug-ins/ +} + +pkg_postinst() { + alternatives_auto_makesym "/usr/bin/gimp" "/usr/bin/gimp-[0-9].[0-9]" + 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 +} |