diff options
| author |   Dan Armak <danarmak@gentoo.org> | 2005-01-15 00:05:06 +0000 |
|---|---|---|
| committer | Dan Armak <danarmak@gentoo.org> | 2005-01-15 00:05:06 +0000 |
| commit | aafc1308dfdd1bfb49839322a33e2b3de4811337 (patch) | |
| tree | 103ddf6ca07de31c9b11871f14991265d8d5f6f5 /media-video | |
| parent | made dep on a monolithic kde-base package accept the equivalent -meta package... (diff) | |
| download | historical-aafc1308dfdd1bfb49839322a33e2b3de4811337.tar.gz historical-aafc1308dfdd1bfb49839322a33e2b3de4811337.tar.bz2 historical-aafc1308dfdd1bfb49839322a33e2b3de4811337.zip | |
made dep on a monolithic kde-base package accept the equivalent -meta package from the split ebuilds as an alternative
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/kdenlive/ChangeLog | 10 | ||||
| -rw-r--r-- | media-video/kdenlive/kdenlive-0.2.4.ebuild | 6 | ||||
| -rw-r--r-- | media-video/klvemkdvd/ChangeLog | 10 | ||||
| -rw-r--r-- | media-video/klvemkdvd/klvemkdvd-0.4.ebuild | 6 |
4 files changed, 22 insertions, 10 deletions
diff --git a/media-video/kdenlive/ChangeLog b/media-video/kdenlive/ChangeLog index 79d92c5dcf84..9fd545471982 100644 --- a/media-video/kdenlive/ChangeLog +++ b/media-video/kdenlive/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/kdenlive -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.7 2004/10/26 22:02:35 malc Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.8 2005/01/15 00:04:17 danarmak Exp $ + + 15 Jan 2005; Dan Armak <danarmak@gentoo.org> kdenlive-0.2.4.ebuild: + Changed dep on a kde-base monolithic package to accept the equivalent split + or -meta package. KDE 3.4 has 'split' packages as well as monolithic, and + either alternative may provide the same files. This dep may have to be + narrowed down in the future to the precise split packages required. 26 Oct 2004; Malcolm Lashley <malc@gentoo.org> kdenlive-0.2.4.ebuild: ~amd64 - closes bug #59344 diff --git a/media-video/kdenlive/kdenlive-0.2.4.ebuild b/media-video/kdenlive/kdenlive-0.2.4.ebuild index a59469e0088d..5be6718053a3 100644 --- a/media-video/kdenlive/kdenlive-0.2.4.ebuild +++ b/media-video/kdenlive/kdenlive-0.2.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.2.4.ebuild,v 1.9 2004/11/01 11:25:40 zypher Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.2.4.ebuild,v 1.10 2005/01/15 00:04:17 danarmak Exp $ inherit eutils gcc kde @@ -14,7 +14,7 @@ KEYWORDS="x86 ~ppc ~sparc ~amd64" IUSE="" DEPEND=">=media-video/piave-0.2.4 - >=kde-base/kdesdk-3.2" + || ( kde-base/kdesdk-meta >=kde-base/kdesdk-3.2 )" need-kde 3 src_unpack() { diff --git a/media-video/klvemkdvd/ChangeLog b/media-video/klvemkdvd/ChangeLog index 17d9dfcb7cde..bfe17fabac45 100644 --- a/media-video/klvemkdvd/ChangeLog +++ b/media-video/klvemkdvd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/klvemkdvd -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/klvemkdvd/ChangeLog,v 1.6 2004/08/25 02:43:53 swegener Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/klvemkdvd/ChangeLog,v 1.7 2005/01/15 00:05:06 danarmak Exp $ + + 15 Jan 2005; Dan Armak <danarmak@gentoo.org> klvemkdvd-0.4.ebuild: + Changed dep on a kde-base monolithic package to accept the equivalent split + or -meta package. KDE 3.4 has 'split' packages as well as monolithic, and + either alternative may provide the same files. This dep may have to be + narrowed down in the future to the precise split packages required. 25 Aug 2004; Sven Wegener <swegener@gentoo.org> klvemkdvd-0.4.ebuild: Changed SRC_URI to use mirror:// syntax. diff --git a/media-video/klvemkdvd/klvemkdvd-0.4.ebuild b/media-video/klvemkdvd/klvemkdvd-0.4.ebuild index 4c27375ba3c0..10b7a1de7aae 100644 --- a/media-video/klvemkdvd/klvemkdvd-0.4.ebuild +++ b/media-video/klvemkdvd/klvemkdvd-0.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/klvemkdvd/klvemkdvd-0.4.ebuild,v 1.7 2004/09/05 18:07:23 malc Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/klvemkdvd/klvemkdvd-0.4.ebuild,v 1.8 2005/01/15 00:05:06 danarmak Exp $ inherit kde eutils @@ -15,7 +15,7 @@ IUSE="" DEPEND=">=media-video/lve-040322 >=x11-libs/qt-3.3.0-r1 - >=kde-base/kdebase-3.2.1 + || ( kde-base/kdebase-meta >=kde-base/kdebase-3.2.1 ) >=media-video/dvdauthor-0.5.0 >=app-cdr/dvd+rw-tools-5.13.4.7.4 >=media-video/mplayer-0.92-r1" |