mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-05-08 20:43:38 +02:00
reverting changeset 3772 and 3774. the logic was reversed improperly and the cleanup was too invasive
let's not break the livecd 2 weeks before I'm trying to push out a beta.
This commit is contained in:
Zero_Chaos
parent
6548297ac8
commit
b958429134
3 changed files with 71 additions and 61 deletions
|
|
@ -25,5 +25,5 @@ AUX pentoo-release-2012.1-rc2 34 SHA256 31e6bd2df90dca4c5483de8ce197bbf39a658179
|
|||
AUX pentoo.xpm.gz 59047 SHA256 4adb6d0d305b599e35bed9a835b6aa3531cce71c0b05e293adb3197cac4c09e0 SHA512 a6a2f152861e63c33afdda9997b9be25bd735f0624c946d61d0088210264743f842f103026eeb7cf63ef94b873131b072b61c55fba1922e9830318bcacd7a074 WHIRLPOOL a3b937b810f02f1fa6ebcdc58cada7a71e778f370b3355a08670a7f524d8e370ba29bdaf408d0bdd14753a129734d80a952937f3e009a69e87bed90995a2aaaf
|
||||
AUX tux-winfly-killah.1600x1200.jpg 360183 SHA256 af7c84386a634e573fbd65884c49c716a4f92369b2f228c68672acc96f4a9879 SHA512 ed81ce83997a7ccc4eeb0fc08d09b98bedd6de8f27b9cfce2cb734ca4f4283c3e44154d7cfa73f94742c627ed67fb3ad520019ad8cbd9286cd8e2ceffc8677e7 WHIRLPOOL a8b2d4b51dc261362c4d9fca225ac9c02defc3903b6e9ecc8a7401a2155135efc2c7d62afba8727de37126ec425936ab08727455a68fd922192ec46a428ebd17
|
||||
AUX xfce4-desktop.xml 378 SHA256 97b1cb040f9819c0fe904537adf0e51fa3dbb35b8a34050d674a08dfb69c11d0 SHA512 ae84b11c4a5e833ff0b6e36e0619c5dab0e3dcab0e859fdc59dcbfed91e140d165677e2293b0c83bbf8ccaa3fcc5b5262888942a598b3e3de666b0dcdd7b2bc9 WHIRLPOOL b1bf73e6b0e577e411c0043603930fe920bd01326d4f3994661141e77c23983e61084d458ba0dd972330b13c2e0c2cd77ece37c6a3295a732879f0ae88df638b
|
||||
EBUILD pentoo-2012.1.ebuild 7277 SHA256 588a6d436879375e94fbcaef059dcf9277240847829c9a6c945b48adec73913f SHA512 4fc4787bc68ba08ed78801af19097f864bb6e72fcd32ca87e6eb547b12ddc93a9bf2ff44fd9dde5ac4124657dc35c22c72379131484c971c5b61441f719763cd WHIRLPOOL e3eb21a33c2cf9a474e2e151e7d28f66136c58a5b1a5f73157adb4b085f0cff271dfe98ffee264196314c037abbd539fca30659e74bb7671276b0184067cec1b
|
||||
EBUILD pentoo-2012.2.ebuild 7156 SHA256 d30ff940e9286412351e289eb9470b838c906044142c8eab6103b6261cb3f398 SHA512 bbc4f7215fef74f7b812241b7c790fbd14da5ad876cf9c1a18528f5d846b6e2da70a1ac6f327957f0be7f2e3e8a59d64d672b46b908c4a578d917e45716aeb23 WHIRLPOOL bd2d2148fd02da6ade8c7dd36fce12cacbcb43782555f65d67370607be2a15d9517d84ed2cc34ba8bfa7b06ee43e306f6cc93f0251442cc847cc1399faf89374
|
||||
EBUILD pentoo-2012.1.ebuild 7276 SHA256 8d6624187fffb4b31152df56dc6bfe3f5a65f6efadb878f8161268ab1a4f1826 SHA512 b35012dc82478176fd08026e6849c6f6be59e54fc164db216307473d27cfacbdac95bda757c9d511020986dcd8627a62836a3569516b0e1e47a29f6e28f03d9e WHIRLPOOL 3f5be8ae350ed5cb048b0f99cea48406680840097f14d1efce19a492e3eb54de70c0485059af97748d2f0b3813176e77c47af6b14a184e918e46d061f1856b6a
|
||||
EBUILD pentoo-2012.2.ebuild 7365 SHA256 eda3620a7b43b2eca600c287af16edd0a93f1ec8bd7419bb3bf0a8d3f438dfa1 SHA512 83dbce54aa26ec190283ece24c51b622a34c65596af780e15841d7ca5e9d2c347c5dc687b77cea3cc68e338ad8f88323ab35ab021a1d7591d96a30f56562e106 WHIRLPOOL c7e9969a5e7485dd8ecbb66768dcbbadabf43bbb0576f278fab6ad400af7d3bb11beb532a6d8d9efc6d6ab2878875a6a1989e388e0c896057165b3062b0c48a8
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ RDEPEND="${RDEPEND}
|
|||
|
||||
# enlightenment
|
||||
RDEPEND="${RDEPEND}
|
||||
enlightenment? ( x11-wm/enlightenment:0.17
|
||||
enlightenment? ( x11-wm/enlightenment:017
|
||||
=x11-plugins/extramenu-9999
|
||||
x11-apps/xrandr )"
|
||||
# =x11-plugins/e_modules-tclock-9999
|
||||
|
|
|
|||
|
|
@ -16,45 +16,40 @@ REQUIRED_USE="xfce? ( !enlightenment )"
|
|||
|
||||
DEPEND="!pentoo/pentoo-etc-portage"
|
||||
|
||||
#things needed for a running system and not for livecd
|
||||
RDEPEND="${RDEPEND}
|
||||
!livecd? ( !pentoo/pentoo-livecd
|
||||
!app-misc/livecd-tools
|
||||
app-portage/portage-utils
|
||||
app-admin/syslog-ng
|
||||
virtual/cron )"
|
||||
|
||||
#RDEPEND="${RDEPEND}
|
||||
# !livecd-stage1? ( video_cards_vmware? ( app-emulation/open-vm-tools ) )"
|
||||
|
||||
# System specific
|
||||
#system
|
||||
RDEPEND="${RDEPEND}
|
||||
!livecd-stage1? ( amd64? ( sys-fs/zfs ) )
|
||||
livecd? ( || ( sys-boot/grub sys-boot/grub-static )
|
||||
app-misc/livecd-tools
|
||||
dev-libs/icu
|
||||
sys-apps/microcode-ctl
|
||||
sys-apps/microcode-data
|
||||
sys-apps/pciutils
|
||||
sys-apps/pcmciautils
|
||||
sys-apps/sysvinit
|
||||
sys-boot/efibootmgr
|
||||
sys-boot/syslinux
|
||||
sys-firmware/amd-ucode
|
||||
sys-fs/cryptsetup
|
||||
sys-fs/jfsutils
|
||||
sys-fs/reiser4progs
|
||||
sys-fs/reiserfsprogs
|
||||
sys-fs/squashfs-tools
|
||||
sys-kernel/genkernel
|
||||
!arm? ( sys-power/acpid[pentoo] )
|
||||
!app-portage/portage-utils
|
||||
!app-admin/syslog-ng
|
||||
!virtual/cron
|
||||
)
|
||||
app-arch/lbzip2
|
||||
sys-apps/openrc[pentoo]
|
||||
app-arch/sharutils
|
||||
app-arch/lbzip2
|
||||
app-arch/xz-utils
|
||||
app-crypt/gnupg
|
||||
app-shells/bash-completion
|
||||
sys-apps/hdparm
|
||||
sys-apps/openrc[pentoo]
|
||||
sys-boot/efibootmgr
|
||||
sys-fs/cryptsetup
|
||||
dev-libs/icu
|
||||
sys-process/lsof
|
||||
sys-kernel/pentoo-sources
|
||||
sys-process/lsof"
|
||||
app-misc/mc
|
||||
sys-apps/pcmciautils
|
||||
sys-kernel/genkernel
|
||||
app-portage/mirrorselect
|
||||
sys-apps/gptfdisk
|
||||
!livecd-stage1? ( amd64? ( sys-fs/zfs ) )
|
||||
"
|
||||
|
||||
# Window makers
|
||||
#window makers
|
||||
RDEPEND="${RDEPEND}
|
||||
dwm? ( x11-wm/dwm )
|
||||
kde? ( kde-base/kde-meta )
|
||||
|
|
@ -68,47 +63,47 @@ RDEPEND="${RDEPEND}
|
|||
xfce-extra/thunar-volman
|
||||
xfce-extra/tumbler
|
||||
x11-themes/tango-icon-theme
|
||||
x11-apps/xrandr
|
||||
media-gfx/geeqie )"
|
||||
|
||||
# Enlightenment
|
||||
# enlightenment
|
||||
RDEPEND="${RDEPEND}
|
||||
enlightenment? ( x11-wm/enlightenment:0.17
|
||||
=x11-plugins/extramenu-9999
|
||||
gnome-base/gnome-menus )"
|
||||
enlightenment? ( x11-wm/enlightenment:017
|
||||
=x11-plugins/extramenu-9999
|
||||
x11-apps/xrandr )"
|
||||
# =x11-plugins/e_modules-tclock-9999
|
||||
# =x11-plugins/e_modules-engage-9999
|
||||
|
||||
# X windows stuff
|
||||
#X windows stuff
|
||||
RDEPEND="${RDEPEND}
|
||||
x11-apps/setxkbmap
|
||||
x11-apps/xbacklight
|
||||
x11-apps/xinit
|
||||
x11-apps/xrandr
|
||||
x11-libs/gksu
|
||||
x11-proto/dri2proto
|
||||
x11-terms/rxvt-unicode
|
||||
x11-terms/terminal
|
||||
x11-themes/gtk-theme-switch"
|
||||
x11-themes/gtk-theme-switch
|
||||
x11-apps/xbacklight"
|
||||
|
||||
# Basic systems
|
||||
#basic systems
|
||||
RDEPEND="${RDEPEND}
|
||||
qemu? ( !livecd-stage1? ( app-emulation/virt-manager ) )
|
||||
x86? ( mail-client/thunderbird-bin )
|
||||
www-client/firefox-bin
|
||||
www-plugins/google-talkplugin
|
||||
|| ( sys-boot/grub
|
||||
sys-boot/grub-static )
|
||||
app-admin/genmenu
|
||||
app-admin/localepurge
|
||||
app-arch/unrar
|
||||
app-arch/unzip
|
||||
app-crypt/openvpn-blacklist
|
||||
app-editors/gedit
|
||||
app-editors/ghex
|
||||
app-editors/hexedit
|
||||
app-editors/nano
|
||||
app-editors/gedit
|
||||
app-editors/vim
|
||||
app-misc/dradis
|
||||
app-misc/mc
|
||||
app-misc/screen
|
||||
app-portage/eix
|
||||
app-portage/gentoolkit
|
||||
app-portage/layman
|
||||
app-portage/mirrorselect
|
||||
app-portage/porthole
|
||||
app-portage/smart-live-rebuild
|
||||
app-portage/ufed
|
||||
|
|
@ -117,31 +112,32 @@ RDEPEND="${RDEPEND}
|
|||
app-text/wgetpaste
|
||||
dev-libs/libxslt
|
||||
dev-vcs/subversion
|
||||
gnome-base/gnome-menus
|
||||
media-fonts/dejavu
|
||||
media-fonts/font-misc-misc
|
||||
media-gfx/fbgrab
|
||||
media-gfx/scrot
|
||||
media-sound/alsa-utils
|
||||
media-sound/alsamixergui
|
||||
media-sound/alsa-utils
|
||||
media-sound/audacious
|
||||
media-sound/pavucontrol
|
||||
media-sound/pulseaudio
|
||||
media-sound/sox
|
||||
media-sound/pulseaudio
|
||||
media-sound/pavucontrol
|
||||
media-video/vlc
|
||||
net-dialup/linux-atm
|
||||
net-dialup/lrzsz
|
||||
net-dialup/minicom
|
||||
net-dialup/ppp
|
||||
net-dialup/wvdial
|
||||
net-dns/bind-tools
|
||||
net-firewall/firehol
|
||||
|| ( net-fs/mount-cifs
|
||||
net-fs/samba )
|
||||
net-firewall/iptables
|
||||
|| ( net-fs/mount-cifs net-fs/samba )
|
||||
net-firewall/firehol
|
||||
net-fs/nfs-utils
|
||||
net-ftp/atftp
|
||||
net-ftp/ftp
|
||||
net-ftp/gproftpd
|
||||
net-ftp/oftpd
|
||||
net-ftp/atftp
|
||||
net-im/pidgin
|
||||
net-irc/irssi
|
||||
net-irc/xchat
|
||||
|
|
@ -170,30 +166,44 @@ RDEPEND="${RDEPEND}
|
|||
net-misc/wlan2eth
|
||||
sys-apps/ethtool
|
||||
sys-apps/fbset
|
||||
sys-apps/gptfdisk
|
||||
sys-apps/iproute2
|
||||
sys-apps/microcode-ctl
|
||||
sys-apps/microcode-data
|
||||
sys-firmware/amd-ucode
|
||||
sys-apps/pciutils
|
||||
sys-apps/mlocate
|
||||
sys-apps/usb_modeswitch
|
||||
sys-apps/sysvinit
|
||||
sys-block/gparted
|
||||
sys-boot/unetbootin
|
||||
sys-boot/syslinux
|
||||
sys-devel/crossdev
|
||||
sys-devel/gettext
|
||||
sys-fs/jfsutils
|
||||
sys-fs/reiser4progs
|
||||
sys-fs/reiserfsprogs
|
||||
sys-fs/squashfs-tools
|
||||
sys-fs/sshfs-fuse
|
||||
sys-libs/gpm
|
||||
!arm? ( sys-power/acpid[pentoo] )
|
||||
sys-power/cpufrequtils
|
||||
sys-power/hibernate-script
|
||||
sys-power/powertop
|
||||
sys-process/htop
|
||||
sys-process/iotop
|
||||
www-client/firefox-bin
|
||||
www-client/links
|
||||
www-client/lynx
|
||||
www-plugins/adobe-flash
|
||||
www-servers/lighttpd
|
||||
www-plugins/firecat
|
||||
www-plugins/google-talkplugin
|
||||
www-servers/lighttpd"
|
||||
x11-apps/setxkbmap
|
||||
x11-apps/xinit
|
||||
sys-boot/unetbootin
|
||||
net-dialup/linux-atm
|
||||
www-client/lynx
|
||||
app-crypt/openvpn-blacklist
|
||||
app-misc/dradis"
|
||||
# qt4? ( net-firewall/fwbuilder )
|
||||
|
||||
# The tools
|
||||
#the tools
|
||||
RDEPEND="${RDEPEND}
|
||||
livecd? ( pentoo/pentoo-livecd )
|
||||
analyzer? ( pentoo/pentoo-analyzer )
|
||||
|
|
|
|||
Loading…
Reference in a new issue