summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2008-04-10 23:28:57 +0000
committerBen de Groot <yngwin@gentoo.org>2008-04-10 23:28:57 +0000
commit884701d2a7311ea92ab5460153a8159620763c74 (patch)
treebcec8cfcb68f9f7047347d89e9668354a7d89db6 /media-video/avidemux
parentbump to 2.6.2. Bug fixes. Close bug #216874. (diff)
downloadhistorical-884701d2a7311ea92ab5460153a8159620763c74.tar.gz
historical-884701d2a7311ea92ab5460153a8159620763c74.tar.bz2
historical-884701d2a7311ea92ab5460153a8159620763c74.zip
media-video/avidemux: Adjust dependency for split qt-4.
Package-Manager: portage-2.1.5_rc2
Diffstat (limited to 'media-video/avidemux')
-rw-r--r--media-video/avidemux/ChangeLog6
-rw-r--r--media-video/avidemux/Manifest6
-rw-r--r--media-video/avidemux/avidemux-2.4.1.ebuild7
-rw-r--r--media-video/avidemux/avidemux-2.4.ebuild7
4 files changed, 18 insertions, 8 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 8b4b15f2a0bb..98b1651ae696 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/avidemux
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.126 2008/04/10 12:14:50 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.127 2008/04/10 23:28:57 yngwin Exp $
+
+ 10 Apr 2008; Ben de Groot <yngwin@gentoo.org> avidemux-2.4.ebuild,
+ avidemux-2.4.1.ebuild:
+ Adjust dependency for split qt-4.
10 Apr 2008; Ben de Groot <yngwin@gentoo.org>
+files/avidemux-2.4.1-gcc43-includes.patch,
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index f20ea40d4967..871e382eb7b1 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -4,7 +4,7 @@ AUX avidemux-2.4.1-gcc43-includes.patch 4125 RMD160 72eb0497889dd1f463ec22dfbe96
AUX avidemux-2.4.1-gcc43-missing-asm-naming.patch 6136 RMD160 d3b38507ac9bee6e854a0002e6f9d92fb80c153d SHA1 00ee010a0d1373a7887d67f6026de55735cfa46e SHA256 c4fe7551a48e7502c1e3e4f16e93a036a67612301ba26186de899e44a9fcca0b
DIST avidemux_2.4.1.tar.gz 5788014 RMD160 8149eb62cb4f3196d98b8c2707a4252f06e198cf SHA1 6bbf542bab73d91cb73f198d2d8afe10d83b2821 SHA256 f3c7ada9da6cd65ce840127dfa7062a7004af0a44a2e3a474ff153b0e7d50b51
DIST avidemux_2.4.tar.gz 5728629 RMD160 2e02e2acc6f87cd8ecf781e3c4a37f03d9365640 SHA1 4a055580d65adbefcd52a159da9059f376a56cc6 SHA256 7ec094464637a8e4ba81021bcae15f04edbd3239d210fe6f9d2ef795c7febf11
-EBUILD avidemux-2.4.1.ebuild 3815 RMD160 c2bf3c57b5fd62cbf0d798d63cc50706c39ce989 SHA1 b37a8ca39809d50982205f48e649b8c7a946d270 SHA256 7af31924f765978a8fa10d39290dc9c525528aabd288a7db123c38435851a171
-EBUILD avidemux-2.4.ebuild 3538 RMD160 7cd2c028e13f8acc66e7c00068e7182f6c364cfb SHA1 b940eb003b700421e58214c2a2c0e6fdcb16d65e SHA256 c9fe079270212408577ae025a031a8842ffc697f636ab0738b77e1f2156f5f01
-MISC ChangeLog 22614 RMD160 4dcaf8377dad6916d17e7adc3e62715fc48aa715 SHA1 fef6be9b715058942fb9f1d0fb345a5c40096e60 SHA256 9719d44d4a71833440311804e8193f5b855876d19aaa4369c51ef422386ad4c9
+EBUILD avidemux-2.4.1.ebuild 3853 RMD160 7445a69592ac4e5ffdba1e510d7736a1dfb79d3d SHA1 7ebdf1c1fc1a6a5a59c876e9af7e9c37b5249243 SHA256 4f3958874000d7368110ae19339e37572636ab8c45afaefb92e1e82257e65abe
+EBUILD avidemux-2.4.ebuild 3576 RMD160 d2a6844e147a567788551a6a7e76a864070cf76a SHA1 82dfd9a609874ace4e10a068a24ee28fb05ce7a0 SHA256 9bd8dff744bf4e1aa49ae97d18e08a42efd58ce5044153fcf5648695991fc31a
+MISC ChangeLog 22745 RMD160 2c938d8c415de276ade8fc490e6b9e569f25961a SHA1 9caea50b98ede0839751246afb0159233d29c18a SHA256 6b33843be5c85f08e011eb0462f052a8e75f2066f2e9c8b9126f8e9c607f88b9
MISC metadata.xml 251 RMD160 dd6e0dda3634c267e55d59fcb94e9a1d4e7fb109 SHA1 26fa0c9c65f848f2bd7793491cadf4cf28ac074c SHA256 44556c130873ffc95cf9229359070f837ad83e8dd5492eda7894bec5c41f80b7
diff --git a/media-video/avidemux/avidemux-2.4.1.ebuild b/media-video/avidemux/avidemux-2.4.1.ebuild
index 90d5d98c70e4..bb5f26466dca 100644
--- a/media-video/avidemux/avidemux-2.4.1.ebuild
+++ b/media-video/avidemux/avidemux-2.4.1.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.1.ebuild,v 1.4 2008/04/10 12:14:50 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.1.ebuild,v 1.5 2008/04/10 23:28:57 yngwin Exp $
+
+EAPI="1"
inherit cmake-utils eutils flag-o-matic
@@ -41,7 +43,8 @@ RDEPEND="dev-libs/libxml2
xvid? ( media-libs/xvid )
gtk? ( >=x11-libs/gtk+-2
x11-libs/libX11 )
- qt4? ( >=x11-libs/qt-4.3
+ qt4? ( || ( =x11-libs/qt-4.3*
+ x11-libs/qt-gui:4 )
x11-libs/libX11 )"
DEPEND="${RDEPEND}
sys-devel/gettext
diff --git a/media-video/avidemux/avidemux-2.4.ebuild b/media-video/avidemux/avidemux-2.4.ebuild
index 6bca92b06b85..5a52be0523bf 100644
--- a/media-video/avidemux/avidemux-2.4.ebuild
+++ b/media-video/avidemux/avidemux-2.4.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.ebuild,v 1.4 2008/04/07 22:04:13 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.ebuild,v 1.5 2008/04/10 23:28:57 yngwin Exp $
+
+EAPI="1"
inherit cmake-utils eutils
@@ -37,7 +39,8 @@ RDEPEND="dev-libs/libxml2
media-libs/fontconfig )
gtk? ( >=x11-libs/gtk+-2
x11-libs/libX11 )
- qt4? ( >=x11-libs/qt-4.3
+ qt4? ( || ( =x11-libs/qt-4.3*
+ x11-libs/qt-gui:4 )
x11-libs/libX11 )
encode? (
aac? ( media-libs/faac )