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 | d6b4b661aa4e70de49b69500459a30415f16f558 (patch) | |
| tree | ffbd2d2a318bebc3b4559975db84db4db70a226b /media-sound | |
| parent | Remove some broken old versions, and stabilize .26 on x86. Add metadata. (diff) | |
| download | gentoo-2-d6b4b661aa4e70de49b69500459a30415f16f558.tar.gz gentoo-2-d6b4b661aa4e70de49b69500459a30415f16f558.tar.bz2 gentoo-2-d6b4b661aa4e70de49b69500459a30415f16f558.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-sound')
| -rw-r--r-- | media-sound/yammi/ChangeLog | 11 | ||||
| -rw-r--r-- | media-sound/yammi/yammi-0.8.2.ebuild | 6 | ||||
| -rw-r--r-- | media-sound/yammi/yammi-1.0-r1.ebuild | 6 | ||||
| -rw-r--r-- | media-sound/yammi/yammi-1.0.ebuild | 6 |
4 files changed, 18 insertions, 11 deletions
diff --git a/media-sound/yammi/ChangeLog b/media-sound/yammi/ChangeLog index 4f59b88e59a2..2db6285f3861 100644 --- a/media-sound/yammi/ChangeLog +++ b/media-sound/yammi/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/yammi -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.19 2004/09/03 21:08:30 eradicator Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.20 2005/01/15 00:01:22 danarmak Exp $ + + 15 Jan 2005; Dan Armak <danarmak@gentoo.org> yammi-0.8.2.ebuild, + yammi-1.0-r1.ebuild, yammi-1.0.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. 03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> yammi-1.0-r1.ebuild: Stable amd64, sparc, x86. diff --git a/media-sound/yammi/yammi-0.8.2.ebuild b/media-sound/yammi/yammi-0.8.2.ebuild index 1de3de83ea4b..4ba327859983 100644 --- a/media-sound/yammi/yammi-0.8.2.ebuild +++ b/media-sound/yammi/yammi-0.8.2.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-sound/yammi/yammi-0.8.2.ebuild,v 1.15 2004/06/25 00:30:33 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-0.8.2.ebuild,v 1.16 2005/01/15 00:01:22 danarmak Exp $ inherit flag-o-matic eutils @@ -23,7 +23,7 @@ DEPEND=">=x11-libs/qt-3.1.0-r1 cdr? ( >=app-cdr/cdlabelgen-2.4.0 >=app-cdr/mp3burn-0.1 ) xmms? ( >=media-sound/xmms-1.2.7-r18 ) oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 ) - kde? ( >=kde-base/kdebase-3.0.4 )" + kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.4 ) )" src_unpack() { unpack ${P}fixed.tar.gz diff --git a/media-sound/yammi/yammi-1.0-r1.ebuild b/media-sound/yammi/yammi-1.0-r1.ebuild index 51e9ea908a91..94e5b811c3c9 100644 --- a/media-sound/yammi/yammi-1.0-r1.ebuild +++ b/media-sound/yammi/yammi-1.0-r1.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-sound/yammi/yammi-1.0-r1.ebuild,v 1.3 2004/09/03 21:08:30 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0-r1.ebuild,v 1.4 2005/01/15 00:01:22 danarmak Exp $ inherit flag-o-matic eutils @@ -22,7 +22,7 @@ DEPEND=">=x11-libs/qt-3.1.0-r1 cdr? ( >=app-cdr/cdlabelgen-2.4.0 >=app-cdr/mp3burn-0.1 ) xmms? ( >=media-sound/xmms-1.2.7-r18 ) oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 ) - kde? ( >=kde-base/kdebase-3.0.4 )" + kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.4 ) )" src_unpack() { unpack ${A} diff --git a/media-sound/yammi/yammi-1.0.ebuild b/media-sound/yammi/yammi-1.0.ebuild index a8e9a7f08728..eb3643786ab9 100644 --- a/media-sound/yammi/yammi-1.0.ebuild +++ b/media-sound/yammi/yammi-1.0.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-sound/yammi/yammi-1.0.ebuild,v 1.9 2004/07/07 11:19:07 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0.ebuild,v 1.10 2005/01/15 00:01:22 danarmak Exp $ inherit flag-o-matic eutils @@ -22,7 +22,7 @@ DEPEND=">=x11-libs/qt-3.1.0-r1 cdr? ( >=app-cdr/cdlabelgen-2.4.0 >=app-cdr/mp3burn-0.1 ) xmms? ( >=media-sound/xmms-1.2.7-r18 ) oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 ) - kde? ( >=kde-base/kdebase-3.0.4 )" + kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.4 ) )" src_unpack() { unpack ${A} |