diff options
author | Joerg Bornkessel <hd_brummy@gentoo.org> | 2009-06-15 09:48:28 +0000 |
---|---|---|
committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2009-06-15 09:48:28 +0000 |
commit | 7a65c8fdf5248fe28a4fb569397df80e2e07569d (patch) | |
tree | 2319eec3cf3ac6bc6cede3d7ce046c08ff398c44 /profiles | |
parent | media-plugins/vdr-reelosdpip: moved from vdr-osdpip to vdr-reelosdpip, due co... (diff) | |
download | testing-7a65c8fdf5248fe28a4fb569397df80e2e07569d.tar.gz testing-7a65c8fdf5248fe28a4fb569397df80e2e07569d.tar.bz2 testing-7a65c8fdf5248fe28a4fb569397df80e2e07569d.zip |
media-plugins/vdr-osdpip-0.1.12384 masked because conflict with package in main portage, use vdr-reelosdpip
svn path=/testing/; revision=588
Diffstat (limited to 'profiles')
-rw-r--r-- | profiles/ChangeLog | 4 | ||||
-rw-r--r-- | profiles/package.mask | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index c579ea2..f6f8664 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -2,3 +2,7 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 15 Jun 2009; Joerg Bornkessel <hd_brummy@gentoo.org> package.mask: + media-plugins/vdr-osdpip-0.1.12384 masked because conflict with package in + main portage, use vdr-reelosdpip + diff --git a/profiles/package.mask b/profiles/package.mask index fac1b88..145ca7a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -21,6 +21,11 @@ ## End example ## +# Joerg Bornkessel <hd_brummy@gentoo.org ( 15 Jun 2009 ) +# masked due conflikt with package in main tree +# use vdr-reelosdpip +=media-plugins/vdr-osdpip-0.1.12384 + # Joerg Bornkessel <hd_brummy@gentoo.org ( 06 Jan 2008 ) # Need some tests more =media-plugins/vdr-touchtft-0.0.4 |