diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-07-13 16:31:43 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-07-13 16:31:43 +0000 |
| commit | 17e47cf2699edc3ca4170dec5032c7da63fdd737 (patch) | |
| tree | 8e51dd869c0ff84be614dd49a8245f303061902e /media-gfx/gimp | |
| parent | added KEYWORDS for QA happiness (diff) | |
| download | historical-17e47cf2699edc3ca4170dec5032c7da63fdd737.tar.gz historical-17e47cf2699edc3ca4170dec5032c7da63fdd737.tar.bz2 historical-17e47cf2699edc3ca4170dec5032c7da63fdd737.zip | |
autoconf fixes
Diffstat (limited to 'media-gfx/gimp')
| -rw-r--r-- | media-gfx/gimp/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/gimp/gimp-1.2.3-r2.ebuild | 46 |
2 files changed, 36 insertions, 15 deletions
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog index b0abc6646936..5c8b516b0518 100644 --- a/media-gfx/gimp/ChangeLog +++ b/media-gfx/gimp/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for media-gfx/gimp # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.7 2002/06/02 18:14:43 spider Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.8 2002/07/13 16:31:43 azarah Exp $ + 14 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gimp-1.2.3-r2: + Some automake warning cleanups. Dont really fix anything except + getting rid of the warnings, so no revision bump. *gimp-1.3.7-r1 (02 Jun 2002) 02 Jun 2002; Spider <spider@gentoo.org> gimp-1.3.7-r1.ebuild: diff --git a/media-gfx/gimp/gimp-1.2.3-r2.ebuild b/media-gfx/gimp/gimp-1.2.3-r2.ebuild index e6492f852e8b..49300bfce6a3 100644 --- a/media-gfx/gimp/gimp-1.2.3-r2.ebuild +++ b/media-gfx/gimp/gimp-1.2.3-r2.ebuild @@ -1,12 +1,14 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r2.ebuild,v 1.4 2002/07/11 06:30:27 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r2.ebuild,v 1.5 2002/07/13 16:31:43 azarah Exp $ 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" + DEPEND="nls? ( sys-devel/gettext ) sys-devel/autoconf sys-devel/automake @@ -25,22 +27,43 @@ RDEPEND="=x11-libs/gtk+-1.2* src_unpack() { unpack ${A} + cd ${S}/plug-ins/common # compile with nonstandard psd_save plugin cp ${FILESDIR}/psd_save.c . - patch -p0 < ${FILESDIR}/${PF}-gentoo.diff + patch -p0 < ${FILESDIR}/${PF}-gentoo.diff || die cd ${S} - automake - autoconf + + 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_5=1 + automake --add-missing + 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 plug-ins/common/gimp-1.2.3.tar.bz2 } src_compile() { - local myconf - local mymake - local myvars + local myconf="" + local mymake="" + local myvars="" if [ -z "`use nls`" ] ; then - myconf="--disable-nls" + myconf="${myconf} --disable-nls" fi if [ -z "`use perl`" ] ; then @@ -81,14 +104,13 @@ src_compile() { > plug-ins/common/Makefile fi - # Doesn't work with -j 4 (hallski) make ${mymake} || die } src_install() { - local mymake + local mymake="" if [ -z "`use aalib`" ] ; then mymake="LIBAA= AA=" fi @@ -126,7 +148,3 @@ src_install() { dodoc devel-docs/*.txt } - - - - |