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 | fc7979daa0fdf184f4a4c8a7555d86c577fbfce7 (patch) | |
| tree | e5ae24f6daef588cb4095fef284174dbaefecd70 | |
| parent | minor fix (diff) | |
| download | historical-fc7979daa0fdf184f4a4c8a7555d86c577fbfce7.tar.gz historical-fc7979daa0fdf184f4a4c8a7555d86c577fbfce7.tar.bz2 historical-fc7979daa0fdf184f4a4c8a7555d86c577fbfce7.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.
Package-Manager: portage-2.0.51.20
| -rw-r--r-- | media-video/avifile/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/avifile/Manifest | 4 | ||||
| -rw-r--r-- | media-video/avifile/avifile-0.7.43.20050224-r1.ebuild | 8 |
3 files changed, 15 insertions, 4 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/Manifest b/media-video/avifile/Manifest index e9ff1798c22c..c615cecbd185 100644 --- a/media-video/avifile/Manifest +++ b/media-video/avifile/Manifest @@ -1,9 +1,9 @@ -MD5 6328dc3a3c5bbad208df9b4b53dc714c ChangeLog 19172 MD5 ead70f1fd6fc60afbc07ad1ea49576a7 avifile-0.7.38.20030710-r1.ebuild 4005 MD5 87aed7721dcd888c80b219218c704004 avifile-0.7.41.20041001-r1.ebuild 4620 MD5 85bae951b6afcb791e94c005ea0ca85e avifile-0.7.41.20041001-r2.ebuild 4601 -MD5 fb76bae6ad464b3e624abc054850ff3f avifile-0.7.43.20050224-r1.ebuild 4554 MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272 +MD5 7428c2f0b2b1ae1369b4bdb80908abca avifile-0.7.43.20050224-r1.ebuild 4672 +MD5 64fca7f41dcf80f9b4b33e89e73db34d ChangeLog 19391 MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943 MD5 7a55e6cb72df715c9b822505d5b4b8b0 files/avifile-0.7.38.20030710-2.6.patch 2038 MD5 624ac61f6a4fb9ed9700a7496f2827cb files/avifile-0.7.38.20030710-amd64.patch 466 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} |