Permalink
Browse files

FL-593: do not automatically merge package.use.stable.mask

  • Loading branch information...
1 parent 04f6b37 commit ca7bc5631a8ab4607e7a2106aa854f2719c4ddb8 @angryvincent angryvincent committed Jun 21, 2013
View
1 funtoo/scripts/merge.py
@@ -35,7 +35,6 @@
"profiles/arch/x86/use.mask":"profiles/funtoo/1.0/linux-gnu/arch/x86-32bit/use.mask/01-gentoo",
"profiles/default/linux/package.use.mask":"profiles/funtoo/1.0/linux-gnu/package.use.mask/01-gentoo",
"profiles/default/linux/use.mask":"profiles/funtoo/1.0/linux-gnu/use.mask/01-gentoo",
- "profiles/eapi-5-files/package.use.stable.mask":"profiles/funtoo/1.0/linux-gnu/build/stable/package.use.stable.mask/01-gentoo",
"profiles/arch/amd64/no-multilib/package.use.mask":"profiles/funtoo/1.0/linux-gnu/arch/x86-64bit/pure64/package.use.mask/01-gentoo",
"profiles/arch/amd64/no-multilib/package.mask":"profiles/funtoo/1.0/linux-gnu/arch/x86-64bit/pure64/package.mask/01-gentoo",
"profiles/arch/amd64/no-multilib/use.mask":"profiles/funtoo/1.0/linux-gnu/arch/x86-64bit/pure64/use.mask/01-gentoo"
View
30 profiles/funtoo/1.0/linux-gnu/build/stable/package.use.stable.mask/01-gentoo
@@ -0,0 +1,30 @@
+# Agostino Sarubbo <ago@gentoo.org> (24 May 2013)
+# Justin Lecher <jlec@gentoo.org> (30 May 2313)
+# Temporary mask because it needs texinfo-5
+# hvm needs qemu #471122
+>=app-emulation/xen-tools-4.2.1-r3 qemu hvm
+
+# Chris Reffett <creffett@gentoo.org> (23 Nov 2012)
+# CMake's PHP module can't find our install location, so
+# libkolab(xml) fails with the php flag enabled, bug #430858.
+net-libs/libkolab php
+net-libs/libkolabxml php
+
+# Samuli Suominen <ssuominen@gentoo.org> (12 Apr 2013)
+# Waiting for >=app-cdr/brasero-3 stabilization
+app-pda/gtkpod cdr
+# Pawel Hajdan jr <phajdan.jr@gentoo.org> (11 Apr 2013)
+# Usually requires recent ffmpeg/libav, not ready for stable.
+www-client/chromium system-ffmpeg
+
+# Pacho Ramos <pacho@gentoo.org> (01 Apr 2013)
+# Needed to stabilize anjuta-3.6
+=dev-util/devhelp-3.6.1-r1 gedit
+
+# Andreas K. Huettel <dilfridge@gentoo.org> (28 Mar 2013)
+# No stable sci-chemistry/avogadro yet but we want kde-4.10 to go stable
+>=kde-base/kalzium-4.10.0 editor
+
+# Sergey Popov <pinkbyte@gentoo.org> (08 Jun 2013)
+# Mask unstable dependencies in leechcraft metapackage
+app-leechcraft/leechcraft-meta unstable

0 comments on commit ca7bc56

Please sign in to comment.