Permalink
Browse files

FL-252: Stop merging out-of-date media-video/handbrake

  • Loading branch information...
1 parent 9b96bd0 commit 13e5de5151e3e58e30f4729dc27873006ceeace9 @jeanfrancisroy jeanfrancisroy committed Nov 30, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 funtoo/scripts/merge.py
View
@@ -33,7 +33,7 @@
"profiles/default/linux/package.use.mask":"profiles/funtoo/1.0/linux-gnu/package.use.mask/01-gentoo"
}),
InsertEbuilds(funtoo_overlay, select="all", skip=None, replace=True),
- InsertEbuilds(foo_overlay, select="all", skip=["sys-fs/mdev-bb"], replace=["app-shells/rssh","net-misc/unison"]),
+ InsertEbuilds(foo_overlay, select="all", skip=["sys-fs/mdev-bb", "media-video/handbrake"], replace=["app-shells/rssh","net-misc/unison"]),
InsertEbuilds(bar_overlay, select="all", skip=["app-emulation/qemu"], replace=True),
InsertEbuilds(flora_overlay, select="all", skip=None, replace=False),
InsertEbuilds(mythtv_overlay, select='all', skip=["media-tv/miro", "media-tv/mythtv-bindings"], replace=True, merge=["dev-libs/libcec", "media-tv/mythtv", "www-apps/mythweb"], ebuildloc="Gentoo"),

0 comments on commit 13e5de5

Please sign in to comment.