summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-03-06 18:28:58 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-03-06 18:28:58 +0000
commitd66ede5bddaa3d09079c8f812f6beae793dd9769 (patch)
tree3011d01312ac0c1872355b25bb8ae3c2bb4e1188
parentAdd ~x86-fbsd keyword (diff)
downloadgentoo-2-d66ede5bddaa3d09079c8f812f6beae793dd9769.tar.gz
gentoo-2-d66ede5bddaa3d09079c8f812f6beae793dd9769.tar.bz2
gentoo-2-d66ede5bddaa3d09079c8f812f6beae793dd9769.zip
Avoid user-installed NVIDIA TEXTOOLS install (bug #261474)
(Portage version: 2.1.6.7/cvs/Linux i686)
-rw-r--r--media-libs/devil/ChangeLog5
-rw-r--r--media-libs/devil/devil-1.7.7.ebuild11
2 files changed, 14 insertions, 2 deletions
diff --git a/media-libs/devil/ChangeLog b/media-libs/devil/ChangeLog
index 14f6255e2f6b..34ef722e9d07 100644
--- a/media-libs/devil/ChangeLog
+++ b/media-libs/devil/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/devil
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.36 2009/02/25 16:24:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.37 2009/03/06 18:28:58 mr_bones_ Exp $
+
+ 06 Mar 2009; Michael Sterrett <mr_bones_@gentoo.org> devil-1.7.7.ebuild:
+ Avoid user-installed NVIDIA TEXTOOLS install (bug #261474)
25 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
-files/devil-1.6.7-png-types.patch, -files/devil-1.6.7-sdl-checks.patch,
diff --git a/media-libs/devil/devil-1.7.7.ebuild b/media-libs/devil/devil-1.7.7.ebuild
index a48225d5dc54..74162ffd6b17 100644
--- a/media-libs/devil/devil-1.7.7.ebuild
+++ b/media-libs/devil/devil-1.7.7.ebuild
@@ -1,8 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.7.7.ebuild,v 1.5 2009/02/25 16:15:59 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.7.7.ebuild,v 1.6 2009/03/06 18:28:58 mr_bones_ Exp $
EAPI=2
+inherit autotools
+
DESCRIPTION="DevIL image library"
HOMEPAGE="http://openil.sourceforge.net/"
SRC_URI="mirror://sourceforge/openil/${P}.tar.gz"
@@ -27,6 +29,13 @@ RDEPEND="gif? ( media-libs/giflib )
DEPEND="${RDEPEND}
X? ( x11-proto/xextproto )"
+src_prepare() {
+ sed -i \
+ -e '/DEVIL_CHECK_NVIDIA_TEXTOOLS/d' \
+ configure.ac \
+ || die "sed failed"
+ eautoreconf
+}
src_configure() {
econf \
--disable-dependency-tracking \