From 7608f1c7180a64b00e15ce7e3785d3ba330cdb33 Mon Sep 17 00:00:00 2001 From: Alastair Tse Date: Tue, 27 May 2003 14:48:30 +0000 Subject: version bump and various fixes --- media-gfx/gimp/ChangeLog | 9 +- media-gfx/gimp/Manifest | 9 +- media-gfx/gimp/files/digest-gimp-1.2.4 | 1 + media-gfx/gimp/files/gimp-1.2.4-gentoo.diff | 25 ++++ media-gfx/gimp/gimp-1.2.4.ebuild | 170 ++++++++++++++++++++++++++++ 5 files changed, 210 insertions(+), 4 deletions(-) create mode 100644 media-gfx/gimp/files/digest-gimp-1.2.4 create mode 100644 media-gfx/gimp/files/gimp-1.2.4-gentoo.diff create mode 100644 media-gfx/gimp/gimp-1.2.4.ebuild (limited to 'media-gfx/gimp') diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog index a248bc1ed29f..7d338c76466c 100644 --- a/media-gfx/gimp/ChangeLog +++ b/media-gfx/gimp/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/gimp # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.32 2003/04/19 17:48:50 malverian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.33 2003/05/27 14:48:21 liquidx Exp $ + +*gimp-1.2.4 (26 May 2003) + + 26 May 2003; Alastair Tse gimp-1.2.4.ebuild, + files/gimp-1.2.4-gentoo.diff: + bumping stable series to 1.2.4. removing custom psd_save and various + ebuild cleanups by foser. also fixed perl man page installation paths. *gimp-1.3.14 (16 Apr 2003) diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 6573ef49c8d8..ec39cb9ca914 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -1,14 +1,15 @@ -MD5 86a64b70b13a9ab784e3e4f6a633aec4 ChangeLog 5025 +MD5 855d7d70f5b845d808e46258219e5d9f ChangeLog 5295 MD5 0baa40e08fefbcca963d21359b210477 gimp-1.2.3-r2.ebuild 4202 MD5 3ffcb6910a8be02857177f4179725ca8 gimp-1.2.3-r3.ebuild 4717 +MD5 c5f902b48e3365bcab097f761b827a35 gimp-1.2.4.ebuild 4743 MD5 f965b674f1ab5e80d1c83313aee3900b gimp-1.3.11.ebuild 2151 -MD5 33b3899f6b5b6a4a8e7e43be18ffed46 gimp-1.3.12.ebuild 2280 MD5 04eb1d0c00755166e94520f1373b452a gimp-1.3.13.ebuild 2355 +MD5 33b3899f6b5b6a4a8e7e43be18ffed46 gimp-1.3.12.ebuild 2280 MD5 333c7a300975f264fb660cc0b65025fe gimp-1.3.14.ebuild 2492 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r2 65 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65 -MD5 e0e988ca6036cf071d0336b57f284b07 files/digest-gimp-1.3.11 65 MD5 3653d9f21a8d987555662106456ffa5d files/digest-gimp-1.3.12 66 +MD5 e0e988ca6036cf071d0336b57f284b07 files/digest-gimp-1.3.11 65 MD5 13e882e38fccf991bbea8677bedca67e files/digest-gimp-1.3.13 66 MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427 @@ -16,3 +17,5 @@ MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427 MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404 MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151 MD5 89fee7931deb88ed771f5ec2ec28aea4 files/digest-gimp-1.3.14 66 +MD5 86551dc2402aaed28ccf3612e8fe7b7a files/digest-gimp-1.2.4 65 +MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-gentoo.diff 427 diff --git a/media-gfx/gimp/files/digest-gimp-1.2.4 b/media-gfx/gimp/files/digest-gimp-1.2.4 new file mode 100644 index 000000000000..7a77c13b4ef4 --- /dev/null +++ b/media-gfx/gimp/files/digest-gimp-1.2.4 @@ -0,0 +1 @@ +MD5 63ac650507eaa2748eb28e9ff4801c32 gimp-1.2.4.tar.bz2 10875154 diff --git a/media-gfx/gimp/files/gimp-1.2.4-gentoo.diff b/media-gfx/gimp/files/gimp-1.2.4-gentoo.diff new file mode 100644 index 000000000000..2021e975f7ba --- /dev/null +++ b/media-gfx/gimp/files/gimp-1.2.4-gentoo.diff @@ -0,0 +1,25 @@ +--- Makefile.am~ Mon Dec 18 16:14:07 2000 ++++ Makefile.am Fri Jun 22 16:58:34 2001 +@@ -105,6 +105,7 @@ + polar \ + ps \ + psd \ ++ psd_save \ + $(PSP) \ + randomize \ + ripple \ +@@ -944,6 +945,14 @@ + psd.c + + psd_LDADD = \ ++ $(top_builddir)/libgimp/libgimp.la \ ++ $(GLIB_LIBS) \ ++ $(INTLLIBS) ++ ++psd_save_SOURCES = \ ++ psd_save.c ++ ++psd_save_LDADD = \ + $(top_builddir)/libgimp/libgimp.la \ + $(GLIB_LIBS) \ + $(INTLLIBS) diff --git a/media-gfx/gimp/gimp-1.2.4.ebuild b/media-gfx/gimp/gimp-1.2.4.ebuild new file mode 100644 index 000000000000..7f78327cd461 --- /dev/null +++ b/media-gfx/gimp/gimp-1.2.4.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.4.ebuild,v 1.1 2003/05/27 14:48:21 liquidx Exp $ + +inherit eutils flag-o-matic + +IUSE="python nls gnome aalib perl doc jpeg png tiff" + +S=${WORKDIR}/${P} +DESCRIPTION="The GIMP" +SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.2/v${PV}/${P}.tar.bz2" +HOMEPAGE="http://www.gimp.org/" + +SLOT="1.2" +KEYWORDS="~x86 ~ppc ~sparc ~alpha" +LICENSE="GPL-2" + +RDEPEND="=x11-libs/gtk+-1.2* + aalib? ( >=media-libs/aalib-1.2 ) + perl? ( >=dev-perl/PDL-2.2.1 + >=dev-perl/Parse-RecDescent-1.80 + >=dev-perl/gtk-perl-0.7004 ) + python? ( >=dev-lang/python-2.0 ) + gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 ) + tiff? ( media-libs/tiff ) + jpeg ( media-libs/jpeg ) + png? ( media-libs/libpng )" + +DEPEND="nls? ( sys-devel/gettext ) + doc? ( dev-util/gtk-doc ) + sys-devel/autoconf + sys-devel/automake + >=media-libs/mpeg-lib-1.3.1 + ${RDEPEND}" + +src_unpack() { +# if [ "`use threads`" ]; then +# eerror "I'm sorry I can't build against a threaded perl," +# eerror "please remerge perl and libperl without" +# eerror "'USE=threads' and try again. (Note: this message" +# eerror "is triggered by having threads in USE so you must" +# eerror "leave threads out of your USE var when merging" +# eerror "gimp." +# die "Not compatible with threaded perl" +# fi + unpack ${A} + +# cd ${S}/plug-ins/common + # compile with nonstandard psd_save plugin +# cp ${FILESDIR}/psd_save.c . +# epatch ${FILESDIR}/${PF}-gentoo.diff +# cd ${S} + +# if [ -f ${ROOT}/usr/share/gettext/config.rpath ] ; then +# cp -f ${ROOT}/usr/share/gettext/config.rpath ${S} +# else +# touch ${S}/config.rpath +# chmod 0755 ${S}/config.rpath +# fi + +# echo ">>> Reconfiguring package..." +# export WANT_AUTOMAKE_1_4=1 +# export WANT_AUTOCONF_2_1=1 +# aclocal -I . -I ${S}/plug-ins/perl +# automake --add-missing --gnu +# Do not run autoreconf, or even autoconf, as it (autoreconf at least) +# needs cvs installed, and breaks configure (locales are not installed). +# Our psd_save patch anyhow only touch .am files, so only automake is +# needed .... This should fix bug #8490, #6021 and #9621. +# +# (2 Nov 2002) +# +# autoreconf --install --symlink &> ${T}/autoreconf.log || ( \ +# echo "DEBUG: working directory is: `pwd`" >>${T}/autoreconf.log +# eerror "Reonfigure failed, please attatch the contents of:" +# eerror +# eerror " ${T}/autoreconf.log" +# eerror +# eerror "in your bugreport." +# # we need an error here, else the ebuild do not die +# exit 1 +# ) || die "running autoreconf failed" + + touch ${S}/plug-ins/common/${P}.tar.bz2 +} + +src_compile() { + + # Strip out -fomit-frame-pointer for k6's + is-flag "-march=k6*" && strip-flags "-fomit-frame-pointer" + + local mymake="" + + use aalib || mymake="LIBAA= AA=" + use gnome || mymake="${mymake} HELPBROWSER=" + use perl && export PERL_MM_OPT=' PREFIX=${D}/usr' + + econf \ + --with-mp \ + --with-threads \ + --disable-debug \ + --disable-print \ + `use_enable perl` \ + `use_enable python` \ + `use_enable nls` \ + `use_with jpeg libjpeg` \ + `use_with png libpng` \ + `use_with tiff libtiff` \ + `use_enable doc gtk-doc` \ + ${myconf} || die + + if [ -z "`use aalib`" ] ; then + # Horrible automake brokenness + cp plug-ins/common/Makefile plug-ins/common/Makefile.orig + cat plug-ins/common/Makefile.orig | \ + sed 's/CML_explorer$(EXEEXT) aa/CML_explorer$(EXEEXT)/' \ + > plug-ins/common/Makefile + fi + + MAKEOPTS="${MAKEOPTS} -j1" + emake ${mymake} || die +} + +src_install() { + + local mymake="" + if [ -z "`use aalib`" ] ; then + mymake="LIBAA= AA=" + fi + + if [ -z "`use gnome`" ] ; then + mymake="${mymake} HELPBROWSER=" + fi + + dodir /usr/lib/gimp/1.2/plug-ins + + einstall \ + gimpdatadir=${D}/usr/share/gimp/1.2 \ + gimpsysconfdir=${D}/etc/gimp/1.2 \ + PREFIX=${D}/usr \ + INSTALLPRIVLIB=${D}/usr/lib/perl5 \ + INSTALLSCRIPT=${D}/usr/bin \ + INSTALLSITELIB=${D}/usr/lib/perl5/site_perl \ + INSTALLBIN=${D}/usr/bin \ + INSTALLMAN1DIR=${D}/usr/share/man/man1 \ + INSTALLMAN3DIR=${D}/usr/share/man/man3 \ + INSTALLSITEMAN1DIR=${D}/usr/share/man/man1 \ + INSTALLSITEMAN3DIR=${D}/usr/share/man/man3pm \ + INSTALLVENDORMAN1DIR=${D}/usr/share/man/man1 \ + INSTALLVENDORMAN3DIR=${D}/usr/share/man/man3pm \ + ${mymake} || die "Installation failed" + + dosym gimp-1.2 /usr/bin/gimp + #this next line closes bug #810 + dosym gimptool-1.2 /usr/bin/gimptool + + if [ "`use gnome`" ] && [ -d ${ROOT}/usr/share/applications ] + then + insinto /usr/share/applications + doins ${FILESDIR}/gimp.desktop + fi + + preplib /usr + + dodoc AUTHORS COPYING ChangeLog* *MAINTAINERS README* TODO + dodoc docs/*.txt docs/*.ps docs/Wilber* docs/quick_reference.tar.gz +# dohtml -r devel-docs +# docinto devel +# dodoc devel-docs/*.txt +} -- cgit v1.2.3-65-gdbad