From 15799920521f354430f3033ffc9a421353c5e9c1 Mon Sep 17 00:00:00 2001 From: Gregorio Guidi Date: Tue, 29 Nov 2005 11:10:48 +0000 Subject: [PATCH] Change oggvorbis flag into vorbis (#94254). Package-Manager: portage-2.0.51.22-r3 --- kde-base/arts/ChangeLog | 6 +++++- kde-base/arts/arts-1.3.2-r1.ebuild | 8 ++++---- kde-base/arts/arts-1.3.2.ebuild | 8 ++++---- kde-base/kdemultimedia/ChangeLog | 6 +++++- kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild | 8 ++++---- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog index 73cedaa85242..bf7919dd2781 100644 --- a/kde-base/arts/ChangeLog +++ b/kde-base/arts/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/arts # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.193 2005/11/27 14:43:14 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.194 2005/11/29 11:08:06 greg_g Exp $ + + 29 Nov 2005; Gregorio Guidi arts-1.3.2.ebuild, + arts-1.3.2-r1.ebuild: + Change oggvorbis flag into vorbis (#94254). 27 Nov 2005; Guy Martin arts-3.4.3.ebuild: Stable on hppa. diff --git a/kde-base/arts/arts-1.3.2-r1.ebuild b/kde-base/arts/arts-1.3.2-r1.ebuild index 0ce77e8b4281..2b4595775350 100644 --- a/kde-base/arts/arts-1.3.2-r1.ebuild +++ b/kde-base/arts/arts-1.3.2-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/kde-base/arts/arts-1.3.2-r1.ebuild,v 1.10 2005/10/13 13:29:17 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.3.2-r1.ebuild,v 1.11 2005/11/29 11:08:06 greg_g Exp $ inherit kde flag-o-matic eutils set-kdedir 3.3 @@ -12,10 +12,10 @@ SRC_URI="mirror://kde/stable/${PV/1.3.2/3.3.2}/src/${PN}-${PV}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="3.3" KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="alsa oggvorbis esd artswrappersuid jack mad hardened" +IUSE="alsa esd artswrappersuid jack mad hardened vorbis" DEPEND="alsa? ( media-libs/alsa-lib virtual/alsa ) - oggvorbis? ( media-libs/libvorbis media-libs/libogg ) + vorbis? ( media-libs/libvorbis media-libs/libogg ) esd? ( media-sound/esound ) jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad media-libs/libid3tag ) @@ -47,7 +47,7 @@ src_compile() { #fix bug 41980 use sparc && filter-flags -fomit-frame-pointer - myconf="$myconf $(use_enable alsa) $(use_enable oggvorbis vorbis) $(use_enable mad libmad) $(use_enable jack)" + myconf="$myconf $(use_enable alsa) $(use_enable vorbis) $(use_enable mad libmad) $(use_enable jack)" kde_src_compile } diff --git a/kde-base/arts/arts-1.3.2.ebuild b/kde-base/arts/arts-1.3.2.ebuild index 51b2e2b7d9f0..6ac923b888b0 100644 --- a/kde-base/arts/arts-1.3.2.ebuild +++ b/kde-base/arts/arts-1.3.2.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/kde-base/arts/arts-1.3.2.ebuild,v 1.16 2005/10/13 13:29:17 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.3.2.ebuild,v 1.17 2005/11/29 11:08:06 greg_g Exp $ inherit kde flag-o-matic eutils set-kdedir 3.3 @@ -12,10 +12,10 @@ SRC_URI="mirror://kde/stable/${PV/1.3.2/3.3.2}/src/${PN}-${PV}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="3.3" KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" -IUSE="alsa oggvorbis esd artswrappersuid jack mad hardened" +IUSE="alsa esd artswrappersuid jack mad hardened vorbis" DEPEND="alsa? ( media-libs/alsa-lib virtual/alsa ) - oggvorbis? ( media-libs/libvorbis media-libs/libogg ) + vorbis? ( media-libs/libvorbis media-libs/libogg ) esd? ( media-sound/esound ) jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad media-libs/libid3tag ) @@ -48,7 +48,7 @@ src_compile() { #fix bug 41980 use sparc && filter-flags -fomit-frame-pointer - myconf="$myconf $(use_enable alsa) $(use_enable oggvorbis vorbis) $(use_enable mad libmad) $(use_enable jack)" + myconf="$myconf $(use_enable alsa) $(use_enable vorbis) $(use_enable mad libmad) $(use_enable jack)" kde_src_compile } diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog index 338db2c16f7c..c9d1cc1fbc71 100644 --- a/kde-base/kdemultimedia/ChangeLog +++ b/kde-base/kdemultimedia/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdemultimedia # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.184 2005/11/27 18:46:39 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.185 2005/11/29 11:10:48 greg_g Exp $ + + 29 Nov 2005; Gregorio Guidi + kdemultimedia-3.3.2.ebuild: + Change oggvorbis flag into vorbis (#94254). 27 Nov 2005; Guy Martin kdemultimedia-3.4.3.ebuild: Stable on hppa. diff --git a/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild index 53741876a0ea..cef62c7404e6 100644 --- a/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild +++ b/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild @@ -1,20 +1,20 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild,v 1.15 2005/07/02 00:28:21 hardave Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild,v 1.16 2005/11/29 11:10:48 greg_g Exp $ inherit kde-dist flag-o-matic eutils DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..." KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86" -IUSE="alsa audiofile cdparanoia encode flac oggvorbis speex xine" +IUSE="alsa audiofile cdparanoia encode flac speex vorbis xine" DEPEND="~kde-base/kdebase-${PV} audiofile? ( media-libs/audiofile ) cdparanoia? ( media-sound/cdparanoia ) flac? ( media-libs/flac ) encode? ( media-sound/lame ) - oggvorbis? ( media-sound/vorbis-tools ) + vorbis? ( media-sound/vorbis-tools ) xine? ( >=media-libs/xine-lib-1_beta12 ) alsa? ( media-libs/alsa-lib ) speex? ( media-libs/speex !=media-libs/speex-1.1.4 ) @@ -46,7 +46,7 @@ src_compile() { # alsa 0.9 not supported use alsa && myconf="$myconf --with-alsa --with-arts-alsa" || myconf="$myconf --without-alsa --disable-alsa" - use oggvorbis && myconf="$myconf --with-vorbis=/usr" || myconf="$myconf --without-vorbis" + use vorbis && myconf="$myconf --with-vorbis=/usr" || myconf="$myconf --without-vorbis" use encode && myconf="$myconf --with-lame=/usr" || myconf="$myconf --without-lame" myconf="$myconf --disable-strict --disable-warnings" -- 2.26.2