diff options
| author |   Marc Hildebrand <zypher@gentoo.org> | 2004-06-28 06:18:27 +0000 |
|---|---|---|
| committer | Marc Hildebrand <zypher@gentoo.org> | 2004-06-28 06:18:27 +0000 |
| commit | 19cb71df7f8b6150bf1dd8f09b16b57514701dfe (patch) | |
| tree | a6fcda0bc8466049e82ea59138ece3d31cac008d /profiles | |
| parent | removing ebuild from repository (diff) | |
| download | gentoo-2-19cb71df7f8b6150bf1dd8f09b16b57514701dfe.tar.gz gentoo-2-19cb71df7f8b6150bf1dd8f09b16b57514701dfe.tar.bz2 gentoo-2-19cb71df7f8b6150bf1dd8f09b16b57514701dfe.zip | |
removed gfs-ebuilds from repository hence from package.mask, too
----------------------------------------------------------------------
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/package.mask | 11 | ||||
| -rw-r--r-- | profiles/use.local.desc | 6 |
2 files changed, 6 insertions, 11 deletions
diff --git a/profiles/package.mask b/profiles/package.mask index 801d6e6b2a74..7529feb2a395 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ ##################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.2968 2004/06/28 04:17:24 agriffis Exp $# +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.2969 2004/06/28 06:18:27 zypher Exp $# #When you add an entry to this file, add your name, the date, and an #explanation of why something is getting masked # @@ -22,15 +22,6 @@ ## End example ## -# <zypher@gentoo.org> (27 June 2004) -# Probably buggy/broken. Needs brave testing -sys-cluster/ccs -sys-cluster/cman -sys-cluster/dlm -sys-cluster/fence -sys-cluster/gfs -sys-cluster/iddev - # <mr_bones_@gentoo.org> (25 June 2004) # No worky for me. Needs some love from Spanky. games-arcade/mtp-target-bin diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 64047041afc0..2bb9896719d1 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.452 2004/06/27 18:31:27 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.453 2004/06/28 06:18:27 zypher Exp $ # This file contains descriptions of local USE flags, and the ebuilds which # contain them. @@ -272,8 +272,12 @@ media-video/mplayer:live - Enables live.com streaming media support media-video/mplayer:matroska - Use external libmatroska, rather then bundled version media-video/mplayer:v4l - Enables video4linux support media-video/mplayer:v4l2 - Enables video4linux2 support +<<<<<<< use.local.desc +media-video/tcvp:ffmpeg - Enable ffmpeg support +======= media-video/tcvp:faad - Enables faad2 support media-video/tcvp:ffmpeg - Enable ffmpeg support +>>>>>>> 1.439 media-video/vlc:faad - Enables faad2 support media-video/vlc:matroska - Enables support for the matroska video format media-video/vlc:v4l - Enables video4linux support |