diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-04-25 00:15:35 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-04-25 00:15:35 +0000 |
| commit | beb6125fe378f433ca34aa58a2620055106ffd44 (patch) | |
| tree | 013f1e960da48b692f4f8da93e5181e6b83b141b /media-video/avifile | |
| parent | minor fix (diff) | |
| download | gentoo-2-beb6125fe378f433ca34aa58a2620055106ffd44.tar.gz gentoo-2-beb6125fe378f433ca34aa58a2620055106ffd44.tar.bz2 gentoo-2-beb6125fe378f433ca34aa58a2620055106ffd44.zip | |
Added check so that qt and dmalloc can't be enabled at the same time as they make avifile not compile at all. Fixes bug #80874.
(Portage version: 2.0.51.20)
Diffstat (limited to 'media-video/avifile')
| -rw-r--r-- | media-video/avifile/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/avifile/avifile-0.7.43.20050224-r1.ebuild | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog index c0f6fc5a2962..a48d1eda7ced 100644 --- a/media-video/avifile/ChangeLog +++ b/media-video/avifile/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/avifile # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.100 2005/04/22 01:34:42 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.101 2005/04/25 00:15:35 flameeyes Exp $ + + 25 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> + avifile-0.7.43.20050224-r1.ebuild: + Added check so that qt and dmalloc can't be enabled at the same time as they + make avifile not compile at all. Fixes #80874. 22 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> +files/avifile-0.7.43.20050224-fixlabels.patch, diff --git a/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild b/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild index 4d4e86abf4e3..fa2cfdfeaf20 100644 --- a/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild +++ b/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild,v 1.3 2005/04/22 01:34:42 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild,v 1.4 2005/04/25 00:15:35 flameeyes Exp $ inherit eutils flag-o-matic @@ -47,6 +47,12 @@ DEPEND="${RDEPEND} # v4l needs linux headers # v4l? ( virtual/os-headers ) +pkg_setup() { + if use qt && use dmalloc; then + die "Sorry, qt and dmalloc can't be enabled at the same time." + fi +} + src_unpack() { unpack ${A} |