[portage] merge x86 portage config

This commit is contained in:
Fabio Erculiani 2011-07-15 10:27:44 +02:00
parent a935029047
commit c23e554c42
4 changed files with 593 additions and 528 deletions

View File

@ -1,4 +1,4 @@
# Only use stable versions of these libs # Only use stable versions of these libs
# sys-kernel/linux-headers -~amd64 -~x86 # sys-kernel/linux-headers -~amd64 -~x86
sys-libs/glibc -~amd64 -~x86 sys-libs/glibc -~amd64 -~x86
dev-lang/python -~amd64 -~x86 dev-lang/python -~amd64 -~x86
@ -14,7 +14,7 @@ dev-python/pycups **
# Grub2, make binpkg for now, keep masked # Grub2, make binpkg for now, keep masked
<sys-boot/grub-2.99 ** <sys-boot/grub-2.99 **
dev-embedded/avr-libc * ~* -amd64 -~amd64 dev-embedded/avr-libc * ~* -x86 -~x86 -amd64 -~amd64
# Use portage-2.2 # Use portage-2.2
=sys-apps/portage-2.2* ** =sys-apps/portage-2.2* **

View File

@ -6,9 +6,11 @@
# Temp. masked # Temp. masked
<gnome-base/gnome-desktop-2.30.2 <gnome-base/gnome-desktop-2.30.2
app-i18n/anthy-ss app-i18n/anthy-ss
app-i18n/atokx2
app-vim/cvscommand app-vim/cvscommand
app-vim/vcscommand app-vim/vcscommand
app-shells/scsh app-shells/scsh
app-vim/enhancedcommentify
app-office/openoffice-l10n-meta app-office/openoffice-l10n-meta
sci-biology/mira sci-biology/mira
media-fonts/acroread-asianfonts media-fonts/acroread-asianfonts
@ -22,7 +24,7 @@ media-sound/frescobaldi
x11-drivers/ati-drivers::gentoo x11-drivers/ati-drivers::gentoo
media-gfx/splashutils::gentoo media-gfx/splashutils::gentoo
# Joost Ruis:squeezebox bundles these # Joost Ruis:squeezebox bundles these
>dev-perl/DBIx-Class-0.08120 >dev-perl/DBIx-Class-0.08120
# Joost Ruis: Tagged for Sabayon 6 # Joost Ruis: Tagged for Sabayon 6
@ -46,7 +48,7 @@ app-admin/moodss
### Blockers ### Blockers
# 2010-10-29 Joost Ruis: Blocks sci-biology/emboss # 2010-10-29 Joost Ruis: Blocks sci-biology/emboss
sys-devel/cons sys-devel/cons
dev-java/emma dev-java/emma
@ -55,17 +57,21 @@ app-shells/bashdb
# Joost Ruis: Blocks app-shells/ksh # Joost Ruis: Blocks app-shells/ksh
app-shells/pdksh app-shells/pdksh
sci-biology/staden-bin
# Joost Ruis: Blocks media-gfx/hugin # Joost Ruis: Blocks media-gfx/hugin
dev-util/cocom dev-util/cocom
# Joost Ruis: Requires mesa +motif # Joost Ruis: We use KDE and want the KDE phonon package
media-libs/openinventor #x11-libs/qt-phonon
sci-biology/arb
# Joost Ruis: Requires flag additions on apache webserver # Joost Ruis: Requires flag additions on apache webserver
gnome-extra/gnome-user-share gnome-extra/gnome-user-share
# Joost Ruis: Requires mesa +motif
media-libs/openinventor
sci-biology/arb
# Joost Ruis: needs pciutils with zlib, but we have it in package.use with -zlib no idea why. # Joost Ruis: needs pciutils with zlib, but we have it in package.use with -zlib no idea why.
xfce-extra/xfce4-cellmodem-plugin xfce-extra/xfce4-cellmodem-plugin
@ -78,8 +84,9 @@ sci-astronomy/ds9
# Gentoo bug #297995 # Gentoo bug #297995
net-misc/asterisk-chan_sccp net-misc/asterisk-chan_sccp
### Slotted packages ### Slotted packages
<net-analyzer/metasploit-3.2_p6750 <net-analyzer/metasploit-3.2_p6750
=app-editors/emacs-18.59-r6
### net-analyser ### net-analyser
@ -87,14 +94,14 @@ net-misc/asterisk-chan_sccp
net-analyzer/netcat net-analyzer/netcat
app-forensics/air app-forensics/air
### net-p2p ### net-p2p
### www-client ### www-client
# Joost Ruis: This requires x11-libs/fltk with -cairo, that ain't happening # Joost Ruis: This requires x11-libs/fltk with -cairo, that ain't happening
www-client/dillo www-client/dillo
### net-misc ### net-misc
# Joost Ruis: We use Avahi so we want to mask this # Joost Ruis: We use Avahi so we want to mask this
net-misc/mDNSResponder net-misc/mDNSResponder
@ -112,10 +119,10 @@ net-misc/pump
# Joost Ruis: This package cannot be in tree with sys-apps/iproute2 # Joost Ruis: This package cannot be in tree with sys-apps/iproute2
net-misc/arpd net-misc/arpd
# Joost Ruis: Wants >=net-libs/loudmouth-1.2.0[debug] #Joost Ruis: Wants >=net-libs/loudmouth-1.2.0[debug]
net-irc/irssi-xmpp net-irc/irssi-xmpp
# Joost Ruis: Wants >=dev-lang/perl-5.6.1[-ithreads] never going to happen. #Joost Ruis: Wants >=dev-lang/perl-5.6.1[-ithreads] never going to happen.
net-irc/epic4 net-irc/epic4
# Joost Ruis: We use net-misc/ntp so we want to mask this # Joost Ruis: We use net-misc/ntp so we want to mask this
@ -124,9 +131,13 @@ net-misc/openntpd
# Joost Ruis: We use net-misc/netkit-telnetd so we want to mask # Joost Ruis: We use net-misc/netkit-telnetd so we want to mask
net-misc/telnet-bsd net-misc/telnet-bsd
# Joost Ruis: Seems to be incompatible with latest net-misc/asterisk # Joost Ruis: Seems to be incompatible with latest net-misc/asterisk
=net-misc/asterisk-rate_engine-0.5.4 =net-misc/asterisk-rate_engine-0.5.4
# Joost Ruis: We use net-wireless/gnome-bluetooth now
net-wireless/bluez-gnome
gnome-extra/gnome-vfs-obexftp
# Joost Ruis: We use dev-texlive/texlive-latexextra so we want to mask this # Joost Ruis: We use dev-texlive/texlive-latexextra so we want to mask this
dev-tex/prosper dev-tex/prosper
dev-texlive/texlive-psutils dev-texlive/texlive-psutils
@ -164,10 +175,6 @@ sci-chemistry/mrbump
sci-physics/camfr sci-physics/camfr
net-analyzer/namebench net-analyzer/namebench
# Joost Ruis: We use net-wireless/gnome-bluetooth now
net-wireless/bluez-gnome
gnome-extra/gnome-vfs-obexftp
# Joost Ruis: Blocks metacity # Joost Ruis: Blocks metacity
x11-misc/expocity x11-misc/expocity
@ -208,7 +215,7 @@ dev-php/phing
dev-php/agavi dev-php/agavi
# 2010-08-17 Joost Ruis: Blocks x11-misc/notification-daemon # 2010-08-17 Joost Ruis: Blocks x11-misc/notification-daemon
xfce-extra/xfce4-notifyd xfce-extra/xfce4-notifyd
# 2010-10-29 Joost Ruis: Needs media-libs/mesa +motif # 2010-10-29 Joost Ruis: Needs media-libs/mesa +motif
sci-chemistry/molmol sci-chemistry/molmol
@ -230,6 +237,10 @@ media-fonts/gnu-gs-fonts-std
# 2010-11-18 Joost Ruis: Blocks media-fonts/culmus # 2010-11-18 Joost Ruis: Blocks media-fonts/culmus
media-fonts/culmus-ancient media-fonts/culmus-ancient
# 2010-11-26 Fabio Erculiani: Keep networkmanager from our overlay
net-misc/networkmanager::gentoo
>=gnome-extra/nm-applet-0.8.4
# 2010-12-28 Joost Ruis: Needs older mythtv version 0.22 # 2010-12-28 Joost Ruis: Needs older mythtv version 0.22
media-plugins/mythflix media-plugins/mythflix
@ -239,10 +250,6 @@ media-plugins/vdr-noepgmenu
# 2010-12-28 Joost Ruis: Needs vdr +setup, but we cannot enable that flag. # 2010-12-28 Joost Ruis: Needs vdr +setup, but we cannot enable that flag.
media-plugins/vdr-setup media-plugins/vdr-setup
# 2010-11-26 Fabio Erculiani: Keep networkmanager from our overlay
net-misc/networkmanager::gentoo
>=gnome-extra/nm-applet-0.8.4
# 2011-01-08 Fabio Erculiani: broken, resolv.conf issue # 2011-01-08 Fabio Erculiani: broken, resolv.conf issue
# see http://forum.sabayon.org/viewtopic.php?f=52&t=22717 # see http://forum.sabayon.org/viewtopic.php?f=52&t=22717
>net-dns/openresolv-3.4 >net-dns/openresolv-3.4
@ -268,5 +275,4 @@ media-plugins/vdr-audiorecorder
# reported upstream... # reported upstream...
# Upstream is LAME # Upstream is LAME
# Kay Sievers !! # Kay Sievers !!
# last working ver is 167-r1 (which uses ppoll() instead of epoll())
# >=sys-fs/udev-168 # >=sys-fs/udev-168

View File

@ -1,3 +1,4 @@
media-sound/potamus
<sys-apps/portage-2.3 <sys-apps/portage-2.3
# E17 support # E17 support

File diff suppressed because it is too large Load Diff