Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-04-21 22:30:59 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pentoo/pentoo-overlay

Browse source
This commit is contained in:
blshkv 2016-04-07 07:11:29 +08:00
commit 1c27d875a6
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pentoo/pentoo-desktop/pentoo-desktop-2016.0.ebuild → pentoo/pentoo-desktop/pentoo-desktop-2016.1.ebuild
View file

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -9,7 +9,7 @@ DESCRIPTION="Pentoo meta ebuild to install all X and WM/DE related things"
HOMEPAGE="http://www.pentoo.ch"
SLOT="0"
LICENSE="GPL-3"
IUSE="X +cdr enlightenment kde livecd-stage1 mate pentoo pulseaudio samba +xfce"
IUSE="X +cdr enlightenment hardened kde livecd-stage1 mate pentoo pulseaudio samba +xfce"
S="${WORKDIR}"
@ -41,7 +41,8 @@ PDEPEND="X? (
pulseaudio? ( media-sound/pavucontrol )
!kde? ( net-misc/rdesktop )
|| ( kde? ( kde-apps/krdc ) net-misc/tigervnc net-misc/tightvnc )
!arm? ( || ( www-client/chromium www-client/google-chrome www-client/google-chrome-beta ) )
amd64? ( || ( www-client/chromium www-client/google-chrome www-client/google-chrome-beta www-client/google-chrome-unstable ) )
x86? ( !hardened? ( || ( www-client/chromium www-client/google-chrome www-client/google-chrome-beta www-client/google-chrome-unstable ) ) )
|| ( www-client/firefox www-client/firefox-bin )
www-plugins/hackplugins-meta
)"

2
pentoo/zero-system/zero-system-9999.ebuild
View file

@ -46,7 +46,7 @@ PDEPEND="
!arm? ( www-client/firefox-bin )
net-ftp/filezilla
!arm? ( www-plugins/chrome-binary-plugins:stable )
!arm? ( www-client/chromium )
amd64? ( www-client/chromium )
!arm? ( www-client/google-chrome )
app-office/libreoffice
!arm? ( app-emulation/virtualbox[extensions] )

1
profiles/pentoo/arch/x86/package.accept_keywords
View file

@ -4,3 +4,4 @@ dev-ruby/tzinfo amd64
~dev-ruby/typhoeus-1.0.1 **
~dev-ruby/backports-3.6.7 **
~dev-ruby/concurrent-ruby-1.0.1 **
~dev-ruby/msgpack-0.7.5 **