Permalink
Browse files

Merge branch 'master' of git.funtoo.org:funtoo-overlay

  • Loading branch information...
2 parents e903b73 + ebaa35e commit 807690b4a3038324ab3889f51956048b06c91b4f @danielrobbins danielrobbins committed Apr 28, 2013
Showing with 2 additions and 0 deletions.
  1. +2 −0 funtoo/scripts/merge.py
View
2 funtoo/scripts/merge.py
@@ -14,6 +14,7 @@
flora_overlay = Tree("flora", "master", "repos@git.funtoo.org:flora.git", pull=True)
progress_overlay = SvnTree("progress", "https://gentoo-progress.googlecode.com/svn/overlays/progress")
sabayon_for_gentoo = Tree("for-gentoo", "master", "git://git.sabayon.org/projects/overlays/for-gentoo.git", pull=True)
+mate_overlay = Tree("mate", "master", "git://github.com/Sabayon/mate-overlay.git", pull=True)
steps = [
SyncTree(gentoo_src,exclude=["/metadata/cache/**","ChangeLog", "dev-util/metro"]),
@@ -41,6 +42,7 @@
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=False),
InsertEbuilds(flora_overlay, select="all", skip=["sys-fs/spl", "sys-fs/zfs"], replace=False),
+ InsertEbuilds(mate_overlay, select="all", skip=None, replace=False),
InsertEbuilds(sabayon_for_gentoo, select=["app-admin/equo", "app-admin/matter", "sys-apps/entropy", "sys-apps/entropy-server", "sys-apps/entropy-client-services","app-admin/rigo", "sys-apps/rigo-daemon", "sys-apps/magneto-core", "x11-misc/magneto-gtk", "x11-misc/magneto-gtk3", "kde-misc/magneto-kde", "app-misc/magneto-loader"], replace=True),
SyncDir(progress_overlay.root, "eclass"),
SyncDir(progress_overlay.root, "profiles/unpack_dependencies"),

0 comments on commit 807690b

Please sign in to comment.