diff options
| author |   Markus Meier <maekke@gentoo.org> | 2008-10-25 12:10:00 +0000 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2008-10-25 12:10:00 +0000 |
| commit | 14f489bc2a2ef24b8f8152a4318034ce597074c0 (patch) | |
| tree | 31d9c1f1dbfc7dfeef6d6e1dff4b84542e87917c /media-gfx/nip2 | |
| parent | bump to blender-2.48a (bugfix release); fix files/blender-2.37-dirs.patch rep... (diff) | |
| download | gentoo-2-14f489bc2a2ef24b8f8152a4318034ce597074c0.tar.gz gentoo-2-14f489bc2a2ef24b8f8152a4318034ce597074c0.tar.bz2 gentoo-2-14f489bc2a2ef24b8f8152a4318034ce597074c0.zip | |
fix file collision for bug #243000
(Portage version: 2.2_rc12/cvs/Linux 2.6.27.3 i686)
Diffstat (limited to 'media-gfx/nip2')
| -rw-r--r-- | media-gfx/nip2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/nip2/files/nip2-7.14.4-configure.patch | 24 | ||||
| -rw-r--r-- | media-gfx/nip2/nip2-7.14.4.ebuild | 17 |
3 files changed, 41 insertions, 6 deletions
diff --git a/media-gfx/nip2/ChangeLog b/media-gfx/nip2/ChangeLog index 1cb5de8c0c9f..076eb6a883a1 100644 --- a/media-gfx/nip2/ChangeLog +++ b/media-gfx/nip2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/nip2 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/nip2/ChangeLog,v 1.10 2008/08/23 10:20:40 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/nip2/ChangeLog,v 1.11 2008/10/25 12:10:00 maekke Exp $ + + 25 Oct 2008; Markus Meier <maekke@gentoo.org> + +files/nip2-7.14.4-configure.patch, nip2-7.14.4.ebuild: + fix file collision for bug #243000 23 Aug 2008; Markus Meier <maekke@gentoo.org> -nip2-7.14.3.ebuild: old diff --git a/media-gfx/nip2/files/nip2-7.14.4-configure.patch b/media-gfx/nip2/files/nip2-7.14.4-configure.patch new file mode 100644 index 000000000000..08498508b2ef --- /dev/null +++ b/media-gfx/nip2/files/nip2-7.14.4-configure.patch @@ -0,0 +1,24 @@ +diff -u nip2-7.14.4.orig/configure.in nip2-7.14.4/configure.in +--- nip2-7.14.4.orig/configure.in 2008-10-25 12:02:23.000000000 +0200 ++++ nip2-7.14.4/configure.in 2008-10-25 12:06:25.000000000 +0200 +@@ -222,13 +222,17 @@ + fi + + # optional ... use these to update desktop after install ++AC_ARG_ENABLE([mime-update], AS_HELP_STRING([--disable-mime-update], [ disable mime update (default: test)])) ++ + AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) + AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no) + + update=no +-if test "x$UPDATE_MIME_DATABASE" != "xno"; then +- if test "x$UPDATE_DESKTOP_DATABASE" != "xno"; then +- update=yes ++if test "x$enable_mime_update" != "xno"; then ++ if test "x$UPDATE_MIME_DATABASE" != "xno"; then ++ if test "x$UPDATE_DESKTOP_DATABASE" != "xno"; then ++ update=yes ++ fi + fi + fi + diff --git a/media-gfx/nip2/nip2-7.14.4.ebuild b/media-gfx/nip2/nip2-7.14.4.ebuild index e7860366b4f9..7c0e389923e0 100644 --- a/media-gfx/nip2/nip2-7.14.4.ebuild +++ b/media-gfx/nip2/nip2-7.14.4.ebuild @@ -1,8 +1,8 @@ # Copyright 2003-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/nip2/nip2-7.14.4.ebuild,v 1.1 2008/06/28 08:46:37 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/nip2/nip2-7.14.4.ebuild,v 1.2 2008/10/25 12:10:00 maekke Exp $ -inherit fdo-mime +inherit fdo-mime autotools DESCRIPTION="VIPS Image Processing Graphical User Interface" SRC_URI="http://www.vips.ecs.soton.ac.uk/supported/7.14/${P}.tar.gz" @@ -26,10 +26,17 @@ DEPEND="${RDEPEND} sys-devel/flex sys-devel/bison" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-configure.patch + eautoreconf +} + src_compile() { - local myconf - use fftw || myconf="--without-fftw" - econf ${myconf} || die "econf failed" + econf \ + --disable-mime-update \ + $(use_with fftw fftw3) || die emake || die "emake failed" } |