[gentoo-commits] proj/grs:desktop-amd64-uclibc-hardened commit in: core/etc/grs/

[Anthony G. Basile]

commit:     fa9ebf8fba57753c260ca8cb9b8bc2f927309fb6
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  5 18:50:42 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jul  5 18:50:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/grs.git/commit/?id=fa9ebf8f

world.conf: switch to new format.

 core/etc/grs/world.conf | 6014 +++++++++++++++++++++++------------------------
 1 file changed, 3007 insertions(+), 3007 deletions(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 169e3b1..7b366ef 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -1,8735 +1,8735 @@
 [app-accessibility/at-spi2-atk:2]
-package.use/app-accessibility_at-spi2-atk_2 : app-accessibility/at-spi2-atk:2 -test
+package.use : app-accessibility/at-spi2-atk:2 -test
 
 [app-accessibility/at-spi2-core:2]
-package.use/app-accessibility_at-spi2-core_2 : app-accessibility/at-spi2-core:2 X introspection
+package.use : app-accessibility/at-spi2-core:2 X introspection
 
 [app-accessibility/emacspeak:0]
-package.use/app-accessibility_emacspeak_0 : app-accessibility/emacspeak:0 espeak
+package.use : app-accessibility/emacspeak:0 espeak
 
 [app-accessibility/espeak:0]
-package.use/app-accessibility_espeak_0 : app-accessibility/espeak:0 -pulseaudio portaudio
+package.use : app-accessibility/espeak:0 -pulseaudio portaudio
 
 [app-accessibility/speech-dispatcher:0]
-package.use/app-accessibility_speech-dispatcher_0 : app-accessibility/speech-dispatcher:0 -ao -flite -pulseaudio alsa espeak nas python static-libs
+package.use : app-accessibility/speech-dispatcher:0 -ao -flite -pulseaudio alsa espeak nas python static-libs
 
 [app-accessibility/speechd-el:0]
-package.use/app-accessibility_speechd-el_0 : app-accessibility/speechd-el:0 -brltty
+package.use : app-accessibility/speechd-el:0 -brltty
 
 [app-admin/ansible:0]
-package.use/app-admin_ansible_0 : app-admin/ansible:0 -test
+package.use : app-admin/ansible:0 -test
 
 [app-admin/apache-tools:0]
-package.use/app-admin_apache-tools_0 : app-admin/apache-tools:0 ssl
+package.use : app-admin/apache-tools:0 ssl
 
 [app-admin/apachetop:0]
-package.use/app-admin_apachetop_0 : app-admin/apachetop:0 fam pcre
+package.use : app-admin/apachetop:0 fam pcre
 
 [app-admin/apg:0]
-package.use/app-admin_apg_0 : app-admin/apg:0 cracklib
+package.use : app-admin/apg:0 cracklib
 
 [app-admin/clustershell:0]
-package.use/app-admin_clustershell_0 : app-admin/clustershell:0 -doc
+package.use : app-admin/clustershell:0 -doc
 
 [app-admin/conky:0]
-package.use/app-admin_conky_0 : app-admin/conky:0 -apcupsd -audacious -debug -eve -hddtemp -iostats -lua-cairo -lua-imlib -moc -mpd -nano-syntax -nvidia -rss -thinkpad -truetype -weather-metar -weather-xoap -wifi -xmms2 X curl imlib lua math ncurses portmon vim-syntax
+package.use : app-admin/conky:0 -apcupsd -audacious -debug -eve -hddtemp -iostats -lua-cairo -lua-imlib -moc -mpd -nano-syntax -nvidia -rss -thinkpad -truetype -weather-metar -weather-xoap -wifi -xmms2 X curl imlib lua math ncurses portmon vim-syntax
 
 [app-admin/conserver:0]
-package.use/app-admin_conserver_0 : app-admin/conserver:0 -debug -kerberos -pam ssl tcpd
+package.use : app-admin/conserver:0 -debug -kerberos -pam ssl tcpd
 
 [app-admin/diradm:0]
-package.use/app-admin_diradm_0 : app-admin/diradm:0 -automount -irixpasswd -test samba
+package.use : app-admin/diradm:0 -automount -irixpasswd -test samba
 
 [app-admin/eselect:0]
-package.use/app-admin_eselect_0 : app-admin/eselect:0 -doc -emacs vim-syntax
+package.use : app-admin/eselect:0 -doc -emacs vim-syntax
 
 [app-admin/fetchlog:0]
-package.use/app-admin_fetchlog_0 : app-admin/fetchlog:0 -snmp
+package.use : app-admin/fetchlog:0 -snmp
 
 [app-admin/gam-server:0]
-package.use/app-admin_gam-server_0 : app-admin/gam-server:0 -debug
+package.use : app-admin/gam-server:0 -debug
 
 [app-admin/gkrellm:2]
-package.use/app-admin_gkrellm_2 : app-admin/gkrellm:2 -hddtemp -lm_sensors -nls -ntlm X gnutls ssl
+package.use : app-admin/gkrellm:2 -hddtemp -lm_sensors -nls -ntlm X gnutls ssl
 
 [app-admin/gtkdiskfree:0]
-package.use/app-admin_gtkdiskfree_0 : app-admin/gtkdiskfree:0 -nls
+package.use : app-admin/gtkdiskfree:0 -nls
 
 [app-admin/kedpm:0]
-package.use/app-admin_kedpm_0 : app-admin/kedpm:0 gtk
+package.use : app-admin/kedpm:0 gtk
 
 [app-admin/lib_users:0]
-package.use/app-admin_lib_users_0 : app-admin/lib_users:0 -test
+package.use : app-admin/lib_users:0 -test
 
 [app-admin/lsat:0]
-package.use/app-admin_lsat_0 : app-admin/lsat:0 -minimal
+package.use : app-admin/lsat:0 -minimal
 
 [app-admin/mcelog:0]
-package.use/app-admin_mcelog_0 : app-admin/mcelog:0 -selinux
+package.use : app-admin/mcelog:0 -selinux
 
 [app-admin/monit:0]
-package.use/app-admin_monit_0 : app-admin/monit:0 -pam ssl
+package.use : app-admin/monit:0 -pam ssl
 
 [app-admin/pwgen:0]
-package.use/app-admin_pwgen_0 : app-admin/pwgen:0 -livecd
+package.use : app-admin/pwgen:0 -livecd
 
 [app-admin/qpage:0]
-package.use/app-admin_qpage_0 : app-admin/qpage:0 tcpd
+package.use : app-admin/qpage:0 tcpd
 
 [app-admin/quickswitch:0]
-package.use/app-admin_quickswitch_0 : app-admin/quickswitch:0 ncurses
+package.use : app-admin/quickswitch:0 ncurses
 
 [app-admin/reportmagic:0]
-package.use/app-admin_reportmagic_0 : app-admin/reportmagic:0 -truetype
+package.use : app-admin/reportmagic:0 -truetype
 
 [app-admin/sshguard:0]
-package.use/app-admin_sshguard_0 : app-admin/sshguard:0 -ipfilter
+package.use : app-admin/sshguard:0 -ipfilter
 
 [app-admin/sudo:0]
-package.use/app-admin_sudo_0 : app-admin/sudo:0 -nls -offensive -pam -selinux ldap sendmail skey
+package.use : app-admin/sudo:0 -nls -offensive -pam -selinux ldap sendmail skey
 
 [app-admin/supervisor:0]
-package.use/app-admin_supervisor_0 : app-admin/supervisor:0 -doc -test
+package.use : app-admin/supervisor:0 -doc -test
 
 [app-admin/syslog-ng:0]
-package.use/app-admin_syslog-ng_0 : app-admin/syslog-ng:0 -amqp -json -mongodb -pacct -redis -smtp -spoof-source -systemd caps dbi geoip ipv6 ssl tcpd
+package.use : app-admin/syslog-ng:0 -amqp -json -mongodb -pacct -redis -smtp -spoof-source -systemd caps dbi geoip ipv6 ssl tcpd
 
 [app-admin/sysstat:0]
-package.use/app-admin_sysstat_0 : app-admin/sysstat:0 -cron -debug -isag -lm_sensors -nls -selinux doc
+package.use : app-admin/sysstat:0 -cron -debug -isag -lm_sensors -nls -selinux doc
 
 [app-admin/testdisk:0]
-package.use/app-admin_testdisk_0 : app-admin/testdisk:0 -ewf -ntfs -reiserfs -static jpeg qt4
+package.use : app-admin/testdisk:0 -ewf -ntfs -reiserfs -static jpeg qt4
 
 [app-admin/tmpwatch:0]
-package.use/app-admin_tmpwatch_0 : app-admin/tmpwatch:0 -selinux
+package.use : app-admin/tmpwatch:0 -selinux
 
 [app-admin/tripwire:0]
-package.use/app-admin_tripwire_0 : app-admin/tripwire:0 -static ssl tools
+package.use : app-admin/tripwire:0 -static ssl tools
 
 [app-admin/ulogd:0]
-package.use/app-admin_ulogd_0 : app-admin/ulogd:0 -doc -json -mysql -nfacct -pcap -postgres dbi nfct nflog sqlite
+package.use : app-admin/ulogd:0 -doc -json -mysql -nfacct -pcap -postgres dbi nfct nflog sqlite
 
 [app-admin/webalizer:0]
-package.use/app-admin_webalizer_0 : app-admin/webalizer:0 -nls -vhosts -xtended geoip
+package.use : app-admin/webalizer:0 -nls -vhosts -xtended geoip
 
 [app-admin/webapp-config:0]
-package.use/app-admin_webapp-config_0 : app-admin/webapp-config:0 portage
+package.use : app-admin/webapp-config:0 portage
 
 [app-admin/xstow:0]
-package.use/app-admin_xstow_0 : app-admin/xstow:0 ncurses
+package.use : app-admin/xstow:0 ncurses
 
 [app-admin/yaala:0]
-package.use/app-admin_yaala_0 : app-admin/yaala:0 -gd -storable
+package.use : app-admin/yaala:0 -gd -storable
 
 [app-antivirus/clamav:0]
-package.use/app-antivirus_clamav_0 : app-antivirus/clamav:0 -clamdtop -metadata-analysis-api -milter -selinux bzip2 iconv ipv6 static-libs uclibc
+package.use : app-antivirus/clamav:0 -clamdtop -metadata-analysis-api -milter -selinux bzip2 iconv ipv6 static-libs uclibc
 
 [app-arch/bzip2:0]
-package.use/app-arch_bzip2_0 : app-arch/bzip2:0 -static static-libs
+package.use : app-arch/bzip2:0 -static static-libs
 
 [app-arch/cpio:0]
-package.use/app-arch_cpio_0 : app-arch/cpio:0 -nls
+package.use : app-arch/cpio:0 -nls
 
 [app-arch/dpkg:0]
-package.use/app-arch_dpkg_0 : app-arch/dpkg:0 -nls -selinux -test bzip2 lzma unicode update-alternatives zlib
+package.use : app-arch/dpkg:0 -nls -selinux -test bzip2 lzma unicode update-alternatives zlib
 
 [app-arch/file-roller:0]
-package.use/app-arch_file-roller_0 : app-arch/file-roller:0 -nautilus -packagekit
+package.use : app-arch/file-roller:0 -nautilus -packagekit
 
 [app-arch/gtk-splitter:0]
-package.use/app-arch_gtk-splitter_0 : app-arch/gtk-splitter:0 crypt
+package.use : app-arch/gtk-splitter:0 crypt
 
 [app-arch/gzip:0]
-package.use/app-arch_gzip_0 : app-arch/gzip:0 -static pic
+package.use : app-arch/gzip:0 -static pic
 
 [app-arch/libarchive:0]
-package.use/app-arch_libarchive_0 : app-arch/libarchive:0 -expat -nettle acl bzip2 e2fsprogs iconv lzma lzo static-libs xattr zlib
+package.use : app-arch/libarchive:0 -expat -nettle acl bzip2 e2fsprogs iconv lzma lzo static-libs xattr zlib
 
 [app-arch/p7zip:0]
-package.use/app-arch_p7zip_0 : app-arch/p7zip:0 -doc -kde -rar -static -wxwidgets pch
+package.use : app-arch/p7zip:0 -doc -kde -rar -static -wxwidgets pch
 
 [app-arch/sharutils:0]
-package.use/app-arch_sharutils_0 : app-arch/sharutils:0 -nls
+package.use : app-arch/sharutils:0 -nls
 
 [app-arch/star:0]
-package.use/app-arch_star_0 : app-arch/star:0 acl xattr
+package.use : app-arch/star:0 acl xattr
 
 [app-arch/tar:0]
-package.use/app-arch_tar_0 : app-arch/tar:0 -minimal -nls -selinux -static acl xattr
+package.use : app-arch/tar:0 -minimal -nls -selinux -static acl xattr
 
 [app-arch/unp:0]
-package.use/app-arch_unp_0 : app-arch/unp:0 -nls
+package.use : app-arch/unp:0 -nls
 
 [app-arch/unzip:0]
-package.use/app-arch_unzip_0 : app-arch/unzip:0 bzip2 natspec unicode
+package.use : app-arch/unzip:0 bzip2 natspec unicode
 
 [app-arch/xar:0]
-package.use/app-arch_xar_0 : app-arch/xar:0 acl bzip2
+package.use : app-arch/xar:0 acl bzip2
 
 [app-arch/xz-utils:0]
-package.use/app-arch_xz-utils_0 : app-arch/xz-utils:0 -nls static-libs threads
+package.use : app-arch/xz-utils:0 -nls static-libs threads
 
 [app-arch/zip:0]
-package.use/app-arch_zip_0 : app-arch/zip:0 bzip2 crypt natspec unicode
+package.use : app-arch/zip:0 bzip2 crypt natspec unicode
 
 [app-backup/backintime:0]
-package.use/app-backup_backintime_0 : app-backup/backintime:0 -gnome -kde
+package.use : app-backup/backintime:0 -gnome -kde
 
 [app-backup/backup-manager:0]
-package.use/app-backup_backup-manager_0 : app-backup/backup-manager:0 -doc
+package.use : app-backup/backup-manager:0 -doc
 
 [app-backup/bacula:0]
-package.use/app-backup_bacula_0 : app-backup/bacula:0 -bacula-clientonly -bacula-nodir -bacula-nosd -examples -logwatch -mysql -postgres -static X acl ipv6 qt4 readline sqlite ssl tcpd vim-syntax
-+package.env : app-backup/bacula:0 app-backup_bacula_0
-env/app-backup_bacula_0 : LDFLAGS="-lintl"
+package.use : app-backup/bacula:0 -bacula-clientonly -bacula-nodir -bacula-nosd -examples -logwatch -mysql -postgres -static X acl ipv6 qt4 readline sqlite ssl tcpd vim-syntax
+package.env : app-backup/bacula:0 app-backup_bacula_0
+env : LDFLAGS="-lintl"
 
 [app-backup/boxbackup:0]
-package.use/app-backup_boxbackup_0 : app-backup/boxbackup:0 -client-only
+package.use : app-backup/boxbackup:0 -client-only
 
 [app-backup/ccollect:0]
-package.use/app-backup_ccollect_0 : app-backup/ccollect:0 -doc -examples
+package.use : app-backup/ccollect:0 -doc -examples
 
 [app-backup/dar:0]
-package.use/app-backup_dar_0 : app-backup/dar:0 -dar32 -dar64 -doc -gcrypt -nls -static acl lzo static-libs
-+package.env : app-backup/dar:0 app-backup_dar_0
-env/app-backup_dar_0 : LDFLAGS="-liconv"
+package.use : app-backup/dar:0 -dar32 -dar64 -doc -gcrypt -nls -static acl lzo static-libs
+package.env : app-backup/dar:0 app-backup_dar_0
+env : LDFLAGS="-liconv"
 
 [app-backup/duplicity:0]
-package.use/app-backup_duplicity_0 : app-backup/duplicity:0 -s3
+package.use : app-backup/duplicity:0 -s3
 
 [app-backup/fsarchiver:0]
-package.use/app-backup_fsarchiver_0 : app-backup/fsarchiver:0 -debug -static lzma lzo
+package.use : app-backup/fsarchiver:0 -debug -static lzma lzo
 
 [app-backup/luckybackup:0]
-package.use/app-backup_luckybackup_0 : app-backup/luckybackup:0 -debug
+package.use : app-backup/luckybackup:0 -debug
 
 [app-backup/rdiff-backup:0]
-package.use/app-backup_rdiff-backup_0 : app-backup/rdiff-backup:0 acl xattr
+package.use : app-backup/rdiff-backup:0 acl xattr
 
 [app-backup/spideroak-bin:0]
-package.use/app-backup_spideroak-bin_0 : app-backup/spideroak-bin:0 X dbus
+package.use : app-backup/spideroak-bin:0 X dbus
 
 [app-benchmarks/acovea:0]
-package.use/app-benchmarks_acovea_0 : app-benchmarks/acovea:0 static-libs
+package.use : app-benchmarks/acovea:0 static-libs
 
 [app-benchmarks/bonnie++:0]
-package.use/app-benchmarks_bonnie++_0 : app-benchmarks/bonnie++:0 -debug
+package.use : app-benchmarks/bonnie++:0 -debug
 
 [app-benchmarks/httperf:0]
-package.use/app-benchmarks_httperf_0 : app-benchmarks/httperf:0 -debug
+package.use : app-benchmarks/httperf:0 -debug
 
 [app-benchmarks/i7z:0]
-package.use/app-benchmarks_i7z_0 : app-benchmarks/i7z:0 X
+package.use : app-benchmarks/i7z:0 X
 
 [app-benchmarks/ramspeed:0]
-package.use/app-benchmarks_ramspeed_0 : app-benchmarks/ramspeed:0 cpu_flags_x86_sse pic
+package.use : app-benchmarks/ramspeed:0 cpu_flags_x86_sse pic
 
 [app-benchmarks/siege:0]
-package.use/app-benchmarks_siege_0 : app-benchmarks/siege:0 ssl
+package.use : app-benchmarks/siege:0 ssl
 
 [app-benchmarks/spew:0]
-package.use/app-benchmarks_spew_0 : app-benchmarks/spew:0 -static
+package.use : app-benchmarks/spew:0 -static
 
 [app-benchmarks/stress:0]
-package.use/app-benchmarks_stress_0 : app-benchmarks/stress:0 -static
+package.use : app-benchmarks/stress:0 -static
 
 [app-benchmarks/sysbench:0]
-package.use/app-benchmarks_sysbench_0 : app-benchmarks/sysbench:0 -aio -mysql
+package.use : app-benchmarks/sysbench:0 -aio -mysql
 
 [app-cdr/disc-cover:0]
-package.use/app-cdr_disc-cover_0 : app-cdr/disc-cover:0 -cdrom
+package.use : app-cdr/disc-cover:0 -cdrom
 
 [app-cdr/dvdisaster:0]
-package.use/app-cdr_dvdisaster_0 : app-cdr/dvdisaster:0 -debug -nls
+package.use : app-cdr/dvdisaster:0 -debug -nls
 
 [app-cdr/gaffitter:0]
-package.use/app-cdr_gaffitter_0 : app-cdr/gaffitter:0 -scripts
+package.use : app-cdr/gaffitter:0 -scripts
 
 [app-cdr/sync2cd:0]
-package.use/app-cdr_sync2cd_0 : app-cdr/sync2cd:0 -cdr -dvdr
+package.use : app-cdr/sync2cd:0 -cdr -dvdr
 
 [app-cdr/xfburn:0]
-package.use/app-cdr_xfburn_0 : app-cdr/xfburn:0 -debug -gstreamer udev
+package.use : app-cdr/xfburn:0 -debug -gstreamer udev
 
 [app-crypt/bcwipe:0]
-package.use/app-crypt_bcwipe_0 : app-crypt/bcwipe:0 -doc
+package.use : app-crypt/bcwipe:0 -doc
 
 [app-crypt/gcr:0]
-package.use/app-crypt_gcr_0 : app-crypt/gcr:0 -debug -test gtk introspection vala
+package.use : app-crypt/gcr:0 -debug -test gtk introspection vala
 
 [app-crypt/gnupg:0]
-package.use/app-crypt_gnupg_0 : app-crypt/gnupg:0 -doc -mta -nls -selinux -static -tools -usb bzip2 ldap readline smartcard
-package.accept_keywords/app-crypt_gnupg_0 : >=app-crypt/gnupg-2.1.6 ~amd64
-+package.env : app-crypt/gnupg:0 app-crypt_gnupg_0
-env/app-crypt_gnupg_0 : LDFLAGS="-lintl"
+package.use : app-crypt/gnupg:0 -doc -mta -nls -selinux -static -tools -usb bzip2 ldap readline smartcard
+package.accept_keywords : >=app-crypt/gnupg-2.1.6 ~amd64
+package.env : app-crypt/gnupg:0 app-crypt_gnupg_0
+env : LDFLAGS="-lintl"
 
 [app-crypt/gpa:0]
-package.use/app-crypt_gpa_0 : app-crypt/gpa:0 -nls
+package.use : app-crypt/gpa:0 -nls
 
 [app-crypt/gpgme:1]
-package.use/app-crypt_gpgme_1 : app-crypt/gpgme:1 -common-lisp static-libs
-+package.env : app-crypt/gpgme:1 app-crypt_gpgme_1
-env/app-crypt_gpgme_1 : LDFLAGS=-largp
+package.use : app-crypt/gpgme:1 -common-lisp static-libs
+package.env : app-crypt/gpgme:1 app-crypt_gpgme_1
+env : LDFLAGS=-largp
 
 [app-crypt/keynote:0]
-package.use/app-crypt_keynote_0 : app-crypt/keynote:0 ssl
+package.use : app-crypt/keynote:0 ssl
 
 [app-crypt/libsecret:0]
-package.use/app-crypt_libsecret_0 : app-crypt/libsecret:0 -debug -test crypt introspection vala
+package.use : app-crypt/libsecret:0 -debug -test crypt introspection vala
 
 [app-crypt/mcrypt:0]
-package.use/app-crypt_mcrypt_0 : app-crypt/mcrypt:0 -nls
+package.use : app-crypt/mcrypt:0 -nls
 
 [app-crypt/mhash:0]
-package.use/app-crypt_mhash_0 : app-crypt/mhash:0 static-libs
+package.use : app-crypt/mhash:0 static-libs
 
 [app-crypt/mit-krb5:0]
-package.use/app-crypt_mit-krb5_0 : app-crypt/mit-krb5:0 -doc -openldap -selinux -test keyutils pkinit threads xinetd
+package.use : app-crypt/mit-krb5:0 -doc -openldap -selinux -test keyutils pkinit threads xinetd
 
 [app-crypt/p11-kit:0]
-package.use/app-crypt_p11-kit_0 : app-crypt/p11-kit:0 -debug asn1 libffi trust
+package.use : app-crypt/p11-kit:0 -debug asn1 libffi trust
 
 [app-crypt/pinentry:0]
-package.use/app-crypt_pinentry_0 : app-crypt/pinentry:0 -static caps gtk ncurses qt4
-+package.env : app-crypt/pinentry:0 app-crypt_pinentry_0
-env/app-crypt_pinentry_0 : LDFLAGS="-liconv -lpthread"
+package.use : app-crypt/pinentry:0 -static caps gtk ncurses qt4
+package.env : app-crypt/pinentry:0 app-crypt_pinentry_0
+env : LDFLAGS="-liconv -lpthread"
 
 [app-crypt/ssh-multiadd:0]
-package.use/app-crypt_ssh-multiadd_0 : app-crypt/ssh-multiadd:0 X
+package.use : app-crypt/ssh-multiadd:0 X
 
 [app-crypt/xca:0]
-package.use/app-crypt_xca_0 : app-crypt/xca:0 bindist
+package.use : app-crypt/xca:0 bindist
 
 [app-dicts/aspell-be:0]
-package.use/app-dicts_aspell-be_0 : app-dicts/aspell-be:0 -classic
+package.use : app-dicts/aspell-be:0 -classic
 
 [app-dicts/mecab-ipadic:0]
-package.use/app-dicts_mecab-ipadic_0 : app-dicts/mecab-ipadic:0 unicode
+package.use : app-dicts/mecab-ipadic:0 unicode
 
 [app-dicts/migemo-dict:0]
-package.use/app-dicts_migemo-dict_0 : app-dicts/migemo-dict:0 unicode
+package.use : app-dicts/migemo-dict:0 unicode
 
 [app-dicts/myspell-pt:0]
-package.use/app-dicts_myspell-pt_0 : app-dicts/myspell-pt:0 preao
+package.use : app-dicts/myspell-pt:0 preao
 
 [app-dicts/prime-dict:0]
-package.use/app-dicts_prime-dict_0 : app-dicts/prime-dict:0 ruby_targets_ruby19
+package.use : app-dicts/prime-dict:0 ruby_targets_ruby19
 
 [app-dicts/stardict-freedict-eng-deu:0]
-package.use/app-dicts_stardict-freedict-eng-deu_0 : app-dicts/stardict-freedict-eng-deu:0 -gzip
+package.use : app-dicts/stardict-freedict-eng-deu:0 -gzip
 
 [app-dicts/stardict-freedict-eng-fra:0]
-package.use/app-dicts_stardict-freedict-eng-fra_0 : app-dicts/stardict-freedict-eng-fra:0 -gzip
+package.use : app-dicts/stardict-freedict-eng-fra:0 -gzip
 
 [app-dicts/stardict-freedict-eng-ita:0]
-package.use/app-dicts_stardict-freedict-eng-ita_0 : app-dicts/stardict-freedict-eng-ita:0 -gzip
+package.use : app-dicts/stardict-freedict-eng-ita:0 -gzip
 
 [app-dicts/stardict-freedict-eng-lat:0]
-package.use/app-dicts_stardict-freedict-eng-lat_0 : app-dicts/stardict-freedict-eng-lat:0 -gzip
+package.use : app-dicts/stardict-freedict-eng-lat:0 -gzip
 
 [app-dicts/stardict-freedict-eng-rus:0]
-package.use/app-dicts_stardict-freedict-eng-rus_0 : app-dicts/stardict-freedict-eng-rus:0 -gzip
+package.use : app-dicts/stardict-freedict-eng-rus:0 -gzip
 
 [app-dicts/stardict-freedict-eng-spa:0]
-package.use/app-dicts_stardict-freedict-eng-spa_0 : app-dicts/stardict-freedict-eng-spa:0 -gzip
+package.use : app-dicts/stardict-freedict-eng-spa:0 -gzip
 
 [app-dicts/stardict-freedict-eng-swe:0]
-package.use/app-dicts_stardict-freedict-eng-swe_0 : app-dicts/stardict-freedict-eng-swe:0 -gzip
+package.use : app-dicts/stardict-freedict-eng-swe:0 -gzip
 
 [app-dicts/stardict-freedict-eng-tur:0]
-package.use/app-dicts_stardict-freedict-eng-tur_0 : app-dicts/stardict-freedict-eng-tur:0 -gzip
+package.use : app-dicts/stardict-freedict-eng-tur:0 -gzip
 
 [app-dicts/stardict-freedict-tur-deu:0]
-package.use/app-dicts_stardict-freedict-tur-deu_0 : app-dicts/stardict-freedict-tur-deu:0 -gzip
+package.use : app-dicts/stardict-freedict-tur-deu:0 -gzip
 
 [app-dicts/stardict-freedict-tur-eng:0]
-package.use/app-dicts_stardict-freedict-tur-eng_0 : app-dicts/stardict-freedict-tur-eng:0 -gzip
+package.use : app-dicts/stardict-freedict-tur-eng:0 -gzip
 
 [app-dicts/wordnet:0]
-package.use/app-dicts_wordnet_0 : app-dicts/wordnet:0 -doc
+package.use : app-dicts/wordnet:0 -doc
 
 [app-dicts/ydpdict:0]
-package.use/app-dicts_ydpdict_0 : app-dicts/ydpdict:0 -ao
+package.use : app-dicts/ydpdict:0 -ao
 
 [app-doc/autobook:0]
-package.use/app-doc_autobook_0 : app-doc/autobook:0 -examples
+package.use : app-doc/autobook:0 -examples
 
 [app-doc/gnucash-docs:0]
-package.use/app-doc_gnucash-docs_0 : app-doc/gnucash-docs:0 -test
+package.use : app-doc/gnucash-docs:0 -test
 
 [app-doc/linkers-and-loaders:0]
-package.use/app-doc_linkers-and-loaders_0 : app-doc/linkers-and-loaders:0 -doc
+package.use : app-doc/linkers-and-loaders:0 -doc
 
 [app-doc/linuxfromscratch:0]
-package.use/app-doc_linuxfromscratch_0 : app-doc/linuxfromscratch:0 -htmlsingle pdf
+package.use : app-doc/linuxfromscratch:0 -htmlsingle pdf
 
 [app-doc/tldp-howto:0]
-package.use/app-doc_tldp-howto_0 : app-doc/tldp-howto:0 -htmlsingle -text html pdf
+package.use : app-doc/tldp-howto:0 -htmlsingle -text html pdf
 
 [app-editors/adie:0]
-package.use/app-editors_adie_0 : app-editors/adie:0 -debug -doc -profile
+package.use : app-editors/adie:0 -debug -doc -profile
 
 [app-editors/bluefish:0]
-package.use/app-editors_bluefish_0 : app-editors/bluefish:0 -nls python spell
+package.use : app-editors/bluefish:0 -nls python spell
 
 [app-editors/emacs:24]
-package.use/app-editors_emacs_24 : app-editors/emacs:24 -aqua -athena -games -gconf -gfile -gpm -gsettings -gzip-el -hesiod -imagemagick -kerberos -libxml2 -livecd -m17n-lib -motif -selinux -sound -source -toolkit-scroll-bars -wide-int -xft X Xaw3d acl alsa dbus gif gnutls gtk gtk3 inotify jpeg pax_kernel png svg tiff xpm zlib
+package.use : app-editors/emacs:24 -aqua -athena -games -gconf -gfile -gpm -gsettings -gzip-el -hesiod -imagemagick -kerberos -libxml2 -livecd -m17n-lib -motif -selinux -sound -source -toolkit-scroll-bars -wide-int -xft X Xaw3d acl alsa dbus gif gnutls gtk gtk3 inotify jpeg pax_kernel png svg tiff xpm zlib
 
 [app-editors/focuswriter:0]
-package.use/app-editors_focuswriter_0 : app-editors/focuswriter:0 -debug
+package.use : app-editors/focuswriter:0 -debug
 
 [app-editors/fte:0]
-package.use/app-editors_fte_0 : app-editors/fte:0 -gpm X slang
+package.use : app-editors/fte:0 -gpm X slang
 
 [app-editors/gedit-plugins:0]
-package.use/app-editors_gedit-plugins_0 : app-editors/gedit-plugins:0 -charmap -terminal -zeitgeist git python
+package.use : app-editors/gedit-plugins:0 -charmap -terminal -zeitgeist git python
 
 [app-editors/gedit:0]
-package.use/app-editors_gedit_0 : app-editors/gedit:0 -test introspection python spell vala
+package.use : app-editors/gedit:0 -test introspection python spell vala
 
 [app-editors/gobby:0]
-package.use/app-editors_gobby_0 : app-editors/gobby:0 -gnome avahi
+package.use : app-editors/gobby:0 -gnome avahi
 
 [app-editors/gvim:0]
-package.use/app-editors_gvim_0 : app-editors/gvim:0 -aqua -debug -gnome -luajit -motif -neXt -netbeans -nls -racket -selinux acl cscope gtk lua perl python ruby session tcl
+package.use : app-editors/gvim:0 -aqua -debug -gnome -luajit -motif -neXt -netbeans -nls -racket -selinux acl cscope gtk lua perl python ruby session tcl
 
 [app-editors/juffed:0]
-package.use/app-editors_juffed_0 : app-editors/juffed:0 -debug
+package.use : app-editors/juffed:0 -debug
 
 [app-editors/latexila:0]
-package.use/app-editors_latexila_0 : app-editors/latexila:0 -rubber latexmk
+package.use : app-editors/latexila:0 -rubber latexmk
 
 [app-editors/leafpad:0]
-package.use/app-editors_leafpad_0 : app-editors/leafpad:0 -emacs
+package.use : app-editors/leafpad:0 -emacs
 
 [app-editors/mousepad:0]
-package.use/app-editors_mousepad_0 : app-editors/mousepad:0 -debug -gtk3 dbus
+package.use : app-editors/mousepad:0 -debug -gtk3 dbus
 
 [app-editors/nano:0]
-package.use/app-editors_nano_0 : app-editors/nano:0 -debug -justify -minimal -nls magic ncurses slang spell unicode
+package.use : app-editors/nano:0 -debug -justify -minimal -nls magic ncurses slang spell unicode
 
 [app-editors/qxmledit:0]
-package.use/app-editors_qxmledit_0 : app-editors/qxmledit:0 -debug
+package.use : app-editors/qxmledit:0 -debug
 
 [app-editors/retext:0]
-package.use/app-editors_retext_0 : app-editors/retext:0 spell
+package.use : app-editors/retext:0 spell
 
 [app-editors/scite:0]
-package.use/app-editors_scite_0 : app-editors/scite:0 lua
+package.use : app-editors/scite:0 lua
 
 [app-editors/vile:0]
-package.use/app-editors_vile_0 : app-editors/vile:0 perl
+package.use : app-editors/vile:0 perl
 
 [app-editors/vim-core:0]
-package.use/app-editors_vim-core_0 : app-editors/vim-core:0 -minimal -nls acl
+package.use : app-editors/vim-core:0 -minimal -nls acl
 
 [app-editors/vim:0]
-package.use/app-editors_vim_0 : app-editors/vim:0 -debug -gpm -luajit -minimal -nls -racket -selinux -vim-pager X acl cscope lua perl python ruby tcl
-+package.env : app-editors/vim:0 app-editors_vim_0
-env/app-editors_vim_0 : LDFLAGS="-liconv"
+package.use : app-editors/vim:0 -debug -gpm -luajit -minimal -nls -racket -selinux -vim-pager X acl cscope lua perl python ruby tcl
+package.env : app-editors/vim:0 app-editors_vim_0
+env : LDFLAGS="-liconv"
 
 [app-editors/xvile:0]
-package.use/app-editors_xvile_0 : app-editors/xvile:0 perl
+package.use : app-editors/xvile:0 perl
 
 [app-editors/zoinks:0]
-package.use/app-editors_zoinks_0 : app-editors/zoinks:0 -nls
+package.use : app-editors/zoinks:0 -nls
 
 [app-emacs/ecb:0]
-package.use/app-emacs_ecb_0 : app-emacs/ecb:0 -java
+package.use : app-emacs/ecb:0 -java
 
 [app-emacs/emacs-common-gentoo:0]
-package.use/app-emacs_emacs-common-gentoo_0 : app-emacs/emacs-common-gentoo:0 -games X
+package.use : app-emacs/emacs-common-gentoo:0 -games X
 
 [app-emacs/gnuplot-mode:0]
-package.use/app-emacs_gnuplot-mode_0 : app-emacs/gnuplot-mode:0 -doc
+package.use : app-emacs/gnuplot-mode:0 -doc
 
 [app-emacs/gnuserv:0]
-package.use/app-emacs_gnuserv_0 : app-emacs/gnuserv:0 X
+package.use : app-emacs/gnuserv:0 X
 
 [app-emacs/magit:0]
-package.use/app-emacs_magit_0 : app-emacs/magit:0 -contrib
+package.use : app-emacs/magit:0 -contrib
 
 [app-emacs/mpg123-el:0]
-package.use/app-emacs_mpg123-el_0 : app-emacs/mpg123-el:0 vorbis
+package.use : app-emacs/mpg123-el:0 vorbis
 
 [app-emacs/muse:0]
-package.use/app-emacs_muse_0 : app-emacs/muse:0 -test
+package.use : app-emacs/muse:0 -test
 
 [app-emacs/org-mode:0]
-package.use/app-emacs_org-mode_0 : app-emacs/org-mode:0 -contrib -doc -odt-schema
+package.use : app-emacs/org-mode:0 -contrib -doc -odt-schema
 
 [app-emacs/wanderlust:0]
-package.use/app-emacs_wanderlust_0 : app-emacs/wanderlust:0 -bbdb ssl
+package.use : app-emacs/wanderlust:0 -bbdb ssl
 
 [app-emacs/wikipedia-mode:0]
-package.use/app-emacs_wikipedia-mode_0 : app-emacs/wikipedia-mode:0 -outline-magic
+package.use : app-emacs/wikipedia-mode:0 -outline-magic
 
 [app-emulation/aranym:0]
-package.use/app-emulation_aranym_0 : app-emulation/aranym:0 -usbhost X fullmmu lilo opengl
+package.use : app-emulation/aranym:0 -usbhost X fullmmu lilo opengl
 
 [app-emulation/cloud-init:0]
-package.use/app-emulation_cloud-init_0 : app-emulation/cloud-init:0 -test
+package.use : app-emulation/cloud-init:0 -test
 
 [app-emulation/dosemu:0]
-package.use/app-emulation_dosemu_0 : app-emulation/dosemu:0 -debug -gpm -sndfile -svga X alsa
+package.use : app-emulation/dosemu:0 -debug -gpm -sndfile -svga X alsa
 
 [app-emulation/fuse:0]
-package.use/app-emulation_fuse_0 : app-emulation/fuse:0 -ao -gpm -memlimit -svga X alsa fbcon gtk joystick png sdl xml
+package.use : app-emulation/fuse:0 -ao -gpm -memlimit -svga X alsa fbcon gtk joystick png sdl xml
 
 [app-emulation/libspectrum:0]
-package.use/app-emulation_libspectrum_0 : app-emulation/libspectrum:0 -audiofile -gcrypt bzip2 zlib
+package.use : app-emulation/libspectrum:0 -audiofile -gcrypt bzip2 zlib
 
 [app-emulation/spectemu:0]
-package.use/app-emulation_spectemu_0 : app-emulation/spectemu:0 -svga X readline
+package.use : app-emulation/spectemu:0 -svga X readline
 
 [app-emulation/spim:0]
-package.use/app-emulation_spim_0 : app-emulation/spim:0 -doc X
+package.use : app-emulation/spim:0 -doc X
 
 [app-emulation/vice:0]
-package.use/app-emulation_vice_0 : app-emulation/vice:0 -ethernet -ffmpeg -gnome -memmap -nls -pulseaudio -xrandr X Xaw3d alsa dga gif ipv6 jpeg lame oss png readline sdl xv zlib
+package.use : app-emulation/vice:0 -ethernet -ffmpeg -gnome -memmap -nls -pulseaudio -xrandr X Xaw3d alsa dga gif ipv6 jpeg lame oss png readline sdl xv zlib
 
 [app-emulation/x48:0]
-package.use/app-emulation_x48_0 : app-emulation/x48:0 readline
+package.use : app-emulation/x48:0 readline
 
 [app-emulation/xtrs:0]
-package.use/app-emulation_xtrs_0 : app-emulation/xtrs:0 -ls-dos
+package.use : app-emulation/xtrs:0 -ls-dos
 
 [app-forensics/aide:0]
-package.use/app-forensics_aide_0 : app-forensics/aide:0 -audit -mhash -nls -postgres -prelink -selinux -static acl curl xattr zlib
+package.use : app-forensics/aide:0 -audit -mhash -nls -postgres -prelink -selinux -static acl curl xattr zlib
 
 [app-forensics/air:0]
-package.use/app-forensics_air_0 : app-forensics/air:0 crypt
+package.use : app-forensics/air:0 crypt
 
 [app-forensics/chkrootkit:0]
-package.use/app-forensics_chkrootkit_0 : app-forensics/chkrootkit:0 cron
+package.use : app-forensics/chkrootkit:0 cron
 
 [app-forensics/sleuthkit:0]
-package.use/app-forensics_sleuthkit_0 : app-forensics/sleuthkit:0 -aff -ewf static-libs
+package.use : app-forensics/sleuthkit:0 -aff -ewf static-libs
 
 [app-i18n/anthy:0]
-package.use/app-i18n_anthy_0 : app-i18n/anthy:0 -canna-2ch -emacs static-libs
+package.use : app-i18n/anthy:0 -canna-2ch -emacs static-libs
 
 [app-i18n/enca:0]
-package.use/app-i18n_enca_0 : app-i18n/enca:0 -doc recode
+package.use : app-i18n/enca:0 -doc recode
 
 [app-i18n/freewnn:0]
-package.use/app-i18n_freewnn_0 : app-i18n/freewnn:0 X ipv6
+package.use : app-i18n/freewnn:0 X ipv6
 
 [app-i18n/ibus-hangul:0]
-package.use/app-i18n_ibus-hangul_0 : app-i18n/ibus-hangul:0 -nls
+package.use : app-i18n/ibus-hangul:0 -nls
 
 [app-i18n/ibus-pinyin:0]
-package.use/app-i18n_ibus-pinyin_0 : app-i18n/ibus-pinyin:0 -boost -nls lua
+package.use : app-i18n/ibus-pinyin:0 -boost -nls lua
 
 [app-i18n/ibus-qt:0]
-package.use/app-i18n_ibus-qt_0 : app-i18n/ibus-qt:0 -doc
+package.use : app-i18n/ibus-qt:0 -doc
 
 [app-i18n/ibus-table:0]
-package.use/app-i18n_ibus-table_0 : app-i18n/ibus-table:0 -nls
+package.use : app-i18n/ibus-table:0 -nls
 
 [app-i18n/ibus:0]
-package.use/app-i18n_ibus_0 : app-i18n/ibus:0 -deprecated -gconf -nls -test -wayland X gtk gtk3 introspection python vala
+package.use : app-i18n/ibus:0 -deprecated -gconf -nls -test -wayland X gtk gtk3 introspection python vala
 
 [app-i18n/im-ja:0]
-package.use/app-i18n_im-ja_0 : app-i18n/im-ja:0 -anthy -canna -freewnn -skk
+package.use : app-i18n/im-ja:0 -anthy -canna -freewnn -skk
 
 [app-i18n/kimera:0]
-package.use/app-i18n_kimera_0 : app-i18n/kimera:0 anthy
+package.use : app-i18n/kimera:0 anthy
 
 [app-i18n/kinput2:0]
-package.use/app-i18n_kinput2_0 : app-i18n/kinput2:0 -freewnn
+package.use : app-i18n/kinput2:0 -freewnn
 
 [app-i18n/libhangul:0]
-package.use/app-i18n_libhangul_0 : app-i18n/libhangul:0 -nls -test static-libs
+package.use : app-i18n/libhangul:0 -nls -test static-libs
 
 [app-i18n/libtabe:0]
-package.use/app-i18n_libtabe_0 : app-i18n/libtabe:0 -debug
+package.use : app-i18n/libtabe:0 -debug
 
 [app-i18n/libtomoe-gtk:0]
-package.use/app-i18n_libtomoe-gtk_0 : app-i18n/libtomoe-gtk:0 -doc gucharmap python static-libs
+package.use : app-i18n/libtomoe-gtk:0 -doc gucharmap python static-libs
 
 [app-i18n/nkf:0]
-package.use/app-i18n_nkf_0 : app-i18n/nkf:0 perl python
+package.use : app-i18n/nkf:0 perl python
 
 [app-i18n/poedit:0]
-package.use/app-i18n_poedit_0 : app-i18n/poedit:0 spell
+package.use : app-i18n/poedit:0 spell
 
 [app-i18n/pyzy:0]
-package.use/app-i18n_pyzy_0 : app-i18n/pyzy:0 -boost -doc -opencc -test
+package.use : app-i18n/pyzy:0 -boost -doc -opencc -test
 
 [app-i18n/scim-tables:0]
-package.use/app-i18n_scim-tables_0 : app-i18n/scim-tables:0 -nls
+package.use : app-i18n/scim-tables:0 -nls
 
 [app-i18n/scim:0]
-package.use/app-i18n_scim_0 : app-i18n/scim:0 -doc gtk3
+package.use : app-i18n/scim:0 -doc gtk3
 
 [app-i18n/tomoe:0]
-package.use/app-i18n_tomoe_0 : app-i18n/tomoe:0 -doc -hyperestraier -mysql python ruby static-libs subversion
+package.use : app-i18n/tomoe:0 -doc -hyperestraier -mysql python ruby static-libs subversion
 
 [app-i18n/uim:0]
-package.use/app-i18n_uim_0 : app-i18n/uim:0 -canna -eb -emacs -expat -kde -libedit -m17n-lib -nls -skk -test -xft X anthy curl gtk gtk3 libffi libnotify ncurses qt4 sqlite ssl static-libs unicode
+package.use : app-i18n/uim:0 -canna -eb -emacs -expat -kde -libedit -m17n-lib -nls -skk -test -xft X anthy curl gtk gtk3 libffi libnotify ncurses qt4 sqlite ssl static-libs unicode
 
 [app-i18n/xvnkb:0]
-package.use/app-i18n_xvnkb_0 : app-i18n/xvnkb:0 -xft spell
+package.use : app-i18n/xvnkb:0 -xft spell
 
 [app-laptop/batti:0]
-package.use/app-laptop_batti_0 : app-laptop/batti:0 libnotify
+package.use : app-laptop/batti:0 libnotify
 
 [app-laptop/i8kutils:0]
-package.use/app-laptop_i8kutils_0 : app-laptop/i8kutils:0 -examples tk
+package.use : app-laptop/i8kutils:0 -examples tk
 
 [app-laptop/pommed:0]
-package.use/app-laptop_pommed_0 : app-laptop/pommed:0 X gtk
+package.use : app-laptop/pommed:0 X gtk
 
 [app-laptop/thinkfan:0]
-package.use/app-laptop_thinkfan_0 : app-laptop/thinkfan:0 -atasmart
+package.use : app-laptop/thinkfan:0 -atasmart
 
 [app-laptop/tpb:0]
-package.use/app-laptop_tpb_0 : app-laptop/tpb:0 -nls -xosd
+package.use : app-laptop/tpb:0 -nls -xosd
 
 [app-leechcraft/lc-blasq:0]
-package.use/app-leechcraft_lc-blasq_0 : app-leechcraft/lc-blasq:0 -debug deathnote rappor spegnersi vangog
+package.use : app-leechcraft/lc-blasq:0 -debug deathnote rappor spegnersi vangog
 
 [app-leechcraft/lc-core:0]
-package.use/app-leechcraft_lc-core_0 : app-leechcraft/lc-core:0 -debug -doc -postgres qwt sqlite
+package.use : app-leechcraft/lc-core:0 -debug -doc -postgres qwt sqlite
 
 [app-leechcraft/lc-cstp:0]
-package.use/app-leechcraft_lc-cstp_0 : app-leechcraft/lc-cstp:0 -debug
+package.use : app-leechcraft/lc-cstp:0 -debug
 
 [app-leechcraft/lc-hotsensors:0]
-package.use/app-leechcraft_lc-hotsensors_0 : app-leechcraft/lc-hotsensors:0 -debug
+package.use : app-leechcraft/lc-hotsensors:0 -debug
 
 [app-leechcraft/lc-poshuku:0]
-package.use/app-leechcraft_lc-poshuku_0 : app-leechcraft/lc-poshuku:0 -debug -postgres -wyfv cleanweb fatape filescheme fua idn keywords onlinebookmarks pcre sqlite
+package.use : app-leechcraft/lc-poshuku:0 -debug -postgres -wyfv cleanweb fatape filescheme fua idn keywords onlinebookmarks pcre sqlite
 
 [app-leechcraft/lc-sb2:0]
-package.use/app-leechcraft_lc-sb2_0 : app-leechcraft/lc-sb2:0 -debug
+package.use : app-leechcraft/lc-sb2:0 -debug
 
 [app-leechcraft/lc-summary:0]
-package.use/app-leechcraft_lc-summary_0 : app-leechcraft/lc-summary:0 -debug
+package.use : app-leechcraft/lc-summary:0 -debug
 
 [app-misc/anki:0]
-package.use/app-misc_anki_0 : app-misc/anki:0 latex recording sound
+package.use : app-misc/anki:0 latex recording sound
 
 [app-misc/astrolog:0]
-package.use/app-misc_astrolog_0 : app-misc/astrolog:0 X
+package.use : app-misc/astrolog:0 X
 
 [app-misc/ca-certificates:0]
-package.use/app-misc_ca-certificates_0 : app-misc/ca-certificates:0 cacert
+package.use : app-misc/ca-certificates:0 cacert
 
 [app-misc/calendar:0]
-+package.env : app-misc/calendar:0 app-misc_calendar_0
-env/app-misc_calendar_0 : LDFLAGS="-liconv"
+package.env : app-misc/calendar:0 app-misc_calendar_0
+env : LDFLAGS="-liconv"
 
 [app-misc/cdargs:0]
-package.use/app-misc_cdargs_0 : app-misc/cdargs:0 -emacs
+package.use : app-misc/cdargs:0 -emacs
 
 [app-misc/cmatrix:0]
-package.use/app-misc_cmatrix_0 : app-misc/cmatrix:0 X
+package.use : app-misc/cmatrix:0 X
 
 [app-misc/digitemp:0]
-package.use/app-misc_digitemp_0 : app-misc/digitemp:0 -ds2490 -ds9097 -ds9097u
+package.use : app-misc/digitemp:0 -ds2490 -ds9097 -ds9097u
 
 [app-misc/dvtm:0]
-package.use/app-misc_dvtm_0 : app-misc/dvtm:0 -savedconfig unicode
+package.use : app-misc/dvtm:0 -savedconfig unicode
 
 [app-misc/empty:0]
-package.use/app-misc_empty_0 : app-misc/empty:0 -examples
+package.use : app-misc/empty:0 -examples
 
 [app-misc/evtest:0]
-package.use/app-misc_evtest_0 : app-misc/evtest:0 xml
+package.use : app-misc/evtest:0 xml
 
 [app-misc/fslint:0]
-package.use/app-misc_fslint_0 : app-misc/fslint:0 -nls
+package.use : app-misc/fslint:0 -nls
 
 [app-misc/g15composer:0]
-package.use/app-misc_g15composer_0 : app-misc/g15composer:0 -examples -truetype
+package.use : app-misc/g15composer:0 -examples -truetype
 
 [app-misc/g15daemon:0]
-package.use/app-misc_g15daemon_0 : app-misc/g15daemon:0 perl python static-libs
+package.use : app-misc/g15daemon:0 perl python static-libs
 
 [app-misc/gcal:0]
-package.use/app-misc_gcal_0 : app-misc/gcal:0 -nls ncurses unicode
-+package.env : app-misc/gcal:0 app-misc_gcal_0
-env/app-misc_gcal_0 : LDFLAGS="-liconv"
+package.use : app-misc/gcal:0 -nls ncurses unicode
+package.env0 : app-misc/gcal:0 app-misc_gcal_0
+env : LDFLAGS="-liconv"
 
 [app-misc/gcstar:0]
-package.use/app-misc_gcstar_0 : app-misc/gcstar:0 -gnome -stats -tellico cddb mp3 spell vorbis
+package.use : app-misc/gcstar:0 -gnome -stats -tellico cddb mp3 spell vorbis
 
 [app-misc/gentoo:0]
-package.use/app-misc_gentoo_0 : app-misc/gentoo:0 -nls
+package.use : app-misc/gentoo:0 -nls
 
 [app-misc/geoclue:2.0]
-package.use/app-misc_geoclue_2.0 : app-misc/geoclue:2.0 modemmanager
+package.use : app-misc/geoclue:2.0 modemmanager
 
 [app-misc/gourmet:0]
-package.use/app-misc_gourmet_0 : app-misc/gourmet:0 -i18n -ipython -print -sound -web pdf spell
+package.use : app-misc/gourmet:0 -i18n -ipython -print -sound -web pdf spell
 
 [app-misc/gramps:0]
-package.use/app-misc_gramps_0 : app-misc/gramps:0 -gnome -reports spell webkit
+package.use : app-misc/gramps:0 -gnome -reports spell webkit
 
 [app-misc/gtypist:0]
-package.use/app-misc_gtypist_0 : app-misc/gtypist:0 -emacs -nls -xemacs
+package.use : app-misc/gtypist:0 -emacs -nls -xemacs
 
 [app-misc/hivex:0]
-package.use/app-misc_hivex_0 : app-misc/hivex:0 -ocaml -test perl python readline ruby ruby_targets_ruby20 static-libs
+package.use : app-misc/hivex:0 -ocaml -test perl python readline ruby ruby_targets_ruby20 static-libs
 
 [app-misc/ignuit:0]
-package.use/app-misc_ignuit_0 : app-misc/ignuit:0 -examples
+package.use : app-misc/ignuit:0 -examples
 
 [app-misc/joy2key:0]
-package.use/app-misc_joy2key_0 : app-misc/joy2key:0 X
+package.use : app-misc/joy2key:0 X
 
 [app-misc/jq:0]
-package.use/app-misc_jq_0 : app-misc/jq:0 -test
+package.use : app-misc/jq:0 -test
 
 [app-misc/klavaro:0]
-package.use/app-misc_klavaro_0 : app-misc/klavaro:0 static-libs
+package.use : app-misc/klavaro:0 static-libs
 
 [app-misc/lcd-stuff:0]
-package.use/app-misc_lcd-stuff_0 : app-misc/lcd-stuff:0 -imap -mpd -rss mp3 xml
+package.use : app-misc/lcd-stuff:0 -imap -mpd -rss mp3 xml
 
 [app-misc/lcd4linux:0]
-package.use/app-misc_lcd4linux_0 : app-misc/lcd4linux:0 -lcd_devices_X -lcd_devices_beckmannegle -lcd_devices_bwct -lcd_devices_cwlinux -lcd_devices_ea232 -lcd_devices_g15 -lcd_devices_hd44780i2c -lcd_devices_lcd2usb -lcd_devices_lcdlinux -lcd_devices_lcdterm -lcd_devices_ledmatrix -lcd_devices_lph7508 -lcd_devices_luise -lcd_devices_m50530 -lcd_devices_milfordbpk -lcd_devices_noritake -lcd_devices_null -lcd_devices_picolcd -lcd_devices_png -lcd_devices_ppm -lcd_devices_routerboard -lcd_devices_serdisplib -lcd_devices_simplelcd -lcd_devices_t6963 -lcd_devices_trefon -lcd_devices_usbhub -lcd_devices_usblcd -lcd_devices_wincor -mpd -mysql iconv lcd_devices_cfontz lcd_devices_hd44780 lcd_devices_mtxorb lcd_devices_ncurses python
+package.use : app-misc/lcd4linux:0 -lcd_devices_X -lcd_devices_beckmannegle -lcd_devices_bwct -lcd_devices_cwlinux -lcd_devices_ea232 -lcd_devices_g15 -lcd_devices_hd44780i2c -lcd_devices_lcd2usb -lcd_devices_lcdlinux -lcd_devices_lcdterm -lcd_devices_ledmatrix -lcd_devices_lph7508 -lcd_devices_luise -lcd_devices_m50530 -lcd_devices_milfordbpk -lcd_devices_noritake -lcd_devices_null -lcd_devices_picolcd -lcd_devices_png -lcd_devices_ppm -lcd_devices_routerboard -lcd_devices_serdisplib -lcd_devices_simplelcd -lcd_devices_t6963 -lcd_devices_trefon -lcd_devices_usbhub -lcd_devices_usblcd -lcd_devices_wincor -mpd -mysql iconv lcd_devices_cfontz lcd_devices_hd44780 lcd_devices_mtxorb lcd_devices_ncurses python
 
 [app-misc/lcdproc:0]
-package.use/app-misc_lcdproc_0 : app-misc/lcdproc:0 -debug -doc -irman -lcd_devices_cfontzpacket -lcd_devices_cwlinux -lcd_devices_ea65 -lcd_devices_eyeboxone -lcd_devices_g15 -lcd_devices_graphlcd -lcd_devices_icpa106 -lcd_devices_imon -lcd_devices_iowarrior -lcd_devices_lcterm -lcd_devices_md8800 -lcd_devices_ms6931 -lcd_devices_mtcs16209x -lcd_devices_noritakevfd -lcd_devices_picolcd -lcd_devices_pyramid -lcd_devices_sed1330 -lcd_devices_sed1520 -lcd_devices_serialpos -lcd_devices_serialvfd -lcd_devices_sli -lcd_devices_stv5730 -lcd_devices_svga -lcd_devices_t6963 -lcd_devices_tyan -lcd_devices_ula200 -lcd_devices_xosd -lirc -nfs -seamless-hbars -usb joystick lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontz633 lcd_devices_glk lcd_devices_hd44780 lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_mtxorb lcd_devices_ncurses lcd_devices_text samba
+package.use : app-misc/lcdproc:0 -debug -doc -irman -lcd_devices_cfontzpacket -lcd_devices_cwlinux -lcd_devices_ea65 -lcd_devices_eyeboxone -lcd_devices_g15 -lcd_devices_graphlcd -lcd_devices_icpa106 -lcd_devices_imon -lcd_devices_iowarrior -lcd_devices_lcterm -lcd_devices_md8800 -lcd_devices_ms6931 -lcd_devices_mtcs16209x -lcd_devices_noritakevfd -lcd_devices_picolcd -lcd_devices_pyramid -lcd_devices_sed1330 -lcd_devices_sed1520 -lcd_devices_serialpos -lcd_devices_serialvfd -lcd_devices_sli -lcd_devices_stv5730 -lcd_devices_svga -lcd_devices_t6963 -lcd_devices_tyan -lcd_devices_ula200 -lcd_devices_xosd -lirc -nfs -seamless-hbars -usb joystick lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontz633 lcd_devices_glk lcd_devices_hd44780 lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_mtxorb lcd_devices_ncurses lcd_devices_text samba
 
 [app-misc/muttprint:0]
-package.use/app-misc_muttprint_0 : app-misc/muttprint:0 -doc
+package.use : app-misc/muttprint:0 -doc
 
 [app-misc/note:0]
-package.use/app-misc_note_0 : app-misc/note:0 -dbm -general -mysql -text crypt
+package.use : app-misc/note:0 -dbm -general -mysql -text crypt
 
 [app-misc/pal:0]
-package.use/app-misc_pal_0 : app-misc/pal:0 -nls
+package.use : app-misc/pal:0 -nls
 
 [app-misc/pax-utils:0]
-package.use/app-misc_pax-utils_0 : app-misc/pax-utils:0 caps python
+package.use : app-misc/pax-utils:0 caps python
 
 [app-misc/pwsafe:0]
-package.use/app-misc_pwsafe_0 : app-misc/pwsafe:0 X readline
+package.use : app-misc/pwsafe:0 X readline
 
 [app-misc/pysmssend:0]
-package.use/app-misc_pysmssend_0 : app-misc/pysmssend:0 qt4
+package.use : app-misc/pysmssend:0 qt4
 
 [app-misc/regex-markup:0]
-package.use/app-misc_regex-markup_0 : app-misc/regex-markup:0 -examples -nls
+package.use : app-misc/regex-markup:0 -examples -nls
 
 [app-misc/rl:0]
-package.use/app-misc_rl_0 : app-misc/rl:0 -debug
+package.use : app-misc/rl:0 -debug
 
 [app-misc/screen:0]
-package.use/app-misc_screen_0 : app-misc/screen:0 -debug -multiuser -nethack -pam -selinux
+package.use : app-misc/screen:0 -debug -multiuser -nethack -pam -selinux
 
 [app-misc/screenfetch:0]
-package.use/app-misc_screenfetch_0 : app-misc/screenfetch:0 X
+package.use : app-misc/screenfetch:0 X
 
 [app-misc/sl:0]
-package.use/app-misc_sl_0 : app-misc/sl:0 -debug -vanilla
-+package.env : app-misc/sl:0 app-misc_sl_0
-env/app-misc_sl_0 : LDFLAGS="-lpthread"
+package.use : app-misc/sl:0 -debug -vanilla
+package.env : app-misc/sl:0 app-misc_sl_0
+env : LDFLAGS="-lpthread"
 
 [app-misc/socnetv:0]
-package.use/app-misc_socnetv_0 : app-misc/socnetv:0 -doc
+package.use : app-misc/socnetv:0 -doc
 
 [app-misc/solaar:0]
-package.use/app-misc_solaar_0 : app-misc/solaar:0 -doc
+package.use : app-misc/solaar:0 -doc
 
 [app-misc/sphinx:0]
-package.use/app-misc_sphinx_0 : app-misc/sphinx:0 -debug -id64 -mysql -postgres -stemmer -test odbc syslog xml
+package.use : app-misc/sphinx:0 -debug -id64 -mysql -postgres -stemmer -test odbc syslog xml
 
 [app-misc/srm:0]
-package.use/app-misc_srm_0 : app-misc/srm:0 -debug
+package.use : app-misc/srm:0 -debug
 
 [app-misc/symlinks:0]
-package.use/app-misc_symlinks_0 : app-misc/symlinks:0 -static
+package.use : app-misc/symlinks:0 -static
 
 [app-misc/task:0]
-package.use/app-misc_task_0 : app-misc/task:0 -zsh-completion gnutls vim-syntax
+package.use : app-misc/task:0 -zsh-completion gnutls vim-syntax
 
 [app-misc/tdl:0]
-package.use/app-misc_tdl_0 : app-misc/tdl:0 -doc readline
+package.use : app-misc/tdl:0 -doc readline
 
 [app-misc/tkpasman:0]
-package.use/app-misc_tkpasman_0 : app-misc/tkpasman:0 ssl
+package.use : app-misc/tkpasman:0 ssl
 
 [app-misc/tmux:0]
-package.use/app-misc_tmux_0 : app-misc/tmux:0 -debug -selinux vim-syntax
+package.use : app-misc/tmux:0 -debug -selinux vim-syntax
 
 [app-misc/unfoo:0]
-package.use/app-misc_unfoo_0 : app-misc/unfoo:0 -test minimal
+package.use : app-misc/unfoo:0 -test minimal
 
 [app-misc/uptimed:0]
-package.use/app-misc_uptimed_0 : app-misc/uptimed:0 static-libs
+package.use : app-misc/uptimed:0 static-libs
 
 [app-misc/utimer:0]
-package.use/app-misc_utimer_0 : app-misc/utimer:0 -debug -nls
+package.use : app-misc/utimer:0 -debug -nls
 
 [app-misc/vifm:0]
-package.use/app-misc_vifm_0 : app-misc/vifm:0 -developer -vim X extended-keys gtk magic vim-syntax
+package.use : app-misc/vifm:0 -developer -vim X extended-keys gtk magic vim-syntax
 
 [app-misc/vlock:0]
-package.use/app-misc_vlock_0 : app-misc/vlock:0 -pam -test
+package.use : app-misc/vlock:0 -pam -test
 
 [app-misc/wcd:0]
-package.use/app-misc_wcd_0 : app-misc/wcd:0 -nls unicode
+package.use : app-misc/wcd:0 -nls unicode
 
 [app-misc/worker:0]
-package.use/app-misc_worker_0 : app-misc/worker:0 -avfs -debug -examples -xft dbus libnotify magic xinerama
+package.use : app-misc/worker:0 -avfs -debug -examples -xft dbus libnotify magic xinerama
 
 [app-misc/workrave:0]
-package.use/app-misc_workrave_0 : app-misc/workrave:0 -ayatana -debug -distribution -doc -gnome -gstreamer -mate -nls -pulseaudio -test -xfce
+package.use : app-misc/workrave:0 -ayatana -debug -distribution -doc -gnome -gstreamer -mate -nls -pulseaudio -test -xfce
 
 [app-mobilephone/gammu:0]
-package.use/app-mobilephone_gammu_0 : app-mobilephone/gammu:0 -debug -irda -mysql -nls -postgres -usb bash-completion bluetooth curl dbi python
+package.use : app-mobilephone/gammu:0 -debug -irda -mysql -nls -postgres -usb bash-completion bluetooth curl dbi python
 
 [app-mobilephone/gnokii:0]
-package.use/app-mobilephone_gnokii_0 : app-mobilephone/gnokii:0 -debug -ical -irda -mysql -nls -postgres -sms -usb X bluetooth
+package.use : app-mobilephone/gnokii:0 -debug -ical -irda -mysql -nls -postgres -sms -usb X bluetooth
 
 [app-mobilephone/gnome-phone-manager:0]
-package.use/app-mobilephone_gnome-phone-manager_0 : app-mobilephone/gnome-phone-manager:0 -debug
+package.use : app-mobilephone/gnome-phone-manager:0 -debug
 
 [app-mobilephone/lightblue:0]
-package.use/app-mobilephone_lightblue_0 : app-mobilephone/lightblue:0 -examples
+package.use : app-mobilephone/lightblue:0 -examples
 
 [app-mobilephone/obexftp:0]
-package.use/app-mobilephone_obexftp_0 : app-mobilephone/obexftp:0 -debug bluetooth perl python ruby tcl
+package.use : app-mobilephone/obexftp:0 -debug bluetooth perl python ruby tcl
 
 [app-mobilephone/wammu:0]
-package.use/app-mobilephone_wammu_0 : app-mobilephone/wammu:0 -gnome bluetooth
+package.use : app-mobilephone/wammu:0 -gnome bluetooth
 
 [app-office/abiword:2]
-package.use/app-office_abiword_2 : app-office/abiword:2 -collab -debug -eds -grammar -map -ots -redland calendar cups goffice introspection latex math plugins readline spell thesaurus wmf wordperfect
+package.use : app-office/abiword:2 -collab -debug -eds -grammar -map -ots -redland calendar cups goffice introspection latex math plugins readline spell thesaurus wmf wordperfect
 
 [app-office/glabels:0]
-package.use/app-office_glabels_0 : app-office/glabels:0 -barcode -eds
+package.use : app-office/glabels:0 -barcode -eds
 
 [app-office/gnumeric:0]
-package.use/app-office_gnumeric_0 : app-office/gnumeric:0 -libgda introspection perl python
+package.use : app-office/gnumeric:0 -libgda introspection perl python
 
 [app-office/grisbi:0]
-package.use/app-office_grisbi_0 : app-office/grisbi:0 -nls -ofx ssl
+package.use : app-office/grisbi:0 -nls -ofx ssl
 
 [app-office/gtimelog:0]
-package.use/app-office_gtimelog_0 : app-office/gtimelog:0 -ayatana -test
+package.use : app-office/gtimelog:0 -ayatana -test
 
 [app-office/homebank:0]
-package.use/app-office_homebank_0 : app-office/homebank:0 ofx
+package.use : app-office/homebank:0 ofx
 
 [app-office/ical:0]
-package.use/app-office_ical_0 : app-office/ical:0 -test
+package.use : app-office/ical:0 -test
 
 [app-office/ledger:0]
-package.use/app-office_ledger_0 : app-office/ledger:0 -debug -emacs -gnuplot -ofx static-libs vim-syntax xml
+package.use : app-office/ledger:0 -debug -emacs -gnuplot -ofx static-libs vim-syntax xml
 
 [app-office/magicpoint:0]
-package.use/app-office_magicpoint_0 : app-office/magicpoint:0 -cjk -doc -emacs -examples -m17n-lib -nls -truetype gif imlib mng
+package.use : app-office/magicpoint:0 -cjk -doc -emacs -examples -m17n-lib -nls -truetype gif imlib mng
 
 [app-office/orage:0]
-package.use/app-office_orage_0 : app-office/orage:0 -debug -xfce_plugins_clock berkdb dbus libnotify
+package.use : app-office/orage:0 -debug -xfce_plugins_clock berkdb dbus libnotify
 
 [app-office/passepartout:0]
-package.use/app-office_passepartout_0 : app-office/passepartout:0 -debug -gnome
+package.use : app-office/passepartout:0 -debug -gnome
 
 [app-office/pinpoint:0]
-package.use/app-office_pinpoint_0 : app-office/pinpoint:0 gstreamer pdf
+package.use : app-office/pinpoint:0 gstreamer pdf
 
 [app-office/planner:0]
-package.use/app-office_planner_0 : app-office/planner:0 -eds -examples python
+package.use : app-office/planner:0 -eds -examples python
 
 [app-office/qchartdiary:0]
-package.use/app-office_qchartdiary_0 : app-office/qchartdiary:0 -debug
+package.use : app-office/qchartdiary:0 -debug
 
 [app-office/taskcoach:0]
-package.use/app-office_taskcoach_0 : app-office/taskcoach:0 libnotify
+package.use : app-office/taskcoach:0 libnotify
 
 [app-office/texmacs:0]
-package.use/app-office_texmacs_0 : app-office/texmacs:0 -netpbm imlib jpeg pdf qt4 spell svg
+package.use : app-office/texmacs:0 -netpbm imlib jpeg pdf qt4 spell svg
 
 [app-office/texstudio:0]
-package.use/app-office_texstudio_0 : app-office/texstudio:0 -video
+package.use : app-office/texstudio:0 -video
 
 [app-pda/coldsync:0]
-package.use/app-pda_coldsync_0 : app-pda/coldsync:0 -nls perl
+package.use : app-pda/coldsync:0 -nls perl
 
 [app-pda/gnupod:0]
-package.use/app-pda_gnupod_0 : app-pda/gnupod:0 aac ffmpeg flac mp3 ogg
+package.use : app-pda/gnupod:0 aac ffmpeg flac mp3 ogg
 
 [app-pda/libimobiledevice:0]
-package.use/app-pda_libimobiledevice_0 : app-pda/libimobiledevice:0 gnutls python static-libs
+package.use : app-pda/libimobiledevice:0 gnutls python static-libs
 
 [app-pda/libopensync:0]
-package.use/app-pda_libopensync_0 : app-pda/libopensync:0 -debug -doc python
+package.use : app-pda/libopensync:0 -debug -doc python
 
 [app-pda/libplist:0]
-package.use/app-pda_libplist_0 : app-pda/libplist:0 python static-libs
+package.use : app-pda/libplist:0 python static-libs
 
 [app-pda/libusbmuxd:0]
-package.use/app-pda_libusbmuxd_0 : app-pda/libusbmuxd:0 static-libs
+package.use : app-pda/libusbmuxd:0 static-libs
 
 [app-portage/cfg-update:0]
-package.use/app-portage_cfg-update_0 : app-portage/cfg-update:0 X
+package.use : app-portage/cfg-update:0 X
 
 [app-portage/conf-update:0]
-package.use/app-portage_conf-update_0 : app-portage/conf-update:0 -colordiff
+package.use : app-portage/conf-update:0 -colordiff
 
 [app-portage/eix:0]
-package.use/app-portage_eix_0 : app-portage/eix:0 -debug -doc -nls -optimization -security -strong-optimization -strong-security -swap-remote -tools dep sqlite
+package.use : app-portage/eix:0 -debug -doc -nls -optimization -security -strong-optimization -strong-security -swap-remote -tools dep sqlite
 
 [app-portage/etc-proposals:0]
-package.use/app-portage_etc-proposals_0 : app-portage/etc-proposals:0 gtk qt4
+package.use : app-portage/etc-proposals:0 gtk qt4
 
 [app-portage/gentoopm:0]
-package.use/app-portage_gentoopm_0 : app-portage/gentoopm:0 -doc
+package.use : app-portage/gentoopm:0 -doc
 
 [app-portage/grs:0]
-package.accept_keywords/app-portage_grs_0 : =app-portage/grs-9999 **
+package.accept_keywords : =app-portage/grs-9999 **
 
 [app-portage/layman:0]
-package.use/app-portage_layman_0 : app-portage/layman:0 -bazaar -cvs -darcs -mercurial -test git subversion
+package.use : app-portage/layman:0 -bazaar -cvs -darcs -mercurial -test git subversion
 
 [app-portage/pfl:0]
-package.use/app-portage_pfl_0 : app-portage/pfl:0 network-cron
+package.use : app-portage/pfl:0 network-cron
 
 [app-portage/portage-utils:0]
-package.use/app-portage_portage-utils_0 : app-portage/portage-utils:0 -nls -static
+package.use : app-portage/portage-utils:0 -nls -static
 
 [app-portage/porthole:0]
-package.use/app-portage_porthole_0 : app-portage/porthole:0 -nls
+package.use : app-portage/porthole:0 -nls
 
 [app-shells/bash:0]
-package.use/app-shells_bash_0 : app-shells/bash:0 -afs -bashlogger -examples -mem-scramble -nls -plugins -vanilla net readline
+package.use : app-shells/bash:0 -afs -bashlogger -examples -mem-scramble -nls -plugins -vanilla net readline
 
 [app-shells/dash:0]
-package.use/app-shells_dash_0 : app-shells/dash:0 -libedit -static
+package.use : app-shells/dash:0 -libedit -static
 
 [app-shells/dsh:0]
-package.use/app-shells_dsh_0 : app-shells/dsh:0 -nls
+package.use : app-shells/dsh:0 -nls
 
 [app-shells/esh:0]
-package.use/app-shells_esh_0 : app-shells/esh:0 -debug
+package.use : app-shells/esh:0 -debug
 
 [app-shells/fish:0]
-package.use/app-shells_fish_0 : app-shells/fish:0 X
+package.use : app-shells/fish:0 X
 
 [app-shells/mksh:0]
-package.use/app-shells_mksh_0 : app-shells/mksh:0 -static
+package.use : app-shells/mksh:0 -static
 
 [app-shells/pdsh:0]
-package.use/app-shells_pdsh_0 : app-shells/pdsh:0 -rsh crypt readline
+package.use : app-shells/pdsh:0 -rsh crypt readline
 
 [app-shells/psh:0]
-package.use/app-shells_psh_0 : app-shells/psh:0 readline
+package.use : app-shells/psh:0 readline
 
 [app-shells/rrs:0]
-package.use/app-shells_rrs_0 : app-shells/rrs:0 ssl
+package.use : app-shells/rrs:0 ssl
 
 [app-shells/rssh:0]
-package.use/app-shells_rssh_0 : app-shells/rssh:0 -static
+package.use : app-shells/rssh:0 -static
 
 [app-shells/sash:0]
-package.use/app-shells_sash_0 : app-shells/sash:0 -static
+package.use : app-shells/sash:0 -static
 
 [app-shells/tcsh:0]
-package.use/app-shells_tcsh_0 : app-shells/tcsh:0 -doc -nls
+package.use : app-shells/tcsh:0 -doc -nls
 
 [app-shells/zsh:0]
-package.use/app-shells_zsh_0 : app-shells/zsh:0 -debug -doc -examples -maildir -static caps gdbm pcre unicode
+package.use : app-shells/zsh:0 -debug -doc -examples -maildir -static caps gdbm pcre unicode
 
 [app-text/aiksaurus:0]
-package.use/app-text_aiksaurus_0 : app-text/aiksaurus:0 gtk
+package.use : app-text/aiksaurus:0 gtk
 
 [app-text/an:0]
-+package.env : app-text/an:0 app-text_an_0
-env/app-text_an_0 : LDFLAGS="-lintl"
+package.env0 : app-text/an:0 app-text_an_0
+env : LDFLAGS="-lintl"
 
 [app-text/apvlv:0]
-package.use/app-text_apvlv_0 : app-text/apvlv:0 -debug -djvu
+package.use : app-text/apvlv:0 -debug -djvu
 
 [app-text/asciidoc:0]
-package.use/app-text_asciidoc_0 : app-text/asciidoc:0 -examples -graphviz -highlight -test vim-syntax
+package.use : app-text/asciidoc:0 -examples -graphviz -highlight -test vim-syntax
 
 [app-text/aspell:0]
-package.use/app-text_aspell_0 : app-text/aspell:0 -nls
+package.use : app-text/aspell:0 -nls
 
 [app-text/bibletime:0]
-package.use/app-text_bibletime_0 : app-text/bibletime:0 -debug
+package.use : app-text/bibletime:0 -debug
 
 [app-text/cb2bib:0]
-package.use/app-text_cb2bib_0 : app-text/cb2bib:0 -debug lzo webkit
+package.use : app-text/cb2bib:0 -debug lzo webkit
 
 [app-text/cmigemo:0]
-package.use/app-text_cmigemo_0 : app-text/cmigemo:0 -emacs unicode vim-syntax
+package.use : app-text/cmigemo:0 -emacs unicode vim-syntax
 
 [app-text/crf++:0]
-package.use/app-text_crf++_0 : app-text/crf++:0 -examples static-libs
+package.use : app-text/crf++:0 -examples static-libs
 
 [app-text/crm114:0]
-package.use/app-text_crm114_0 : app-text/crm114:0 -mew -mimencode -nls -normalizemime -static -test
+package.use : app-text/crm114:0 -mew -mimencode -nls -normalizemime -static -test
 
 [app-text/dbacl:0]
-package.use/app-text_dbacl_0 : app-text/dbacl:0 -interactive
+package.use : app-text/dbacl:0 -interactive
 
 [app-text/docbook-sgml-utils:0]
-package.use/app-text_docbook-sgml-utils_0 : app-text/docbook-sgml-utils:0 -jadetex
+package.use : app-text/docbook-sgml-utils:0 -jadetex
 
 [app-text/docbook-xsl-ns-stylesheets:0]
-package.use/app-text_docbook-xsl-ns-stylesheets_0 : app-text/docbook-xsl-ns-stylesheets:0 ruby
+package.use : app-text/docbook-xsl-ns-stylesheets:0 ruby
 
 [app-text/docbook-xsl-stylesheets:0]
-package.use/app-text_docbook-xsl-stylesheets_0 : app-text/docbook-xsl-stylesheets:0 ruby
+package.use : app-text/docbook-xsl-stylesheets:0 ruby
 
 [app-text/docbook2X:0]
-package.use/app-text_docbook2x_0 : app-text/docbook2X:0 -test
+package.use : app-text/docbook2X:0 -test
 
 [app-text/dvipng:0]
-package.use/app-text_dvipng_0 : app-text/dvipng:0 -t1lib -test -truetype
+package.use : app-text/dvipng:0 -t1lib -test -truetype
 
 [app-text/dvipsk:0]
-package.use/app-text_dvipsk_0 : app-text/dvipsk:0 -doc -source
-package.accept_keywords/app-text_dvipsk_0 : >=app-text/dvipsk-5.994_p20140525 ~amd64
+package.use : app-text/dvipsk:0 -doc -source
+package.accept_keywords : >=app-text/dvipsk-5.994_p20140525 ~amd64
 
 [app-text/enchant:0]
-package.use/app-text_enchant_0 : app-text/enchant:0 -aspell -zemberek hunspell static-libs
+package.use : app-text/enchant:0 -aspell -zemberek hunspell static-libs
 
 [app-text/evince:0]
-package.use/app-text_evince_0 : app-text/evince:0 -debug -djvu -dvi -gnome -libsecret -nautilus -nsplugin -t1lib -xps introspection postscript tiff
+package.use : app-text/evince:0 -debug -djvu -dvi -gnome -libsecret -nautilus -nsplugin -t1lib -xps introspection postscript tiff
 
 [app-text/ghostscript-gpl:0]
-package.use/app-text_ghostscript-gpl_0 : app-text/ghostscript-gpl:0 -djvu X cups dbus gtk idn static-libs
+package.use : app-text/ghostscript-gpl:0 -djvu X cups dbus gtk idn static-libs
 
 [app-text/glark:0]
-package.use/app-text_glark_0 : app-text/glark:0 -doc -test -zip ruby_targets_ruby19 ruby_targets_ruby20
+package.use : app-text/glark:0 -doc -test -zip ruby_targets_ruby19 ruby_targets_ruby20
 
 [app-text/gnome-doc-utils:0]
-+package.env : app-text/gnome-doc-utils:0 app-text_gnome-doc-utils_0
-env/app-text_gnome-doc-utils_0 : MAKEOPTS="-j1"
+package.env : app-text/gnome-doc-utils:0 app-text_gnome-doc-utils_0
+env : MAKEOPTS="-j1"
 
 [app-text/gtkspell:3]
-package.use/app-text_gtkspell_3 : app-text/gtkspell:3 introspection vala
+package.use : app-text/gtkspell:3 introspection vala
 
 [app-text/gtranslator:0]
-package.use/app-text_gtranslator_0 : app-text/gtranslator:0 -gnome spell
+package.use : app-text/gtranslator:0 -gnome spell
 
 [app-text/htmldoc:0]
-package.use/app-text_htmldoc_0 : app-text/htmldoc:0 -fltk ssl
+package.use : app-text/htmldoc:0 -fltk ssl
 
 [app-text/htmltidy:0]
-package.use/app-text_htmltidy_0 : app-text/htmltidy:0 -debug -doc static-libs
+package.use : app-text/htmltidy:0 -debug -doc static-libs
 
 [app-text/hunspell:0]
-package.use/app-text_hunspell_0 : app-text/hunspell:0 -nls ncurses readline static-libs
+package.use : app-text/hunspell:0 -nls ncurses readline static-libs
 
 [app-text/info2html:2.0]
-package.use/app-text_info2html_2.0 : app-text/info2html:2.0 -vhosts
+package.use : app-text/info2html:2.0 -vhosts
 
 [app-text/jist:0]
-package.use/app-text_jist_0 : app-text/jist:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : app-text/jist:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [app-text/kchmviewer:0]
-package.use/app-text_kchmviewer_0 : app-text/kchmviewer:0 -aqua -debug -kde
+package.use : app-text/kchmviewer:0 -aqua -debug -kde
 
 [app-text/lcdf-typetools:0]
-package.use/app-text_lcdf-typetools_0 : app-text/lcdf-typetools:0 kpathsea
+package.use : app-text/lcdf-typetools:0 kpathsea
 
 [app-text/libspectre:0]
-package.use/app-text_libspectre_0 : app-text/libspectre:0 -debug -doc static-libs
+package.use : app-text/libspectre:0 -debug -doc static-libs
 
 [app-text/libwpd:0.9]
-package.use/app-text_libwpd_0.9 : app-text/libwpd:0.9 -doc -test tools
+package.use : app-text/libwpd:0.9 -doc -test tools
 
 [app-text/libwpg:0.2]
-package.use/app-text_libwpg_0.2 : app-text/libwpg:0.2 -doc static-libs
+package.use : app-text/libwpg:0.2 -doc static-libs
 
 [app-text/lodgeit:0]
-package.use/app-text_lodgeit_0 : app-text/lodgeit:0 -vim
+package.use : app-text/lodgeit:0 -vim
 
 [app-text/mathtex:0]
-package.use/app-text_mathtex_0 : app-text/mathtex:0 png
+package.use : app-text/mathtex:0 png
 
 [app-text/mecab:0]
-package.use/app-text_mecab_0 : app-text/mecab:0 static-libs unicode
+package.use : app-text/mecab:0 static-libs unicode
 
 [app-text/mftrace:1]
-package.use/app-text_mftrace_1 : app-text/mftrace:1 -test -truetype
+package.use : app-text/mftrace:1 -test -truetype
 
 [app-text/multitail:0]
-package.use/app-text_multitail_0 : app-text/multitail:0 -debug -examples unicode
+package.use : app-text/multitail:0 -debug -examples unicode
 
 [app-text/namazu:0]
-package.use/app-text_namazu_0 : app-text/namazu:0 -emacs -nls tk
+package.use : app-text/namazu:0 -emacs -nls tk
 
 [app-text/openjade:0]
-package.use/app-text_openjade_0 : app-text/openjade:0 static-libs
+package.use : app-text/openjade:0 static-libs
 
 [app-text/opensp:0]
-package.use/app-text_opensp_0 : app-text/opensp:0 -doc -nls -test static-libs
+package.use : app-text/opensp:0 -doc -nls -test static-libs
 
 [app-text/pastebinit:0]
-package.use/app-text_pastebinit_0 : app-text/pastebinit:0 crypt
+package.use : app-text/pastebinit:0 crypt
 
 [app-text/pdfgrep:0]
-package.use/app-text_pdfgrep_0 : app-text/pdfgrep:0 -unac
+package.use : app-text/pdfgrep:0 -unac
 
 [app-text/pdfminer:0]
-package.use/app-text_pdfminer_0 : app-text/pdfminer:0 -doc -examples
+package.use : app-text/pdfminer:0 -doc -examples
 
 [app-text/pinfo:0]
-package.use/app-text_pinfo_0 : app-text/pinfo:0 -nls readline
+package.use : app-text/pinfo:0 -nls readline
 
 [app-text/po4a:0]
-package.use/app-text_po4a_0 : app-text/po4a:0 -test
+package.use : app-text/po4a:0 -test
 
 [app-text/poppler:0]
-package.use/app-text_poppler_0 : app-text/poppler:0 -cjk -debug -doc -qt5 cairo curl cxx introspection jpeg jpeg2k lcms png qt4 tiff utils
+package.use : app-text/poppler:0 -cjk -debug -doc -qt5 cairo curl cxx introspection jpeg jpeg2k lcms png qt4 tiff utils
 
 [app-text/ps2pkm:0]
-package.accept_keywords/app-text_ps2pkm_0 : >=app-text/ps2pkm-1.5_p20140525 ~amd64
+package.accept_keywords : >=app-text/ps2pkm-1.5_p20140525 ~amd64
 
 [app-text/pspresent:0]
-package.use/app-text_pspresent_0 : app-text/pspresent:0 xinerama
+package.use : app-text/pspresent:0 xinerama
 
 [app-text/pylize:0]
-package.use/app-text_pylize_0 : app-text/pylize:0 -doc
+package.use : app-text/pylize:0 -doc
 
 [app-text/qpdf:0]
-package.use/app-text_qpdf_0 : app-text/qpdf:0 -doc -examples -test static-libs
+package.use : app-text/qpdf:0 -doc -examples -test static-libs
 
 [app-text/qpdfview:0]
-package.use/app-text_qpdfview_0 : app-text/qpdfview:0 -djvu -fitz -qt5 -synctex cups dbus pdf postscript qt4 sqlite svg
+package.use : app-text/qpdfview:0 -djvu -fitz -qt5 -synctex cups dbus pdf postscript qt4 sqlite svg
 
 [app-text/rarian:0]
-package.use/app-text_rarian_0 : app-text/rarian:0 static-libs
+package.use : app-text/rarian:0 static-libs
 
 [app-text/recode:0]
-package.use/app-text_recode_0 : app-text/recode:0 -nls static-libs
+package.use : app-text/recode:0 -nls static-libs
 
 [app-text/sablotron:0]
-package.use/app-text_sablotron_0 : app-text/sablotron:0 perl
+package.use : app-text/sablotron:0 perl
 
 [app-text/sary:0]
-package.use/app-text_sary_0 : app-text/sary:0 static-libs
+package.use : app-text/sary:0 static-libs
 
 [app-text/sgmltools-lite:0]
-package.use/app-text_sgmltools-lite_0 : app-text/sgmltools-lite:0 -jadetex
+package.use : app-text/sgmltools-lite:0 -jadetex
 
 [app-text/spellutils:0]
-package.use/app-text_spellutils_0 : app-text/spellutils:0 -nls
+package.use : app-text/spellutils:0 -nls
 
 [app-text/stardict:0]
-package.use/app-text_stardict_0 : app-text/stardict:0 -espeak -gucharmap -pronounce -qqwry -tools spell
+package.use : app-text/stardict:0 -espeak -gucharmap -pronounce -qqwry -tools spell
 
 [app-text/sword:0]
-package.use/app-text_sword_0 : app-text/sword:0 -debug -doc curl icu static-libs
+package.use : app-text/sword:0 -debug -doc curl icu static-libs
 
 [app-text/tesseract:0]
-package.use/app-text_tesseract_0 : app-text/tesseract:0 -doc -examples -osd jpeg png scrollview static-libs tiff webp
+package.use : app-text/tesseract:0 -doc -examples -osd jpeg png scrollview static-libs tiff webp
 
 [app-text/texi2html:0]
-package.use/app-text_texi2html_0 : app-text/texi2html:0 unicode
+package.use : app-text/texi2html:0 unicode
 
 [app-text/texlive-core:0]
-package.use/app-text_texlive-core_0 : app-text/texlive-core:0 -doc -source X cjk tk xetex
-package.accept_keywords/app-text_texlive-core_0 : >=app-text/texlive-core-2014-r4 ~amd64
+package.use : app-text/texlive-core:0 -doc -source X cjk tk xetex
+package.accept_keywords : >=app-text/texlive-core-2014-r4 ~amd64
 
 [app-text/texlive:0]
-package.use/app-text_texlive_0 : app-text/texlive:0 -cjk -context -detex -dvi2tty -epspdf -extra -games -graphics -humanities -jadetex -luatex -metapost -music -omega -pdfannotextractor -pstricks -publishers -science -tex4ht -texi2html -truetype -xetex -xindy X png xml
-package.accept_keywords/app-text_texlive_0 : >=app-text/texlive-2014 ~amd64
+package.use : app-text/texlive:0 -cjk -context -detex -dvi2tty -epspdf -extra -games -graphics -humanities -jadetex -luatex -metapost -music -omega -pdfannotextractor -pstricks -publishers -science -tex4ht -texi2html -truetype -xetex -xindy X png xml
+package.accept_keywords : >=app-text/texlive-2014 ~amd64
 
 [app-text/wdiff:0]
-package.use/app-text_wdiff_0 : app-text/wdiff:0 -experimental -test
+package.use : app-text/wdiff:0 -experimental -test
 
 [app-text/wklej:0]
-package.use/app-text_wklej_0 : app-text/wklej:0 vim
+package.use : app-text/wklej:0 vim
 
 [app-text/wv:0]
-package.use/app-text_wv_0 : app-text/wv:0 -tools wmf
+package.use : app-text/wv:0 -tools wmf
 
 [app-text/xdvik:0]
-package.use/app-text_xdvik_0 : app-text/xdvik:0 -emacs -motif -neXt Xaw3d
+package.use : app-text/xdvik:0 -emacs -motif -neXt Xaw3d
 
 [app-text/xiphos:0]
-package.use/app-text_xiphos_0 : app-text/xiphos:0 -debug dbus webkit
+package.use : app-text/xiphos:0 -debug dbus webkit
 
 [app-text/xmlto:0]
-package.use/app-text_xmlto_0 : app-text/xmlto:0 latex
+package.use : app-text/xmlto:0 latex
 
 [app-text/xournal:0]
-package.use/app-text_xournal_0 : app-text/xournal:0 pdf
+package.use : app-text/xournal:0 pdf
 
 [app-text/zathura-meta:0]
-package.use/app-text_zathura-meta_0 : app-text/zathura-meta:0 -cb -djvu pdf postscript
+package.use : app-text/zathura-meta:0 -cb -djvu pdf postscript
 
 [app-text/zathura:0]
-package.use/app-text_zathura_0 : app-text/zathura:0 -test magic sqlite
+package.use : app-text/zathura:0 -test magic sqlite
 
 [app-vim/calendar:0]
-+package.env : app-vim/calendar:0 app-vim_calendar_0
-env/app-vim_calendar_0 : LDFLAGS="-liconv"
+package.env : app-vim/calendar:0 app-vim_calendar_0
+env : LDFLAGS="-liconv"
 
 [app-vim/gentoo-syntax:0]
-package.use/app-vim_gentoo-syntax_0 : app-vim/gentoo-syntax:0 -ignore-glep31
+package.use : app-vim/gentoo-syntax:0 -ignore-glep31
 
 [dev-cpp/atkmm:0]
-package.use/dev-cpp_atkmm_0 : dev-cpp/atkmm:0 -doc
+package.use : dev-cpp/atkmm:0 -doc
 
 [dev-cpp/cairomm:0]
-package.use/dev-cpp_cairomm_0 : dev-cpp/cairomm:0 -doc svg
+package.use : dev-cpp/cairomm:0 -doc svg
 
 [dev-cpp/clucene:1]
-package.use/dev-cpp_clucene_1 : dev-cpp/clucene:1 -debug -doc static-libs
+package.use : dev-cpp/clucene:1 -debug -doc static-libs
 
 [dev-cpp/gconfmm:0]
-package.use/dev-cpp_gconfmm_0 : dev-cpp/gconfmm:0 -doc
+package.use : dev-cpp/gconfmm:0 -doc
 
 [dev-cpp/glibmm:2]
-package.use/dev-cpp_glibmm_2 : dev-cpp/glibmm:2 -debug -doc -examples -test
+package.use : dev-cpp/glibmm:2 -debug -doc -examples -test
 
 [dev-cpp/gnome-vfsmm:1.1]
-package.use/dev-cpp_gnome-vfsmm_1.1 : dev-cpp/gnome-vfsmm:1.1 -doc -examples
+package.use : dev-cpp/gnome-vfsmm:1.1 -doc -examples
 
 [dev-cpp/gstreamermm:0.10]
-package.use/dev-cpp_gstreamermm_0.10 : dev-cpp/gstreamermm:0.10 -debug -test
+package.use : dev-cpp/gstreamermm:0.10 -debug -test
 
 [dev-cpp/gtkglextmm:1.0]
-package.use/dev-cpp_gtkglextmm_1.0 : dev-cpp/gtkglextmm:1.0 -debug -doc
+package.use : dev-cpp/gtkglextmm:1.0 -debug -doc
 
 [dev-cpp/gtkmm:2.4]
-package.use/dev-cpp_gtkmm_2.4 : dev-cpp/gtkmm:2.4 -doc -examples -test
+package.use : dev-cpp/gtkmm:2.4 -doc -examples -test
 
 [dev-cpp/gtkmm:3.0]
-package.use/dev-cpp_gtkmm_3.0 : dev-cpp/gtkmm:3.0 -aqua -doc -examples -test -wayland X
+package.use : dev-cpp/gtkmm:3.0 -aqua -doc -examples -test -wayland X
 
 [dev-cpp/gtksourceviewmm:2.0]
-package.use/dev-cpp_gtksourceviewmm_2.0 : dev-cpp/gtksourceviewmm:2.0 -doc
+package.use : dev-cpp/gtksourceviewmm:2.0 -doc
 
 [dev-cpp/gtksourceviewmm:3.0]
-package.use/dev-cpp_gtksourceviewmm_3.0 : dev-cpp/gtksourceviewmm:3.0 -doc
+package.use : dev-cpp/gtksourceviewmm:3.0 -doc
 
 [dev-cpp/libbinio:0]
-package.use/dev-cpp_libbinio_0 : dev-cpp/libbinio:0 static-libs
+package.use : dev-cpp/libbinio:0 static-libs
 
 [dev-cpp/libglademm:2.4]
-package.use/dev-cpp_libglademm_2.4 : dev-cpp/libglademm:2.4 -doc -examples
+package.use : dev-cpp/libglademm:2.4 -doc -examples
 
 [dev-cpp/libgnomecanvasmm:2.6]
-package.use/dev-cpp_libgnomecanvasmm_2.6 : dev-cpp/libgnomecanvasmm:2.6 -doc -examples
+package.use : dev-cpp/libgnomecanvasmm:2.6 -doc -examples
 
 [dev-cpp/libxmlpp:2.6]
-package.use/dev-cpp_libxmlpp_2.6 : dev-cpp/libxmlpp:2.6 -doc
+package.use : dev-cpp/libxmlpp:2.6 -doc
 
 [dev-cpp/muParser:0]
-package.use/dev-cpp_muparser_0 : dev-cpp/muParser:0 -doc -test
+package.use : dev-cpp/muParser:0 -doc -test
 
 [dev-cpp/pangomm:1.4]
-package.use/dev-cpp_pangomm_1.4 : dev-cpp/pangomm:1.4 -doc
+package.use : dev-cpp/pangomm:1.4 -doc
 
 [dev-cpp/tree:0]
-package.use/dev-cpp_tree_0 : dev-cpp/tree:0 -doc
+package.use : dev-cpp/tree:0 -doc
 
 [dev-db/couchdb:0]
-package.use/dev-db_couchdb_0 : dev-db/couchdb:0 -selinux -test
+package.use : dev-db/couchdb:0 -selinux -test
 
 [dev-db/dbmodel:0]
-package.use/dev-db_dbmodel_0 : dev-db/dbmodel:0 -debug
+package.use : dev-db/dbmodel:0 -debug
 
 [dev-db/gigabase:0]
-package.use/dev-db_gigabase_0 : dev-db/gigabase:0 -doc static-libs
+package.use : dev-db/gigabase:0 -doc static-libs
 
 [dev-db/libdbi-drivers:0]
-package.use/dev-db_libdbi-drivers_0 : dev-db/libdbi-drivers:0 -doc -firebird -mysql -oci8 -postgres sqlite static-libs
+package.use : dev-db/libdbi-drivers:0 -doc -firebird -mysql -oci8 -postgres sqlite static-libs
 
 [dev-db/libdbi:0]
-package.use/dev-db_libdbi_0 : dev-db/libdbi:0 -doc static-libs
+package.use : dev-db/libdbi:0 -doc static-libs
 
 [dev-db/libiodbc:0]
-package.use/dev-db_libiodbc_0 : dev-db/libiodbc:0 gtk
+package.use : dev-db/libiodbc:0 gtk
 
 [dev-db/libzdb:0]
-package.use/dev-db_libzdb_0 : dev-db/libzdb:0 -debug -doc -mysql -postgres sqlite ssl static-libs
+package.use : dev-db/libzdb:0 -debug -doc -mysql -postgres sqlite ssl static-libs
 
 [dev-db/maatkit:0]
-package.use/dev-db_maatkit_0 : dev-db/maatkit:0 -udf
+package.use : dev-db/maatkit:0 -udf
 
 [dev-db/mariadb:0]
-package.use/dev-db_mariadb_0 : dev-db/mariadb:0 -cluster -debug -embedded -extraengine -jemalloc -latin1 -minimal -oqgraph -pam -profiling -selinux -sphinx -static -systemtap -tcmalloc -test -tokudb bindist community odbc perl ssl static-libs xml
+package.use : dev-db/mariadb:0 -cluster -debug -embedded -extraengine -jemalloc -latin1 -minimal -oqgraph -pam -profiling -selinux -sphinx -static -systemtap -tcmalloc -test -tokudb bindist community odbc perl ssl static-libs xml
 
 [dev-db/mysql-super-smack:0]
-package.use/dev-db_mysql-super-smack_0 : dev-db/mysql-super-smack:0 -postgres mysql
+package.use : dev-db/mysql-super-smack:0 -postgres mysql
 
 [dev-db/pgadmin3:0]
-package.use/dev-db_pgadmin3_0 : dev-db/pgadmin3:0 -debug databasedesigner
+package.use : dev-db/pgadmin3:0 -debug databasedesigner
 
 [dev-db/postgresql:9.2]
-package.use/dev-db_postgresql_9.2 : dev-db/postgresql:9.2 -doc -kerberos -nls -pam -pg_legacytimestamp -selinux ldap perl python readline server ssl static-libs tcl threads uuid xml zlib
+package.use : dev-db/postgresql:9.2 -doc -kerberos -nls -pam -pg_legacytimestamp -selinux ldap perl python readline server ssl static-libs tcl threads uuid xml zlib
 
 [dev-db/postgresql:9.4]
-package.use/dev-db_postgresql_9.4 : dev-db/postgresql:9.4 -doc -kerberos -nls -pam -pg_legacytimestamp -selinux ldap perl python readline server ssl static-libs tcl threads uuid xml zlib
+package.use : dev-db/postgresql:9.4 -doc -kerberos -nls -pam -pg_legacytimestamp -selinux ldap perl python readline server ssl static-libs tcl threads uuid xml zlib
 
 [dev-db/qdbm:0]
-package.use/dev-db_qdbm_0 : dev-db/qdbm:0 -debug -java cxx perl ruby zlib
+package.use : dev-db/qdbm:0 -debug -java cxx perl ruby zlib
 
 [dev-db/slony1:0]
-package.use/dev-db_slony1_0 : dev-db/slony1:0 -doc perl
+package.use : dev-db/slony1:0 -doc perl
 
 [dev-db/sqlite:0]
-package.use/dev-db_sqlite_0 : dev-db/sqlite:0 -doc -nls tcl
+package.use : dev-db/sqlite:0 -doc -nls tcl
 
 [dev-db/sqlite:3]
-package.use/dev-db_sqlite_3 : dev-db/sqlite:3 -debug -doc -secure-delete -test -tools icu readline static-libs tcl
+package.use : dev-db/sqlite:3 -debug -doc -secure-delete -test -tools icu readline static-libs tcl
 
 [dev-db/tinycdb:0]
-package.use/dev-db_tinycdb_0 : dev-db/tinycdb:0 static-libs
+package.use : dev-db/tinycdb:0 static-libs
 
 [dev-db/unixODBC:0]
-package.use/dev-db_unixodbc_0 : dev-db/unixODBC:0 -odbcmanual minimal static-libs unicode
+package.use : dev-db/unixODBC:0 -odbcmanual minimal static-libs unicode
 
 [dev-db/xbase:0]
-package.use/dev-db_xbase_0 : dev-db/xbase:0 -doc static-libs
+package.use : dev-db/xbase:0 -doc static-libs
 
 [dev-db/xbsql:0]
-package.use/dev-db_xbsql_0 : dev-db/xbsql:0 -doc static-libs
+package.use : dev-db/xbsql:0 -doc static-libs
 
 [dev-embedded/avra:0]
-package.use/dev-embedded_avra_0 : dev-embedded/avra:0 -doc -examples
+package.use : dev-embedded/avra:0 -doc -examples
 
 [dev-embedded/bitbake:0]
-package.use/dev-embedded_bitbake_0 : dev-embedded/bitbake:0 -doc
+package.use : dev-embedded/bitbake:0 -doc
 
 [dev-embedded/dc-tool-ip:0]
-package.use/dev-embedded_dc-tool-ip_0 : dev-embedded/dc-tool-ip:0 -doc
+package.use : dev-embedded/dc-tool-ip:0 -doc
 
 [dev-embedded/gnusim8085:0]
-package.use/dev-embedded_gnusim8085_0 : dev-embedded/gnusim8085:0 -examples -nls
+package.use : dev-embedded/gnusim8085:0 -examples -nls
 
 [dev-embedded/gpsim:0]
-package.use/dev-embedded_gpsim_0 : dev-embedded/gpsim:0 -doc gtk static-libs
+package.use : dev-embedded/gpsim:0 -doc gtk static-libs
 
 [dev-embedded/tigcc:0]
-package.use/dev-embedded_tigcc_0 : dev-embedded/tigcc:0 -doc
+package.use : dev-embedded/tigcc:0 -doc
 
 [dev-embedded/urjtag:0]
-package.use/dev-embedded_urjtag_0 : dev-embedded/urjtag:0 -ftdi readline
+package.use : dev-embedded/urjtag:0 -ftdi readline
 
 [dev-games/KXL:0]
-package.use/dev-games_kxl_0 : dev-games/KXL:0 static-libs
+package.use : dev-games/KXL:0 static-libs
 
 [dev-games/aseprite:0]
-package.use/dev-games_aseprite_0 : dev-games/aseprite:0 -debug -memleak -static -test
+package.use : dev-games/aseprite:0 -debug -memleak -static -test
 
 [dev-games/clanlib:0.8]
-package.use/dev-games_clanlib_0.8 : dev-games/clanlib:0.8 -doc -mikmod ipv6 opengl sdl static-libs vorbis
+package.use : dev-games/clanlib:0.8 -doc -mikmod ipv6 opengl sdl static-libs vorbis
 
 [dev-games/flatzebra:0]
-package.use/dev-games_flatzebra_0 : dev-games/flatzebra:0 static-libs
+package.use : dev-games/flatzebra:0 static-libs
 
 [dev-games/hawknl:0]
-package.use/dev-games_hawknl_0 : dev-games/hawknl:0 -doc
+package.use : dev-games/hawknl:0 -doc
 
 [dev-games/ode:0]
-package.use/dev-games_ode_0 : dev-games/ode:0 -debug -doc -double-precision -examples -gyroscopic static-libs
-+package.env : dev-games/ode:0 dev-games_ode_0
-env/dev-games_ode_0 : LDFLAGS="-liconv"
+package.use : dev-games/ode:0 -debug -doc -double-precision -examples -gyroscopic static-libs
+package.env : dev-games/ode:0 dev-games_ode_0
+env : LDFLAGS="-liconv"
 
 [dev-games/physfs:0]
-package.use/dev-games_physfs_0 : dev-games/physfs:0 -doc -grp -hog -mvl -qpak -wad static-libs zip
+package.use : dev-games/physfs:0 -doc -grp -hog -mvl -qpak -wad static-libs zip
 
 [dev-games/poker-eval:0]
-package.use/dev-games_poker-eval_0 : dev-games/poker-eval:0 static-libs
+package.use : dev-games/poker-eval:0 static-libs
 
 [dev-lang/bff:0]
-package.use/dev-lang_bff_0 : dev-lang/bff:0 -test
+package.use : dev-lang/bff:0 -test
 
 [dev-lang/erlang:0]
-package.use/dev-lang_erlang_0 : dev-lang/erlang:0 -compat-ethread -doc -emacs -halfword -hipe -java -kpoll -sctp -systemd -wxwidgets odbc smp ssl tk
+package.use : dev-lang/erlang:0 -compat-ethread -doc -emacs -halfword -hipe -java -kpoll -sctp -systemd -wxwidgets odbc smp ssl tk
 
 [dev-lang/go:0]
-+package.env : dev-lang/go:0 dev-lang_go_0
-env/dev-lang_go_0 : MAKEOPTS="-j1"
+package.env : dev-lang/go:0 dev-lang_go_0
+env : MAKEOPTS="-j1"
 
 [dev-lang/gprolog:0]
-package.use/dev-lang_gprolog_0 : dev-lang/gprolog:0 -debug -doc -examples
+package.use : dev-lang/gprolog:0 -debug -doc -examples
 
 [dev-lang/lua:0]
-package.use/dev-lang_lua_0 : dev-lang/lua:0 -emacs -static deprecated readline
+package.use : dev-lang/lua:0 -emacs -static deprecated readline
 
 [dev-lang/mmix:0]
-package.use/dev-lang_mmix_0 : dev-lang/mmix:0 -doc
+package.use : dev-lang/mmix:0 -doc
 
 [dev-lang/nasm:0]
-package.use/dev-lang_nasm_0 : dev-lang/nasm:0 -doc
+package.use : dev-lang/nasm:0 -doc
 
 [dev-lang/nqc:0]
-package.use/dev-lang_nqc_0 : dev-lang/nqc:0 -usb
+package.use : dev-lang/nqc:0 -usb
 
 [dev-lang/orc:0]
-package.use/dev-lang_orc_0 : dev-lang/orc:0 -examples static-libs
+package.use : dev-lang/orc:0 -examples static-libs
 
 [dev-lang/perl:0]
-package.use/dev-lang_perl_0 : dev-lang/perl:0 -debug -doc -ithreads berkdb gdbm
+package.use : dev-lang/perl:0 -debug -doc -ithreads berkdb gdbm
 
 [dev-lang/python:2.7]
-package.use/dev-lang_python_2.7 : dev-lang/python:2.7 -berkdb -build -doc -examples -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads tk wide-unicode xml
-+package.env : dev-lang/python:2.7 dev-lang_python_2.7
-env/dev-lang_python_2.7 : MAKEOPTS="-j1"
+package.use : dev-lang/python:2.7 -berkdb -build -doc -examples -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads tk wide-unicode xml
+package.env : dev-lang/python:2.7 dev-lang_python_2.7
+env : MAKEOPTS="-j1"
 
 [dev-lang/python:3.3]
-package.use/dev-lang_python_3.3 : dev-lang/python:3.3 -build -doc -examples -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads tk xml
-+package.env : dev-lang/python:3.3 dev-lang_python_3.3
-env/dev-lang_python_3.3 : MAKEOPTS="-j1"
+package.use : dev-lang/python:3.3 -build -doc -examples -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads tk xml
+package.env : dev-lang/python:3.3 dev-lang_python_3.3
+env : MAKEOPTS="-j1"
 
 [dev-lang/python:3.4]
-package.use/dev-lang_python_3.4 : dev-lang/python:3.4 -build -examples -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads tk xml
-+package.env : dev-lang/python:3.4 dev-lang_python_3.4
-env/dev-lang_python_3.4 : MAKEOPTS="-j1"
+package.use : dev-lang/python:3.4 -build -examples -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads tk xml
+package.env : dev-lang/python:3.4 dev-lang_python_3.4
+env : MAKEOPTS="-j1"
 
 [dev-lang/ruby:1.9]
-package.use/dev-lang_ruby_1.9 : dev-lang/ruby:1.9 -debug -doc -examples -rubytests -socks5 -xemacs berkdb gdbm ipv6 ncurses rdoc readline ssl yaml
+package.use : dev-lang/ruby:1.9 -debug -doc -examples -rubytests -socks5 -xemacs berkdb gdbm ipv6 ncurses rdoc readline ssl yaml
 
 [dev-lang/ruby:2.0]
-package.use/dev-lang_ruby_2.0 : dev-lang/ruby:2.0 -debug -doc -examples -rubytests -socks5 -xemacs berkdb cpu_flags_x86_sse2 gdbm ipv6 ncurses rdoc readline ssl
+package.use : dev-lang/ruby:2.0 -debug -doc -examples -rubytests -socks5 -xemacs berkdb cpu_flags_x86_sse2 gdbm ipv6 ncurses rdoc readline ssl
 
 [dev-lang/spidermonkey:0]
-package.use/dev-lang_spidermonkey_0 : dev-lang/spidermonkey:0 -debug -minimal -test static-libs
+package.use : dev-lang/spidermonkey:0 -debug -minimal -test static-libs
 
 [dev-lang/swi-prolog:0]
-package.use/dev-lang_swi-prolog_0 : dev-lang/swi-prolog:0 -archive -debug -doc -java -minimal -test X gmp hardened odbc readline ssl static-libs zlib
+package.use : dev-lang/swi-prolog:0 -archive -debug -doc -java -minimal -test X gmp hardened odbc readline ssl static-libs zlib
 
 [dev-lang/swig:0]
-package.use/dev-lang_swig_0 : dev-lang/swig:0 -ccache -doc pcre
+package.use : dev-lang/swig:0 -ccache -doc pcre
 
 [dev-lang/swig:1]
-package.use/dev-lang_swig_1 : dev-lang/swig:1 -ccache -doc
+package.use : dev-lang/swig:1 -ccache -doc
 
 [dev-lang/tcl:0]
-package.use/dev-lang_tcl_0 : dev-lang/tcl:0 -debug threads
+package.use : dev-lang/tcl:0 -debug threads
 
 [dev-lang/tk:0]
-package.use/dev-lang_tk_0 : dev-lang/tk:0 -aqua -debug -test -truetype threads xscreensaver
+package.use : dev-lang/tk:0 -aqua -debug -test -truetype threads xscreensaver
 
 [dev-lang/vala:0.26]
-package.use/dev-lang_vala_0.26 : dev-lang/vala:0.26 -test
+package.use : dev-lang/vala:0.26 -test
 
 [dev-lang/xsb:0]
-package.use/dev-lang_xsb_0 : dev-lang/xsb:0 -debug -examples -java -mysql curl iodbc odbc pcre threads xml
+package.use : dev-lang/xsb:0 -debug -examples -java -mysql curl iodbc odbc pcre threads xml
 
 [dev-lang/yap:0]
-package.use/dev-lang_yap_0 : dev-lang/yap:0 -debug -doc -examples -java -mpi -mysql -static gmp odbc readline threads
+package.use : dev-lang/yap:0 -debug -doc -examples -java -mpi -mysql -static gmp odbc readline threads
 
 [dev-lang/yasm:0]
-package.use/dev-lang_yasm_0 : dev-lang/yasm:0 -nls python
+package.use : dev-lang/yasm:0 -nls python
 
 [dev-libs/DirectFB:0]
-package.use/dev-libs_directfb_0 : dev-libs/DirectFB:0 -X -debug -doc -gif -input_devices_dynapro -input_devices_elo2300 -input_devices_lirc -sdl -static-libs -v4l -video_cards_nsc -video_cards_nvidia -video_cards_via -video_cards_vmware cpu_flags_x86_mmx cpu_flags_x86_sse fbcon input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_tslib jpeg png truetype video_cards_intel video_cards_mach64 video_cards_mga video_cards_neomagic video_cards_r128 video_cards_radeon video_cards_s3 video_cards_savage video_cards_sis video_cards_tdfx zlib
+package.use : dev-libs/DirectFB:0 -X -debug -doc -gif -input_devices_dynapro -input_devices_elo2300 -input_devices_lirc -sdl -static-libs -v4l -video_cards_nsc -video_cards_nvidia -video_cards_via -video_cards_vmware cpu_flags_x86_mmx cpu_flags_x86_sse fbcon input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_tslib jpeg png truetype video_cards_intel video_cards_mach64 video_cards_mga video_cards_neomagic video_cards_r128 video_cards_radeon video_cards_s3 video_cards_savage video_cards_sis video_cards_tdfx zlib
 
 [dev-libs/ace:0]
-package.use/dev-libs_ace_0 : dev-libs/ace:0 -ciao -tao X ipv6
+package.use : dev-libs/ace:0 -ciao -tao X ipv6
 
 [dev-libs/appstream-glib:0]
-package.use/dev-libs_appstream-glib_0 : dev-libs/appstream-glib:0 -nls introspection
+package.use : dev-libs/appstream-glib:0 -nls introspection
 
 [dev-libs/apr-util:1]
-package.use/dev-libs_apr-util_1 : dev-libs/apr-util:1 -doc -freetds -mysql -nss -openssl -postgres berkdb gdbm ldap odbc sqlite static-libs
+package.use : dev-libs/apr-util:1 -doc -freetds -mysql -nss -openssl -postgres berkdb gdbm ldap odbc sqlite static-libs
 
 [dev-libs/apr:1]
-package.use/dev-libs_apr_1 : dev-libs/apr:1 -doc -older-kernels-compatibility -selinux static-libs urandom
+package.use : dev-libs/apr:1 -doc -older-kernels-compatibility -selinux static-libs urandom
 
 [dev-libs/argtable:0]
-package.use/dev-libs_argtable_0 : dev-libs/argtable:0 -debug -doc -examples static-libs
+package.use : dev-libs/argtable:0 -debug -doc -examples static-libs
 
 [dev-libs/atk:0]
-package.use/dev-libs_atk_0 : dev-libs/atk:0 -nls -test introspection
+package.use : dev-libs/atk:0 -nls -test introspection
 
 [dev-libs/bitset:0]
-package.use/dev-libs_bitset_0 : dev-libs/bitset:0 -jemalloc -tcmalloc static-libs
+package.use : dev-libs/bitset:0 -jemalloc -tcmalloc static-libs
 
 [dev-libs/boost:0]
-package.use/dev-libs_boost_0 : dev-libs/boost:0 -context -debug -doc -mpi -nls -tools icu python static-libs threads
+package.use : dev-libs/boost:0 -context -debug -doc -mpi -nls -tools icu python static-libs threads
 
 [dev-libs/botan:0]
-package.use/dev-libs_botan_0 : dev-libs/botan:0 -doc bindist bzip2 gmp python ssl static-libs threads zlib
+package.use : dev-libs/botan:0 -doc bindist bzip2 gmp python ssl static-libs threads zlib
 
 [dev-libs/cdk:0]
-package.use/dev-libs_cdk_0 : dev-libs/cdk:0 -examples static-libs unicode
+package.use : dev-libs/cdk:0 -examples static-libs unicode
 
 [dev-libs/cgicc:0]
-package.use/dev-libs_cgicc_0 : dev-libs/cgicc:0 -doc
+package.use : dev-libs/cgicc:0 -doc
 
 [dev-libs/cgilib:0]
-package.use/dev-libs_cgilib_0 : dev-libs/cgilib:0 static-libs
+package.use : dev-libs/cgilib:0 static-libs
 
 [dev-libs/check:0]
-package.use/dev-libs_check_0 : dev-libs/check:0 -subunit static-libs
+package.use : dev-libs/check:0 -subunit static-libs
 
 [dev-libs/chmlib:0]
-package.use/dev-libs_chmlib_0 : dev-libs/chmlib:0 examples static-libs
+package.use : dev-libs/chmlib:0 examples static-libs
 
 [dev-libs/clearsilver:0]
-package.use/dev-libs_clearsilver_0 : dev-libs/clearsilver:0 perl python zlib
+package.use : dev-libs/clearsilver:0 perl python zlib
 
 [dev-libs/cloog:0]
-package.use/dev-libs_cloog_0 : dev-libs/cloog:0 static-libs
+package.use : dev-libs/cloog:0 static-libs
 
 [dev-libs/confuse:0]
-package.use/dev-libs_confuse_0 : dev-libs/confuse:0 -nls static-libs
+package.use : dev-libs/confuse:0 -nls static-libs
 
 [dev-libs/crypto++:0]
-package.use/dev-libs_crypto++_0 : dev-libs/crypto++:0 static-libs
+package.use : dev-libs/crypto++:0 static-libs
 
 [dev-libs/cyberjack:0]
-package.use/dev-libs_cyberjack_0 : dev-libs/cyberjack:0 -fox -udev xml
+package.use : dev-libs/cyberjack:0 -fox -udev xml
 
 [dev-libs/cyrus-sasl:2]
-package.use/dev-libs_cyrus-sasl_2 : dev-libs/cyrus-sasl:2 -authdaemond -java -kerberos -ldapdb -mysql -openldap -pam -postgres -sample -selinux -srp -urandom berkdb gdbm sqlite ssl static-libs
+package.use : dev-libs/cyrus-sasl:2 -authdaemond -java -kerberos -ldapdb -mysql -openldap -pam -postgres -sample -selinux -srp -urandom berkdb gdbm sqlite ssl static-libs
 
 [dev-libs/dbus-glib:0]
-package.use/dev-libs_dbus-glib_0 : dev-libs/dbus-glib:0 -debug -doc -test static-libs
+package.use : dev-libs/dbus-glib:0 -debug -doc -test static-libs
 
 [dev-libs/eventlog:0]
-package.use/dev-libs_eventlog_0 : dev-libs/eventlog:0 static-libs
+package.use : dev-libs/eventlog:0 static-libs
 
 [dev-libs/expat:0]
-package.use/dev-libs_expat_0 : dev-libs/expat:0 -examples static-libs unicode
+package.use : dev-libs/expat:0 -examples static-libs unicode
 
 [dev-libs/ferrisloki:0]
-package.use/dev-libs_ferrisloki_0 : dev-libs/ferrisloki:0 -stlport static-libs
+package.use : dev-libs/ferrisloki:0 -stlport static-libs
 
 [dev-libs/fribidi:0]
-package.use/dev-libs_fribidi_0 : dev-libs/fribidi:0 static-libs
+package.use : dev-libs/fribidi:0 static-libs
 
 [dev-libs/gdl:3]
-package.use/dev-libs_gdl_3 : dev-libs/gdl:3 introspection
+package.use : dev-libs/gdl:3 introspection
 
 [dev-libs/geoip:0]
-package.use/dev-libs_geoip_0 : dev-libs/geoip:0 static-libs
+package.use : dev-libs/geoip:0 static-libs
 
 [dev-libs/girara:3]
-package.use/dev-libs_girara_3 : dev-libs/girara:3 libnotify static-libs
+package.use : dev-libs/girara:3 libnotify static-libs
 
 [dev-libs/glib:2]
-package.use/dev-libs_glib_2 : dev-libs/glib:2 -debug -fam -selinux -systemtap -test dbus mime static-libs utils xattr
+package.use : dev-libs/glib:2 -debug -fam -selinux -systemtap -test dbus mime static-libs utils xattr
 
 [dev-libs/gmime:2.6]
-package.use/dev-libs_gmime_2.6 : dev-libs/gmime:2.6 -doc -mono static-libs vala
+package.use : dev-libs/gmime:2.6 -doc -mono static-libs vala
 
 [dev-libs/gmp:0]
-package.use/dev-libs_gmp_0 : dev-libs/gmp:0 -doc -pgo cxx static-libs
+package.use : dev-libs/gmp:0 -doc -pgo cxx static-libs
 
 [dev-libs/gobject-introspection:0]
-package.use/dev-libs_gobject-introspection_0 : dev-libs/gobject-introspection:0 -doctool -test cairo
+package.use : dev-libs/gobject-introspection:0 -doctool -test cairo
 
 [dev-libs/guiloader-c++:0]
-package.use/dev-libs_guiloader-c++_0 : dev-libs/guiloader-c++:0 -nls
+package.use : dev-libs/guiloader-c++:0 -nls
 
 [dev-libs/guiloader:0]
-package.use/dev-libs_guiloader_0 : dev-libs/guiloader:0 -nls
+package.use : dev-libs/guiloader:0 -nls
 
 [dev-libs/hashit:0]
-package.use/dev-libs_hashit_0 : dev-libs/hashit:0 -debug
+package.use : dev-libs/hashit:0 -debug
 
 [dev-libs/hiredis:0]
-package.use/dev-libs_hiredis_0 : dev-libs/hiredis:0 static-libs
+package.use : dev-libs/hiredis:0 static-libs
 
 [dev-libs/icu:0]
-package.use/dev-libs_icu_0 : dev-libs/icu:0 -debug -doc -examples static-libs
+package.use : dev-libs/icu:0 -debug -doc -examples static-libs
 
 [dev-libs/iniparser:0]
-package.use/dev-libs_iniparser_0 : dev-libs/iniparser:0 -doc -examples static-libs
+package.use : dev-libs/iniparser:0 -doc -examples static-libs
 
 [dev-libs/isl:0]
-package.use/dev-libs_isl_0 : dev-libs/isl:0 static-libs
+package.use : dev-libs/isl:0 static-libs
 
 [dev-libs/json-c:0]
-package.use/dev-libs_json-c_0 : dev-libs/json-c:0 -doc static-libs
+package.use : dev-libs/json-c:0 -doc static-libs
 
 [dev-libs/json-glib:0]
-package.use/dev-libs_json-glib_0 : dev-libs/json-glib:0 -debug introspection
+package.use : dev-libs/json-glib:0 -debug introspection
 
 [dev-libs/jthread:0]
-package.use/dev-libs_jthread_0 : dev-libs/jthread:0 static-libs
+package.use : dev-libs/jthread:0 static-libs
 
 [dev-libs/keybinder:0]
-package.use/dev-libs_keybinder_0 : dev-libs/keybinder:0 introspection lua python
+package.use : dev-libs/keybinder:0 introspection lua python
 
 [dev-libs/keybinder:3]
-package.use/dev-libs_keybinder_3 : dev-libs/keybinder:3 introspection
+package.use : dev-libs/keybinder:3 introspection
 
 [dev-libs/klibc:0]
-package.use/dev-libs_klibc_0 : dev-libs/klibc:0 -debug
+package.use : dev-libs/klibc:0 -debug
 
 [dev-libs/kpathsea:0]
-package.use/dev-libs_kpathsea_0 : dev-libs/kpathsea:0 -doc -source static-libs
-package.accept_keywords/dev-libs_kpathsea_0 : >=dev-libs/kpathsea-6.2.0_p20140525 ~amd64
+package.use : dev-libs/kpathsea:0 -doc -source static-libs
+package.accept_keywords : >=dev-libs/kpathsea-6.2.0_p20140525 ~amd64
 
 [dev-libs/libRocket:0]
-package.use/dev-libs_librocket_0 : dev-libs/libRocket:0 -samples python
+package.use : dev-libs/libRocket:0 -samples python
 
 [dev-libs/libaio:0]
-package.use/dev-libs_libaio_0 : dev-libs/libaio:0 -test static-libs
+package.use : dev-libs/libaio:0 -test static-libs
 
 [dev-libs/libassuan:0]
-package.use/dev-libs_libassuan_0 : dev-libs/libassuan:0 static-libs
+package.use : dev-libs/libassuan:0 static-libs
 
 [dev-libs/libax25:0]
-package.use/dev-libs_libax25_0 : dev-libs/libax25:0 static-libs
+package.use : dev-libs/libax25:0 static-libs
 
 [dev-libs/libbrahe:0]
-package.use/dev-libs_libbrahe_0 : dev-libs/libbrahe:0 static-libs
+package.use : dev-libs/libbrahe:0 static-libs
 
 [dev-libs/libbsd:0]
-package.use/dev-libs_libbsd_0 : dev-libs/libbsd:0 static-libs
+package.use : dev-libs/libbsd:0 static-libs
 
 [dev-libs/libburn:0]
-package.use/dev-libs_libburn_0 : dev-libs/libburn:0 -debug -track-src-odirect cdio static-libs
+package.use : dev-libs/libburn:0 -debug -track-src-odirect cdio static-libs
 
 [dev-libs/libcdio-paranoia:0]
-package.use/dev-libs_libcdio-paranoia_0 : dev-libs/libcdio-paranoia:0 -test cxx static-libs
+package.use : dev-libs/libcdio-paranoia:0 -test cxx static-libs
 
 [dev-libs/libcdio:0]
-package.use/dev-libs_libcdio_0 : dev-libs/libcdio:0 -minimal -test cddb cxx static-libs
+package.use : dev-libs/libcdio:0 -minimal -test cddb cxx static-libs
 
 [dev-libs/libcgroup:0]
-package.use/dev-libs_libcgroup_0 : dev-libs/libcgroup:0 -debug -pam daemon static-libs tools
+package.use : dev-libs/libcgroup:0 -debug -pam daemon static-libs tools
 
 [dev-libs/libconfig:0]
-package.use/dev-libs_libconfig_0 : dev-libs/libconfig:0 -examples cxx static-libs
+package.use : dev-libs/libconfig:0 -examples cxx static-libs
 
 [dev-libs/libcoyotl:0]
-package.use/dev-libs_libcoyotl_0 : dev-libs/libcoyotl:0 -doc static-libs
+package.use : dev-libs/libcoyotl:0 -doc static-libs
 
 [dev-libs/libcroco:0.6]
-package.use/dev-libs_libcroco_0.6 : dev-libs/libcroco:0.6 -test
+package.use : dev-libs/libcroco:0.6 -test
 
 [dev-libs/libdaemon:0]
-package.use/dev-libs_libdaemon_0 : dev-libs/libdaemon:0 -doc -examples static-libs
+package.use : dev-libs/libdaemon:0 -doc -examples static-libs
 
 [dev-libs/libdnet:0]
-package.use/dev-libs_libdnet_0 : dev-libs/libdnet:0 -test ipv6 python static-libs
+package.use : dev-libs/libdnet:0 -test ipv6 python static-libs
 
 [dev-libs/libdshconfig:0]
-package.use/dev-libs_libdshconfig_0 : dev-libs/libdshconfig:0 static-libs
+package.use : dev-libs/libdshconfig:0 static-libs
 
 [dev-libs/libelf:0]
-package.use/dev-libs_libelf_0 : dev-libs/libelf:0 -debug -nls
+package.use : dev-libs/libelf:0 -debug -nls
 
 [dev-libs/libev:0]
-package.use/dev-libs_libev_0 : dev-libs/libev:0 static-libs
+package.use : dev-libs/libev:0 static-libs
 
 [dev-libs/libevdev:0]
-package.use/dev-libs_libevdev_0 : dev-libs/libevdev:0 static-libs
+package.use : dev-libs/libevdev:0 static-libs
 
 [dev-libs/libevent:0]
-package.use/dev-libs_libevent_0 : dev-libs/libevent:0 -debug -test ssl static-libs threads
+package.use : dev-libs/libevent:0 -debug -test ssl static-libs threads
 
 [dev-libs/libevocosm:0]
-package.use/dev-libs_libevocosm_0 : dev-libs/libevocosm:0 -doc static-libs
+package.use : dev-libs/libevocosm:0 -doc static-libs
 
 [dev-libs/libffi:0]
-package.use/dev-libs_libffi_0 : dev-libs/libffi:0 -debug -test pax_kernel static-libs
+package.use : dev-libs/libffi:0 -debug -test pax_kernel static-libs
 
 [dev-libs/libg15render:0]
-package.use/dev-libs_libg15render_0 : dev-libs/libg15render:0 -truetype
+package.use : dev-libs/libg15render:0 -truetype
 
 [dev-libs/libgamin:0]
-package.use/dev-libs_libgamin_0 : dev-libs/libgamin:0 -debug python static-libs
+package.use : dev-libs/libgamin:0 -debug python static-libs
 
 [dev-libs/libgcrypt:0]
-package.use/dev-libs_libgcrypt_0 : dev-libs/libgcrypt:0 -doc static-libs
-package.accept_keywords/dev-libs_libgcrypt_0 : >=dev-libs/libgcrypt-1.6.3-r3 ~amd64
+package.use : dev-libs/libgcrypt:0 -doc static-libs
+package.accept_keywords : >=dev-libs/libgcrypt-1.6.3-r3 ~amd64
 
 [dev-libs/libgdata:0]
-package.use/dev-libs_libgdata_0 : dev-libs/libgdata:0 -debug -gnome -test introspection static-libs vala
+package.use : dev-libs/libgdata:0 -debug -gnome -test introspection static-libs vala
 
 [dev-libs/libgee:0]
-package.use/dev-libs_libgee_0 : dev-libs/libgee:0 introspection
+package.use : dev-libs/libgee:0 introspection
 
 [dev-libs/libgee:0.8]
-package.use/dev-libs_libgee_0.8 : dev-libs/libgee:0.8 introspection
+package.use : dev-libs/libgee:0.8 introspection
 
 [dev-libs/libgit2-glib:0]
-package.use/dev-libs_libgit2-glib_0 : dev-libs/libgit2-glib:0 -ssh python vala
+package.use : dev-libs/libgit2-glib:0 -ssh python vala
 
 [dev-libs/libgit2:0]
-package.use/dev-libs_libgit2_0 : dev-libs/libgit2:0 -examples -ssh -test -trace threads
+package.use : dev-libs/libgit2:0 -examples -ssh -test -trace threads
 
 [dev-libs/libgpg-error:0]
-package.use/dev-libs_libgpg-error_0 : dev-libs/libgpg-error:0 -common-lisp -nls static-libs
-package.accept_keywords/dev-libs_libgpg-error_0 : >=dev-libs/libgpg-error-1.19 ~amd64
+package.use : dev-libs/libgpg-error:0 -common-lisp -nls static-libs
+package.accept_keywords : >=dev-libs/libgpg-error-1.19 ~amd64
 
 [dev-libs/libgweather:2]
-package.use/dev-libs_libgweather_2 : dev-libs/libgweather:2 -glade introspection vala
+package.use : dev-libs/libgweather:2 -glade introspection vala
 
 [dev-libs/libhash:0]
-package.use/dev-libs_libhash_0 : dev-libs/libhash:0 -doc
+package.use : dev-libs/libhash:0 -doc
 
 [dev-libs/libical:0]
-package.use/dev-libs_libical_0 : dev-libs/libical:0 -doc -examples -introspection static-libs
+package.use : dev-libs/libical:0 -doc -examples -introspection static-libs
 
 [dev-libs/libiconv:0]
-package.use/dev-libs_libiconv_0 : dev-libs/libiconv:0 static-libs
+package.use : dev-libs/libiconv:0 static-libs
 
 [dev-libs/libisofs:0]
-package.use/dev-libs_libisofs_0 : dev-libs/libisofs:0 -debug -verbose-debug acl static-libs xattr zlib
+package.use : dev-libs/libisofs:0 -debug -verbose-debug acl static-libs xattr zlib
 
 [dev-libs/libksba:0]
-package.use/dev-libs_libksba_0 : dev-libs/libksba:0 static-libs
+package.use : dev-libs/libksba:0 static-libs
 
 [dev-libs/liblist:0]
-package.use/dev-libs_liblist_0 : dev-libs/liblist:0 -doc -examples static-libs
+package.use : dev-libs/liblist:0 -doc -examples static-libs
 
 [dev-libs/libltdl:0]
-package.use/dev-libs_libltdl_0 : dev-libs/libltdl:0 static-libs
+package.use : dev-libs/libltdl:0 static-libs
 
 [dev-libs/libmail:0]
-package.use/dev-libs_libmail_0 : dev-libs/libmail:0 -apop -debug -profile gnutls sasl static-libs
+package.use : dev-libs/libmail:0 -apop -debug -profile gnutls sasl static-libs
 
 [dev-libs/libmateweather:0]
-package.use/dev-libs_libmateweather_0 : dev-libs/libmateweather:0 -debug python
+package.use : dev-libs/libmateweather:0 -debug python
 
 [dev-libs/libmba:0]
-package.use/dev-libs_libmba_0 : dev-libs/libmba:0 static-libs
+package.use : dev-libs/libmba:0 static-libs
 
 [dev-libs/libmix:0]
-package.use/dev-libs_libmix_0 : dev-libs/libmix:0 static-libs
+package.use : dev-libs/libmix:0 static-libs
 
 [dev-libs/libnatspec:0]
-package.use/dev-libs_libnatspec_0 : dev-libs/libnatspec:0 -doc python
+package.use : dev-libs/libnatspec:0 -doc python
 
 [dev-libs/libnl:1.1]
-package.use/dev-libs_libnl_1.1 : dev-libs/libnl:1.1 -doc static-libs
+package.use : dev-libs/libnl:1.1 -doc static-libs
 
 [dev-libs/libnl:3]
-package.use/dev-libs_libnl_3 : dev-libs/libnl:3 python static-libs utils
+package.use : dev-libs/libnl:3 python static-libs utils
 
 [dev-libs/libofx:0]
-package.use/dev-libs_libofx_0 : dev-libs/libofx:0 -doc -test static-libs
+package.use : dev-libs/libofx:0 -doc -test static-libs
 
 [dev-libs/liboop:0]
-package.use/dev-libs_liboop_0 : dev-libs/liboop:0 -adns -gnome readline tcl
+package.use : dev-libs/liboop:0 -adns -gnome readline tcl
 
 [dev-libs/libowfat:0]
-package.use/dev-libs_libowfat_0 : dev-libs/libowfat:0 -diet
+package.use : dev-libs/libowfat:0 -diet
 
 [dev-libs/libp11:0]
-package.use/dev-libs_libp11_0 : dev-libs/libp11:0 -doc
+package.use : dev-libs/libp11:0 -doc
 
 [dev-libs/libpcre:3]
-package.use/dev-libs_libpcre_3 : dev-libs/libpcre:3 -jit -libedit -pcre16 -pcre32 bzip2 cxx readline recursion-limit static-libs unicode zlib
+package.use : dev-libs/libpcre:3 -jit -libedit -pcre16 -pcre32 bzip2 cxx readline recursion-limit static-libs unicode zlib
 
 [dev-libs/libpeas:0]
-package.use/dev-libs_libpeas_0 : dev-libs/libpeas:0 -glade -test gtk python
+package.use : dev-libs/libpeas:0 -glade -test gtk python
 
 [dev-libs/libpipeline:0]
-package.use/dev-libs_libpipeline_0 : dev-libs/libpipeline:0 -test static-libs
+package.use : dev-libs/libpipeline:0 -test static-libs
 
 [dev-libs/libpthread-stubs:0]
-package.use/dev-libs_libpthread-stubs_0 : dev-libs/libpthread-stubs:0 static-libs
+package.use : dev-libs/libpthread-stubs:0 static-libs
 
 [dev-libs/librep:0]
-package.use/dev-libs_librep_0 : dev-libs/librep:0 -emacs readline
+package.use : dev-libs/librep:0 -emacs readline
 
 [dev-libs/libsigc++:1.2]
-package.use/dev-libs_libsigc++_1.2 : dev-libs/libsigc++:1.2 -debug
+package.use : dev-libs/libsigc++:1.2 -debug
 
 [dev-libs/libsigc++:2]
-package.use/dev-libs_libsigc++_2 : dev-libs/libsigc++:2 -doc -test static-libs
+package.use : dev-libs/libsigc++:2 -doc -test static-libs
 
 [dev-libs/libsodium:0]
-package.use/dev-libs_libsodium_0 : dev-libs/libsodium:0 -minimal asm static-libs urandom
+package.use : dev-libs/libsodium:0 -minimal asm static-libs urandom
 
 [dev-libs/libstrl:0]
-package.use/dev-libs_libstrl_0 : dev-libs/libstrl:0 -doc -test static-libs
+package.use : dev-libs/libstrl:0 -doc -test static-libs
 
 [dev-libs/libtasn1:0]
-package.use/dev-libs_libtasn1_0 : dev-libs/libtasn1:0 -doc static-libs
+package.use : dev-libs/libtasn1:0 -doc static-libs
 
 [dev-libs/libtecla:0]
-package.use/dev-libs_libtecla_0 : dev-libs/libtecla:0 static-libs
+package.use : dev-libs/libtecla:0 static-libs
 
 [dev-libs/libtommath:0]
-package.use/dev-libs_libtommath_0 : dev-libs/libtommath:0 -doc -examples static-libs
+package.use : dev-libs/libtommath:0 -doc -examples static-libs
 
 [dev-libs/libunique:1]
-package.use/dev-libs_libunique_1 : dev-libs/libunique:1 -debug -doc -test dbus introspection
+package.use : dev-libs/libunique:1 -debug -doc -test dbus introspection
 
 [dev-libs/libunique:3]
-package.use/dev-libs_libunique_3 : dev-libs/libunique:3 -debug -doc -test introspection
+package.use : dev-libs/libunique:3 -debug -doc -test introspection
 
 [dev-libs/libunistring:0]
-package.use/dev-libs_libunistring_0 : dev-libs/libunistring:0 -doc -static-libs
+package.use : dev-libs/libunistring:0 -doc -static-libs
 
 [dev-libs/libusb-compat:0]
-package.use/dev-libs_libusb-compat_0 : dev-libs/libusb-compat:0 -debug -examples static-libs
+package.use : dev-libs/libusb-compat:0 -debug -examples static-libs
 
 [dev-libs/libusb:1]
-package.use/dev-libs_libusb_1 : dev-libs/libusb:1 -debug -doc -examples -test -udev static-libs
+package.use : dev-libs/libusb:1 -debug -doc -examples -test -udev static-libs
 
 [dev-libs/libverto:0]
-package.use/dev-libs_libverto_0 : dev-libs/libverto:0 -glib -libevent -tevent libev static-libs threads
+package.use : dev-libs/libverto:0 -glib -libevent -tevent libev static-libs threads
 
 [dev-libs/libwacom:0]
-package.use/dev-libs_libwacom_0 : dev-libs/libwacom:0 -doc static-libs
+package.use : dev-libs/libwacom:0 -doc static-libs
 
 [dev-libs/libwbxml:0]
-package.use/dev-libs_libwbxml_0 : dev-libs/libwbxml:0 -test
+package.use : dev-libs/libwbxml:0 -test
 
 [dev-libs/libx86:0]
-package.use/dev-libs_libx86_0 : dev-libs/libx86:0 static-libs
+package.use : dev-libs/libx86:0 static-libs
 
 [dev-libs/libxdg-basedir:0]
-package.use/dev-libs_libxdg-basedir_0 : dev-libs/libxdg-basedir:0 -doc static-libs
+package.use : dev-libs/libxdg-basedir:0 -doc static-libs
 
 [dev-libs/libxml2:2]
-package.use/dev-libs_libxml2_2 : dev-libs/libxml2:2 -debug -examples -test icu ipv6 lzma python readline static-libs
+package.use : dev-libs/libxml2:2 -debug -examples -test icu ipv6 lzma python readline static-libs
 
 [dev-libs/libxslt:0]
-package.use/dev-libs_libxslt_0 : dev-libs/libxslt:0 -debug crypt python static-libs
+package.use : dev-libs/libxslt:0 -debug crypt python static-libs
 
 [dev-libs/libyaml:0]
-package.use/dev-libs_libyaml_0 : dev-libs/libyaml:0 -doc -examples -test static-libs
+package.use : dev-libs/libyaml:0 -doc -examples -test static-libs
 
 [dev-libs/libzip:0]
-package.use/dev-libs_libzip_0 : dev-libs/libzip:0 static-libs
+package.use : dev-libs/libzip:0 static-libs
 
 [dev-libs/log4cpp:0]
-package.use/dev-libs_log4cpp_0 : dev-libs/log4cpp:0 -doc
+package.use : dev-libs/log4cpp:0 -doc
 
 [dev-libs/log4sh:0]
-package.use/dev-libs_log4sh_0 : dev-libs/log4sh:0 -examples
+package.use : dev-libs/log4sh:0 -examples
 
 [dev-libs/lzo:2]
-package.use/dev-libs_lzo_2 : dev-libs/lzo:2 -examples static-libs
+package.use : dev-libs/lzo:2 -examples static-libs
 
 [dev-libs/mini-xml:0]
-package.use/dev-libs_mini-xml_0 : dev-libs/mini-xml:0 static-libs threads
+package.use : dev-libs/mini-xml:0 static-libs threads
 
 [dev-libs/mpc:0]
-package.use/dev-libs_mpc_0 : dev-libs/mpc:0 static-libs
+package.use : dev-libs/mpc:0 static-libs
 
 [dev-libs/mpfr:0]
-package.use/dev-libs_mpfr_0 : dev-libs/mpfr:0 static-libs
+package.use : dev-libs/mpfr:0 static-libs
 
 [dev-libs/nettle:0]
-package.use/dev-libs_nettle_0 : dev-libs/nettle:0 -doc -neon -test gmp static-libs
+package.use : dev-libs/nettle:0 -doc -neon -test gmp static-libs
 
 [dev-libs/npth:0]
-package.use/dev-libs_npth_0 : dev-libs/npth:0 static-libs
-package.accept_keywords/dev-libs_npth_0 : >=dev-libs/npth-1.1 ~amd64
+package.use : dev-libs/npth:0 static-libs
+package.accept_keywords : >=dev-libs/npth-1.1 ~amd64
 
 [dev-libs/nspr:0]
-package.use/dev-libs_nspr_0 : dev-libs/nspr:0 -debug
+package.use : dev-libs/nspr:0 -debug
 
 [dev-libs/nss:0]
-package.use/dev-libs_nss_0 : dev-libs/nss:0 cacert nss-pem utils
+package.use : dev-libs/nss:0 cacert nss-pem utils
 
 [dev-libs/openobex:0]
-package.use/dev-libs_openobex_0 : dev-libs/openobex:0 -debug -irda -usb bluetooth syslog
+package.use : dev-libs/openobex:0 -debug -irda -usb bluetooth syslog
 
 [dev-libs/opensc:0]
-package.use/dev-libs_opensc_0 : dev-libs/opensc:0 -doc -libtool -openct pcsc-lite readline ssl zlib
+package.use : dev-libs/opensc:0 -doc -libtool -openct pcsc-lite readline ssl zlib
 
 [dev-libs/openssl:0]
-package.use/dev-libs_openssl_0 : dev-libs/openssl:0 -kerberos -rfc3779 -test -vanilla bindist cpu_flags_x86_sse2 gmp static-libs tls-heartbeat zlib
+package.use : dev-libs/openssl:0 -kerberos -rfc3779 -test -vanilla bindist cpu_flags_x86_sse2 gmp static-libs tls-heartbeat zlib
 
 [dev-libs/ossp-uuid:0]
-package.use/dev-libs_ossp-uuid_0 : dev-libs/ossp-uuid:0 -php -php_targets_php5-4 cxx perl php_targets_php5-5 static-libs
+package.use : dev-libs/ossp-uuid:0 -php -php_targets_php5-4 cxx perl php_targets_php5-5 static-libs
 
 [dev-libs/pakchois:0]
-package.use/dev-libs_pakchois_0 : dev-libs/pakchois:0 -nls
-+package.env : dev-libs/pakchois:0 dev-libs_pakchois_0
-env/dev-libs_pakchois_0 : LDFLAGS="-lintl"
+package.use : dev-libs/pakchois:0 -nls
+package.env : dev-libs/pakchois:0 dev-libs_pakchois_0
+env : LDFLAGS="-lintl"
 
 [dev-libs/popt:0]
-package.use/dev-libs_popt_0 : dev-libs/popt:0 -nls static-libs
+package.use : dev-libs/popt:0 -nls static-libs
 
 [dev-libs/protobuf-c:0]
-package.use/dev-libs_protobuf-c_0 : dev-libs/protobuf-c:0 static-libs
+package.use : dev-libs/protobuf-c:0 static-libs
 
 [dev-libs/protobuf:0]
-package.use/dev-libs_protobuf_0 : dev-libs/protobuf:0 -emacs -examples -java -source python static-libs vim-syntax
+package.use : dev-libs/protobuf:0 -emacs -examples -java -source python static-libs vim-syntax
 
 [dev-libs/pslib:0]
-package.use/dev-libs_pslib_0 : dev-libs/pslib:0 -debug jpeg png tiff
+package.use : dev-libs/pslib:0 -debug jpeg png tiff
 
 [dev-libs/ptexenc:0]
-package.use/dev-libs_ptexenc_0 : dev-libs/ptexenc:0 iconv static-libs
-package.accept_keywords/dev-libs_ptexenc_0 : >=dev-libs/ptexenc-1.3.2_p20140525-r1 ~amd64
+package.use : dev-libs/ptexenc:0 iconv static-libs
+package.accept_keywords : >=dev-libs/ptexenc-1.3.2_p20140525-r1 ~amd64
 
 [dev-libs/pth:0]
-package.use/dev-libs_pth_0 : dev-libs/pth:0 -debug static-libs
+package.use : dev-libs/pth:0 -debug static-libs
 
 [dev-libs/ptypes:0]
-package.use/dev-libs_ptypes_0 : dev-libs/ptypes:0 -debug
+package.use : dev-libs/ptypes:0 -debug
 
 [dev-libs/qjson:0]
-package.use/dev-libs_qjson_0 : dev-libs/qjson:0 -debug -doc -test
+package.use : dev-libs/qjson:0 -debug -doc -test
 
 [dev-libs/quazip:0]
-package.use/dev-libs_quazip_0 : dev-libs/quazip:0 -test
+package.use : dev-libs/quazip:0 -test
 
 [dev-libs/socketstream:0]
-package.use/dev-libs_socketstream_0 : dev-libs/socketstream:0 -doc
+package.use : dev-libs/socketstream:0 -doc
 
 [dev-libs/syck:0]
-package.use/dev-libs_syck_0 : dev-libs/syck:0 -php python
+package.use : dev-libs/syck:0 -php python
 
 [dev-libs/tinyxml2:0]
-package.use/dev-libs_tinyxml2_0 : dev-libs/tinyxml2:0 -test static-libs
+package.use : dev-libs/tinyxml2:0 -test static-libs
 
 [dev-libs/tinyxml:0]
-package.use/dev-libs_tinyxml_0 : dev-libs/tinyxml:0 -debug -doc static-libs stl
+package.use : dev-libs/tinyxml:0 -debug -doc static-libs stl
 
 [dev-libs/totem-pl-parser:0]
-package.use/dev-libs_totem-pl-parser_0 : dev-libs/totem-pl-parser:0 -archive -test crypt introspection quvi
+package.use : dev-libs/totem-pl-parser:0 -archive -test crypt introspection quvi
 
 [dev-libs/tre:0]
-package.use/dev-libs_tre_0 : dev-libs/tre:0 -nls python static-libs
+package.use : dev-libs/tre:0 -nls python static-libs
 
 [dev-libs/uchardet:0]
-package.use/dev-libs_uchardet_0 : dev-libs/uchardet:0 static-libs
+package.use : dev-libs/uchardet:0 static-libs
 
 [dev-libs/ucl:0]
-package.use/dev-libs_ucl_0 : dev-libs/ucl:0 static-libs
+package.use : dev-libs/ucl:0 static-libs
 
 [dev-libs/uthash:0]
-package.use/dev-libs_uthash_0 : dev-libs/uthash:0 -test
+package.use : dev-libs/uthash:0 -test
 
 [dev-libs/xapian:0]
-package.use/dev-libs_xapian_0 : dev-libs/xapian:0 -doc brass chert cpu_flags_x86_sse cpu_flags_x86_sse2 inmemory static-libs
+package.use : dev-libs/xapian:0 -doc brass chert cpu_flags_x86_sse cpu_flags_x86_sse2 inmemory static-libs
 
 [dev-libs/xerces-c:0]
-package.use/dev-libs_xerces-c_0 : dev-libs/xerces-c:0 -doc cpu_flags_x86_sse2 curl iconv icu static-libs threads
+package.use : dev-libs/xerces-c:0 -doc cpu_flags_x86_sse2 curl iconv icu static-libs threads
 
 [dev-libs/xmlrpc-epi:0]
-package.use/dev-libs_xmlrpc-epi_0 : dev-libs/xmlrpc-epi:0 -examples static-libs
+package.use : dev-libs/xmlrpc-epi:0 -examples static-libs
 
 [dev-libs/xmlwrapp:0]
-package.use/dev-libs_xmlwrapp_0 : dev-libs/xmlwrapp:0 static-libs
+package.use : dev-libs/xmlwrapp:0 static-libs
 
 [dev-libs/zziplib:0]
-package.use/dev-libs_zziplib_0 : dev-libs/zziplib:0 -doc -test sdl static-libs
+package.use : dev-libs/zziplib:0 -doc -test sdl static-libs
 
 [dev-lisp/asdf:0]
-package.use/dev-lisp_asdf_0 : dev-lisp/asdf:0 -doc -test
+package.use : dev-lisp/asdf:0 -doc -test
 
 [dev-lua/lpeg:0]
-package.use/dev-lua_lpeg_0 : dev-lua/lpeg:0 -debug -doc
+package.use : dev-lua/lpeg:0 -debug -doc
 
 [dev-lua/luadbi:0]
-package.use/dev-lua_luadbi_0 : dev-lua/luadbi:0 -mysql -postgres sqlite
+package.use : dev-lua/luadbi:0 -mysql -postgres sqlite
 
 [dev-lua/luajson:0]
-package.use/dev-lua_luajson_0 : dev-lua/luajson:0 -test
+package.use : dev-lua/luajson:0 -test
 
 [dev-lua/luasocket:0]
-package.use/dev-lua_luasocket_0 : dev-lua/luasocket:0 -debug
+package.use : dev-lua/luasocket:0 -debug
 
 [dev-perl/Algorithm-Dependency:0]
-package.use/dev-perl_algorithm-dependency_0 : dev-perl/Algorithm-Dependency:0 -test
+package.use : dev-perl/Algorithm-Dependency:0 -test
 
 [dev-perl/Alien-wxWidgets:0]
-package.use/dev-perl_alien-wxwidgets_0 : dev-perl/Alien-wxWidgets:0 -test
+package.use : dev-perl/Alien-wxWidgets:0 -test
 
 [dev-perl/Archive-Extract:0]
-package.use/dev-perl_archive-extract_0 : dev-perl/Archive-Extract:0 -test
+package.use : dev-perl/Archive-Extract:0 -test
 
 [dev-perl/Array-Window:0]
-package.use/dev-perl_array-window_0 : dev-perl/Array-Window:0 -test
+package.use : dev-perl/Array-Window:0 -test
 
 [dev-perl/Audio-FLAC-Header:0]
-package.use/dev-perl_audio-flac-header_0 : dev-perl/Audio-FLAC-Header:0 -test
+package.use : dev-perl/Audio-FLAC-Header:0 -test
 
 [dev-perl/Authen-NTLM:0]
-package.use/dev-perl_authen-ntlm_0 : dev-perl/Authen-NTLM:0 -test
+package.use : dev-perl/Authen-NTLM:0 -test
 
 [dev-perl/Authen-SASL:0]
-package.use/dev-perl_authen-sasl_0 : dev-perl/Authen-SASL:0 -kerberos
+package.use : dev-perl/Authen-SASL:0 -kerberos
 
 [dev-perl/BerkeleyDB:0]
-package.use/dev-perl_berkeleydb_0 : dev-perl/BerkeleyDB:0 -test
+package.use : dev-perl/BerkeleyDB:0 -test
 
 [dev-perl/CGI:0]
-package.use/dev-perl_cgi_0 : dev-perl/CGI:0 -test
+package.use : dev-perl/CGI:0 -test
 
 [dev-perl/CPAN-Checksums:0]
-package.use/dev-perl_cpan-checksums_0 : dev-perl/CPAN-Checksums:0 -test
+package.use : dev-perl/CPAN-Checksums:0 -test
 
 [dev-perl/CPAN-Mini:0]
-package.use/dev-perl_cpan-mini_0 : dev-perl/CPAN-Mini:0 -test
+package.use : dev-perl/CPAN-Mini:0 -test
 
 [dev-perl/Cairo:0]
-package.use/dev-perl_cairo_0 : dev-perl/Cairo:0 -test
+package.use : dev-perl/Cairo:0 -test
 
 [dev-perl/Calendar-Simple:0]
-package.use/dev-perl_calendar-simple_0 : dev-perl/Calendar-Simple:0 -test
+package.use : dev-perl/Calendar-Simple:0 -test
 
 [dev-perl/Capture-Tiny:0]
-package.use/dev-perl_capture-tiny_0 : dev-perl/Capture-Tiny:0 -test
+package.use : dev-perl/Capture-Tiny:0 -test
 
 [dev-perl/Carp-Clan:0]
-package.use/dev-perl_carp-clan_0 : dev-perl/Carp-Clan:0 -test
+package.use : dev-perl/Carp-Clan:0 -test
 
 [dev-perl/Class-Accessor-Grouped:0]
-package.use/dev-perl_class-accessor-grouped_0 : dev-perl/Class-Accessor-Grouped:0 -test
+package.use : dev-perl/Class-Accessor-Grouped:0 -test
 
 [dev-perl/Class-C3:0]
-package.use/dev-perl_class-c3_0 : dev-perl/Class-C3:0 -test
+package.use : dev-perl/Class-C3:0 -test
 
 [dev-perl/Class-Load-XS:0]
-package.use/dev-perl_class-load-xs_0 : dev-perl/Class-Load-XS:0 -test
+package.use : dev-perl/Class-Load-XS:0 -test
 
 [dev-perl/Class-Load:0]
-package.use/dev-perl_class-load_0 : dev-perl/Class-Load:0 -test
+package.use : dev-perl/Class-Load:0 -test
 
 [dev-perl/Class-Method-Modifiers:0]
-package.use/dev-perl_class-method-modifiers_0 : dev-perl/Class-Method-Modifiers:0 -test
+package.use : dev-perl/Class-Method-Modifiers:0 -test
 
 [dev-perl/Class-XPath:0]
-package.use/dev-perl_class-xpath_0 : dev-perl/Class-XPath:0 -test
+package.use : dev-perl/Class-XPath:0 -test
 
 [dev-perl/Config-IniFiles:0]
-package.use/dev-perl_config-inifiles_0 : dev-perl/Config-IniFiles:0 -test
+package.use : dev-perl/Config-IniFiles:0 -test
 
 [dev-perl/Config-Tiny:0]
-package.use/dev-perl_config-tiny_0 : dev-perl/Config-Tiny:0 -test
+package.use : dev-perl/Config-Tiny:0 -test
 
 [dev-perl/Crypt-Cracklib:0]
-package.use/dev-perl_crypt-cracklib_0 : dev-perl/Crypt-Cracklib:0 -test
+package.use : dev-perl/Crypt-Cracklib:0 -test
 
 [dev-perl/Crypt-OpenPGP:0]
-package.use/dev-perl_crypt-openpgp_0 : dev-perl/Crypt-OpenPGP:0 -test
+package.use : dev-perl/Crypt-OpenPGP:0 -test
 
 [dev-perl/Crypt-Rijndael:0]
-package.use/dev-perl_crypt-rijndael_0 : dev-perl/Crypt-Rijndael:0 -test
+package.use : dev-perl/Crypt-Rijndael:0 -test
 
 [dev-perl/Crypt-SSLeay:0]
-package.use/dev-perl_crypt-ssleay_0 : dev-perl/Crypt-SSLeay:0 -test
+package.use : dev-perl/Crypt-SSLeay:0 -test
 
 [dev-perl/Crypt-Simple:0]
-package.use/dev-perl_crypt-simple_0 : dev-perl/Crypt-Simple:0 -test
+package.use : dev-perl/Crypt-Simple:0 -test
 
 [dev-perl/Curses-UI:0]
-package.use/dev-perl_curses-ui_0 : dev-perl/Curses-UI:0 -test
+package.use : dev-perl/Curses-UI:0 -test
 
 [dev-perl/Curses:0]
-package.use/dev-perl_curses_0 : dev-perl/Curses:0 unicode
+package.use : dev-perl/Curses:0 unicode
 
 [dev-perl/DBD-SQLite:0]
-package.use/dev-perl_dbd-sqlite_0 : dev-perl/DBD-SQLite:0 -test
+package.use : dev-perl/DBD-SQLite:0 -test
 
 [dev-perl/DBD-mysql:0]
-package.use/dev-perl_dbd-mysql_0 : dev-perl/DBD-mysql:0 -embedded
+package.use : dev-perl/DBD-mysql:0 -embedded
 
 [dev-perl/DBI:0]
-package.use/dev-perl_dbi_0 : dev-perl/DBI:0 -test
+package.use : dev-perl/DBI:0 -test
 
 [dev-perl/DBIx-ContextualFetch:0]
-package.use/dev-perl_dbix-contextualfetch_0 : dev-perl/DBIx-ContextualFetch:0 -test
+package.use : dev-perl/DBIx-ContextualFetch:0 -test
 
 [dev-perl/Data-Compare:0]
-package.use/dev-perl_data-compare_0 : dev-perl/Data-Compare:0 -test
+package.use : dev-perl/Data-Compare:0 -test
 
 [dev-perl/Data-Hierarchy:0]
-package.use/dev-perl_data-hierarchy_0 : dev-perl/Data-Hierarchy:0 -test
+package.use : dev-perl/Data-Hierarchy:0 -test
 
 [dev-perl/Data-OptList:0]
-package.use/dev-perl_data-optlist_0 : dev-perl/Data-OptList:0 -test
+package.use : dev-perl/Data-OptList:0 -test
 
 [dev-perl/DateManip:0]
-package.use/dev-perl_datemanip_0 : dev-perl/DateManip:0 -test
+package.use : dev-perl/DateManip:0 -test
 
 [dev-perl/DateTime-TimeZone:0]
-package.use/dev-perl_datetime-timezone_0 : dev-perl/DateTime-TimeZone:0 -test
+package.use : dev-perl/DateTime-TimeZone:0 -test
 
 [dev-perl/DateTime:0]
-package.use/dev-perl_datetime_0 : dev-perl/DateTime:0 -test
+package.use : dev-perl/DateTime:0 -test
 
 [dev-perl/Devel-Size:0]
-package.use/dev-perl_devel-size_0 : dev-perl/Devel-Size:0 -test
+package.use : dev-perl/Devel-Size:0 -test
 
 [dev-perl/Devel-StackTrace:0]
-package.use/dev-perl_devel-stacktrace_0 : dev-perl/Devel-StackTrace:0 -test
+package.use : dev-perl/Devel-StackTrace:0 -test
 
 [dev-perl/Dist-CheckConflicts:0]
-package.use/dev-perl_dist-checkconflicts_0 : dev-perl/Dist-CheckConflicts:0 -test
+package.use : dev-perl/Dist-CheckConflicts:0 -test
 
 [dev-perl/Email-Address:0]
-package.use/dev-perl_email-address_0 : dev-perl/Email-Address:0 -test
+package.use : dev-perl/Email-Address:0 -test
 
 [dev-perl/Email-Date-Format:0]
-package.use/dev-perl_email-date-format_0 : dev-perl/Email-Date-Format:0 -test
+package.use : dev-perl/Email-Date-Format:0 -test
 
 [dev-perl/Email-Send-Gmail:0]
-package.use/dev-perl_email-send-gmail_0 : dev-perl/Email-Send-Gmail:0 -test
+package.use : dev-perl/Email-Send-Gmail:0 -test
 
 [dev-perl/Email-Sender:0]
-package.use/dev-perl_email-sender_0 : dev-perl/Email-Sender:0 -test
+package.use : dev-perl/Email-Sender:0 -test
 
 [dev-perl/Email-Simple:0]
-package.use/dev-perl_email-simple_0 : dev-perl/Email-Simple:0 -test
+package.use : dev-perl/Email-Simple:0 -test
 
 [dev-perl/Email-Valid:0]
-package.use/dev-perl_email-valid_0 : dev-perl/Email-Valid:0 -test
+package.use : dev-perl/Email-Valid:0 -test
 
 [dev-perl/Error:0]
-package.use/dev-perl_error_0 : dev-perl/Error:0 -test
+package.use : dev-perl/Error:0 -test
 
 [dev-perl/Eval-Closure:0]
-package.use/dev-perl_eval-closure_0 : dev-perl/Eval-Closure:0 -test
+package.use : dev-perl/Eval-Closure:0 -test
 
 [dev-perl/ExtUtils-XSpp:0]
-package.use/dev-perl_extutils-xspp_0 : dev-perl/ExtUtils-XSpp:0 -test
+package.use : dev-perl/ExtUtils-XSpp:0 -test
 
 [dev-perl/File-BaseDir:0]
-package.use/dev-perl_file-basedir_0 : dev-perl/File-BaseDir:0 -test
+package.use : dev-perl/File-BaseDir:0 -test
 
 [dev-perl/File-DesktopEntry:0]
-package.use/dev-perl_file-desktopentry_0 : dev-perl/File-DesktopEntry:0 -test
+package.use : dev-perl/File-DesktopEntry:0 -test
 
 [dev-perl/File-Find-Rule:0]
-package.use/dev-perl_file-find-rule_0 : dev-perl/File-Find-Rule:0 -test
+package.use : dev-perl/File-Find-Rule:0 -test
 
 [dev-perl/File-HomeDir:0]
-package.use/dev-perl_file-homedir_0 : dev-perl/File-HomeDir:0 xdg
+package.use : dev-perl/File-HomeDir:0 xdg
 
 [dev-perl/File-MimeInfo:0]
-package.use/dev-perl_file-mimeinfo_0 : dev-perl/File-MimeInfo:0 -test
+package.use : dev-perl/File-MimeInfo:0 -test
 
 [dev-perl/File-Next:0]
-package.use/dev-perl_file-next_0 : dev-perl/File-Next:0 -test
+package.use : dev-perl/File-Next:0 -test
 
 [dev-perl/File-Which:0]
-package.use/dev-perl_file-which_0 : dev-perl/File-Which:0 -test
+package.use : dev-perl/File-Which:0 -test
 
 [dev-perl/GD:0]
-package.use/dev-perl_gd_0 : dev-perl/GD:0 -animgif -truetype gif jpeg png xpm
+package.use : dev-perl/GD:0 -animgif -truetype gif jpeg png xpm
 
 [dev-perl/Gtk2-Ex-PrintDialog:0]
-package.use/dev-perl_gtk2-ex-printdialog_0 : dev-perl/Gtk2-Ex-PrintDialog:0 cups
+package.use : dev-perl/Gtk2-Ex-PrintDialog:0 cups
 
 [dev-perl/Gtk2-Notify:0]
-package.use/dev-perl_gtk2-notify_0 : dev-perl/Gtk2-Notify:0 -test
+package.use : dev-perl/Gtk2-Notify:0 -test
 
 [dev-perl/HTML-Format:0]
-package.use/dev-perl_html-format_0 : dev-perl/HTML-Format:0 -test
+package.use : dev-perl/HTML-Format:0 -test
 
 [dev-perl/HTML-Mason:0]
-package.use/dev-perl_html-mason_0 : dev-perl/HTML-Mason:0 -modperl -test
+package.use : dev-perl/HTML-Mason:0 -modperl -test
 
 [dev-perl/HTML-Object:0]
-package.use/dev-perl_html-object_0 : dev-perl/HTML-Object:0 -examples
+package.use : dev-perl/HTML-Object:0 -examples
 
 [dev-perl/HTML-Parser:0]
-package.use/dev-perl_html-parser_0 : dev-perl/HTML-Parser:0 -test
+package.use : dev-perl/HTML-Parser:0 -test
 
 [dev-perl/HTML-TableParser:0]
-package.use/dev-perl_html-tableparser_0 : dev-perl/HTML-TableParser:0 -test
+package.use : dev-perl/HTML-TableParser:0 -test
 
 [dev-perl/HTML-Tree:0]
-package.use/dev-perl_html-tree_0 : dev-perl/HTML-Tree:0 -test
+package.use : dev-perl/HTML-Tree:0 -test
 
 [dev-perl/HTTP-BrowserDetect:0]
-package.use/dev-perl_http-browserdetect_0 : dev-perl/HTTP-BrowserDetect:0 -test
+package.use : dev-perl/HTTP-BrowserDetect:0 -test
 
 [dev-perl/HTTP-Server-Simple:0]
-package.use/dev-perl_http-server-simple_0 : dev-perl/HTTP-Server-Simple:0 -test
+package.use : dev-perl/HTTP-Server-Simple:0 -test
 
 [dev-perl/Hook-LexWrap:0]
-package.use/dev-perl_hook-lexwrap_0 : dev-perl/Hook-LexWrap:0 -test
+package.use : dev-perl/Hook-LexWrap:0 -test
 
 [dev-perl/IMAP-Admin:0]
-package.use/dev-perl_imap-admin_0 : dev-perl/IMAP-Admin:0 -examples
+package.use : dev-perl/IMAP-Admin:0 -examples
 
 [dev-perl/IO-Socket-SSL:0]
-package.use/dev-perl_io-socket-ssl_0 : dev-perl/IO-Socket-SSL:0 idn
+package.use : dev-perl/IO-Socket-SSL:0 idn
 
 [dev-perl/IPC-Run:0]
-package.use/dev-perl_ipc-run_0 : dev-perl/IPC-Run:0 -test
+package.use : dev-perl/IPC-Run:0 -test
 
 [dev-perl/IPC-ShareLite:0]
-package.use/dev-perl_ipc-sharelite_0 : dev-perl/IPC-ShareLite:0 -test
+package.use : dev-perl/IPC-ShareLite:0 -test
 
 [dev-perl/Inline:0]
-package.use/dev-perl_inline_0 : dev-perl/Inline:0 -test
+package.use : dev-perl/Inline:0 -test
 
 [dev-perl/JSON-XS:0]
-package.use/dev-perl_json-xs_0 : dev-perl/JSON-XS:0 -test
+package.use : dev-perl/JSON-XS:0 -test
 
 [dev-perl/Lingua-EN-NameParse:0]
-package.use/dev-perl_lingua-en-nameparse_0 : dev-perl/Lingua-EN-NameParse:0 -test
+package.use : dev-perl/Lingua-EN-NameParse:0 -test
 
 [dev-perl/List-AllUtils:0]
-package.use/dev-perl_list-allutils_0 : dev-perl/List-AllUtils:0 -test
+package.use : dev-perl/List-AllUtils:0 -test
 
 [dev-perl/Log-Log4perl:0]
-package.use/dev-perl_log-log4perl_0 : dev-perl/Log-Log4perl:0 -test
+package.use : dev-perl/Log-Log4perl:0 -test
 
 [dev-perl/MIME-tools:0]
-package.use/dev-perl_mime-tools_0 : dev-perl/MIME-tools:0 -test
+package.use : dev-perl/MIME-tools:0 -test
 
 [dev-perl/MLDBM-Sync:0]
-package.use/dev-perl_mldbm-sync_0 : dev-perl/MLDBM-Sync:0 -test
+package.use : dev-perl/MLDBM-Sync:0 -test
 
 [dev-perl/MRO-Compat:0]
-package.use/dev-perl_mro-compat_0 : dev-perl/MRO-Compat:0 -test
+package.use : dev-perl/MRO-Compat:0 -test
 
 [dev-perl/Mail-DomainKeys:0]
-package.use/dev-perl_mail-domainkeys_0 : dev-perl/Mail-DomainKeys:0 -test
+package.use : dev-perl/Mail-DomainKeys:0 -test
 
 [dev-perl/Math-Vec:0]
-package.use/dev-perl_math-vec_0 : dev-perl/Math-Vec:0 -test
+package.use : dev-perl/Math-Vec:0 -test
 
 [dev-perl/Module-Build:0]
-package.use/dev-perl_module-build_0 : dev-perl/Module-Build:0 -test
+package.use : dev-perl/Module-Build:0 -test
 
 [dev-perl/Module-Implementation:0]
-package.use/dev-perl_module-implementation_0 : dev-perl/Module-Implementation:0 -test
+package.use : dev-perl/Module-Implementation:0 -test
 
 [dev-perl/Module-Install:0]
-package.use/dev-perl_module-install_0 : dev-perl/Module-Install:0 -test
+package.use : dev-perl/Module-Install:0 -test
 
 [dev-perl/Module-Manifest:0]
-package.use/dev-perl_module-manifest_0 : dev-perl/Module-Manifest:0 -test
+package.use : dev-perl/Module-Manifest:0 -test
 
 [dev-perl/Module-Runtime:0]
-package.use/dev-perl_module-runtime_0 : dev-perl/Module-Runtime:0 -test
+package.use : dev-perl/Module-Runtime:0 -test
 
 [dev-perl/Module-ScanDeps:0]
-package.use/dev-perl_module-scandeps_0 : dev-perl/Module-ScanDeps:0 -test
+package.use : dev-perl/Module-ScanDeps:0 -test
 
 [dev-perl/Module-Signature:0]
-package.use/dev-perl_module-signature_0 : dev-perl/Module-Signature:0 -test
+package.use : dev-perl/Module-Signature:0 -test
 
 [dev-perl/Module-Starter:0]
-package.use/dev-perl_module-starter_0 : dev-perl/Module-Starter:0 -test
+package.use : dev-perl/Module-Starter:0 -test
 
 [dev-perl/Moo:0]
-package.use/dev-perl_moo_0 : dev-perl/Moo:0 -test
+package.use : dev-perl/Moo:0 -test
 
 [dev-perl/Moose:0]
-package.use/dev-perl_moose_0 : dev-perl/Moose:0 -test
+package.use : dev-perl/Moose:0 -test
 
 [dev-perl/Net-CUPS:0]
-package.use/dev-perl_net-cups_0 : dev-perl/Net-CUPS:0 -test
+package.use : dev-perl/Net-CUPS:0 -test
 
 [dev-perl/Net-DNS:0]
-package.use/dev-perl_net-dns_0 : dev-perl/Net-DNS:0 -test ipv6
+package.use : dev-perl/Net-DNS:0 -test ipv6
 
 [dev-perl/Net-Google-SafeBrowsing-Blocklist:0]
-package.use/dev-perl_net-google-safebrowsing-blocklist_0 : dev-perl/Net-Google-SafeBrowsing-Blocklist:0 -test
+package.use : dev-perl/Net-Google-SafeBrowsing-Blocklist:0 -test
 
 [dev-perl/Net-Google-SafeBrowsing-UpdateRequest:0]
-package.use/dev-perl_net-google-safebrowsing-updaterequest_0 : dev-perl/Net-Google-SafeBrowsing-UpdateRequest:0 -test
+package.use : dev-perl/Net-Google-SafeBrowsing-UpdateRequest:0 -test
 
 [dev-perl/NetPacket:0]
-package.use/dev-perl_netpacket_0 : dev-perl/NetPacket:0 -test
+package.use : dev-perl/NetPacket:0 -test
 
 [dev-perl/POE:0]
-package.use/dev-perl_poe_0 : dev-perl/POE:0 -libwww -test ipv6 ncurses tk
+package.use : dev-perl/POE:0 -libwww -test ipv6 ncurses tk
 
 [dev-perl/Package-DeprecationManager:0]
-package.use/dev-perl_package-deprecationmanager_0 : dev-perl/Package-DeprecationManager:0 -test
+package.use : dev-perl/Package-DeprecationManager:0 -test
 
 [dev-perl/Package-Stash-XS:0]
-package.use/dev-perl_package-stash-xs_0 : dev-perl/Package-Stash-XS:0 -test
+package.use : dev-perl/Package-Stash-XS:0 -test
 
 [dev-perl/Package-Stash:0]
-package.use/dev-perl_package-stash_0 : dev-perl/Package-Stash:0 -test
+package.use : dev-perl/Package-Stash:0 -test
 
 [dev-perl/Params-Validate:0]
-package.use/dev-perl_params-validate_0 : dev-perl/Params-Validate:0 -test
+package.use : dev-perl/Params-Validate:0 -test
 
 [dev-perl/Parse-RecDescent:0]
-package.use/dev-perl_parse-recdescent_0 : dev-perl/Parse-RecDescent:0 -test
+package.use : dev-perl/Parse-RecDescent:0 -test
 
 [dev-perl/Path-Class:0]
-package.use/dev-perl_path-class_0 : dev-perl/Path-Class:0 -test
+package.use : dev-perl/Path-Class:0 -test
 
 [dev-perl/Pod-Coverage:0]
-package.use/dev-perl_pod-coverage_0 : dev-perl/Pod-Coverage:0 -test
+package.use : dev-perl/Pod-Coverage:0 -test
 
 [dev-perl/PortageXS:0]
-package.use/dev-perl_portagexs_0 : dev-perl/PortageXS:0 -minimal
+package.use : dev-perl/PortageXS:0 -minimal
 
 [dev-perl/Proc-Daemon:0]
-package.use/dev-perl_proc-daemon_0 : dev-perl/Proc-Daemon:0 -test
+package.use : dev-perl/Proc-Daemon:0 -test
 
 [dev-perl/Role-Tiny:0]
-package.use/dev-perl_role-tiny_0 : dev-perl/Role-Tiny:0 -test
+package.use : dev-perl/Role-Tiny:0 -test
 
 [dev-perl/Roman:0]
-package.use/dev-perl_roman_0 : dev-perl/Roman:0 -test
+package.use : dev-perl/Roman:0 -test
 
 [dev-perl/SQL-Abstract:0]
-package.use/dev-perl_sql-abstract_0 : dev-perl/SQL-Abstract:0 -test
+package.use : dev-perl/SQL-Abstract:0 -test
 
 [dev-perl/SVG:0]
-package.use/dev-perl_svg_0 : dev-perl/SVG:0 -test
+package.use : dev-perl/SVG:0 -test
 
 [dev-perl/Scope-Guard:0]
-package.use/dev-perl_scope-guard_0 : dev-perl/Scope-Guard:0 -test
+package.use : dev-perl/Scope-Guard:0 -test
 
 [dev-perl/Search-Xapian:0]
-package.use/dev-perl_search-xapian_0 : dev-perl/Search-Xapian:0 -examples
+package.use : dev-perl/Search-Xapian:0 -examples
 
 [dev-perl/Spreadsheet-ParseExcel:0]
-package.use/dev-perl_spreadsheet-parseexcel_0 : dev-perl/Spreadsheet-ParseExcel:0 -cjk -test unicode
+package.use : dev-perl/Spreadsheet-ParseExcel:0 -cjk -test unicode
 
 [dev-perl/Statistics-Descriptive:0]
-package.use/dev-perl_statistics-descriptive_0 : dev-perl/Statistics-Descriptive:0 -test
+package.use : dev-perl/Statistics-Descriptive:0 -test
 
 [dev-perl/Sub-Install:0]
-package.use/dev-perl_sub-install_0 : dev-perl/Sub-Install:0 -test
+package.use : dev-perl/Sub-Install:0 -test
 
 [dev-perl/Sub-Override:0]
-package.use/dev-perl_sub-override_0 : dev-perl/Sub-Override:0 -test
+package.use : dev-perl/Sub-Override:0 -test
 
 [dev-perl/Sys-Statistics-Linux:0]
-package.use/dev-perl_sys-statistics-linux_0 : dev-perl/Sys-Statistics-Linux:0 -test
+package.use : dev-perl/Sys-Statistics-Linux:0 -test
 
 [dev-perl/Template-DBI:0]
-package.use/dev-perl_template-dbi_0 : dev-perl/Template-DBI:0 -test
+package.use : dev-perl/Template-DBI:0 -test
 
 [dev-perl/Template-Plugin-Latex:0]
-package.use/dev-perl_template-plugin-latex_0 : dev-perl/Template-Plugin-Latex:0 -test
+package.use : dev-perl/Template-Plugin-Latex:0 -test
 
 [dev-perl/Template-Toolkit:0]
-package.use/dev-perl_template-toolkit_0 : dev-perl/Template-Toolkit:0 -gd -mysql -postgres latex vim-syntax xml
+package.use : dev-perl/Template-Toolkit:0 -gd -mysql -postgres latex vim-syntax xml
 
 [dev-perl/Test-Class:0]
-package.use/dev-perl_test-class_0 : dev-perl/Test-Class:0 -test
+package.use : dev-perl/Test-Class:0 -test
 
 [dev-perl/Test-Deep:0]
-package.use/dev-perl_test-deep_0 : dev-perl/Test-Deep:0 -test
+package.use : dev-perl/Test-Deep:0 -test
 
 [dev-perl/Test-Differences:0]
-package.use/dev-perl_test-differences_0 : dev-perl/Test-Differences:0 -test
+package.use : dev-perl/Test-Differences:0 -test
 
 [dev-perl/Test-DistManifest:0]
-package.use/dev-perl_test-distmanifest_0 : dev-perl/Test-DistManifest:0 -test
+package.use : dev-perl/Test-DistManifest:0 -test
 
 [dev-perl/Test-Inline:0]
-package.use/dev-perl_test-inline_0 : dev-perl/Test-Inline:0 -test
+package.use : dev-perl/Test-Inline:0 -test
 
 [dev-perl/Test-Pod-Coverage:0]
-package.use/dev-perl_test-pod-coverage_0 : dev-perl/Test-Pod-Coverage:0 -test
+package.use : dev-perl/Test-Pod-Coverage:0 -test
 
 [dev-perl/Test-Trap:0]
-package.use/dev-perl_test-trap_0 : dev-perl/Test-Trap:0 -test
+package.use : dev-perl/Test-Trap:0 -test
 
 [dev-perl/Test-Warn:0]
-package.use/dev-perl_test-warn_0 : dev-perl/Test-Warn:0 -test
+package.use : dev-perl/Test-Warn:0 -test
 
 [dev-perl/Text-CSV-Simple:0]
-package.use/dev-perl_text-csv-simple_0 : dev-perl/Text-CSV-Simple:0 -test
+package.use : dev-perl/Text-CSV-Simple:0 -test
 
 [dev-perl/Text-CSV_XS:0]
-package.use/dev-perl_text-csv_xs_0 : dev-perl/Text-CSV_XS:0 -test
+package.use : dev-perl/Text-CSV_XS:0 -test
 
 [dev-perl/Text-Format:0]
-package.use/dev-perl_text-format_0 : dev-perl/Text-Format:0 -test
+package.use : dev-perl/Text-Format:0 -test
 
 [dev-perl/Tie-Array-Sorted:0]
-package.use/dev-perl_tie-array-sorted_0 : dev-perl/Tie-Array-Sorted:0 -test
+package.use : dev-perl/Tie-Array-Sorted:0 -test
 
 [dev-perl/Tie-IxHash:0]
-package.use/dev-perl_tie-ixhash_0 : dev-perl/Tie-IxHash:0 -test
+package.use : dev-perl/Tie-IxHash:0 -test
 
 [dev-perl/Tree-Simple:0]
-package.use/dev-perl_tree-simple_0 : dev-perl/Tree-Simple:0 -test
+package.use : dev-perl/Tree-Simple:0 -test
 
 [dev-perl/Try-Tiny:0]
-package.use/dev-perl_try-tiny_0 : dev-perl/Try-Tiny:0 -test
+package.use : dev-perl/Try-Tiny:0 -test
 
 [dev-perl/UNIVERSAL-moniker:0]
-package.use/dev-perl_universal-moniker_0 : dev-perl/UNIVERSAL-moniker:0 -test
+package.use : dev-perl/UNIVERSAL-moniker:0 -test
 
 [dev-perl/Validate-Net:0]
-package.use/dev-perl_validate-net_0 : dev-perl/Validate-Net:0 -test
+package.use : dev-perl/Validate-Net:0 -test
 
 [dev-perl/Variable-Magic:0]
-package.use/dev-perl_variable-magic_0 : dev-perl/Variable-Magic:0 -test
+package.use : dev-perl/Variable-Magic:0 -test
 
 [dev-perl/XML-DT:0]
-package.use/dev-perl_xml-dt_0 : dev-perl/XML-DT:0 -test
+package.use : dev-perl/XML-DT:0 -test
 
 [dev-perl/XML-LibXML:0]
-package.use/dev-perl_xml-libxml_0 : dev-perl/XML-LibXML:0 -test
+package.use : dev-perl/XML-LibXML:0 -test
 
 [dev-perl/XML-RSS-Feed:0]
-package.use/dev-perl_xml-rss-feed_0 : dev-perl/XML-RSS-Feed:0 -test
+package.use : dev-perl/XML-RSS-Feed:0 -test
 
 [dev-perl/XML-RSS:0]
-package.use/dev-perl_xml-rss_0 : dev-perl/XML-RSS:0 -test
+package.use : dev-perl/XML-RSS:0 -test
 
 [dev-perl/XML-Stream:0]
-package.use/dev-perl_xml-stream_0 : dev-perl/XML-Stream:0 ssl
+package.use : dev-perl/XML-Stream:0 ssl
 
 [dev-perl/XML-Twig:0]
-package.use/dev-perl_xml-twig_0 : dev-perl/XML-Twig:0 -nls
+package.use : dev-perl/XML-Twig:0 -nls
 
 [dev-perl/cache-mmap:0]
-package.use/dev-perl_cache-mmap_0 : dev-perl/cache-mmap:0 -test
+package.use : dev-perl/cache-mmap:0 -test
 
 [dev-perl/crypt-cbc:0]
-package.use/dev-perl_crypt-cbc_0 : dev-perl/crypt-cbc:0 -test
+package.use : dev-perl/crypt-cbc:0 -test
 
 [dev-perl/crypt-dsa:0]
-package.use/dev-perl_crypt-dsa_0 : dev-perl/crypt-dsa:0 -test
+package.use : dev-perl/crypt-dsa:0 -test
 
 [dev-perl/dbix-searchbuilder:0]
-package.use/dev-perl_dbix-searchbuilder_0 : dev-perl/dbix-searchbuilder:0 -test
+package.use : dev-perl/dbix-searchbuilder:0 -test
 
 [dev-perl/gtk2-fu:0]
-package.use/dev-perl_gtk2-fu_0 : dev-perl/gtk2-fu:0 -test
+package.use : dev-perl/gtk2-fu:0 -test
 
 [dev-perl/libwww-perl:0]
-package.use/dev-perl_libwww-perl_0 : dev-perl/libwww-perl:0 ssl
+package.use : dev-perl/libwww-perl:0 ssl
 
 [dev-perl/locale-maketext-lexicon:0]
-package.use/dev-perl_locale-maketext-lexicon_0 : dev-perl/locale-maketext-lexicon:0 -test
+package.use : dev-perl/locale-maketext-lexicon:0 -test
 
 [dev-perl/module-info:0]
-package.use/dev-perl_module-info_0 : dev-perl/module-info:0 -test
+package.use : dev-perl/module-info:0 -test
 
 [dev-perl/net-server:0]
-package.use/dev-perl_net-server_0 : dev-perl/net-server:0 ipv6
+package.use : dev-perl/net-server:0 ipv6
 
 [dev-perl/text-reform:0]
-package.use/dev-perl_text-reform_0 : dev-perl/text-reform:0 -test
+package.use : dev-perl/text-reform:0 -test
 
 [dev-php/smarty-docs:0]
-package.use/dev-php_smarty-docs_0 : dev-php/smarty-docs:0 -html pdf
+package.use : dev-php/smarty-docs:0 -html pdf
 
 [dev-python/PyQt4:0]
-package.use/dev-python_pyqt4_0 : dev-python/PyQt4:0 -debug -declarative -designer -doc -examples -help -kde -multimedia -phonon -script -scripttools -sql -xmlpatterns X dbus opengl svg webkit
+package.use : dev-python/PyQt4:0 -debug -declarative -designer -doc -examples -help -kde -multimedia -phonon -script -scripttools -sql -xmlpatterns X dbus opengl svg webkit
 
 [dev-python/adodb-py:0]
-package.use/dev-python_adodb-py_0 : dev-python/adodb-py:0 -mysql -postgres sqlite
+package.use : dev-python/adodb-py:0 -mysql -postgres sqlite
 
 [dev-python/alembic:0]
-package.use/dev-python_alembic_0 : dev-python/alembic:0 -doc -test
+package.use : dev-python/alembic:0 -doc -test
 
 [dev-python/amqplib:0]
-package.use/dev-python_amqplib_0 : dev-python/amqplib:0 -examples -test extras
+package.use : dev-python/amqplib:0 -examples -test extras
 
 [dev-python/ansi2html:0]
-package.use/dev-python_ansi2html_0 : dev-python/ansi2html:0 -test
+package.use : dev-python/ansi2html:0 -test
 
 [dev-python/anyjson:0]
-package.use/dev-python_anyjson_0 : dev-python/anyjson:0 -test
+package.use : dev-python/anyjson:0 -test
 
 [dev-python/anyvc:0]
-package.use/dev-python_anyvc_0 : dev-python/anyvc:0 -bazaar -doc -mercurial git subversion
+package.use : dev-python/anyvc:0 -bazaar -doc -mercurial git subversion
 
 [dev-python/apsw:0]
-package.use/dev-python_apsw_0 : dev-python/apsw:0 -doc
+package.use : dev-python/apsw:0 -doc
 
 [dev-python/assets:0]
-package.use/dev-python_assets_0 : dev-python/assets:0 -test
+package.use : dev-python/assets:0 -test
 
 [dev-python/astng:0]
-package.use/dev-python_astng_0 : dev-python/astng:0 -test
+package.use : dev-python/astng:0 -test
 
 [dev-python/astroid:0]
-package.use/dev-python_astroid_0 : dev-python/astroid:0 -test
+package.use : dev-python/astroid:0 -test
 
 [dev-python/async:0]
-package.use/dev-python_async_0 : dev-python/async:0 -test
+package.use : dev-python/async:0 -test
 
 [dev-python/atom:0]
-package.use/dev-python_atom_0 : dev-python/atom:0 -examples -test
+package.use : dev-python/atom:0 -examples -test
 
 [dev-python/bcrypt:0]
-package.use/dev-python_bcrypt_0 : dev-python/bcrypt:0 -test
+package.use : dev-python/bcrypt:0 -test
 
 [dev-python/bicyclerepair:0]
-package.use/dev-python_bicyclerepair_0 : dev-python/bicyclerepair:0 -emacs
+package.use : dev-python/bicyclerepair:0 -emacs
 
 [dev-python/billiard:0]
-package.use/dev-python_billiard_0 : dev-python/billiard:0 -doc -test
+package.use : dev-python/billiard:0 -doc -test
 
 [dev-python/bitstring:0]
-package.use/dev-python_bitstring_0 : dev-python/bitstring:0 -test
+package.use : dev-python/bitstring:0 -test
 
 [dev-python/bleach:0]
-package.use/dev-python_bleach_0 : dev-python/bleach:0 -test
+package.use : dev-python/bleach:0 -test
 
 [dev-python/blinker:0]
-package.use/dev-python_blinker_0 : dev-python/blinker:0 -doc -test
+package.use : dev-python/blinker:0 -doc -test
 
 [dev-python/boto:0]
-package.use/dev-python_boto_0 : dev-python/boto:0 -test
+package.use : dev-python/boto:0 -test
 
 [dev-python/bpython:0]
-package.use/dev-python_bpython_0 : dev-python/bpython:0 -doc -test gtk
+package.use : dev-python/bpython:0 -doc -test gtk
 
 [dev-python/bsddb3:0]
-package.use/dev-python_bsddb3_0 : dev-python/bsddb3:0 -doc
+package.use : dev-python/bsddb3:0 -doc
 
 [dev-python/buildutils:0]
-package.use/dev-python_buildutils_0 : dev-python/buildutils:0 -doc -test
+package.use : dev-python/buildutils:0 -doc -test
 
 [dev-python/buzhug:0]
-package.use/dev-python_buzhug_0 : dev-python/buzhug:0 -test
+package.use : dev-python/buzhug:0 -test
 
 [dev-python/carrot:0]
-package.use/dev-python_carrot_0 : dev-python/carrot:0 -doc
+package.use : dev-python/carrot:0 -doc
 
 [dev-python/celery:0]
-package.use/dev-python_celery_0 : dev-python/celery:0 -doc -examples -redis -sqs -test -yaml -zeromq
+package.use : dev-python/celery:0 -doc -examples -redis -sqs -test -yaml -zeromq
 
 [dev-python/cement:0]
-package.use/dev-python_cement_0 : dev-python/cement:0 -doc -test
+package.use : dev-python/cement:0 -doc -test
 
 [dev-python/cffi:0]
-package.use/dev-python_cffi_0 : dev-python/cffi:0 -doc
+package.use : dev-python/cffi:0 -doc
 
 [dev-python/cgkit:0]
-package.use/dev-python_cgkit_0 : dev-python/cgkit:0 -3ds
+package.use : dev-python/cgkit:0 -3ds
 
 [dev-python/chameleon:0]
-package.use/dev-python_chameleon_0 : dev-python/chameleon:0 -doc -test
+package.use : dev-python/chameleon:0 -doc -test
 
 [dev-python/cliff:0]
-package.use/dev-python_cliff_0 : dev-python/cliff:0 -test
+package.use : dev-python/cliff:0 -test
 
 [dev-python/colander:0]
-package.use/dev-python_colander_0 : dev-python/colander:0 -doc -test
+package.use : dev-python/colander:0 -doc -test
 
 [dev-python/colorama:0]
-package.use/dev-python_colorama_0 : dev-python/colorama:0 -examples
+package.use : dev-python/colorama:0 -examples
 
 [dev-python/columnize:0]
-package.use/dev-python_columnize_0 : dev-python/columnize:0 -test
+package.use : dev-python/columnize:0 -test
 
 [dev-python/contextlib2:0]
-package.use/dev-python_contextlib2_0 : dev-python/contextlib2:0 -test
+package.use : dev-python/contextlib2:0 -test
 
 [dev-python/crumbs:0]
-package.use/dev-python_crumbs_0 : dev-python/crumbs:0 -inotify -test
+package.use : dev-python/crumbs:0 -inotify -test
 
 [dev-python/cryptography:0]
-package.use/dev-python_cryptography_0 : dev-python/cryptography:0 -test
+package.use : dev-python/cryptography:0 -test
 
 [dev-python/cssutils:0]
-package.use/dev-python_cssutils_0 : dev-python/cssutils:0 -examples -test
+package.use : dev-python/cssutils:0 -examples -test
 
 [dev-python/cython:0]
-package.use/dev-python_cython_0 : dev-python/cython:0 -doc -examples -test
+package.use : dev-python/cython:0 -doc -examples -test
 
 [dev-python/dbus-python:0]
-package.use/dev-python_dbus-python_0 : dev-python/dbus-python:0 -doc -examples -test
+package.use : dev-python/dbus-python:0 -doc -examples -test
 
 [dev-python/dbutils:0]
-package.use/dev-python_dbutils_0 : dev-python/dbutils:0 -doc -examples
+package.use : dev-python/dbutils:0 -doc -examples
 
 [dev-python/deform:0]
-package.use/dev-python_deform_0 : dev-python/deform:0 -test
+package.use : dev-python/deform:0 -test
 
 [dev-python/defusedxml:0]
-package.use/dev-python_defusedxml_0 : dev-python/defusedxml:0 -examples
+package.use : dev-python/defusedxml:0 -examples
 
 [dev-python/demjson:0]
-package.use/dev-python_demjson_0 : dev-python/demjson:0 -doc
+package.use : dev-python/demjson:0 -doc
 
 [dev-python/disqus-python:0]
-package.use/dev-python_disqus-python_0 : dev-python/disqus-python:0 -test
+package.use : dev-python/disqus-python:0 -test
 
 [dev-python/django-appconf:0]
-package.use/dev-python_django-appconf_0 : dev-python/django-appconf:0 -doc -test
+package.use : dev-python/django-appconf:0 -doc -test
 
 [dev-python/django-auth-ldap:0]
-package.use/dev-python_django-auth-ldap_0 : dev-python/django-auth-ldap:0 -doc -test
+package.use : dev-python/django-auth-ldap:0 -doc -test
 
 [dev-python/django-celery:0]
-package.use/dev-python_django-celery_0 : dev-python/django-celery:0 -doc -examples -test
+package.use : dev-python/django-celery:0 -doc -examples -test
 
 [dev-python/django-compressor:0]
-package.use/dev-python_django-compressor_0 : dev-python/django-compressor:0 -doc -test
+package.use : dev-python/django-compressor:0 -doc -test
 
 [dev-python/django-debug-toolbar:0]
-package.use/dev-python_django-debug-toolbar_0 : dev-python/django-debug-toolbar:0 -doc -examples
+package.use : dev-python/django-debug-toolbar:0 -doc -examples
 
 [dev-python/django-endless-pagination:0]
-package.use/dev-python_django-endless-pagination_0 : dev-python/django-endless-pagination:0 -doc -test
+package.use : dev-python/django-endless-pagination:0 -doc -test
 
 [dev-python/django-evolution:0]
-package.use/dev-python_django-evolution_0 : dev-python/django-evolution:0 -test
+package.use : dev-python/django-evolution:0 -test
 
 [dev-python/django-haystack:0]
-package.use/dev-python_django-haystack_0 : dev-python/django-haystack:0 -doc
+package.use : dev-python/django-haystack:0 -doc
 
 [dev-python/django-ldapdb:0]
-package.use/dev-python_django-ldapdb_0 : dev-python/django-ldapdb:0 -test
+package.use : dev-python/django-ldapdb:0 -test
 
 [dev-python/django-pipeline:0]
-package.use/dev-python_django-pipeline_0 : dev-python/django-pipeline:0 -doc -test
+package.use : dev-python/django-pipeline:0 -doc -test
 
 [dev-python/django-recaptcha:0]
-package.use/dev-python_django-recaptcha_0 : dev-python/django-recaptcha:0 -test
+package.use : dev-python/django-recaptcha:0 -test
 
 [dev-python/django-social-auth:0]
-package.use/dev-python_django-social-auth_0 : dev-python/django-social-auth:0 -doc -examples
+package.use : dev-python/django-social-auth:0 -doc -examples
 
 [dev-python/django-tastypie:0]
-package.use/dev-python_django-tastypie_0 : dev-python/django-tastypie:0 -bip -digest -doc -lxml -oauth -test -yaml
+package.use : dev-python/django-tastypie:0 -bip -digest -doc -lxml -oauth -test -yaml
 
 [dev-python/django-xslt:0]
-package.use/dev-python_django-xslt_0 : dev-python/django-xslt:0 -test
+package.use : dev-python/django-xslt:0 -test
 
 [dev-python/django:0]
-package.use/dev-python_django_0 : dev-python/django:0 -doc -test sqlite
+package.use : dev-python/django:0 -doc -test sqlite
 
 [dev-python/dnspython:0]
-package.use/dev-python_dnspython_0 : dev-python/dnspython:0 -examples -test
+package.use : dev-python/dnspython:0 -examples -test
 
 [dev-python/docker-py:0]
-package.use/dev-python_docker-py_0 : dev-python/docker-py:0 -doc -test
+package.use : dev-python/docker-py:0 -doc -test
 
 [dev-python/dogpile-core:0]
-package.use/dev-python_dogpile-core_0 : dev-python/dogpile-core:0 -test
+package.use : dev-python/dogpile-core:0 -test
 
 [dev-python/doit:0]
-package.use/dev-python_doit_0 : dev-python/doit:0 -test
+package.use : dev-python/doit:0 -test
 
 [dev-python/dpkt:0]
-package.use/dev-python_dpkt_0 : dev-python/dpkt:0 -examples
+package.use : dev-python/dpkt:0 -examples
 
 [dev-python/dugong:0]
-package.use/dev-python_dugong_0 : dev-python/dugong:0 -doc -examples -test
+package.use : dev-python/dugong:0 -doc -examples -test
 
 [dev-python/dulwich:0]
-package.use/dev-python_dulwich_0 : dev-python/dulwich:0 -doc -examples -test
+package.use : dev-python/dulwich:0 -doc -examples -test
 
 [dev-python/egg-python:0]
-package.use/dev-python_egg-python_0 : dev-python/egg-python:0 -examples
+package.use : dev-python/egg-python:0 -examples
 
 [dev-python/embedly:0]
-package.use/dev-python_embedly_0 : dev-python/embedly:0 -test
+package.use : dev-python/embedly:0 -test
 
 [dev-python/empy:0]
-package.use/dev-python_empy_0 : dev-python/empy:0 -doc
+package.use : dev-python/empy:0 -doc
 
 [dev-python/enaml:0]
-package.use/dev-python_enaml_0 : dev-python/enaml:0 -examples -test
+package.use : dev-python/enaml:0 -examples -test
 
 [dev-python/encore:0]
-package.use/dev-python_encore_0 : dev-python/encore:0 -test
+package.use : dev-python/encore:0 -test
 
 [dev-python/epsilon:0]
-package.use/dev-python_epsilon_0 : dev-python/epsilon:0 -test
+package.use : dev-python/epsilon:0 -test
 
 [dev-python/epydoc:0]
-package.use/dev-python_epydoc_0 : dev-python/epydoc:0 -doc latex tk
+package.use : dev-python/epydoc:0 -doc latex tk
 
 [dev-python/errorhandler:0]
-package.use/dev-python_errorhandler_0 : dev-python/errorhandler:0 -doc
+package.use : dev-python/errorhandler:0 -doc
 
 [dev-python/eventlet:0]
-package.use/dev-python_eventlet_0 : dev-python/eventlet:0 -doc -examples -test
+package.use : dev-python/eventlet:0 -doc -examples -test
 
 [dev-python/execnet:0]
-package.use/dev-python_execnet_0 : dev-python/execnet:0 -doc -test
+package.use : dev-python/execnet:0 -doc -test
 
 [dev-python/fabric:0]
-package.use/dev-python_fabric_0 : dev-python/fabric:0 -doc -test
+package.use : dev-python/fabric:0 -doc -test
 
 [dev-python/feedgenerator:0]
-package.use/dev-python_feedgenerator_0 : dev-python/feedgenerator:0 -test
+package.use : dev-python/feedgenerator:0 -test
 
 [dev-python/flask-admin:0]
-package.use/dev-python_flask-admin_0 : dev-python/flask-admin:0 -test
+package.use : dev-python/flask-admin:0 -test
 
 [dev-python/flask-mail:0]
-package.use/dev-python_flask-mail_0 : dev-python/flask-mail:0 -doc -test
+package.use : dev-python/flask-mail:0 -doc -test
 
 [dev-python/flask-migrate:0]
-package.use/dev-python_flask-migrate_0 : dev-python/flask-migrate:0 -test
+package.use : dev-python/flask-migrate:0 -test
 
 [dev-python/flask-openid:0]
-package.use/dev-python_flask-openid_0 : dev-python/flask-openid:0 -doc -examples
+package.use : dev-python/flask-openid:0 -doc -examples
 
 [dev-python/flask-principal:0]
-package.use/dev-python_flask-principal_0 : dev-python/flask-principal:0 -test
+package.use : dev-python/flask-principal:0 -test
 
 [dev-python/flask-restful:0]
-package.use/dev-python_flask-restful_0 : dev-python/flask-restful:0 -doc -examples -paging -test
+package.use : dev-python/flask-restful:0 -doc -examples -paging -test
 
 [dev-python/flask-restless:0]
-package.use/dev-python_flask-restless_0 : dev-python/flask-restless:0 -doc -examples -test
+package.use : dev-python/flask-restless:0 -doc -examples -test
 
 [dev-python/flask-script:0]
-package.use/dev-python_flask-script_0 : dev-python/flask-script:0 -doc -test
+package.use : dev-python/flask-script:0 -doc -test
 
 [dev-python/flask-security:0]
-package.use/dev-python_flask-security_0 : dev-python/flask-security:0 -test
+package.use : dev-python/flask-security:0 -test
 
 [dev-python/flask-sqlalchemy:0]
-package.use/dev-python_flask-sqlalchemy_0 : dev-python/flask-sqlalchemy:0 -doc
+package.use : dev-python/flask-sqlalchemy:0 -doc
 
 [dev-python/flask-whooshalchemy:0]
-package.use/dev-python_flask-whooshalchemy_0 : dev-python/flask-whooshalchemy:0 -test
+package.use : dev-python/flask-whooshalchemy:0 -test
 
 [dev-python/flask-wtf:0]
-package.use/dev-python_flask-wtf_0 : dev-python/flask-wtf:0 -doc -test
+package.use : dev-python/flask-wtf:0 -doc -test
 
 [dev-python/flask:0]
-package.use/dev-python_flask_0 : dev-python/flask:0 -examples
+package.use : dev-python/flask:0 -examples
 
 [dev-python/frozen-flask:0]
-package.use/dev-python_frozen-flask_0 : dev-python/frozen-flask:0 -doc -test
+package.use : dev-python/frozen-flask:0 -doc -test
 
 [dev-python/funcsigs:0]
-package.use/dev-python_funcsigs_0 : dev-python/funcsigs:0 -test
+package.use : dev-python/funcsigs:0 -test
 
 [dev-python/fusil:0]
-package.use/dev-python_fusil_0 : dev-python/fusil:0 -doc -examples
+package.use : dev-python/fusil:0 -doc -examples
 
 [dev-python/futures:0]
-package.use/dev-python_futures_0 : dev-python/futures:0 -doc
+package.use : dev-python/futures:0 -doc
 
 [dev-python/gconf-python:2]
-package.use/dev-python_gconf-python_2 : dev-python/gconf-python:2 -examples
+package.use : dev-python/gconf-python:2 -examples
 
 [dev-python/genshi:0]
-package.use/dev-python_genshi_0 : dev-python/genshi:0 -doc -examples
+package.use : dev-python/genshi:0 -doc -examples
 
 [dev-python/gevent:0]
-package.use/dev-python_gevent_0 : dev-python/gevent:0 -doc -examples
+package.use : dev-python/gevent:0 -doc -examples
 
 [dev-python/git-python:0]
-package.use/dev-python_git-python_0 : dev-python/git-python:0 -test
+package.use : dev-python/git-python:0 -test
 
 [dev-python/gnome-python-extras-base:0]
-package.use/dev-python_gnome-python-extras-base_0 : dev-python/gnome-python-extras-base:0 -debug
+package.use : dev-python/gnome-python-extras-base:0 -debug
 
 [dev-python/gnome-vfs-python:2]
-package.use/dev-python_gnome-vfs-python_2 : dev-python/gnome-vfs-python:2 -doc -examples
+package.use : dev-python/gnome-vfs-python:2 -doc -examples
 
 [dev-python/graphy:0]
-package.use/dev-python_graphy_0 : dev-python/graphy:0 -examples
+package.use : dev-python/graphy:0 -examples
 
 [dev-python/greenlet:0]
-package.use/dev-python_greenlet_0 : dev-python/greenlet:0 -doc
+package.use : dev-python/greenlet:0 -doc
 
 [dev-python/gst-python:0.10]
-package.use/dev-python_gst-python_0.10 : dev-python/gst-python:0.10 -examples -test
+package.use : dev-python/gst-python:0.10 -examples -test
 
 [dev-python/gtkspell-python:0]
-package.use/dev-python_gtkspell-python_0 : dev-python/gtkspell-python:0 -doc -examples
+package.use : dev-python/gtkspell-python:0 -doc -examples
 
 [dev-python/happydoc:0]
-package.use/dev-python_happydoc_0 : dev-python/happydoc:0 -doc
+package.use : dev-python/happydoc:0 -doc
 
 [dev-python/hcs-utils:0]
-package.use/dev-python_hcs-utils_0 : dev-python/hcs-utils:0 -test
+package.use : dev-python/hcs-utils:0 -test
 
 [dev-python/hgdistver:0]
-package.use/dev-python_hgdistver_0 : dev-python/hgdistver:0 -test
+package.use : dev-python/hgdistver:0 -test
 
 [dev-python/hgtools:0]
-package.use/dev-python_hgtools_0 : dev-python/hgtools:0 -test
+package.use : dev-python/hgtools:0 -test
 
 [dev-python/html5lib:0]
-package.use/dev-python_html5lib_0 : dev-python/html5lib:0 -test
+package.use : dev-python/html5lib:0 -test
 
 [dev-python/htmlgen:0]
-package.use/dev-python_htmlgen_0 : dev-python/htmlgen:0 -doc
+package.use : dev-python/htmlgen:0 -doc
 
 [dev-python/iconvcodec:0]
-+package.env : dev-python/iconvcodec:0 dev-python_iconvcodec_0
-env/dev-python_iconvcodec_0 : LDFLAGS="-liconv"
+package.env : dev-python/iconvcodec:0 dev-python_iconvcodec_0
+env : LDFLAGS="-liconv"
 
 [dev-python/imapclient:0]
-package.use/dev-python_imapclient_0 : dev-python/imapclient:0 -doc -examples -test
+package.use : dev-python/imapclient:0 -doc -examples -test
 
 [dev-python/ipython:0]
-package.use/dev-python_ipython_0 : dev-python/ipython:0 -doc -examples -matplotlib -mongodb -nbconvert -notebook -octave -test -wxwidgets qt4 smp
+package.use : dev-python/ipython:0 -doc -examples -matplotlib -mongodb -nbconvert -notebook -octave -test -wxwidgets qt4 smp
 
 [dev-python/irc:0]
-package.use/dev-python_irc_0 : dev-python/irc:0 -examples -test
+package.use : dev-python/irc:0 -examples -test
 
 [dev-python/jaraco-utils:0]
-package.use/dev-python_jaraco-utils_0 : dev-python/jaraco-utils:0 -test
+package.use : dev-python/jaraco-utils:0 -test
 
 [dev-python/jinja:0]
-package.use/dev-python_jinja_0 : dev-python/jinja:0 -doc -examples
+package.use : dev-python/jinja:0 -doc -examples
 
 [dev-python/jmespath:0]
-package.use/dev-python_jmespath_0 : dev-python/jmespath:0 -test
+package.use : dev-python/jmespath:0 -test
 
 [dev-python/joblib:0]
-package.use/dev-python_joblib_0 : dev-python/joblib:0 -doc -test
+package.use : dev-python/joblib:0 -doc -test
 
 [dev-python/jonpy:0]
-package.use/dev-python_jonpy_0 : dev-python/jonpy:0 -doc -examples
+package.use : dev-python/jonpy:0 -doc -examples
 
 [dev-python/jsmin:0]
-package.use/dev-python_jsmin_0 : dev-python/jsmin:0 -doc
+package.use : dev-python/jsmin:0 -doc
 
 [dev-python/json-rpc:0]
-package.use/dev-python_json-rpc_0 : dev-python/json-rpc:0 -test
+package.use : dev-python/json-rpc:0 -test
 
 [dev-python/json-tools:0]
-package.use/dev-python_json-tools_0 : dev-python/json-tools:0 -test
+package.use : dev-python/json-tools:0 -test
 
 [dev-python/jsonpickle:0]
-package.use/dev-python_jsonpickle_0 : dev-python/jsonpickle:0 -doc -test
+package.use : dev-python/jsonpickle:0 -doc -test
 
 [dev-python/jsonschema:0]
-package.use/dev-python_jsonschema_0 : dev-python/jsonschema:0 -test
+package.use : dev-python/jsonschema:0 -test
 
 [dev-python/kaa-base:0]
-package.use/dev-python_kaa-base_0 : dev-python/kaa-base:0 -lirc -tls avahi sqlite
+package.use : dev-python/kaa-base:0 -lirc -tls avahi sqlite
 
 [dev-python/kaa-metadata:0]
-package.use/dev-python_kaa-metadata_0 : dev-python/kaa-metadata:0 -css dvd
+package.use : dev-python/kaa-metadata:0 -css dvd
 
 [dev-python/kazoo:0]
-package.use/dev-python_kazoo_0 : dev-python/kazoo:0 -doc -gevent -test
+package.use : dev-python/kazoo:0 -doc -gevent -test
 
 [dev-python/keyczar:0]
-package.use/dev-python_keyczar_0 : dev-python/keyczar:0 -doc
+package.use : dev-python/keyczar:0 -doc
 
 [dev-python/keyring:0]
-package.use/dev-python_keyring_0 : dev-python/keyring:0 -test
+package.use : dev-python/keyring:0 -test
 
 [dev-python/kiwi:0]
-package.use/dev-python_kiwi_0 : dev-python/kiwi:0 -examples -test
+package.use : dev-python/kiwi:0 -examples -test
 
 [dev-python/kombu:0]
-package.use/dev-python_kombu_0 : dev-python/kombu:0 -amqplib -doc -examples -msgpack -sqs -test
+package.use : dev-python/kombu:0 -amqplib -doc -examples -msgpack -sqs -test
 
 [dev-python/lesscpy:0]
-package.use/dev-python_lesscpy_0 : dev-python/lesscpy:0 -test
+package.use : dev-python/lesscpy:0 -test
 
 [dev-python/libbonobo-python:2]
-package.use/dev-python_libbonobo-python_2 : dev-python/libbonobo-python:2 -examples
+package.use : dev-python/libbonobo-python:2 -examples
 
 [dev-python/libcloud:0]
-package.use/dev-python_libcloud_0 : dev-python/libcloud:0 -examples -test
+package.use : dev-python/libcloud:0 -examples -test
 
 [dev-python/libgnome-python:2]
-package.use/dev-python_libgnome-python_2 : dev-python/libgnome-python:2 -examples
+package.use : dev-python/libgnome-python:2 -examples
 
 [dev-python/libgnomecanvas-python:2]
-package.use/dev-python_libgnomecanvas-python_2 : dev-python/libgnomecanvas-python:2 -examples
+package.use : dev-python/libgnomecanvas-python:2 -examples
 
 [dev-python/librsvg-python:0]
-package.use/dev-python_librsvg-python_0 : dev-python/librsvg-python:0 -examples
+package.use : dev-python/librsvg-python:0 -examples
 
 [dev-python/libwnck-python:0]
-package.use/dev-python_libwnck-python_0 : dev-python/libwnck-python:0 -examples
+package.use : dev-python/libwnck-python:0 -examples
 
 [dev-python/lockfile:0]
-package.use/dev-python_lockfile_0 : dev-python/lockfile:0 -doc -test
+package.use : dev-python/lockfile:0 -doc -test
 
 [dev-python/log4py:0]
-package.use/dev-python_log4py_0 : dev-python/log4py:0 -doc
+package.use : dev-python/log4py:0 -doc
 
 [dev-python/logbook:0]
-package.use/dev-python_logbook_0 : dev-python/logbook:0 -doc -test
+package.use : dev-python/logbook:0 -doc -test
 
 [dev-python/logilab-common:0]
-package.use/dev-python_logilab-common_0 : dev-python/logilab-common:0 -doc -test
+package.use : dev-python/logilab-common:0 -doc -test
 
 [dev-python/logilab-constraint:0]
-package.use/dev-python_logilab-constraint_0 : dev-python/logilab-constraint:0 -doc -examples
+package.use : dev-python/logilab-constraint:0 -doc -examples
 
 [dev-python/lupy:0]
-package.use/dev-python_lupy_0 : dev-python/lupy:0 -examples
+package.use : dev-python/lupy:0 -examples
 
 [dev-python/lxml:0]
-package.use/dev-python_lxml_0 : dev-python/lxml:0 -beautifulsoup3 -doc -examples threads
+package.use : dev-python/lxml:0 -beautifulsoup3 -doc -examples threads
 
 [dev-python/mako:0]
-package.use/dev-python_mako_0 : dev-python/mako:0 -doc -test
+package.use : dev-python/mako:0 -doc -test
 
 [dev-python/markdown:0]
-package.use/dev-python_markdown_0 : dev-python/markdown:0 -doc -pygments -test
+package.use : dev-python/markdown:0 -doc -pygments -test
 
 [dev-python/mock:0]
-package.use/dev-python_mock_0 : dev-python/mock:0 -doc -test
+package.use : dev-python/mock:0 -doc -test
 
 [dev-python/more-itertools:0]
-package.use/dev-python_more-itertools_0 : dev-python/more-itertools:0 -test
+package.use : dev-python/more-itertools:0 -test
 
 [dev-python/mygpoclient:0]
-package.use/dev-python_mygpoclient_0 : dev-python/mygpoclient:0 -test
+package.use : dev-python/mygpoclient:0 -test
 
 [dev-python/natsort:0]
-package.use/dev-python_natsort_0 : dev-python/natsort:0 -test
+package.use : dev-python/natsort:0 -test
 
 [dev-python/nevow:0]
-package.use/dev-python_nevow_0 : dev-python/nevow:0 -doc
+package.use : dev-python/nevow:0 -doc
 
 [dev-python/nltk:0]
-package.use/dev-python_nltk_0 : dev-python/nltk:0 -numpy -tk
+package.use : dev-python/nltk:0 -numpy -tk
 
 [dev-python/nose:0]
-package.use/dev-python_nose_0 : dev-python/nose:0 -doc -examples -test
+package.use : dev-python/nose:0 -doc -examples -test
 
 [dev-python/notify-python:0]
-package.use/dev-python_notify-python_0 : dev-python/notify-python:0 -examples
+package.use : dev-python/notify-python:0 -examples
 
 [dev-python/numpy:0]
-package.use/dev-python_numpy_0 : dev-python/numpy:0 -doc -lapack -test
+package.use : dev-python/numpy:0 -doc -lapack -test
 
 [dev-python/oauth2:0]
-package.use/dev-python_oauth2_0 : dev-python/oauth2:0 -test
+package.use : dev-python/oauth2:0 -test
 
 [dev-python/oauth2client:0]
-package.use/dev-python_oauth2client_0 : dev-python/oauth2client:0 -test
+package.use : dev-python/oauth2client:0 -test
 
 [dev-python/oauthlib:0]
-package.use/dev-python_oauthlib_0 : dev-python/oauthlib:0 -test
+package.use : dev-python/oauthlib:0 -test
 
 [dev-python/optcomplete:0]
-package.use/dev-python_optcomplete_0 : dev-python/optcomplete:0 -doc -examples
+package.use : dev-python/optcomplete:0 -doc -examples
 
 [dev-python/paisley:0]
-package.use/dev-python_paisley_0 : dev-python/paisley:0 -test
+package.use : dev-python/paisley:0 -test
 
 [dev-python/paramiko:0]
-package.use/dev-python_paramiko_0 : dev-python/paramiko:0 -doc -examples
+package.use : dev-python/paramiko:0 -doc -examples
 
 [dev-python/passlib:0]
-package.use/dev-python_passlib_0 : dev-python/passlib:0 -doc -test
+package.use : dev-python/passlib:0 -doc -test
 
 [dev-python/pastedeploy:0]
-package.use/dev-python_pastedeploy_0 : dev-python/pastedeploy:0 -doc
+package.use : dev-python/pastedeploy:0 -doc
 
 [dev-python/pbr:0]
-package.use/dev-python_pbr_0 : dev-python/pbr:0 -test
+package.use : dev-python/pbr:0 -test
 
 [dev-python/pep8:0]
-package.use/dev-python_pep8_0 : dev-python/pep8:0 -doc
+package.use : dev-python/pep8:0 -doc
 
 [dev-python/peppercorn:0]
-package.use/dev-python_peppercorn_0 : dev-python/peppercorn:0 -doc
+package.use : dev-python/peppercorn:0 -doc
 
 [dev-python/pexpect:0]
-package.use/dev-python_pexpect_0 : dev-python/pexpect:0 -doc -examples -test
+package.use : dev-python/pexpect:0 -doc -examples -test
 
 [dev-python/pgasync:0]
-package.use/dev-python_pgasync_0 : dev-python/pgasync:0 -doc
+package.use : dev-python/pgasync:0 -doc
 
 [dev-python/pillow:0]
-package.use/dev-python_pillow_0 : dev-python/pillow:0 -doc -examples -test -truetype jpeg jpeg2k lcms tiff tk webp zlib
+package.use : dev-python/pillow:0 -doc -examples -test -truetype jpeg jpeg2k lcms tiff tk webp zlib
 
 [dev-python/pkginfo:0]
-package.use/dev-python_pkginfo_0 : dev-python/pkginfo:0 -doc -examples
+package.use : dev-python/pkginfo:0 -doc -examples
 
 [dev-python/ply:0]
-package.use/dev-python_ply_0 : dev-python/ply:0 -examples
+package.use : dev-python/ply:0 -examples
 
 [dev-python/plyr:0]
-package.use/dev-python_plyr_0 : dev-python/plyr:0 -doc
+package.use : dev-python/plyr:0 -doc
 
 [dev-python/prettytable:0]
-package.use/dev-python_prettytable_0 : dev-python/prettytable:0 -test
+package.use : dev-python/prettytable:0 -test
 
 [dev-python/psutil:0]
-package.use/dev-python_psutil_0 : dev-python/psutil:0 -test
+package.use : dev-python/psutil:0 -test
 
 [dev-python/py-amqp:0]
-package.use/dev-python_py-amqp_0 : dev-python/py-amqp:0 -doc -examples -test extras
+package.use : dev-python/py-amqp:0 -doc -examples -test extras
 
 [dev-python/py-notify:0]
-package.use/dev-python_py-notify_0 : dev-python/py-notify:0 -examples -test
+package.use : dev-python/py-notify:0 -examples -test
 
 [dev-python/py:0]
-package.use/dev-python_py_0 : dev-python/py:0 -doc -test
-+package.env : dev-python/py:0 dev-python_py_0
-env/dev-python_py_0 : MAKEOPTS="-j1"
+package.use : dev-python/py:0 -doc -test
+package.env : dev-python/py:0 dev-python_py_0
+env : MAKEOPTS="-j1"
 
 [dev-python/pyalsaaudio:0]
-package.use/dev-python_pyalsaaudio_0 : dev-python/pyalsaaudio:0 -doc
+package.use : dev-python/pyalsaaudio:0 -doc
 
 [dev-python/pyasn1:0]
-package.use/dev-python_pyasn1_0 : dev-python/pyasn1:0 -doc
+package.use : dev-python/pyasn1:0 -doc
 
 [dev-python/pyaudio:0]
-package.use/dev-python_pyaudio_0 : dev-python/pyaudio:0 -doc
+package.use : dev-python/pyaudio:0 -doc
 
 [dev-python/pybluez:0]
-package.use/dev-python_pybluez_0 : dev-python/pybluez:0 -examples
+package.use : dev-python/pybluez:0 -examples
 
 [dev-python/pycairo:0]
-package.use/dev-python_pycairo_0 : dev-python/pycairo:0 -doc -examples -test svg xcb
+package.use : dev-python/pycairo:0 -doc -examples -test svg xcb
 
 [dev-python/pychart:0]
-package.use/dev-python_pychart_0 : dev-python/pychart:0 -doc -examples
+package.use : dev-python/pychart:0 -doc -examples
 
 [dev-python/pycparser:0]
-package.use/dev-python_pycparser_0 : dev-python/pycparser:0 -test
+package.use : dev-python/pycparser:0 -test
 
 [dev-python/pycrypto:0]
-package.use/dev-python_pycrypto_0 : dev-python/pycrypto:0 -doc gmp
+package.use : dev-python/pycrypto:0 -doc gmp
 
 [dev-python/pycxx:0]
-package.use/dev-python_pycxx_0 : dev-python/pycxx:0 -doc -examples
+package.use : dev-python/pycxx:0 -doc -examples
 
 [dev-python/pydns:2]
-package.use/dev-python_pydns_2 : dev-python/pydns:2 -examples
+package.use : dev-python/pydns:2 -examples
 
 [dev-python/pydns:3]
-package.use/dev-python_pydns_3 : dev-python/pydns:3 -examples
+package.use : dev-python/pydns:3 -examples
 
 [dev-python/pyelftools:0]
-package.use/dev-python_pyelftools_0 : dev-python/pyelftools:0 -examples
+package.use : dev-python/pyelftools:0 -examples
 
 [dev-python/pygame:0]
-package.use/dev-python_pygame_0 : dev-python/pygame:0 -doc -examples -test X
+package.use : dev-python/pygame:0 -doc -examples -test X
 
 [dev-python/pygments:0]
-package.use/dev-python_pygments_0 : dev-python/pygments:0 -doc -test
+package.use : dev-python/pygments:0 -doc -test
 
 [dev-python/pygobject:2]
-package.use/dev-python_pygobject_2 : dev-python/pygobject:2 -examples -test libffi
-+package.env : dev-python/pygobject:2 dev-python_pygobject_2
-env/dev-python_pygobject_2 : MAKEOPTS="-j1"
+package.use : dev-python/pygobject:2 -examples -test libffi
+package.env : dev-python/pygobject:2 dev-python_pygobject_2
+env : MAKEOPTS="-j1"
 
 [dev-python/pygobject:3]
-package.use/dev-python_pygobject_3 : dev-python/pygobject:3 -examples -test cairo threads
-+package.env : dev-python/pygobject:3 dev-python_pygobject_3
-env/dev-python_pygobject_3 : MAKEOPTS="-j1"
+package.use : dev-python/pygobject:3 -examples -test cairo threads
+package.env : dev-python/pygobject:3 dev-python_pygobject_3
+env : MAKEOPTS="-j1"
 
 [dev-python/pygoocanvas:0]
-package.use/dev-python_pygoocanvas_0 : dev-python/pygoocanvas:0 -doc -examples
+package.use : dev-python/pygoocanvas:0 -doc -examples
 
 [dev-python/pygtk:2]
-package.use/dev-python_pygtk_2 : dev-python/pygtk:2 -doc -examples -test
+package.use : dev-python/pygtk:2 -doc -examples -test
 
 [dev-python/pygtkglext:0]
-package.use/dev-python_pygtkglext_0 : dev-python/pygtkglext:0 -examples
+package.use : dev-python/pygtkglext:0 -examples
 
 [dev-python/pygtkhelpers:0]
-package.use/dev-python_pygtkhelpers_0 : dev-python/pygtkhelpers:0 -doc -examples
+package.use : dev-python/pygtkhelpers:0 -doc -examples
 
 [dev-python/pygtksourceview:2]
-package.use/dev-python_pygtksourceview_2 : dev-python/pygtksourceview:2 -doc
+package.use : dev-python/pygtksourceview:2 -doc
 
 [dev-python/pyinotify:0]
-package.use/dev-python_pyinotify_0 : dev-python/pyinotify:0 -examples
+package.use : dev-python/pyinotify:0 -examples
 
 [dev-python/pyjwt:0]
-package.use/dev-python_pyjwt_0 : dev-python/pyjwt:0 -test
+package.use : dev-python/pyjwt:0 -test
 
 [dev-python/pylibpcap:0]
-package.use/dev-python_pylibpcap_0 : dev-python/pylibpcap:0 -examples
+package.use : dev-python/pylibpcap:0 -examples
 
 [dev-python/pylint:0]
-package.use/dev-python_pylint_0 : dev-python/pylint:0 -doc -examples -test
+package.use : dev-python/pylint:0 -doc -examples -test
 
 [dev-python/pymtp:0]
-package.use/dev-python_pymtp_0 : dev-python/pymtp:0 -examples
+package.use : dev-python/pymtp:0 -examples
 
 [dev-python/pynotifier:0]
-package.use/dev-python_pynotifier_0 : dev-python/pynotifier:0 gtk qt4
+package.use : dev-python/pynotifier:0 gtk qt4
 
 [dev-python/pyodbc:0]
-package.use/dev-python_pyodbc_0 : dev-python/pyodbc:0 -mssql
+package.use : dev-python/pyodbc:0 -mssql
 
 [dev-python/pyode:0]
-package.use/dev-python_pyode_0 : dev-python/pyode:0 -examples
+package.use : dev-python/pyode:0 -examples
 
 [dev-python/pyopengl:0]
-package.use/dev-python_pyopengl_0 : dev-python/pyopengl:0 tk
+package.use : dev-python/pyopengl:0 tk
 
 [dev-python/pyopenssl:0]
-package.use/dev-python_pyopenssl_0 : dev-python/pyopenssl:0 -doc -examples
+package.use : dev-python/pyopenssl:0 -doc -examples
 
 [dev-python/pyosd:0]
-package.use/dev-python_pyosd_0 : dev-python/pyosd:0 -examples
+package.use : dev-python/pyosd:0 -examples
 
 [dev-python/pyparsing:0]
-package.use/dev-python_pyparsing_0 : dev-python/pyparsing:0 -doc -examples
+package.use : dev-python/pyparsing:0 -doc -examples
 
 [dev-python/pypax:0]
-package.use/dev-python_pypax_0 : dev-python/pypax:0 -ptpax xtpax
+package.use : dev-python/pypax:0 -ptpax xtpax
 
 [dev-python/pyqwt:5]
-package.use/dev-python_pyqwt_5 : dev-python/pyqwt:5 -debug -doc -examples svg
+package.use : dev-python/pyqwt:5 -debug -doc -examples svg
 
 [dev-python/pyrex:0]
-package.use/dev-python_pyrex_0 : dev-python/pyrex:0 -examples
+package.use : dev-python/pyrex:0 -examples
 
 [dev-python/pyro:4]
-package.use/dev-python_pyro_4 : dev-python/pyro:4 -doc -examples -test
+package.use : dev-python/pyro:4 -doc -examples -test
 
 [dev-python/pyserial:0]
-package.use/dev-python_pyserial_0 : dev-python/pyserial:0 -doc -examples
+package.use : dev-python/pyserial:0 -doc -examples
 
 [dev-python/pysnmp:0]
-package.use/dev-python_pysnmp_0 : dev-python/pysnmp:0 -examples
+package.use : dev-python/pysnmp:0 -examples
 
 [dev-python/pyspf:0]
-package.use/dev-python_pyspf_0 : dev-python/pyspf:0 -test ipv6
+package.use : dev-python/pyspf:0 -test ipv6
 
 [dev-python/pysvn:0]
-package.use/dev-python_pysvn_0 : dev-python/pysvn:0 -doc -examples
+package.use : dev-python/pysvn:0 -doc -examples
 
 [dev-python/pytest:0]
-package.use/dev-python_pytest_0 : dev-python/pytest:0 -doc -test
+package.use : dev-python/pytest:0 -doc -test
 
 [dev-python/python-daemon:0]
-package.use/dev-python_python-daemon_0 : dev-python/python-daemon:0 -test
+package.use : dev-python/python-daemon:0 -test
 
 [dev-python/python-dateutil:0]
-package.use/dev-python_python-dateutil_0 : dev-python/python-dateutil:0 -examples
+package.use : dev-python/python-dateutil:0 -examples
 
 [dev-python/python-gtkmvc:0]
-package.use/dev-python_python-gtkmvc_0 : dev-python/python-gtkmvc:0 -doc -examples
+package.use : dev-python/python-gtkmvc:0 -doc -examples
 
 [dev-python/python-ldap:0]
-package.use/dev-python_python-ldap_0 : dev-python/python-ldap:0 -examples sasl ssl
+package.use : dev-python/python-ldap:0 -examples sasl ssl
 
 [dev-python/python-mpd:0]
-package.use/dev-python_python-mpd_0 : dev-python/python-mpd:0 -test
+package.use : dev-python/python-mpd:0 -test
 
 [dev-python/python-musicbrainz:0]
-package.use/dev-python_python-musicbrainz_0 : dev-python/python-musicbrainz:0 -doc -examples
+package.use : dev-python/python-musicbrainz:0 -doc -examples
 
 [dev-python/python-openid:0]
-package.use/dev-python_python-openid_0 : dev-python/python-openid:0 -examples -mysql -postgres -test sqlite
+package.use : dev-python/python-openid:0 -examples -mysql -postgres -test sqlite
 
 [dev-python/python-poppler:0]
-package.use/dev-python_python-poppler_0 : dev-python/python-poppler:0 -examples
+package.use : dev-python/python-poppler:0 -examples
 
 [dev-python/python-ptrace:0]
-package.use/dev-python_python-ptrace_0 : dev-python/python-ptrace:0 -doc -examples
+package.use : dev-python/python-ptrace:0 -doc -examples
 
 [dev-python/python-social-auth:0]
-package.use/dev-python_python-social-auth_0 : dev-python/python-social-auth:0 -doc -examples -test
+package.use : dev-python/python-social-auth:0 -doc -examples -test
 
 [dev-python/python-sqlparse:0]
-package.use/dev-python_python-sqlparse_0 : dev-python/python-sqlparse:0 -doc -examples -test
+package.use : dev-python/python-sqlparse:0 -doc -examples -test
 
 [dev-python/python3-openid:0]
-package.use/dev-python_python3-openid_0 : dev-python/python3-openid:0 -examples -test
+package.use : dev-python/python3-openid:0 -examples -test
 
 [dev-python/pythondialog:0]
-package.use/dev-python_pythondialog_0 : dev-python/pythondialog:0 -examples
+package.use : dev-python/pythondialog:0 -examples
 
 [dev-python/pyudev:0]
-package.use/dev-python_pyudev_0 : dev-python/pyudev:0 -pygobject -pyqt4 -pyside -test
+package.use : dev-python/pyudev:0 -pygobject -pyqt4 -pyside -test
 
 [dev-python/pywebkitgtk:0]
-package.use/dev-python_pywebkitgtk_0 : dev-python/pywebkitgtk:0 -test
+package.use : dev-python/pywebkitgtk:0 -test
 
 [dev-python/pyxattr:0]
-package.use/dev-python_pyxattr_0 : dev-python/pyxattr:0 -doc -test
+package.use : dev-python/pyxattr:0 -doc -test
 
 [dev-python/pyxdg:0]
-package.use/dev-python_pyxdg_0 : dev-python/pyxdg:0 -test
+package.use : dev-python/pyxdg:0 -test
 
 [dev-python/pyxml:0]
-package.use/dev-python_pyxml_0 : dev-python/pyxml:0 -doc -examples
+package.use : dev-python/pyxml:0 -doc -examples
 
 [dev-python/pyyaml:0]
-package.use/dev-python_pyyaml_0 : dev-python/pyyaml:0 -examples -libyaml
+package.use : dev-python/pyyaml:0 -examples -libyaml
 
 [dev-python/pyzmq:0]
-package.use/dev-python_pyzmq_0 : dev-python/pyzmq:0 -doc -examples -green -test
+package.use : dev-python/pyzmq:0 -doc -examples -green -test
 
 [dev-python/pyzor:0]
-package.use/dev-python_pyzor_0 : dev-python/pyzor:0 -pyzord
+package.use : dev-python/pyzor:0 -pyzord
 
 [dev-python/qscintilla-python:0]
-package.use/dev-python_qscintilla-python_0 : dev-python/qscintilla-python:0 -debug
+package.use : dev-python/qscintilla-python:0 -debug
 
 [dev-python/queuelib:0]
-package.use/dev-python_queuelib_0 : dev-python/queuelib:0 -test
+package.use : dev-python/queuelib:0 -test
 
 [dev-python/quixote:0]
-package.use/dev-python_quixote_0 : dev-python/quixote:0 -doc -test
+package.use : dev-python/quixote:0 -doc -test
 
 [dev-python/reportlab:0]
-package.use/dev-python_reportlab_0 : dev-python/reportlab:0 -doc -examples
+package.use : dev-python/reportlab:0 -doc -examples
 
 [dev-python/requests-cache:0]
-package.use/dev-python_requests-cache_0 : dev-python/requests-cache:0 -doc
+package.use : dev-python/requests-cache:0 -doc
 
 [dev-python/requests-oauthlib:0]
-package.use/dev-python_requests-oauthlib_0 : dev-python/requests-oauthlib:0 -test
+package.use : dev-python/requests-oauthlib:0 -test
 
 [dev-python/roman:0]
-package.use/dev-python_roman_0 : dev-python/roman:0 -test
+package.use : dev-python/roman:0 -test
 
 [dev-python/routes:0]
-package.use/dev-python_routes_0 : dev-python/routes:0 -doc -test
+package.use : dev-python/routes:0 -doc -test
 
 [dev-python/rsa:0]
-package.use/dev-python_rsa_0 : dev-python/rsa:0 -test
+package.use : dev-python/rsa:0 -test
 
 [dev-python/selenium:0]
-package.use/dev-python_selenium_0 : dev-python/selenium:0 -doc
+package.use : dev-python/selenium:0 -doc
 
 [dev-python/send2trash:0]
-package.use/dev-python_send2trash_0 : dev-python/send2trash:0 -doc
+package.use : dev-python/send2trash:0 -doc
 
 [dev-python/setproctitle:0]
-package.use/dev-python_setproctitle_0 : dev-python/setproctitle:0 -test
+package.use : dev-python/setproctitle:0 -test
 
 [dev-python/setuptools:0]
-package.use/dev-python_setuptools_0 : dev-python/setuptools:0 -test
+package.use : dev-python/setuptools:0 -test
 
 [dev-python/simpleparse:0]
-package.use/dev-python_simpleparse_0 : dev-python/simpleparse:0 -doc -examples
+package.use : dev-python/simpleparse:0 -doc -examples
 
 [dev-python/sip:0]
-package.use/dev-python_sip_0 : dev-python/sip:0 -debug -doc
+package.use : dev-python/sip:0 -debug -doc
 
 [dev-python/six:0]
-package.use/dev-python_six_0 : dev-python/six:0 -doc -test
+package.use : dev-python/six:0 -doc -test
 
 [dev-python/smmap:0]
-package.use/dev-python_smmap_0 : dev-python/smmap:0 -test
+package.use : dev-python/smmap:0 -test
 
 [dev-python/sphinx:0]
-package.use/dev-python_sphinx_0 : dev-python/sphinx:0 -doc -test latex
+package.use : dev-python/sphinx:0 -doc -test latex
 
 [dev-python/sqlalchemy:0]
-package.use/dev-python_sqlalchemy_0 : dev-python/sqlalchemy:0 -doc -examples -test sqlite
+package.use : dev-python/sqlalchemy:0 -doc -examples -test sqlite
 
 [dev-python/stevedore:0]
-package.use/dev-python_stevedore_0 : dev-python/stevedore:0 -doc -test
+package.use : dev-python/stevedore:0 -doc -test
 
 [dev-python/stomper:0]
-package.use/dev-python_stomper_0 : dev-python/stomper:0 -examples
+package.use : dev-python/stomper:0 -examples
 
 [dev-python/subvertpy:0]
-package.use/dev-python_subvertpy_0 : dev-python/subvertpy:0 -test
+package.use : dev-python/subvertpy:0 -test
 
 [dev-python/suds:0]
-package.use/dev-python_suds_0 : dev-python/suds:0 -doc
+package.use : dev-python/suds:0 -doc
 
 [dev-python/sudsds:0]
-package.use/dev-python_sudsds_0 : dev-python/sudsds:0 -doc
+package.use : dev-python/sudsds:0 -doc
 
 [dev-python/symboltype:0]
-package.use/dev-python_symboltype_0 : dev-python/symboltype:0 -doc
+package.use : dev-python/symboltype:0 -doc
 
 [dev-python/tagpy:0]
-package.use/dev-python_tagpy_0 : dev-python/tagpy:0 -examples
+package.use : dev-python/tagpy:0 -examples
 
 [dev-python/testfixtures:0]
-package.use/dev-python_testfixtures_0 : dev-python/testfixtures:0 -doc -test
+package.use : dev-python/testfixtures:0 -doc -test
 
 [dev-python/thunarx-python:0]
-package.use/dev-python_thunarx-python_0 : dev-python/thunarx-python:0 -debug
+package.use : dev-python/thunarx-python:0 -debug
 
 [dev-python/tpg:0]
-package.use/dev-python_tpg_0 : dev-python/tpg:0 -doc -examples
+package.use : dev-python/tpg:0 -doc -examples
 
 [dev-python/tracing:0]
-package.use/dev-python_tracing_0 : dev-python/tracing:0 -doc -examples
+package.use : dev-python/tracing:0 -doc -examples
 
 [dev-python/twisted-core:0]
-package.use/dev-python_twisted-core_0 : dev-python/twisted-core:0 -serial crypt gtk
+package.use : dev-python/twisted-core:0 -serial crypt gtk
 
 [dev-python/twisted-web:0]
-package.use/dev-python_twisted-web_0 : dev-python/twisted-web:0 -soap
+package.use : dev-python/twisted-web:0 -soap
 
 [dev-python/urwid:0]
-package.use/dev-python_urwid_0 : dev-python/urwid:0 -doc -examples -test
+package.use : dev-python/urwid:0 -doc -examples -test
 
 [dev-python/venusian:0]
-package.use/dev-python_venusian_0 : dev-python/venusian:0 -test
+package.use : dev-python/venusian:0 -test
 
 [dev-python/warlock:0]
-package.use/dev-python_warlock_0 : dev-python/warlock:0 -test
+package.use : dev-python/warlock:0 -test
 
 [dev-python/webob:0]
-package.use/dev-python_webob_0 : dev-python/webob:0 -doc -test
+package.use : dev-python/webob:0 -doc -test
 
 [dev-python/websocket-client:0]
-package.use/dev-python_websocket-client_0 : dev-python/websocket-client:0 -examples
+package.use : dev-python/websocket-client:0 -examples
 
 [dev-python/webut:0]
-package.use/dev-python_webut_0 : dev-python/webut:0 -examples
+package.use : dev-python/webut:0 -examples
 
 [dev-python/whoosh:0]
-package.use/dev-python_whoosh_0 : dev-python/whoosh:0 -doc -test
+package.use : dev-python/whoosh:0 -doc -test
 
 [dev-python/winpdb:0]
-package.use/dev-python_winpdb_0 : dev-python/winpdb:0 wxwidgets
+package.use : dev-python/winpdb:0 wxwidgets
 
 [dev-python/wtforms:0]
-package.use/dev-python_wtforms_0 : dev-python/wtforms:0 -doc
+package.use : dev-python/wtforms:0 -doc
 
 [dev-python/wxpython:2.8]
-package.use/dev-python_wxpython_2.8 : dev-python/wxpython:2.8 -doc -examples cairo opengl
+package.use : dev-python/wxpython:2.8 -doc -examples cairo opengl
 
 [dev-python/xmpppy:0]
-package.use/dev-python_xmpppy_0 : dev-python/xmpppy:0 -doc
+package.use : dev-python/xmpppy:0 -doc
 
 [dev-python/yolk:0]
-package.use/dev-python_yolk_0 : dev-python/yolk:0 -examples
+package.use : dev-python/yolk:0 -examples
 
 [dev-qt/assistant:4]
-package.use/dev-qt_assistant_4 : dev-qt/assistant:4 -aqua -debug -pch exceptions webkit
+package.use : dev-qt/assistant:4 -aqua -debug -pch exceptions webkit
 
 [dev-qt/designer:4]
-package.use/dev-qt_designer_4 : dev-qt/designer:4 -aqua -debug -declarative -kde -pch -phonon exceptions qt3support webkit
+package.use : dev-qt/designer:4 -aqua -debug -declarative -kde -pch -phonon exceptions qt3support webkit
 
 [dev-qt/linguist:4]
-package.use/dev-qt_linguist_4 : dev-qt/linguist:4 -aqua -debug -pch exceptions
+package.use : dev-qt/linguist:4 -aqua -debug -pch exceptions
 
 [dev-qt/pixeltool:4]
-package.use/dev-qt_pixeltool_4 : dev-qt/pixeltool:4 -aqua -debug -pch exceptions
+package.use : dev-qt/pixeltool:4 -aqua -debug -pch exceptions
 
 [dev-qt/qdbusviewer:4]
-package.use/dev-qt_qdbusviewer_4 : dev-qt/qdbusviewer:4 -aqua -debug -pch exceptions
+package.use : dev-qt/qdbusviewer:4 -aqua -debug -pch exceptions
 
 [dev-qt/qt-creator:0]
-package.use/dev-qt_qt-creator_0 : dev-qt/qt-creator:0 -android -autotools -bazaar -clearcase -cmake -cvs -debug -doc -examples -fakevim -madde -mercurial -perforce -qnx -test -valgrind git subversion
+package.use : dev-qt/qt-creator:0 -android -autotools -bazaar -clearcase -cmake -cvs -debug -doc -examples -fakevim -madde -mercurial -perforce -qnx -test -valgrind git subversion
 
 [dev-qt/qt-meta:4]
-package.use/dev-qt_qt-meta_4 : dev-qt/qt-meta:4 -examples -kde -openvg dbus qt3support webkit
+package.use : dev-qt/qt-meta:4 -examples -kde -openvg dbus qt3support webkit
 
 [dev-qt/qt3support:4]
-package.use/dev-qt_qt3support_4 : dev-qt/qt3support:4 -aqua -debug -pch accessibility exceptions
+package.use : dev-qt/qt3support:4 -aqua -debug -pch accessibility exceptions
 
 [dev-qt/qtbearer:4]
-package.use/dev-qt_qtbearer_4 : dev-qt/qtbearer:4 -aqua -connman -debug -networkmanager -pch exceptions
+package.use : dev-qt/qtbearer:4 -aqua -connman -debug -networkmanager -pch exceptions
 
 [dev-qt/qtchooser:0]
-package.use/dev-qt_qtchooser_0 : dev-qt/qtchooser:0 -qt5 -test
+package.use : dev-qt/qtchooser:0 -qt5 -test
 
 [dev-qt/qtcore:4]
-package.use/dev-qt_qtcore_4 : dev-qt/qtcore:4 -aqua -debug -pch exceptions glib iconv icu qt3support ssl
-+package.env : dev-qt/qtcore:4 dev-qt_qtcore_4
-env/dev-qt_qtcore_4 : LDFLAGS="-liconv"
+package.use : dev-qt/qtcore:4 -aqua -debug -pch exceptions glib iconv icu qt3support ssl
+package.env : dev-qt/qtcore:4 dev-qt_qtcore_4
+env : LDFLAGS="-liconv"
 
 [dev-qt/qtdbus:4]
-package.use/dev-qt_qtdbus_4 : dev-qt/qtdbus:4 -aqua -debug -pch exceptions
+package.use : dev-qt/qtdbus:4 -aqua -debug -pch exceptions
 
 [dev-qt/qtdeclarative:4]
-package.use/dev-qt_qtdeclarative_4 : dev-qt/qtdeclarative:4 -aqua -debug -pch accessibility exceptions qt3support webkit
+package.use : dev-qt/qtdeclarative:4 -aqua -debug -pch accessibility exceptions qt3support webkit
 
 [dev-qt/qtgui:4]
-package.use/dev-qt_qtgui_4 : dev-qt/qtgui:4 -aqua -debug -egl -gtkstyle -nis -pch -trace accessibility cups exceptions glib mng nas qt3support tiff xinerama xv
+package.use : dev-qt/qtgui:4 -aqua -debug -egl -gtkstyle -nis -pch -trace accessibility cups exceptions glib mng nas qt3support tiff xinerama xv
 
 [dev-qt/qthelp:4]
-package.use/dev-qt_qthelp_4 : dev-qt/qthelp:4 -aqua -compat -debug -doc -pch exceptions
+package.use : dev-qt/qthelp:4 -aqua -compat -debug -doc -pch exceptions
 
 [dev-qt/qtlockedfile:0]
-package.use/dev-qt_qtlockedfile_0 : dev-qt/qtlockedfile:0 -doc
+package.use : dev-qt/qtlockedfile:0 -doc
 
 [dev-qt/qtmultimedia:4]
-package.use/dev-qt_qtmultimedia_4 : dev-qt/qtmultimedia:4 -aqua -debug -pch alsa exceptions
+package.use : dev-qt/qtmultimedia:4 -aqua -debug -pch alsa exceptions
 
 [dev-qt/qtopengl:4]
-package.use/dev-qt_qtopengl_4 : dev-qt/qtopengl:4 -aqua -debug -egl -pch exceptions qt3support
+package.use : dev-qt/qtopengl:4 -aqua -debug -egl -pch exceptions qt3support
 
 [dev-qt/qtphonon:4]
-package.use/dev-qt_qtphonon_4 : dev-qt/qtphonon:4 -aqua -debug -pch dbus exceptions qt3support
+package.use : dev-qt/qtphonon:4 -aqua -debug -pch dbus exceptions qt3support
 
 [dev-qt/qtscript:4]
-package.use/dev-qt_qtscript_4 : dev-qt/qtscript:4 -aqua -debug -jit -pch exceptions
+package.use : dev-qt/qtscript:4 -aqua -debug -jit -pch exceptions
 
 [dev-qt/qtsingleapplication:0]
-package.use/dev-qt_qtsingleapplication_0 : dev-qt/qtsingleapplication:0 -doc X
+package.use : dev-qt/qtsingleapplication:0 -doc X
 
 [dev-qt/qtsql:4]
-package.use/dev-qt_qtsql_4 : dev-qt/qtsql:4 -aqua -debug -freetds -mysql -oci8 -pch -postgres exceptions odbc qt3support sqlite
+package.use : dev-qt/qtsql:4 -aqua -debug -freetds -mysql -oci8 -pch -postgres exceptions odbc qt3support sqlite
 
 [dev-qt/qtsvg:4]
-package.use/dev-qt_qtsvg_4 : dev-qt/qtsvg:4 -aqua -debug -pch accessibility exceptions
+package.use : dev-qt/qtsvg:4 -aqua -debug -pch accessibility exceptions
 
 [dev-qt/qttest:4]
-package.use/dev-qt_qttest_4 : dev-qt/qttest:4 -aqua -debug -pch exceptions
+package.use : dev-qt/qttest:4 -aqua -debug -pch exceptions
 
 [dev-qt/qtwebkit:4]
-package.use/dev-qt_qtwebkit_4 : dev-qt/qtwebkit:4 -aqua -debug -jit -pch exceptions gstreamer icu
+package.use : dev-qt/qtwebkit:4 -aqua -debug -jit -pch exceptions gstreamer icu
 
 [dev-qt/qtxmlpatterns:4]
-package.use/dev-qt_qtxmlpatterns_4 : dev-qt/qtxmlpatterns:4 -aqua -debug -pch
+package.use : dev-qt/qtxmlpatterns:4 -aqua -debug -pch
 
 [dev-ruby/GeoRuby:0]
-package.use/dev-ruby_georuby_0 : dev-ruby/GeoRuby:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/GeoRuby:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/RubyInline:0]
-package.use/dev-ruby_rubyinline_0 : dev-ruby/RubyInline:0 -doc -test ruby_targets_ruby19
+package.use : dev-ruby/RubyInline:0 -doc -test ruby_targets_ruby19
 
 [dev-ruby/archive-tar-minitar:0]
-package.use/dev-ruby_archive-tar-minitar_0 : dev-ruby/archive-tar-minitar:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/archive-tar-minitar:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/bundler:0]
-package.use/dev-ruby_bundler_0 : dev-ruby/bundler:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/bundler:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/cmdparse:0]
-package.use/dev-ruby_cmdparse_0 : dev-ruby/cmdparse:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/cmdparse:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/color:0]
-package.use/dev-ruby_color_0 : dev-ruby/color:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/color:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/daemons:0]
-package.use/dev-ruby_daemons_0 : dev-ruby/daemons:0 -doc -examples -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/daemons:0 -doc -examples -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/dbf:0]
-package.use/dev-ruby_dbf_0 : dev-ruby/dbf:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/dbf:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/deprecated:3]
-package.use/dev-ruby_deprecated_3 : dev-ruby/deprecated:3 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/deprecated:3 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/domain_name:0]
-package.use/dev-ruby_domain_name_0 : dev-ruby/domain_name:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/domain_name:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/eventmachine:0]
-package.use/dev-ruby_eventmachine_0 : dev-ruby/eventmachine:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/eventmachine:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/hoe:0]
-package.use/dev-ruby_hoe_0 : dev-ruby/hoe:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/hoe:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/htmlentities:0]
-package.use/dev-ruby_htmlentities_0 : dev-ruby/htmlentities:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/htmlentities:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/http-cookie:0]
-package.use/dev-ruby_http-cookie_0 : dev-ruby/http-cookie:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/http-cookie:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/imagesize:0]
-package.use/dev-ruby_imagesize_0 : dev-ruby/imagesize:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/imagesize:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/jeweler:0]
-package.use/dev-ruby_jeweler_0 : dev-ruby/jeweler:0 -doc -test ruby_targets_ruby19
+package.use : dev-ruby/jeweler:0 -doc -test ruby_targets_ruby19
 
 [dev-ruby/json:0]
-package.use/dev-ruby_json_0 : dev-ruby/json:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/json:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/kirbybase:0]
-package.use/dev-ruby_kirbybase_0 : dev-ruby/kirbybase:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/kirbybase:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/libxml:0]
-package.use/dev-ruby_libxml_0 : dev-ruby/libxml:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/libxml:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/logue:0]
-package.use/dev-ruby_logue_0 : dev-ruby/logue:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/logue:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/matchy:0]
-package.use/dev-ruby_matchy_0 : dev-ruby/matchy:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/matchy:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/mecab-ruby:0]
-package.use/dev-ruby_mecab-ruby_0 : dev-ruby/mecab-ruby:0 ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/mecab-ruby:0 ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/mechanize:0]
-package.use/dev-ruby_mechanize_0 : dev-ruby/mechanize:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/mechanize:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/memcache-client:0]
-package.use/dev-ruby_memcache-client_0 : dev-ruby/memcache-client:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/memcache-client:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/mime-types:2]
-package.use/dev-ruby_mime-types_2 : dev-ruby/mime-types:2 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/mime-types:2 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/multi_xml:0]
-package.use/dev-ruby_multi_xml_0 : dev-ruby/multi_xml:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/multi_xml:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/narray:0]
-package.use/dev-ruby_narray_0 : dev-ruby/narray:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/narray:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/net-http-digest_auth:0]
-package.use/dev-ruby_net-http-digest_auth_0 : dev-ruby/net-http-digest_auth:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/net-http-digest_auth:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/net-http-persistent:0]
-package.use/dev-ruby_net-http-persistent_0 : dev-ruby/net-http-persistent:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/net-http-persistent:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/netrc:0]
-package.use/dev-ruby_netrc_0 : dev-ruby/netrc:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/netrc:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/nokogiri:0]
-package.use/dev-ruby_nokogiri_0 : dev-ruby/nokogiri:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/nokogiri:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/ntlm-http:0]
-package.use/dev-ruby_ntlm-http_0 : dev-ruby/ntlm-http:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/ntlm-http:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/pkg-config:0]
-package.use/dev-ruby_pkg-config_0 : dev-ruby/pkg-config:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/pkg-config:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/racc:0]
-package.use/dev-ruby_racc_0 : dev-ruby/racc:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/racc:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/ragol:0]
-package.use/dev-ruby_ragol_0 : dev-ruby/ragol:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/ragol:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/rainbow:2]
-package.use/dev-ruby_rainbow_2 : dev-ruby/rainbow:2 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/rainbow:2 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/rake-compiler:0]
-package.use/dev-ruby_rake-compiler_0 : dev-ruby/rake-compiler:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/rake-compiler:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/rake:0]
-package.use/dev-ruby_rake_0 : dev-ruby/rake:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/rake:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/rcairo:0]
-package.use/dev-ruby_rcairo_0 : dev-ruby/rcairo:0 -doc -test ruby_targets_ruby19
+package.use : dev-ruby/rcairo:0 -doc -test ruby_targets_ruby19
 
 [dev-ruby/rdoc:0]
-package.use/dev-ruby_rdoc_0 : dev-ruby/rdoc:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/rdoc:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/rdtool:0]
-package.use/dev-ruby_rdtool_0 : dev-ruby/rdtool:0 -doc -emacs -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/rdtool:0 -doc -emacs -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/rest-client:0]
-package.use/dev-ruby_rest-client_0 : dev-ruby/rest-client:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/rest-client:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/rexical:0]
-package.use/dev-ruby_rexical_0 : dev-ruby/rexical:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/rexical:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/riel:0]
-package.use/dev-ruby_riel_0 : dev-ruby/riel:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/riel:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/rrdtool-bindings:0]
-package.use/dev-ruby_rrdtool-bindings_0 : dev-ruby/rrdtool-bindings:0 ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/rrdtool-bindings:0 ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/ruby-atk:0]
-package.use/dev-ruby_ruby-atk_0 : dev-ruby/ruby-atk:0 -test ruby_targets_ruby19
+package.use : dev-ruby/ruby-atk:0 -test ruby_targets_ruby19
 
 [dev-ruby/ruby-dict:0]
-package.use/dev-ruby_ruby-dict_0 : dev-ruby/ruby-dict:0 ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/ruby-dict:0 ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/ruby-gdkpixbuf2:0]
-package.use/dev-ruby_ruby-gdkpixbuf2_0 : dev-ruby/ruby-gdkpixbuf2:0 -test ruby_targets_ruby19
+package.use : dev-ruby/ruby-gdkpixbuf2:0 -test ruby_targets_ruby19
 
 [dev-ruby/ruby-gio2:0]
-package.use/dev-ruby_ruby-gio2_0 : dev-ruby/ruby-gio2:0 -test ruby_targets_ruby19
+package.use : dev-ruby/ruby-gio2:0 -test ruby_targets_ruby19
 
 [dev-ruby/ruby-glib2:0]
-package.use/dev-ruby_ruby-glib2_0 : dev-ruby/ruby-glib2:0 -test ruby_targets_ruby19
+package.use : dev-ruby/ruby-glib2:0 -test ruby_targets_ruby19
 
 [dev-ruby/ruby-gnome2:0]
-package.use/dev-ruby_ruby-gnome2_0 : dev-ruby/ruby-gnome2:0 -test ruby_targets_ruby19
+package.use : dev-ruby/ruby-gnome2:0 -test ruby_targets_ruby19
 
 [dev-ruby/ruby-goocanvas:0]
-package.use/dev-ruby_ruby-goocanvas_0 : dev-ruby/ruby-goocanvas:0 -test ruby_targets_ruby19
+package.use : dev-ruby/ruby-goocanvas:0 -test ruby_targets_ruby19
 
 [dev-ruby/ruby-gstreamer:0]
-package.use/dev-ruby_ruby-gstreamer_0 : dev-ruby/ruby-gstreamer:0 -test ruby_targets_ruby19
+package.use : dev-ruby/ruby-gstreamer:0 -test ruby_targets_ruby19
 
 [dev-ruby/ruby-gtk2:0]
-package.use/dev-ruby_ruby-gtk2_0 : dev-ruby/ruby-gtk2:0 -test ruby_targets_ruby19
+package.use : dev-ruby/ruby-gtk2:0 -test ruby_targets_ruby19
 
 [dev-ruby/ruby-gtksourceview:0]
-package.use/dev-ruby_ruby-gtksourceview_0 : dev-ruby/ruby-gtksourceview:0 -test ruby_targets_ruby19
+package.use : dev-ruby/ruby-gtksourceview:0 -test ruby_targets_ruby19
 
 [dev-ruby/ruby-odbc:0]
-package.use/dev-ruby_ruby-odbc_0 : dev-ruby/ruby-odbc:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/ruby-odbc:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/ruby-openid:0]
-package.use/dev-ruby_ruby-openid_0 : dev-ruby/ruby-openid:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/ruby-openid:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/ruby-pango:0]
-package.use/dev-ruby_ruby-pango_0 : dev-ruby/ruby-pango:0 -test ruby_targets_ruby19
+package.use : dev-ruby/ruby-pango:0 -test ruby_targets_ruby19
 
 [dev-ruby/ruby-poppler:0]
-package.use/dev-ruby_ruby-poppler_0 : dev-ruby/ruby-poppler:0 -test ruby_targets_ruby19
+package.use : dev-ruby/ruby-poppler:0 -test ruby_targets_ruby19
 
 [dev-ruby/ruby-progressbar:0]
-package.use/dev-ruby_ruby-progressbar_0 : dev-ruby/ruby-progressbar:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/ruby-progressbar:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/ruby-rsvg:0]
-package.use/dev-ruby_ruby-rsvg_0 : dev-ruby/ruby-rsvg:0 -test cairo ruby_targets_ruby19
+package.use : dev-ruby/ruby-rsvg:0 -test cairo ruby_targets_ruby19
 
 [dev-ruby/ruby-sdl:0]
-package.use/dev-ruby_ruby-sdl_0 : dev-ruby/ruby-sdl:0 -image -mixer -sge -truetype mpeg ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/ruby-sdl:0 -image -mixer -sge -truetype mpeg ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/ruby-tcpwrap:0]
-package.use/dev-ruby_ruby-tcpwrap_0 : dev-ruby/ruby-tcpwrap:0 ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/ruby-tcpwrap:0 ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/ruby-termios:0]
-package.use/dev-ruby_ruby-termios_0 : dev-ruby/ruby-termios:0 ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/ruby-termios:0 ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/ruby-vte:0]
-package.use/dev-ruby_ruby-vte_0 : dev-ruby/ruby-vte:0 -test ruby_targets_ruby19
+package.use : dev-ruby/ruby-vte:0 -test ruby_targets_ruby19
 
 [dev-ruby/ruby-xslt:0]
-package.use/dev-ruby_ruby-xslt_0 : dev-ruby/ruby-xslt:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/ruby-xslt:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/rubygems:0]
-package.use/dev-ruby_rubygems_0 : dev-ruby/rubygems:0 -server -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/rubygems:0 -server -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/rubypants:0]
-package.use/dev-ruby_rubypants_0 : dev-ruby/rubypants:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/rubypants:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/serialport:0]
-package.use/dev-ruby_serialport_0 : dev-ruby/serialport:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/serialport:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/shorturl:0]
-package.use/dev-ruby_shorturl_0 : dev-ruby/shorturl:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/shorturl:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/simple-rss:0]
-package.use/dev-ruby_simple-rss_0 : dev-ruby/simple-rss:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/simple-rss:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/snmplib:0]
-package.use/dev-ruby_snmplib_0 : dev-ruby/snmplib:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/snmplib:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/systemu:0]
-package.use/dev-ruby_systemu_0 : dev-ruby/systemu:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/systemu:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/text-hyphen:0]
-package.use/dev-ruby_text-hyphen_0 : dev-ruby/text-hyphen:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/text-hyphen:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/tins:0]
-package.use/dev-ruby_tins_0 : dev-ruby/tins:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/tins:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/transaction-simple:0]
-package.use/dev-ruby_transaction-simple_0 : dev-ruby/transaction-simple:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/transaction-simple:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/tzinfo:0]
-package.use/dev-ruby_tzinfo_0 : dev-ruby/tzinfo:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/tzinfo:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/unf:0]
-package.use/dev-ruby_unf_0 : dev-ruby/unf:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/unf:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/unf_ext:0]
-package.use/dev-ruby_unf_ext_0 : dev-ruby/unf_ext:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/unf_ext:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/uuidtools:0]
-package.use/dev-ruby_uuidtools_0 : dev-ruby/uuidtools:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/uuidtools:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/webrobots:0]
-package.use/dev-ruby_webrobots_0 : dev-ruby/webrobots:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/webrobots:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/wirble:0]
-package.use/dev-ruby_wirble_0 : dev-ruby/wirble:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/wirble:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/xml-simple:0]
-package.use/dev-ruby_xml-simple_0 : dev-ruby/xml-simple:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/xml-simple:0 -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/zentest:0]
-package.use/dev-ruby_zentest_0 : dev-ruby/zentest:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : dev-ruby/zentest:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-scheme/chicken:0]
-package.use/dev-scheme_chicken_0 : dev-scheme/chicken:0 -doc -emacs -parallel-build
+package.use : dev-scheme/chicken:0 -doc -emacs -parallel-build
 
 [dev-scheme/guile:12]
-package.use/dev-scheme_guile_12 : dev-scheme/guile:12 -debug -debug-freelist -debug-malloc -discouraged -emacs -nls deprecated networking regex threads
+package.use : dev-scheme/guile:12 -debug -debug-freelist -debug-malloc -discouraged -emacs -nls deprecated networking regex threads
 
 [dev-scheme/tinyscheme:0]
-package.use/dev-scheme_tinyscheme_0 : dev-scheme/tinyscheme:0 static-libs
+package.use : dev-scheme/tinyscheme:0 static-libs
 
 [dev-tcltk/blt:0]
-package.use/dev-tcltk_blt_0 : dev-tcltk/blt:0 X jpeg static-libs
+package.use : dev-tcltk/blt:0 X jpeg static-libs
 
 [dev-tcltk/bwidget:0]
-package.use/dev-tcltk_bwidget_0 : dev-tcltk/bwidget:0 -doc -test
+package.use : dev-tcltk/bwidget:0 -doc -test
 
 [dev-tcltk/expect-lite:0]
-package.use/dev-tcltk_expect-lite_0 : dev-tcltk/expect-lite:0 -debug -examples
+package.use : dev-tcltk/expect-lite:0 -debug -examples
 
 [dev-tcltk/expect:0]
-package.use/dev-tcltk_expect_0 : dev-tcltk/expect:0 -debug -doc X threads
+package.use : dev-tcltk/expect:0 -debug -doc X threads
 
 [dev-tcltk/snack:0]
-package.use/dev-tcltk_snack_0 : dev-tcltk/snack:0 -examples alsa python threads vorbis
+package.use : dev-tcltk/snack:0 -examples alsa python threads vorbis
 
 [dev-tcltk/tcllib:0]
-package.use/dev-tcltk_tcllib_0 : dev-tcltk/tcllib:0 -examples -test
+package.use : dev-tcltk/tcllib:0 -examples -test
 
 [dev-tcltk/tclreadline:0]
-package.use/dev-tcltk_tclreadline_0 : dev-tcltk/tclreadline:0 static-libs
+package.use : dev-tcltk/tclreadline:0 static-libs
 
 [dev-tcltk/tclx:0]
-package.use/dev-tcltk_tclx_0 : dev-tcltk/tclx:0 threads tk
+package.use : dev-tcltk/tclx:0 threads tk
 
 [dev-tcltk/tclxml:0]
-package.use/dev-tcltk_tclxml_0 : dev-tcltk/tclxml:0 -debug threads
+package.use : dev-tcltk/tclxml:0 -debug threads
 
 [dev-tcltk/thread:0]
-package.use/dev-tcltk_thread_0 : dev-tcltk/thread:0 -debug gdbm
+package.use : dev-tcltk/thread:0 -debug gdbm
 
 [dev-tcltk/tkTheme:0]
-package.use/dev-tcltk_tktheme_0 : dev-tcltk/tkTheme:0 -debug -examples static-libs threads
+package.use : dev-tcltk/tkTheme:0 -debug -examples static-libs threads
 
 [dev-tcltk/tkXwin:0]
-package.use/dev-tcltk_tkxwin_0 : dev-tcltk/tkXwin:0 -debug static-libs threads
+package.use : dev-tcltk/tkXwin:0 -debug static-libs threads
 
 [dev-tcltk/tkimg:0]
-package.use/dev-tcltk_tkimg_0 : dev-tcltk/tkimg:0 -doc -test static-libs
+package.use : dev-tcltk/tkimg:0 -doc -test static-libs
 
 [dev-tcltk/tktray:0]
-package.use/dev-tcltk_tktray_0 : dev-tcltk/tktray:0 -debug -test threads
+package.use : dev-tcltk/tktray:0 -debug -test threads
 
 [dev-tcltk/tls:0]
-package.use/dev-tcltk_tls_0 : dev-tcltk/tls:0 tk
+package.use : dev-tcltk/tls:0 tk
 
 [dev-tcltk/togl:0]
-package.use/dev-tcltk_togl_0 : dev-tcltk/togl:0 -debug threads
+package.use : dev-tcltk/togl:0 -debug threads
 
 [dev-tcltk/vtcl:0]
-package.use/dev-tcltk_vtcl_0 : dev-tcltk/vtcl:0 -doc
+package.use : dev-tcltk/vtcl:0 -doc
 
 [dev-tex/bibtexu:0]
-package.use/dev-tex_bibtexu_0 : dev-tex/bibtexu:0 -doc -source
-package.accept_keywords/dev-tex_bibtexu_0 : >=dev-tex/bibtexu-3.71_p20140525 ~amd64
+package.use : dev-tex/bibtexu:0 -doc -source
+package.accept_keywords : >=dev-tex/bibtexu-3.71_p20140525 ~amd64
 
 [dev-tex/curve:0]
-package.use/dev-tex_curve_0 : dev-tex/curve:0 -doc -examples
+package.use : dev-tex/curve:0 -doc -examples
 
 [dev-tex/latex-beamer:0]
-package.use/dev-tex_latex-beamer_0 : dev-tex/latex-beamer:0 -doc -examples
+package.use : dev-tex/latex-beamer:0 -doc -examples
 
 [dev-tex/lgrind:0]
-package.use/dev-tex_lgrind_0 : dev-tex/lgrind:0 -examples
+package.use : dev-tex/lgrind:0 -examples
 
 [dev-tex/pgf:0]
-package.use/dev-tex_pgf_0 : dev-tex/pgf:0 -doc -source
+package.use : dev-tex/pgf:0 -doc -source
 
 [dev-tex/style-check:0]
-package.use/dev-tex_style-check_0 : dev-tex/style-check:0 -test
+package.use : dev-tex/style-check:0 -test
 
 [dev-texlive/texlive-basic:0]
-package.use/dev-texlive_texlive-basic_0 : dev-texlive/texlive-basic:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-basic_0 : >=dev-texlive/texlive-basic-2014 ~amd64
+package.use : dev-texlive/texlive-basic:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-basic-2014 ~amd64
 
 [dev-texlive/texlive-fontsrecommended:0]
-package.use/dev-texlive_texlive-fontsrecommended_0 : dev-texlive/texlive-fontsrecommended:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-fontsrecommended_0 : >=dev-texlive/texlive-fontsrecommended-2014 ~amd64
+package.use : dev-texlive/texlive-fontsrecommended:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-fontsrecommended-2014 ~amd64
 
 [dev-texlive/texlive-fontutils:0]
-package.use/dev-texlive_texlive-fontutils_0 : dev-texlive/texlive-fontutils:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-fontutils_0 : >=dev-texlive/texlive-fontutils-2014 ~amd64
+package.use : dev-texlive/texlive-fontutils:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-fontutils-2014 ~amd64
 
 [dev-texlive/texlive-genericrecommended:0]
-package.use/dev-texlive_texlive-genericrecommended_0 : dev-texlive/texlive-genericrecommended:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-genericrecommended_0 : >=dev-texlive/texlive-genericrecommended-2014 ~amd64
+package.use : dev-texlive/texlive-genericrecommended:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-genericrecommended-2014 ~amd64
 
 [dev-texlive/texlive-langafrican:0]
-package.use/dev-texlive_texlive-langafrican_0 : dev-texlive/texlive-langafrican:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langafrican_0 : >=dev-texlive/texlive-langafrican-2014 ~amd64
+package.use : dev-texlive/texlive-langafrican:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langafrican-2014 ~amd64
 
 [dev-texlive/texlive-langarabic:0]
-package.use/dev-texlive_texlive-langarabic_0 : dev-texlive/texlive-langarabic:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langarabic_0 : >=dev-texlive/texlive-langarabic-2014 ~amd64
+package.use : dev-texlive/texlive-langarabic:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langarabic-2014 ~amd64
 
 [dev-texlive/texlive-langchinese:0]
-package.use/dev-texlive_texlive-langchinese_0 : dev-texlive/texlive-langchinese:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langchinese_0 : >=dev-texlive/texlive-langchinese-2014 ~amd64
+package.use : dev-texlive/texlive-langchinese:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langchinese-2014 ~amd64
 
 [dev-texlive/texlive-langcjk:0]
-package.use/dev-texlive_texlive-langcjk_0 : dev-texlive/texlive-langcjk:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langcjk_0 : >=dev-texlive/texlive-langcjk-2014 ~amd64
+package.use : dev-texlive/texlive-langcjk:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langcjk-2014 ~amd64
 
 [dev-texlive/texlive-langcyrillic:0]
-package.use/dev-texlive_texlive-langcyrillic_0 : dev-texlive/texlive-langcyrillic:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langcyrillic_0 : >=dev-texlive/texlive-langcyrillic-2014 ~amd64
+package.use : dev-texlive/texlive-langcyrillic:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langcyrillic-2014 ~amd64
 
 [dev-texlive/texlive-langczechslovak:0]
-package.use/dev-texlive_texlive-langczechslovak_0 : dev-texlive/texlive-langczechslovak:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langczechslovak_0 : >=dev-texlive/texlive-langczechslovak-2014 ~amd64
+package.use : dev-texlive/texlive-langczechslovak:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langczechslovak-2014 ~amd64
 
 [dev-texlive/texlive-langenglish:0]
-package.use/dev-texlive_texlive-langenglish_0 : dev-texlive/texlive-langenglish:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langenglish_0 : >=dev-texlive/texlive-langenglish-2014 ~amd64
+package.use : dev-texlive/texlive-langenglish:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langenglish-2014 ~amd64
 
 [dev-texlive/texlive-langeuropean:0]
-package.use/dev-texlive_texlive-langeuropean_0 : dev-texlive/texlive-langeuropean:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langeuropean_0 : >=dev-texlive/texlive-langeuropean-2014 ~amd64
+package.use : dev-texlive/texlive-langeuropean:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langeuropean-2014 ~amd64
 
 [dev-texlive/texlive-langfrench:0]
-package.use/dev-texlive_texlive-langfrench_0 : dev-texlive/texlive-langfrench:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langfrench_0 : >=dev-texlive/texlive-langfrench-2014 ~amd64
+package.use : dev-texlive/texlive-langfrench:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langfrench-2014 ~amd64
 
 [dev-texlive/texlive-langgerman:0]
-package.use/dev-texlive_texlive-langgerman_0 : dev-texlive/texlive-langgerman:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langgerman_0 : >=dev-texlive/texlive-langgerman-2014 ~amd64
+package.use : dev-texlive/texlive-langgerman:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langgerman-2014 ~amd64
 
 [dev-texlive/texlive-langgreek:0]
-package.use/dev-texlive_texlive-langgreek_0 : dev-texlive/texlive-langgreek:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langgreek_0 : >=dev-texlive/texlive-langgreek-2014 ~amd64
+package.use : dev-texlive/texlive-langgreek:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langgreek-2014 ~amd64
 
 [dev-texlive/texlive-langindic:0]
-package.use/dev-texlive_texlive-langindic_0 : dev-texlive/texlive-langindic:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langindic_0 : >=dev-texlive/texlive-langindic-2014 ~amd64
+package.use : dev-texlive/texlive-langindic:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langindic-2014 ~amd64
 
 [dev-texlive/texlive-langitalian:0]
-package.use/dev-texlive_texlive-langitalian_0 : dev-texlive/texlive-langitalian:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langitalian_0 : >=dev-texlive/texlive-langitalian-2014 ~amd64
+package.use : dev-texlive/texlive-langitalian:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langitalian-2014 ~amd64
 
 [dev-texlive/texlive-langjapanese:0]
-package.use/dev-texlive_texlive-langjapanese_0 : dev-texlive/texlive-langjapanese:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langjapanese_0 : >=dev-texlive/texlive-langjapanese-2014 ~amd64
+package.use : dev-texlive/texlive-langjapanese:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langjapanese-2014 ~amd64
 
 [dev-texlive/texlive-langkorean:0]
-package.use/dev-texlive_texlive-langkorean_0 : dev-texlive/texlive-langkorean:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langkorean_0 : >=dev-texlive/texlive-langkorean-2014 ~amd64
+package.use : dev-texlive/texlive-langkorean:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langkorean-2014 ~amd64
 
 [dev-texlive/texlive-langother:0]
-package.use/dev-texlive_texlive-langother_0 : dev-texlive/texlive-langother:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langother_0 : >=dev-texlive/texlive-langother-2014 ~amd64
+package.use : dev-texlive/texlive-langother:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langother-2014 ~amd64
 
 [dev-texlive/texlive-langpolish:0]
-package.use/dev-texlive_texlive-langpolish_0 : dev-texlive/texlive-langpolish:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langpolish_0 : >=dev-texlive/texlive-langpolish-2014 ~amd64
+package.use : dev-texlive/texlive-langpolish:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langpolish-2014 ~amd64
 
 [dev-texlive/texlive-langportuguese:0]
-package.use/dev-texlive_texlive-langportuguese_0 : dev-texlive/texlive-langportuguese:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langportuguese_0 : >=dev-texlive/texlive-langportuguese-2014 ~amd64
+package.use : dev-texlive/texlive-langportuguese:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langportuguese-2014 ~amd64
 
 [dev-texlive/texlive-langspanish:0]
-package.use/dev-texlive_texlive-langspanish_0 : dev-texlive/texlive-langspanish:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-langspanish_0 : >=dev-texlive/texlive-langspanish-2014 ~amd64
+package.use : dev-texlive/texlive-langspanish:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-langspanish-2014 ~amd64
 
 [dev-texlive/texlive-latex:0]
-package.use/dev-texlive_texlive-latex_0 : dev-texlive/texlive-latex:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-latex_0 : >=dev-texlive/texlive-latex-2014 ~amd64
+package.use : dev-texlive/texlive-latex:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-latex-2014 ~amd64
 
 [dev-texlive/texlive-latexextra:0]
-package.use/dev-texlive_texlive-latexextra_0 : dev-texlive/texlive-latexextra:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-latexextra_0 : >=dev-texlive/texlive-latexextra-2014 ~amd64
+package.use : dev-texlive/texlive-latexextra:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-latexextra-2014 ~amd64
 
 [dev-texlive/texlive-latexrecommended:0]
-package.use/dev-texlive_texlive-latexrecommended_0 : dev-texlive/texlive-latexrecommended:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-latexrecommended_0 : >=dev-texlive/texlive-latexrecommended-2014 ~amd64
+package.use : dev-texlive/texlive-latexrecommended:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-latexrecommended-2014 ~amd64
 
 [dev-texlive/texlive-pictures:0]
-package.use/dev-texlive_texlive-pictures_0 : dev-texlive/texlive-pictures:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-pictures_0 : >=dev-texlive/texlive-pictures-2014 ~amd64
+package.use : dev-texlive/texlive-pictures:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-pictures-2014 ~amd64
 
 [dev-texlive/texlive-pstricks:0]
-package.use/dev-texlive_texlive-pstricks_0 : dev-texlive/texlive-pstricks:0 -doc -source
-package.accept_keywords/dev-texlive_texlive-pstricks_0 : >=dev-texlive/texlive-pstricks-2014 ~amd64
+package.use : dev-texlive/texlive-pstricks:0 -doc -source
+package.accept_keywords : >=dev-texlive/texlive-pstricks-2014 ~amd64
 
 [dev-texlive/texlive-texinfo:0]
-package.use/dev-texlive_texlive-texinfo_0 : dev-texlive/texlive-texinfo:0 -doc -source
+package.use : dev-texlive/texlive-texinfo:0 -doc -source
 
 [dev-util/astyle:0]
-package.use/dev-util_astyle_0 : dev-util/astyle:0 -doc -java static-libs
+package.use : dev-util/astyle:0 -doc -java static-libs
 
 [dev-util/bam:0]
-package.use/dev-util_bam_0 : dev-util/bam:0 -doc -test
+package.use : dev-util/bam:0 -doc -test
 
 [dev-util/boost-build:0]
-package.use/dev-util_boost-build_0 : dev-util/boost-build:0 -examples -test python
+package.use : dev-util/boost-build:0 -examples -test python
 
 [dev-util/buildbot-slave:0]
-package.use/dev-util_buildbot-slave_0 : dev-util/buildbot-slave:0 -test
+package.use : dev-util/buildbot-slave:0 -test
 
 [dev-util/buildbot:0]
-package.use/dev-util_buildbot_0 : dev-util/buildbot:0 -doc -examples -irc -mail -manhole -test
+package.use : dev-util/buildbot:0 -doc -examples -irc -mail -manhole -test
 
 [dev-util/cdecl:0]
-package.use/dev-util_cdecl_0 : dev-util/cdecl:0 readline
+package.use : dev-util/cdecl:0 readline
 
 [dev-util/cmake:0]
-package.use/dev-util_cmake_0 : dev-util/cmake:0 -doc -emacs -qt5 -system-jsoncpp -test ncurses qt4
-+package.env : dev-util/cmake:0 dev-util_cmake_0
-env/dev-util_cmake_0 : LDFLAGS="-lpthread"
+package.use : dev-util/cmake:0 -doc -emacs -qt5 -system-jsoncpp -test ncurses qt4
+package.env : dev-util/cmake:0 dev-util_cmake_0
+env : LDFLAGS="-lpthread"
 
 [dev-util/cppi:0]
-package.use/dev-util_cppi_0 : dev-util/cppi:0 -nls
+package.use : dev-util/cppi:0 -nls
 
 [dev-util/cppunit:0]
-package.use/dev-util_cppunit_0 : dev-util/cppunit:0 -doc -examples static-libs
+package.use : dev-util/cppunit:0 -doc -examples static-libs
 
 [dev-util/crow-designer:0]
-package.use/dev-util_crow-designer_0 : dev-util/crow-designer:0 -nls
+package.use : dev-util/crow-designer:0 -nls
 
 [dev-util/cscope:0]
-package.use/dev-util_cscope_0 : dev-util/cscope:0 -emacs
+package.use : dev-util/cscope:0 -emacs
 
 [dev-util/ctags:0]
-package.use/dev-util_ctags_0 : dev-util/ctags:0 -ada
+package.use : dev-util/ctags:0 -ada
 
 [dev-util/cunit:0]
-package.use/dev-util_cunit_0 : dev-util/cunit:0 ncurses static-libs
+package.use : dev-util/cunit:0 ncurses static-libs
 
 [dev-util/d-feet:0]
-package.use/dev-util_d-feet_0 : dev-util/d-feet:0 -test
+package.use : dev-util/d-feet:0 -test
 
 [dev-util/desktop-file-utils:0]
-package.use/dev-util_desktop-file-utils_0 : dev-util/desktop-file-utils:0 -emacs
+package.use : dev-util/desktop-file-utils:0 -emacs
 
 [dev-util/dialog:0]
-package.use/dev-util_dialog_0 : dev-util/dialog:0 -examples -minimal -nls static-libs unicode
+package.use : dev-util/dialog:0 -examples -minimal -nls static-libs unicode
 
 [dev-util/diffball:0]
-package.use/dev-util_diffball_0 : dev-util/diffball:0 -debug
+package.use : dev-util/diffball:0 -debug
 
 [dev-util/difffilter:0]
-package.use/dev-util_difffilter_0 : dev-util/difffilter:0 -doc
+package.use : dev-util/difffilter:0 -doc
 
 [dev-util/duma:0]
-package.use/dev-util_duma_0 : dev-util/duma:0 -examples
+package.use : dev-util/duma:0 -examples
 
 [dev-util/elfkickers:0]
-package.use/dev-util_elfkickers_0 : dev-util/elfkickers:0 -doc
+package.use : dev-util/elfkickers:0 -doc
 
 [dev-util/geany-plugins:0]
-package.use/dev-util_geany-plugins_0 : dev-util/geany-plugins:0 -debugger -devhelp -enchant -gpg -gtkspell -markdown -multiterm -nls -scope -soup commander lua webkit
+package.use : dev-util/geany-plugins:0 -debugger -devhelp -enchant -gpg -gtkspell -markdown -multiterm -nls -scope -soup commander lua webkit
 
 [dev-util/geany:0]
-package.use/dev-util_geany_0 : dev-util/geany:0 vte
+package.use : dev-util/geany:0 vte
 
 [dev-util/global:0]
-package.use/dev-util_global_0 : dev-util/global:0 -doc -emacs -vim
+package.use : dev-util/global:0 -doc -emacs -vim
 
 [dev-util/gob:2]
-+package.env : dev-util/gob:2 dev-util_gob_2
-env/dev-util_gob_2 : MAKEOPTS="-j1"
+package.env : dev-util/gob:2 dev-util_gob_2
+env : MAKEOPTS="-j1"
 
 [dev-util/jay:0]
-package.use/dev-util_jay_0 : dev-util/jay:0 -java -mono
+package.use : dev-util/jay:0 -java -mono
 
 [dev-util/ketchup:0]
-package.use/dev-util_ketchup_0 : dev-util/ketchup:0 -doc
+package.use : dev-util/ketchup:0 -doc
 
 [dev-util/memprof:0]
-package.use/dev-util_memprof_0 : dev-util/memprof:0 -nls
+package.use : dev-util/memprof:0 -nls
 
 [dev-util/min-cscope:0]
-package.use/dev-util_min-cscope_0 : dev-util/min-cscope:0 -debug
+package.use : dev-util/min-cscope:0 -debug
 
 [dev-util/nemiver:0]
-package.use/dev-util_nemiver_0 : dev-util/nemiver:0 -debug -memoryview
+package.use : dev-util/nemiver:0 -debug -memoryview
 
 [dev-util/patchutils:0]
-package.use/dev-util_patchutils_0 : dev-util/patchutils:0 -test
+package.use : dev-util/patchutils:0 -test
 
 [dev-util/pkgconfig:0]
-package.use/dev-util_pkgconfig_0 : dev-util/pkgconfig:0 -internal-glib hardened
+package.use : dev-util/pkgconfig:0 -internal-glib hardened
 
 [dev-util/qdevelop:0]
-package.use/dev-util_qdevelop_0 : dev-util/qdevelop:0 -debug -plugins
+package.use : dev-util/qdevelop:0 -debug -plugins
 
 [dev-util/quilt:0]
-package.use/dev-util_quilt_0 : dev-util/quilt:0 -emacs -graphviz
+package.use : dev-util/quilt:0 -emacs -graphviz
 
 [dev-util/ragel:0]
-package.use/dev-util_ragel_0 : dev-util/ragel:0 vim-syntax
+package.use : dev-util/ragel:0 vim-syntax
 
 [dev-util/reswrap:0]
-package.use/dev-util_reswrap_0 : dev-util/reswrap:0 -debug -doc -profile
+package.use : dev-util/reswrap:0 -debug -doc -profile
 
 [dev-util/scons:0]
-package.use/dev-util_scons_0 : dev-util/scons:0 -doc
+package.use : dev-util/scons:0 -doc
 
 [dev-util/shflags:0]
-package.use/dev-util_shflags_0 : dev-util/shflags:0 -examples
+package.use : dev-util/shflags:0 -examples
 
 [dev-util/strace:0]
-package.use/dev-util_strace_0 : dev-util/strace:0 -aio -static perl
+package.use : dev-util/strace:0 -aio -static perl
 
 [dev-util/ticpp:0]
-package.use/dev-util_ticpp_0 : dev-util/ticpp:0 -debug -doc
+package.use : dev-util/ticpp:0 -debug -doc
 
 [dev-util/treecc:0]
-package.use/dev-util_treecc_0 : dev-util/treecc:0 -doc -examples
+package.use : dev-util/treecc:0 -doc -examples
 
 [dev-util/txt2regex:0]
-package.use/dev-util_txt2regex_0 : dev-util/txt2regex:0 -cjk -nls
+package.use : dev-util/txt2regex:0 -cjk -nls
 
 [dev-util/uncrustify:0]
-package.use/dev-util_uncrustify_0 : dev-util/uncrustify:0 -test
+package.use : dev-util/uncrustify:0 -test
 
 [dev-util/valgrind:0]
-package.use/dev-util_valgrind_0 : dev-util/valgrind:0 -mpi
+package.use : dev-util/valgrind:0 -mpi
 
 [dev-util/wiggle:0]
-package.use/dev-util_wiggle_0 : dev-util/wiggle:0 -test
+package.use : dev-util/wiggle:0 -test
 
 [dev-vcs/cssc:0]
-package.use/dev-vcs_cssc_0 : dev-vcs/cssc:0 -test -valgrind
+package.use : dev-vcs/cssc:0 -test -valgrind
 
 [dev-vcs/cvs:0]
-package.use/dev-vcs_cvs_0 : dev-vcs/cvs:0 -doc -kerberos -nls -pam -server crypt
+package.use : dev-vcs/cvs:0 -doc -kerberos -nls -pam -server crypt
 
 [dev-vcs/cvsd:0]
-package.use/dev-vcs_cvsd_0 : dev-vcs/cvsd:0 tcpd
+package.use : dev-vcs/cvsd:0 tcpd
 
 [dev-vcs/giggle:0]
-package.use/dev-vcs_giggle_0 : dev-vcs/giggle:0 -eds
+package.use : dev-vcs/giggle:0 -eds
 
 [dev-vcs/git-cola:0]
-package.use/dev-vcs_git-cola_0 : dev-vcs/git-cola:0 -doc -test
+package.use : dev-vcs/git-cola:0 -doc -test
 
 [dev-vcs/git:0]
-package.use/dev-vcs_git_0 : dev-vcs/git:0 -cvs -doc -emacs -highlight -mediawiki -nls -ppcsha1 -test blksha1 cgi curl gnome-keyring gpg gtk iconv pcre perl python subversion threads tk webdav xinetd
-+package.env : dev-vcs/git:0 dev-vcs_git_0
-env/dev-vcs_git_0 : LDFLAGS="-liconv"
+package.use : dev-vcs/git:0 -cvs -doc -emacs -highlight -mediawiki -nls -ppcsha1 -test blksha1 cgi curl gnome-keyring gpg gtk iconv pcre perl python subversion threads tk webdav xinetd
+package.env : dev-vcs/git:0 dev-vcs_git_0
+env : LDFLAGS="-liconv"
 
 [dev-vcs/gitg:0]
-package.use/dev-vcs_gitg_0 : dev-vcs/gitg:0 -debug -glade python
+package.use : dev-vcs/gitg:0 -debug -glade python
 
 [dev-vcs/guilt:0]
-package.use/dev-vcs_guilt_0 : dev-vcs/guilt:0 -doc
+package.use : dev-vcs/guilt:0 -doc
 
 [dev-vcs/hgsubversion:0]
-package.use/dev-vcs_hgsubversion_0 : dev-vcs/hgsubversion:0 -test
+package.use : dev-vcs/hgsubversion:0 -test
 
 [dev-vcs/mercurial:0]
-package.use/dev-vcs_mercurial_0 : dev-vcs/mercurial:0 -bugzilla -emacs -gpg -test tk
+package.use : dev-vcs/mercurial:0 -bugzilla -emacs -gpg -test tk
 
 [dev-vcs/monotone:1]
-package.use/dev-vcs_monotone_1 : dev-vcs/monotone:1 -doc -nls -test ipv6
+package.use : dev-vcs/monotone:1 -doc -nls -test ipv6
 
 [dev-vcs/rapidsvn:0]
-package.use/dev-vcs_rapidsvn_0 : dev-vcs/rapidsvn:0 -doc static-libs
+package.use : dev-vcs/rapidsvn:0 -doc static-libs
 
 [dev-vcs/rcs:0]
-package.use/dev-vcs_rcs_0 : dev-vcs/rcs:0 -doc
+package.use : dev-vcs/rcs:0 -doc
 
 [dev-vcs/stgit:0]
-package.use/dev-vcs_stgit_0 : dev-vcs/stgit:0 -doc
+package.use : dev-vcs/stgit:0 -doc
 
 [dev-vcs/subversion:0]
-package.use/dev-vcs_subversion_0 : dev-vcs/subversion:0 -apache2 -ctypes-python -debug -doc -dso -java -kde -nls -test berkdb extras gnome-keyring http perl python ruby sasl vim-syntax
+package.use : dev-vcs/subversion:0 -apache2 -ctypes-python -debug -doc -dso -java -kde -nls -test berkdb extras gnome-keyring http perl python ruby sasl vim-syntax
 
 [dev-vcs/tig:0]
-package.use/dev-vcs_tig_0 : dev-vcs/tig:0 unicode
+package.use : dev-vcs/tig:0 unicode
 
 [dev-vcs/tortoisehg:0]
-package.use/dev-vcs_tortoisehg_0 : dev-vcs/tortoisehg:0 -doc
+package.use : dev-vcs/tortoisehg:0 -doc
 
 [games-action/0verkill:0]
-package.use/games-action_0verkill_0 : games-action/0verkill:0 X
+package.use : games-action/0verkill:0 X
 
 [games-action/bomberclone:0]
-package.use/games-action_bomberclone_0 : games-action/bomberclone:0 X
+package.use : games-action/bomberclone:0 X
 
 [games-action/bzflag:0]
-package.use/games-action_bzflag_0 : games-action/bzflag:0 -dedicated sdl upnp
+package.use : games-action/bzflag:0 -dedicated sdl upnp
 
 [games-action/chromium-bsu:0]
-package.use/games-action_chromium-bsu_0 : games-action/chromium-bsu:0 -mixer -nls sdl
+package.use : games-action/chromium-bsu:0 -mixer -nls sdl
 
 [games-action/heroes:0]
-package.use/games-action_heroes_0 : games-action/heroes:0 -nls ggi sdl
+package.use : games-action/heroes:0 -nls ggi sdl
 
 [games-action/supertuxkart:0]
-package.use/games-action_supertuxkart_0 : games-action/supertuxkart:0 -debug -fribidi -wiimote
+package.use : games-action/supertuxkart:0 -debug -fribidi -wiimote
 
 [games-action/teeworlds:0]
-package.use/games-action_teeworlds_0 : games-action/teeworlds:0 -debug -dedicated
+package.use : games-action/teeworlds:0 -debug -dedicated
 
 [games-action/wordwarvi:0]
-package.use/games-action_wordwarvi_0 : games-action/wordwarvi:0 portaudio
+package.use : games-action/wordwarvi:0 portaudio
 
 [games-arcade/bomns:0]
-package.use/games-arcade_bomns_0 : games-arcade/bomns:0 -editor gtk
+package.use : games-arcade/bomns:0 -editor gtk
 
 [games-arcade/burgerspace:0]
-package.use/games-arcade_burgerspace_0 : games-arcade/burgerspace:0 -network
+package.use : games-arcade/burgerspace:0 -network
 
 [games-arcade/commandergenius:0]
-package.use/games-arcade_commandergenius_0 : games-arcade/commandergenius:0 -tremor opengl
+package.use : games-arcade/commandergenius:0 -tremor opengl
 
 [games-arcade/crack-attack:0]
-package.use/games-arcade_crack-attack_0 : games-arcade/crack-attack:0 gtk sdl
+package.use : games-arcade/crack-attack:0 gtk sdl
 
 [games-arcade/jumpnbump:0]
-package.use/games-arcade_jumpnbump_0 : games-arcade/jumpnbump:0 -kde -svga X fbcon music tk
+package.use : games-arcade/jumpnbump:0 -kde -svga X fbcon music tk
 
 [games-arcade/kobodeluxe:0]
-package.use/games-arcade_kobodeluxe_0 : games-arcade/kobodeluxe:0 opengl
+package.use : games-arcade/kobodeluxe:0 opengl
 
 [games-arcade/lbreakout2:0]
-package.use/games-arcade_lbreakout2_0 : games-arcade/lbreakout2:0 -nls -themes
+package.use : games-arcade/lbreakout2:0 -nls -themes
 
 [games-arcade/moleinvasion:0]
-package.use/games-arcade_moleinvasion_0 : games-arcade/moleinvasion:0 -music
+package.use : games-arcade/moleinvasion:0 -music
 
 [games-arcade/monkey-bubble:0]
-package.use/games-arcade_monkey-bubble_0 : games-arcade/monkey-bubble:0 -debug
+package.use : games-arcade/monkey-bubble:0 -debug
 
 [games-arcade/slimevolley:0]
-package.use/games-arcade_slimevolley_0 : games-arcade/slimevolley:0 -net
+package.use : games-arcade/slimevolley:0 -net
 
 [games-arcade/supertux:0]
-package.use/games-arcade_supertux_0 : games-arcade/supertux:0 opengl
+package.use : games-arcade/supertux:0 opengl
 
 [games-arcade/xbill:0]
-package.use/games-arcade_xbill_0 : games-arcade/xbill:0 gtk
+package.use : games-arcade/xbill:0 gtk
 
 [games-arcade/xbubble:0]
-package.use/games-arcade_xbubble_0 : games-arcade/xbubble:0 -nls
+package.use : games-arcade/xbubble:0 -nls
 
 [games-board/awale:0]
-package.use/games-board_awale_0 : games-board/awale:0 tk
+package.use : games-board/awale:0 tk
 
 [games-board/capicity:0]
-package.use/games-board_capicity_0 : games-board/capicity:0 -dedicated
+package.use : games-board/capicity:0 -dedicated
 
 [games-board/cockatrice:0]
-package.use/games-board_cockatrice_0 : games-board/cockatrice:0 -dedicated -server
+package.use : games-board/cockatrice:0 -dedicated -server
 
 [games-board/eboard:0]
-package.use/games-board_eboard_0 : games-board/eboard:0 -nls
+package.use : games-board/eboard:0 -nls
 
 [games-board/freedoko:0]
-package.use/games-board_freedoko_0 : games-board/freedoko:0 -net backgrounds gnomecards kdecards openclipartcards pysolcards xskatcards
+package.use : games-board/freedoko:0 -net backgrounds gnomecards kdecards openclipartcards pysolcards xskatcards
 
 [games-board/gamazons:0]
-package.use/games-board_gamazons_0 : games-board/gamazons:0 -debug
+package.use : games-board/gamazons:0 -debug
 
 [games-board/gnome-hearts:0]
-package.use/games-board_gnome-hearts_0 : games-board/gnome-hearts:0 -nls
+package.use : games-board/gnome-hearts:0 -nls
 
 [games-board/gnome-mastermind:0]
-package.use/games-board_gnome-mastermind_0 : games-board/gnome-mastermind:0 -debug
+package.use : games-board/gnome-mastermind:0 -debug
 
 [games-board/gnubg:0]
-package.use/games-board_gnubg_0 : games-board/gnubg:0 -cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 gtk opengl python sqlite threads
+package.use : games-board/gnubg:0 -cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 gtk opengl python sqlite threads
 
 [games-board/gnushogi:0]
-package.use/games-board_gnushogi_0 : games-board/gnushogi:0 X
+package.use : games-board/gnushogi:0 X
 
 [games-board/gtkboard:0]
-package.use/games-board_gtkboard_0 : games-board/gtkboard:0 -gnome
+package.use : games-board/gtkboard:0 -gnome
 
 [games-board/holdingnuts:0]
-package.use/games-board_holdingnuts_0 : games-board/holdingnuts:0 -debug -dedicated alsa
+package.use : games-board/holdingnuts:0 -debug -dedicated alsa
 
 [games-board/pasang-emas:0]
-package.use/games-board_pasang-emas_0 : games-board/pasang-emas:0 -nls extras
+package.use : games-board/pasang-emas:0 -nls extras
 
 [games-board/pioneers:0]
-package.use/games-board_pioneers_0 : games-board/pioneers:0 -debug -dedicated -help -nls
+package.use : games-board/pioneers:0 -debug -dedicated -help -nls
 
 [games-board/pouetchess:0]
-package.use/games-board_pouetchess_0 : games-board/pouetchess:0 -debug
+package.use : games-board/pouetchess:0 -debug
 
 [games-board/pychess:0]
-package.use/games-board_pychess_0 : games-board/pychess:0 -gstreamer
+package.use : games-board/pychess:0 -gstreamer
 
 [games-board/pysolfc:0]
-package.use/games-board_pysolfc_0 : games-board/pysolfc:0 -extra-cardsets -minimal sound
+package.use : games-board/pysolfc:0 -extra-cardsets -minimal sound
 
 [games-board/sirius:0]
-package.use/games-board_sirius_0 : games-board/sirius:0 -nls
+package.use : games-board/sirius:0 -nls
 
 [games-board/spider:0]
-package.use/games-board_spider_0 : games-board/spider:0 -athena
+package.use : games-board/spider:0 -athena
 
 [games-board/teg:0]
-package.use/games-board_teg_0 : games-board/teg:0 -debug -nls
+package.use : games-board/teg:0 -debug -nls
 
 [games-board/xboard:0]
-package.use/games-board_xboard_0 : games-board/xboard:0 -nls -zippy Xaw3d default-font gtk
+package.use : games-board/xboard:0 -nls -zippy Xaw3d default-font gtk
 
 [games-emulation/advancemame:0]
-package.use/games-emulation_advancemame_0 : games-emulation/advancemame:0 -truetype alsa fbcon oss
+package.use : games-emulation/advancemame:0 -truetype alsa fbcon oss
 
 [games-emulation/advancemenu:0]
-package.use/games-emulation_advancemenu_0 : games-emulation/advancemenu:0 -debug -truetype alsa fbcon ncurses oss sdl slang
+package.use : games-emulation/advancemenu:0 -debug -truetype alsa fbcon ncurses oss sdl slang
 
 [games-emulation/atari800:0]
-package.use/games-emulation_atari800_0 : games-emulation/atari800:0 ncurses opengl oss readline sdl sound
+package.use : games-emulation/atari800:0 ncurses opengl oss readline sdl sound
 
 [games-emulation/dgen-sdl:0]
-package.use/games-emulation_dgen-sdl_0 : games-emulation/dgen-sdl:0 joystick opengl
+package.use : games-emulation/dgen-sdl:0 joystick opengl
 
 [games-emulation/dosbox:0]
-package.use/games-emulation_dosbox_0 : games-emulation/dosbox:0 -debug alsa hardened opengl
+package.use : games-emulation/dosbox:0 -debug alsa hardened opengl
 
 [games-emulation/fakenes:0]
-package.use/games-emulation_fakenes_0 : games-emulation/fakenes:0 openal opengl zlib
+package.use : games-emulation/fakenes:0 openal opengl zlib
 
 [games-emulation/fceux:0]
-package.use/games-emulation_fceux_0 : games-emulation/fceux:0 gtk lua opengl
+package.use : games-emulation/fceux:0 gtk lua opengl
 
 [games-emulation/gambatte:0]
-package.use/games-emulation_gambatte_0 : games-emulation/gambatte:0 qt4 sdl
+package.use : games-emulation/gambatte:0 qt4 sdl
 
 [games-emulation/generator:0]
-package.use/games-emulation_generator_0 : games-emulation/generator:0 sdlaudio
+package.use : games-emulation/generator:0 sdlaudio
 
 [games-emulation/gnuboy:0]
-package.use/games-emulation_gnuboy_0 : games-emulation/gnuboy:0 X sdl
+package.use : games-emulation/gnuboy:0 X sdl
 
 [games-emulation/gxmame:0]
-package.use/games-emulation_gxmame_0 : games-emulation/gxmame:0 -nls joystick
+package.use : games-emulation/gxmame:0 -nls joystick
 
 [games-emulation/higan:0]
-package.use/games-emulation_higan_0 : games-emulation/higan:0 -ao -profile_accuracy -profile_performance -pulseaudio -udev alsa openal opengl oss profile_balanced qt4 sdl xv
+package.use : games-emulation/higan:0 -ao -profile_accuracy -profile_performance -pulseaudio -udev alsa openal opengl oss profile_balanced qt4 sdl xv
 
 [games-emulation/nestopia:0]
-package.use/games-emulation_nestopia_0 : games-emulation/nestopia:0 -doc
+package.use : games-emulation/nestopia:0 -doc
 
 [games-emulation/snes9x:0]
-package.use/games-emulation_snes9x_0 : games-emulation/snes9x:0 -debug -multilib -netplay -nls -pulseaudio alsa gtk joystick opengl oss png portaudio xrandr xv zlib
+package.use : games-emulation/snes9x:0 -debug -multilib -netplay -nls -pulseaudio alsa gtk joystick opengl oss png portaudio xrandr xv zlib
 
 [games-emulation/stella:0]
-package.use/games-emulation_stella_0 : games-emulation/stella:0 joystick
+package.use : games-emulation/stella:0 joystick
 
 [games-emulation/yabause:0]
-package.use/games-emulation_yabause_0 : games-emulation/yabause:0 -qt5 openal opengl pic sdl
+package.use : games-emulation/yabause:0 -qt5 openal opengl pic sdl
 
 [games-engines/odamex:0]
-package.use/games-engines_odamex_0 : games-engines/odamex:0 -dedicated -master -portmidi -server odalaunch
+package.use : games-engines/odamex:0 -dedicated -master -portmidi -server odalaunch
 
 [games-engines/renpy:6.17]
-package.use/games-engines_renpy_6.17 : games-engines/renpy:6.17 -development -doc -examples
+package.use : games-engines/renpy:6.17 -development -doc -examples
 
 [games-engines/scummvm-tools:0]
-package.use/games-engines_scummvm-tools_0 : games-engines/scummvm-tools:0 flac iconv mad png vorbis
+package.use : games-engines/scummvm-tools:0 flac iconv mad png vorbis
 
 [games-engines/scummvm:0]
-package.use/games-engines_scummvm_0 : games-engines/scummvm:0 -debug -fluidsynth -mpeg2 -truetype -unsupported aac alsa flac jpeg mp3 opengl png theora vorbis zlib
+package.use : games-engines/scummvm:0 -debug -fluidsynth -mpeg2 -truetype -unsupported aac alsa flac jpeg mp3 opengl png theora vorbis zlib
 
 [games-engines/solarus:0]
-package.use/games-engines_solarus_0 : games-engines/solarus:0 -doc -luajit
+package.use : games-engines/solarus:0 -doc -luajit
 
 [games-fps/alienarena:0]
-package.use/games-fps_alienarena_0 : games-fps/alienarena:0 -dedicated dga vidmode
+package.use : games-fps/alienarena:0 -dedicated dga vidmode
 
 [games-fps/doom-data:0]
-package.use/games-fps_doom-data_0 : games-fps/doom-data:0 -doomsday
+package.use : games-fps/doom-data:0 -doomsday
 
 [games-fps/doomsday:0]
-package.use/games-fps_doomsday_0 : games-fps/doomsday:0 -dedicated -demo -fluidsynth -freedoom -heretic -hexen -resources -snowberry -tools doom openal
+package.use : games-fps/doomsday:0 -dedicated -demo -fluidsynth -freedoom -heretic -hexen -resources -snowberry -tools doom openal
 
 [games-fps/openarena:0]
-package.use/games-fps_openarena_0 : games-fps/openarena:0 curl openal vorbis
+package.use : games-fps/openarena:0 curl openal vorbis
 
 [games-fps/warsow:0]
-package.use/games-fps_warsow_0 : games-fps/warsow:0 -debug -dedicated -irc -server openal
+package.use : games-fps/warsow:0 -debug -dedicated -irc -server openal
 
 [games-kids/lletters:0]
-package.use/games-kids_lletters_0 : games-kids/lletters:0 -nls
+package.use : games-kids/lletters:0 -nls
 
 [games-misc/fortune-mod-all:0]
-package.use/games-misc_fortune-mod-all_0 : games-misc/fortune-mod-all:0 -offensive
+package.use : games-misc/fortune-mod-all:0 -offensive
 
 [games-misc/fortune-mod-at-linux:0]
-package.use/games-misc_fortune-mod-at-linux_0 : games-misc/fortune-mod-at-linux:0 unicode
+package.use : games-misc/fortune-mod-at-linux:0 unicode
 
 [games-misc/fortune-mod-cs:0]
-package.use/games-misc_fortune-mod-cs_0 : games-misc/fortune-mod-cs:0 unicode
+package.use : games-misc/fortune-mod-cs:0 unicode
 
 [games-misc/fortune-mod-gentoo-dev:0]
-package.use/games-misc_fortune-mod-gentoo-dev_0 : games-misc/fortune-mod-gentoo-dev:0 -offensive
+package.use : games-misc/fortune-mod-gentoo-dev:0 -offensive
 
 [games-misc/fortune-mod-gentoo-forums:0]
-package.use/games-misc_fortune-mod-gentoo-forums_0 : games-misc/fortune-mod-gentoo-forums:0 -offensive
+package.use : games-misc/fortune-mod-gentoo-forums:0 -offensive
 
 [games-misc/fortune-mod-it:0]
-package.use/games-misc_fortune-mod-it_0 : games-misc/fortune-mod-it:0 -offensive
+package.use : games-misc/fortune-mod-it:0 -offensive
 
 [games-misc/fortune-mod-kernelcookies:0]
-package.use/games-misc_fortune-mod-kernelcookies_0 : games-misc/fortune-mod-kernelcookies:0 -offensive
+package.use : games-misc/fortune-mod-kernelcookies:0 -offensive
 
 [games-misc/fortune-mod:0]
-package.use/games-misc_fortune-mod_0 : games-misc/fortune-mod:0 -offensive
+package.use : games-misc/fortune-mod:0 -offensive
 
 [games-misc/gBhed:0]
-package.use/games-misc_gbhed_0 : games-misc/gBhed:0 gtk
+package.use : games-misc/gBhed:0 gtk
 
 [games-misc/ggencoder:0]
-package.use/games-misc_ggencoder_0 : games-misc/ggencoder:0 -doc
+package.use : games-misc/ggencoder:0 -doc
 
 [games-misc/katawa-shoujo:0]
-package.use/games-misc_katawa-shoujo_0 : games-misc/katawa-shoujo:0 -doc system-renpy
+package.use : games-misc/katawa-shoujo:0 -doc system-renpy
 
 [games-misc/typespeed:0]
-package.use/games-misc_typespeed_0 : games-misc/typespeed:0 -nls
+package.use : games-misc/typespeed:0 -nls
 
 [games-misc/xcowsay:0]
-package.use/games-misc_xcowsay_0 : games-misc/xcowsay:0 -fortune dbus
+package.use : games-misc/xcowsay:0 -fortune dbus
 
 [games-mud/gnome-mud:0]
-package.use/games-mud_gnome-mud_0 : games-mud/gnome-mud:0 -debug -gstreamer
+package.use : games-mud/gnome-mud:0 -debug -gstreamer
 
 [games-mud/kildclient:0]
-package.use/games-mud_kildclient_0 : games-mud/kildclient:0 -doc gnutls spell
+package.use : games-mud/kildclient:0 -doc gnutls spell
 
 [games-mud/lyntin:0]
-package.use/games-mud_lyntin_0 : games-mud/lyntin:0 tk
+package.use : games-mud/lyntin:0 tk
 
 [games-mud/tf:0]
-package.use/games-mud_tf_0 : games-mud/tf:0 -debug -doc atcp gmcp ipv6 option102 ssl
-+package.env : games-mud/tf:0 games-mud_tf_0
-env/games-mud_tf_0 : LDFLAGS="-lintl"
+package.use : games-mud/tf:0 -debug -doc atcp gmcp ipv6 option102 ssl
+package.env : games-mud/tf:0 games-mud_tf_0
+env : LDFLAGS="-lintl"
 
 [games-puzzle/atomix:0]
-package.use/games-puzzle_atomix_0 : games-puzzle/atomix:0 -debug
+package.use : games-puzzle/atomix:0 -debug
 
 [games-puzzle/enigma:0]
-package.use/games-puzzle_enigma_0 : games-puzzle/enigma:0 -nls
+package.use : games-puzzle/enigma:0 -nls
 
 [games-puzzle/flobopuyo:0]
-package.use/games-puzzle_flobopuyo_0 : games-puzzle/flobopuyo:0 opengl
+package.use : games-puzzle/flobopuyo:0 opengl
 
 [games-puzzle/glightoff:0]
-package.use/games-puzzle_glightoff_0 : games-puzzle/glightoff:0 -debug
+package.use : games-puzzle/glightoff:0 -debug
 
 [games-puzzle/groundhog:0]
-package.use/games-puzzle_groundhog_0 : games-puzzle/groundhog:0 -nls
+package.use : games-puzzle/groundhog:0 -nls
 
 [games-puzzle/gtetrinet:0]
-package.use/games-puzzle_gtetrinet_0 : games-puzzle/gtetrinet:0 -debug -nls ipv6
+package.use : games-puzzle/gtetrinet:0 -debug -nls ipv6
 
 [games-puzzle/gtkballs:0]
-package.use/games-puzzle_gtkballs_0 : games-puzzle/gtkballs:0 -nls
+package.use : games-puzzle/gtkballs:0 -nls
 
 [games-puzzle/jag:0]
-package.use/games-puzzle_jag_0 : games-puzzle/jag:0 -editor
+package.use : games-puzzle/jag:0 -editor
 
 [games-puzzle/lpairs:0]
-package.use/games-puzzle_lpairs_0 : games-puzzle/lpairs:0 -nls
+package.use : games-puzzle/lpairs:0 -nls
 
 [games-puzzle/ltris:0]
-package.use/games-puzzle_ltris_0 : games-puzzle/ltris:0 -nls
+package.use : games-puzzle/ltris:0 -nls
 
 [games-puzzle/meandmyshadow:0]
-package.use/games-puzzle_meandmyshadow_0 : games-puzzle/meandmyshadow:0 opengl
+package.use : games-puzzle/meandmyshadow:0 opengl
 
 [games-puzzle/mirrormagic:0]
-package.use/games-puzzle_mirrormagic_0 : games-puzzle/mirrormagic:0 sdl
+package.use : games-puzzle/mirrormagic:0 sdl
 
 [games-puzzle/mures:0]
-package.use/games-puzzle_mures_0 : games-puzzle/mures:0 opengl
+package.use : games-puzzle/mures:0 opengl
 
 [games-puzzle/neverball:0]
-package.use/games-puzzle_neverball_0 : games-puzzle/neverball:0 -nls
+package.use : games-puzzle/neverball:0 -nls
 
 [games-puzzle/pathological:0]
-package.use/games-puzzle_pathological_0 : games-puzzle/pathological:0 -doc
+package.use : games-puzzle/pathological:0 -doc
 
 [games-puzzle/pingus:0]
-package.use/games-puzzle_pingus_0 : games-puzzle/pingus:0 -music opengl
+package.use : games-puzzle/pingus:0 -music opengl
 
 [games-puzzle/sgt-puzzles:0]
-package.use/games-puzzle_sgt-puzzles_0 : games-puzzle/sgt-puzzles:0 -doc
+package.use : games-puzzle/sgt-puzzles:0 -doc
 
 [games-puzzle/skoosh:0]
-package.use/games-puzzle_skoosh_0 : games-puzzle/skoosh:0 -debug -nls
+package.use : games-puzzle/skoosh:0 -debug -nls
 
 [games-puzzle/tetrinet:0]
-package.use/games-puzzle_tetrinet_0 : games-puzzle/tetrinet:0 ipv6
+package.use : games-puzzle/tetrinet:0 ipv6
 
 [games-puzzle/xlogical:0]
-package.use/games-puzzle_xlogical_0 : games-puzzle/xlogical:0 -alt_gfx
+package.use : games-puzzle/xlogical:0 -alt_gfx
 
 [games-puzzle/zaz:0]
-package.use/games-puzzle_zaz_0 : games-puzzle/zaz:0 -nls
+package.use : games-puzzle/zaz:0 -nls
 
 [games-roguelike/angband:0]
-package.use/games-roguelike_angband_0 : games-roguelike/angband:0 X ncurses sdl sound
+package.use : games-roguelike/angband:0 X ncurses sdl sound
 
 [games-roguelike/crossfire-client:0]
-package.use/games-roguelike_crossfire-client_0 : games-roguelike/crossfire-client:0 alsa lua opengl oss sdl
+package.use : games-roguelike/crossfire-client:0 alsa lua opengl oss sdl
 
 [games-roguelike/tome:0]
-package.use/games-roguelike_tome_0 : games-roguelike/tome:0 X Xaw3d gtk sdl
+package.use : games-roguelike/tome:0 X Xaw3d gtk sdl
 
 [games-roguelike/zangband:0]
-package.use/games-roguelike_zangband_0 : games-roguelike/zangband:0 tk
+package.use : games-roguelike/zangband:0 tk
 
 [games-rpg/adonthell:0]
-package.use/games-rpg_adonthell_0 : games-rpg/adonthell:0 -doc -nls
+package.use : games-rpg/adonthell:0 -doc -nls
 
 [games-rpg/drascula:0]
-package.use/games-rpg_drascula_0 : games-rpg/drascula:0 sound
+package.use : games-rpg/drascula:0 sound
 
 [games-rpg/dreamweb:0]
-package.use/games-rpg_dreamweb_0 : games-rpg/dreamweb:0 -doc
+package.use : games-rpg/dreamweb:0 -doc
 
 [games-rpg/freedroidrpg:0]
-package.use/games-rpg_freedroidrpg_0 : games-rpg/freedroidrpg:0 opengl vorbis
+package.use : games-rpg/freedroidrpg:0 opengl vorbis
 
 [games-rpg/kqlives:0]
-package.use/games-rpg_kqlives_0 : games-rpg/kqlives:0 -cheats -nls
+package.use : games-rpg/kqlives:0 -cheats -nls
 
 [games-rpg/queen:0]
-package.use/games-rpg_queen_0 : games-rpg/queen:0 mp3
+package.use : games-rpg/queen:0 mp3
 
 [games-rpg/wastesedge:0]
-package.use/games-rpg_wastesedge_0 : games-rpg/wastesedge:0 -nls
+package.use : games-rpg/wastesedge:0 -nls
 
 [games-server/crossfire-server:0]
-package.use/games-server_crossfire-server_0 : games-server/crossfire-server:0 X
+package.use : games-server/crossfire-server:0 X
 
 [games-server/monopd:0]
-package.use/games-server_monopd_0 : games-server/monopd:0 -systemd
+package.use : games-server/monopd:0 -systemd
 
 [games-server/pvpgn:0]
-package.use/games-server_pvpgn_0 : games-server/pvpgn:0 -mysql -postgres
+package.use : games-server/pvpgn:0 -mysql -postgres
 
 [games-simulation/cannonsmash:0]
-package.use/games-simulation_cannonsmash_0 : games-simulation/cannonsmash:0 -nls vorbis
+package.use : games-simulation/cannonsmash:0 -nls vorbis
 
 [games-simulation/dangerdeep:0]
-package.use/games-simulation_dangerdeep_0 : games-simulation/dangerdeep:0 -debug cpu_flags_x86_sse
+package.use : games-simulation/dangerdeep:0 -debug cpu_flags_x86_sse
 
 [games-simulation/lincity:0]
-package.use/games-simulation_lincity_0 : games-simulation/lincity:0 -nls
+package.use : games-simulation/lincity:0 -nls
 
 [games-simulation/pmars-sdl:0]
-package.use/games-simulation_pmars-sdl_0 : games-simulation/pmars-sdl:0 X sdl
+package.use : games-simulation/pmars-sdl:0 X sdl
 
 [games-simulation/senken:0]
-package.use/games-simulation_senken_0 : games-simulation/senken:0 -nls
+package.use : games-simulation/senken:0 -nls
 
 [games-simulation/singularity:0]
-package.use/games-simulation_singularity_0 : games-simulation/singularity:0 music
+package.use : games-simulation/singularity:0 music
 
 [games-sports/foobillard:0]
-package.use/games-sports_foobillard_0 : games-sports/foobillard:0 -video_cards_nvidia sdl
+package.use : games-sports/foobillard:0 -video_cards_nvidia sdl
 
 [games-sports/gracer:0]
-package.use/games-sports_gracer_0 : games-sports/gracer:0 joystick
+package.use : games-sports/gracer:0 joystick
 
 [games-sports/xmoto:0]
-package.use/games-sports_xmoto_0 : games-sports/xmoto:0 -editor -nls
+package.use : games-sports/xmoto:0 -editor -nls
 
 [games-strategy/crimson:0]
-package.use/games-strategy_crimson_0 : games-strategy/crimson:0 -test zlib
+package.use : games-strategy/crimson:0 -test zlib
 
 [games-strategy/dopewars:0]
-package.use/games-strategy_dopewars_0 : games-strategy/dopewars:0 -gnome -nls gtk ncurses sdl
+package.use : games-strategy/dopewars:0 -gnome -nls gtk ncurses sdl
 
 [games-strategy/freeciv:0]
-package.use/games-strategy_freeciv_0 : games-strategy/freeciv:0 -aimodules -auth -dedicated -mapimg -modpack -mysql -nls -qt5 -system-lua gtk ipv6 readline sdl server sound sqlite
+package.use : games-strategy/freeciv:0 -aimodules -auth -dedicated -mapimg -modpack -mysql -nls -qt5 -system-lua gtk ipv6 readline sdl server sound sqlite
 
 [games-strategy/freesynd:0]
-package.use/games-strategy_freesynd_0 : games-strategy/freesynd:0 -debug -devtools
+package.use : games-strategy/freesynd:0 -debug -devtools
 
 [games-strategy/gwp:0]
-package.use/games-strategy_gwp_0 : games-strategy/gwp:0 -debug -nls opengl python
+package.use : games-strategy/gwp:0 -debug -nls opengl python
 
 [games-strategy/lgeneral:0]
-package.use/games-strategy_lgeneral_0 : games-strategy/lgeneral:0 -nls
+package.use : games-strategy/lgeneral:0 -nls
 
 [games-strategy/liquidwar6:0]
-package.use/games-strategy_liquidwar6_0 : games-strategy/liquidwar6:0 -doc -gles2 -nls -test gtk libcaca maps ogg openmp readline
+package.use : games-strategy/liquidwar6:0 -doc -gles2 -nls -test gtk libcaca maps ogg openmp readline
 
 [games-strategy/liquidwar:0]
-package.use/games-strategy_liquidwar_0 : games-strategy/liquidwar:0 -nls
+package.use : games-strategy/liquidwar:0 -nls
 
 [games-strategy/naev:0]
-package.use/games-strategy_naev_0 : games-strategy/naev:0 -debug mixer openal
+package.use : games-strategy/naev:0 -debug mixer openal
 
 [games-strategy/scorched3d:0]
-package.use/games-strategy_scorched3d_0 : games-strategy/scorched3d:0 -dedicated -mysql
+package.use : games-strategy/scorched3d:0 -dedicated -mysql
 
 [games-strategy/uqm:0]
-package.use/games-strategy_uqm_0 : games-strategy/uqm:0 -music -remix -voice opengl
+package.use : games-strategy/uqm:0 -music -remix -voice opengl
 
 [games-strategy/warmux:0]
-package.use/games-strategy_warmux_0 : games-strategy/warmux:0 -debug -nls unicode
+package.use : games-strategy/warmux:0 -debug -nls unicode
 
 [games-strategy/warzone2100:0]
-package.use/games-strategy_warzone2100_0 : games-strategy/warzone2100:0 -debug -nls -videos qt4
+package.use : games-strategy/warzone2100:0 -debug -nls -videos qt4
 
 [games-util/dfarc:0]
-package.use/games-util_dfarc_0 : games-util/dfarc:0 -nls
+package.use : games-util/dfarc:0 -nls
 
 [games-util/glbsp:0]
-package.use/games-util_glbsp_0 : games-util/glbsp:0 -fltk
+package.use : games-util/glbsp:0 -fltk
 
 [games-util/gslist:0]
-package.use/games-util_gslist_0 : games-util/gslist:0 -web
+package.use : games-util/gslist:0 -web
 
 [games-util/higan-purify:0]
-package.use/games-util_higan-purify_0 : games-util/higan-purify:0 qt4
+package.use : games-util/higan-purify:0 qt4
 
 [games-util/joystick:0]
-package.use/games-util_joystick_0 : games-util/joystick:0 -udev sdl
+package.use : games-util/joystick:0 -udev sdl
 
 [gnome-base/dconf:0]
-package.use/gnome-base_dconf_0 : gnome-base/dconf:0 -test X
+package.use : gnome-base/dconf:0 -test X
 
 [gnome-base/gconf:2]
-package.use/gnome-base_gconf_2 : gnome-base/gconf:2 -debug -policykit introspection ldap
+package.use : gnome-base/gconf:2 -debug -policykit introspection ldap
 
 [gnome-base/gnome-common:3]
-package.use/gnome-base_gnome-common_3 : gnome-base/gnome-common:3 autoconf-archive
+package.use : gnome-base/gnome-common:3 autoconf-archive
 
 [gnome-base/gnome-desktop:2]
-package.use/gnome-base_gnome-desktop_2 : gnome-base/gnome-desktop:2 -debug -license-docs
-+package.env : gnome-base/gnome-desktop:2 gnome-base_gnome-desktop_2
-env/gnome-base_gnome-desktop_2 : CPPFLAGS="-D_GNU_SOURCE"
+package.use : gnome-base/gnome-desktop:2 -debug -license-docs
+package.env : gnome-base/gnome-desktop:2 gnome-base_gnome-desktop_2
+env : CPPFLAGS="-D_GNU_SOURCE"
 
 [gnome-base/gnome-desktop:3]
-package.use/gnome-base_gnome-desktop_3 : gnome-base/gnome-desktop:3 -debug -test introspection
-+package.env : gnome-base/gnome-desktop:3 gnome-base_gnome-desktop_3
-env/gnome-base_gnome-desktop_3 : CPPFLAGS="-D_GNU_SOURCE"
+package.use : gnome-base/gnome-desktop:3 -debug -test introspection
+package.env : gnome-base/gnome-desktop:3 gnome-base_gnome-desktop_3
+env : CPPFLAGS="-D_GNU_SOURCE"
 
 [gnome-base/gnome-keyring:0]
-package.use/gnome-base_gnome-keyring_0 : gnome-base/gnome-keyring:0 -debug -pam -selinux -test caps filecaps ssh-agent
+package.use : gnome-base/gnome-keyring:0 -debug -pam -selinux -test caps filecaps ssh-agent
 
 [gnome-base/gnome-menus:3]
-package.use/gnome-base_gnome-menus_3 : gnome-base/gnome-menus:3 -debug -test introspection
+package.use : gnome-base/gnome-menus:3 -debug -test introspection
 
 [gnome-base/gnome-mime-data:0]
-package.use/gnome-base_gnome-mime-data_0 : gnome-base/gnome-mime-data:0 -debug
+package.use : gnome-base/gnome-mime-data:0 -debug
 
 [gnome-base/gnome-vfs:2]
-package.use/gnome-base_gnome-vfs_2 : gnome-base/gnome-vfs:2 -doc -kerberos -test acl avahi fam gnutls ipv6 samba ssl
+package.use : gnome-base/gnome-vfs:2 -doc -kerberos -test acl avahi fam gnutls ipv6 samba ssl
 
 [gnome-base/gsettings-desktop-schemas:0]
-package.use/gnome-base_gsettings-desktop-schemas_0 : gnome-base/gsettings-desktop-schemas:0 introspection
+package.use : gnome-base/gsettings-desktop-schemas:0 introspection
 
 [gnome-base/gvfs:0]
-package.use/gnome-base_gvfs_0 : gnome-base/gvfs:0 -afp -archive -bluray -fuse -gnome-online-accounts -gphoto2 -libsecret -systemd -test -udisks cdda gtk http ios mtp samba udev zeroconf
+package.use : gnome-base/gvfs:0 -afp -archive -bluray -fuse -gnome-online-accounts -gphoto2 -libsecret -systemd -test -udisks cdda gtk http ios mtp samba udev zeroconf
 
 [gnome-base/libbonobo:0]
-package.use/gnome-base_libbonobo_0 : gnome-base/libbonobo:0 -debug -examples -test
+package.use : gnome-base/libbonobo:0 -debug -examples -test
 
 [gnome-base/libbonoboui:0]
-package.use/gnome-base_libbonoboui_0 : gnome-base/libbonoboui:0 -examples -test
+package.use : gnome-base/libbonoboui:0 -examples -test
 
 [gnome-base/libglade:2.0]
-package.use/gnome-base_libglade_2.0 : gnome-base/libglade:2.0 -test -tools static-libs
+package.use : gnome-base/libglade:2.0 -test -tools static-libs
 
 [gnome-base/libgnome-keyring:0]
-package.use/gnome-base_libgnome-keyring_0 : gnome-base/libgnome-keyring:0 -debug -test introspection vala
+package.use : gnome-base/libgnome-keyring:0 -debug -test introspection vala
 
 [gnome-base/libgnome:0]
-package.use/gnome-base_libgnome_0 : gnome-base/libgnome:0 -branding -debug
+package.use : gnome-base/libgnome:0 -branding -debug
 
 [gnome-base/libgnomecanvas:0]
-package.use/gnome-base_libgnomecanvas_0 : gnome-base/libgnomecanvas:0 -glade -test
+package.use : gnome-base/libgnomecanvas:0 -glade -test
 
 [gnome-base/libgnomeui:0]
-package.use/gnome-base_libgnomeui_0 : gnome-base/libgnomeui:0 -test
+package.use : gnome-base/libgnomeui:0 -test
 
 [gnome-base/libgtop:2]
-package.use/gnome-base_libgtop_2 : gnome-base/libgtop:2 -debug introspection
+package.use : gnome-base/libgtop:2 -debug introspection
 
 [gnome-base/librsvg:2]
-package.use/gnome-base_librsvg_2 : gnome-base/librsvg:2 -tools introspection vala
+package.use : gnome-base/librsvg:2 -tools introspection vala
 
 [gnome-base/orbit:2]
-package.use/gnome-base_orbit_2 : gnome-base/orbit:2 -debug -test pic static-libs
+package.use : gnome-base/orbit:2 -debug -test pic static-libs
 
 [gnome-extra/assogiate:0]
-package.use/gnome-extra_assogiate_0 : gnome-extra/assogiate:0 -debug
+package.use : gnome-extra/assogiate:0 -debug
 
 [gnome-extra/evolution-data-server:0]
-package.use/gnome-extra_evolution-data-server_0 : gnome-extra/evolution-data-server:0 -api-doc-extras -kerberos -test gnome-online-accounts gtk introspection ipv6 ldap vala weather
+package.use : gnome-extra/evolution-data-server:0 -api-doc-extras -kerberos -test gnome-online-accounts gtk introspection ipv6 ldap vala weather
 
 [gnome-extra/gdesklets-core:0]
-package.use/gnome-extra_gdesklets-core_0 : gnome-extra/gdesklets-core:0 dbus
+package.use : gnome-extra/gdesklets-core:0 dbus
 
 [gnome-extra/gnome-commander:0]
-package.use/gnome-extra_gnome-commander_0 : gnome-extra/gnome-commander:0 -chm -debug -doc -gsf exif pdf python taglib
+package.use : gnome-extra/gnome-commander:0 -chm -debug -doc -gsf exif pdf python taglib
 
 [gnome-extra/gnome-dvb-daemon:0]
-package.use/gnome-extra_gnome-dvb-daemon_0 : gnome-extra/gnome-dvb-daemon:0 -nls -totem vala
+package.use : gnome-extra/gnome-dvb-daemon:0 -nls -totem vala
 
 [gnome-extra/gnome-system-monitor:0]
-package.use/gnome-extra_gnome-system-monitor_0 : gnome-extra/gnome-system-monitor:0 -systemd X
+package.use : gnome-extra/gnome-system-monitor:0 -systemd X
 
 [gnome-extra/gnome-user-docs:0]
-package.use/gnome-extra_gnome-user-docs_0 : gnome-extra/gnome-user-docs:0 -test
+package.use : gnome-extra/gnome-user-docs:0 -test
 
 [gnome-extra/gucharmap:0]
-package.use/gnome-extra_gucharmap_0 : gnome-extra/gucharmap:0 -cjk -debug -doc introspection
+package.use : gnome-extra/gucharmap:0 -cjk -debug -doc introspection
 
 [gnome-extra/gucharmap:2.90]
-package.use/gnome-extra_gucharmap_2.90 : gnome-extra/gucharmap:2.90 -cjk -debug -test introspection vala
+package.use : gnome-extra/gucharmap:2.90 -cjk -debug -test introspection vala
 
 [gnome-extra/libgda:5]
-package.use/gnome-extra_libgda_5 : gnome-extra/libgda:5 -canvas -debug -firebird -graphviz -http -java -json -libsecret -mdb -mysql -oci8 -postgres -reports -sourceview berkdb gtk introspection ldap ssl
+package.use : gnome-extra/libgda:5 -canvas -debug -firebird -graphviz -http -java -json -libsecret -mdb -mysql -oci8 -postgres -reports -sourceview berkdb gtk introspection ldap ssl
 
 [gnome-extra/libgsf:0]
-package.use/gnome-extra_libgsf_0 : gnome-extra/libgsf:0 bzip2 gtk introspection
+package.use : gnome-extra/libgsf:0 bzip2 gtk introspection
 
 [kde-apps/oxygen-icons:4]
-package.use/kde-apps_oxygen-icons_4 : kde-apps/oxygen-icons:4 -aqua -sources
+package.use : kde-apps/oxygen-icons:4 -aqua -sources
 
 [kde-misc/kdiff3:4]
-package.use/kde-misc_kdiff3_4 : kde-misc/kdiff3:4 -aqua -debug -kde handbook
+package.use : kde-misc/kdiff3:4 -aqua -debug -kde handbook
 
 [lxde-base/lxdm:0]
-package.use/lxde-base_lxdm_0 : lxde-base/lxdm:0 -consolekit -debug -nls -pam gtk3
+package.use : lxde-base/lxdm:0 -consolekit -debug -nls -pam gtk3
 
 [mail-client/balsa:0]
-package.use/mail-client_balsa_0 : mail-client/balsa:0 -gnome -kerberos -networkmanager -rubrica crypt gtkspell ldap libnotify sqlite ssl webkit xface
+package.use : mail-client/balsa:0 -gnome -kerberos -networkmanager -rubrica crypt gtkspell ldap libnotify sqlite ssl webkit xface
 
 [mail-client/claws-mail:0]
-package.use/mail-client_claws-mail_0 : mail-client/claws-mail:0 -bogofilter -dillo -doc -pda -smime -spamassassin crypt dbus imap ipv6 ldap nntp session spell ssl startup-notification xface
+package.use : mail-client/claws-mail:0 -bogofilter -dillo -doc -pda -smime -spamassassin crypt dbus imap ipv6 ldap nntp session spell ssl startup-notification xface
 
 [mail-client/cone:0]
-package.use/mail-client_cone_0 : mail-client/cone:0 crypt fam gnutls idn ipv6 ldap spell
+package.use : mail-client/cone:0 crypt fam gnutls idn ipv6 ldap spell
 
 [mail-client/evolution:2.0]
-package.use/mail-client_evolution_2.0 : mail-client/evolution:2.0 -highlight -map -spamassassin bogofilter crypt ldap spell ssl weather
+package.use : mail-client/evolution:2.0 -highlight -map -spamassassin bogofilter crypt ldap spell ssl weather
 
 [mail-client/geary:0]
-package.use/mail-client_geary_0 : mail-client/geary:0 -nls
+package.use : mail-client/geary:0 -nls
 
 [mail-client/mail-notification:0]
-package.use/mail-client_mail-notification_0 : mail-client/mail-notification:0 -sylpheed gnome-keyring sasl sound ssl
+package.use : mail-client/mail-notification:0 -sylpheed gnome-keyring sasl sound ssl
 
 [mail-client/mutt:0]
-package.use/mail-client_mutt_0 : mail-client/mutt:0 -debug -doc -gpg -imap -kerberos -nls -pop -qdbm -selinux -sidebar -smime -smtp -tokyocabinet berkdb crypt gdbm gnutls idn mbox nntp sasl slang ssl
+package.use : mail-client/mutt:0 -debug -doc -gpg -imap -kerberos -nls -pop -qdbm -selinux -sidebar -smime -smtp -tokyocabinet berkdb crypt gdbm gnutls idn mbox nntp sasl slang ssl
 
 [mail-client/trojita:0]
-package.use/mail-client_trojita_0 : mail-client/trojita:0 -debug -test zlib
+package.use : mail-client/trojita:0 -debug -test zlib
 
 [mail-filter/bmf:0]
-package.use/mail-filter_bmf_0 : mail-filter/bmf:0 -mysql berkdb
+package.use : mail-filter/bmf:0 -mysql berkdb
 
 [mail-filter/bogofilter:0]
-package.use/mail-filter_bogofilter_0 : mail-filter/bogofilter:0 -tokyocabinet berkdb sqlite
+package.use : mail-filter/bogofilter:0 -tokyocabinet berkdb sqlite
 
 [mail-filter/clamassassin:0]
-package.use/mail-filter_clamassassin_0 : mail-filter/clamassassin:0 -clamd -subject-rewrite
+package.use : mail-filter/clamassassin:0 -clamd -subject-rewrite
 
 [mail-filter/gld:0]
-package.use/mail-filter_gld_0 : mail-filter/gld:0 -postgres
+package.use : mail-filter/gld:0 -postgres
 
 [mail-filter/libdkim:0]
-package.use/mail-filter_libdkim_0 : mail-filter/libdkim:0 static-libs
+package.use : mail-filter/libdkim:0 static-libs
 
 [mail-filter/libmilter:0]
-package.use/mail-filter_libmilter_0 : mail-filter/libmilter:0 -poll ipv6
+package.use : mail-filter/libmilter:0 -poll ipv6
 
 [mail-filter/libsrs2:0]
-package.use/mail-filter_libsrs2_0 : mail-filter/libsrs2:0 static-libs
+package.use : mail-filter/libsrs2:0 static-libs
 
 [mail-filter/mapson:0]
-package.use/mail-filter_mapson_0 : mail-filter/mapson:0 -debug
+package.use : mail-filter/mapson:0 -debug
 
 [mail-filter/mimedefang:0]
-package.use/mail-filter_mimedefang_0 : mail-filter/mimedefang:0 -clamav poll
+package.use : mail-filter/mimedefang:0 -clamav poll
 
 [mail-filter/popfile:0]
-package.use/mail-filter_popfile_0 : mail-filter/popfile:0 -cjk -mysql -xmlrpc ipv6 ssl
+package.use : mail-filter/popfile:0 -cjk -mysql -xmlrpc ipv6 ssl
 
 [mail-filter/postgrey:0]
-package.use/mail-filter_postgrey_0 : mail-filter/postgrey:0 -targrey
+package.use : mail-filter/postgrey:0 -targrey
 
 [mail-filter/procmail:0]
-package.use/mail-filter_procmail_0 : mail-filter/procmail:0 -selinux mbox
+package.use : mail-filter/procmail:0 -selinux mbox
 
 [mail-filter/spamprobe:0]
-package.use/mail-filter_spamprobe_0 : mail-filter/spamprobe:0 berkdb gif jpeg png
+package.use : mail-filter/spamprobe:0 berkdb gif jpeg png
 
 [mail-filter/sqlgrey:0]
-package.use/mail-filter_sqlgrey_0 : mail-filter/sqlgrey:0 -mysql -postgres sqlite
+package.use : mail-filter/sqlgrey:0 -mysql -postgres sqlite
 
 [mail-mta/postfix:0]
-package.use/mail-mta_postfix_0 : mail-mta/postfix:0 -doc -dovecot-sasl -ldap-bind -lmdb -memcached -mysql -nis -pam -postgres -selinux -vda berkdb cdb eai hardened ldap mbox sasl sqlite ssl
+package.use : mail-mta/postfix:0 -doc -dovecot-sasl -ldap-bind -lmdb -memcached -mysql -nis -pam -postgres -selinux -vda berkdb cdb eai hardened ldap mbox sasl sqlite ssl
 
 [mate-base/mate-desktop:0]
-package.use/mate-base_mate-desktop_0 : mate-base/mate-desktop:0 -debug X startup-notification
+package.use : mate-base/mate-desktop:0 -debug X startup-notification
 
 [mate-base/mate-menus:0]
-package.use/mate-base_mate-menus_0 : mate-base/mate-menus:0 -debug introspection python
+package.use : mate-base/mate-menus:0 -debug introspection python
 
 [mate-base/mate-panel:0]
-package.use/mate-base_mate-panel_0 : mate-base/mate-panel:0 -networkmanager X introspection
+package.use : mate-base/mate-panel:0 -networkmanager X introspection
 
 [mate-extra/mate-sensors-applet:0]
-package.use/mate-extra_mate-sensors-applet_0 : mate-extra/mate-sensors-applet:0 -hddtemp -lm_sensors -video_cards_fglrx -video_cards_nvidia dbus libnotify
+package.use : mate-extra/mate-sensors-applet:0 -hddtemp -lm_sensors -video_cards_fglrx -video_cards_nvidia dbus libnotify
 
 [media-fonts/alee-fonts:0]
-package.use/media-fonts_alee-fonts_0 : media-fonts/alee-fonts:0 X
+package.use : media-fonts/alee-fonts:0 X
 
 [media-fonts/andika:0]
-package.use/media-fonts_andika_0 : media-fonts/andika:0 X
+package.use : media-fonts/andika:0 X
 
 [media-fonts/anonymous-pro:0]
-package.use/media-fonts_anonymous-pro_0 : media-fonts/anonymous-pro:0 X
+package.use : media-fonts/anonymous-pro:0 X
 
 [media-fonts/aquafont:0]
-package.use/media-fonts_aquafont_0 : media-fonts/aquafont:0 X
+package.use : media-fonts/aquafont:0 X
 
 [media-fonts/aquapfont:0]
-package.use/media-fonts_aquapfont_0 : media-fonts/aquapfont:0 X
+package.use : media-fonts/aquapfont:0 X
 
 [media-fonts/arabeyes-fonts:0]
-package.use/media-fonts_arabeyes-fonts_0 : media-fonts/arabeyes-fonts:0 X
+package.use : media-fonts/arabeyes-fonts:0 X
 
 [media-fonts/arkpandora:0]
-package.use/media-fonts_arkpandora_0 : media-fonts/arkpandora:0 X
+package.use : media-fonts/arkpandora:0 X
 
 [media-fonts/arphicfonts:0]
-package.use/media-fonts_arphicfonts_0 : media-fonts/arphicfonts:0 X
+package.use : media-fonts/arphicfonts:0 X
 
 [media-fonts/artwiz-aleczapka-en:0]
-package.use/media-fonts_artwiz-aleczapka-en_0 : media-fonts/artwiz-aleczapka-en:0 X
+package.use : media-fonts/artwiz-aleczapka-en:0 X
 
 [media-fonts/artwiz-latin1:0]
-package.use/media-fonts_artwiz-latin1_0 : media-fonts/artwiz-latin1:0 X
+package.use : media-fonts/artwiz-latin1:0 X
 
 [media-fonts/baekmuk-fonts:0]
-package.use/media-fonts_baekmuk-fonts_0 : media-fonts/baekmuk-fonts:0 X unicode
+package.use : media-fonts/baekmuk-fonts:0 X unicode
 
 [media-fonts/bitstream-cyberbit:0]
-package.use/media-fonts_bitstream-cyberbit_0 : media-fonts/bitstream-cyberbit:0 X
+package.use : media-fonts/bitstream-cyberbit:0 X
 
 [media-fonts/cardo:0]
-package.use/media-fonts_cardo_0 : media-fonts/cardo:0 X
+package.use : media-fonts/cardo:0 X
 
 [media-fonts/cheapskatefonts:0]
-package.use/media-fonts_cheapskatefonts_0 : media-fonts/cheapskatefonts:0 X
+package.use : media-fonts/cheapskatefonts:0 X
 
 [media-fonts/cm-unicode:0]
-package.use/media-fonts_cm-unicode_0 : media-fonts/cm-unicode:0 X
+package.use : media-fonts/cm-unicode:0 X
 
 [media-fonts/comic-neue:0]
-package.use/media-fonts_comic-neue_0 : media-fonts/comic-neue:0 X
+package.use : media-fonts/comic-neue:0 X
 
 [media-fonts/dejavu:0]
-package.use/media-fonts_dejavu_0 : media-fonts/dejavu:0 X fontforge
+package.use : media-fonts/dejavu:0 X fontforge
 
 [media-fonts/dina:0]
-package.use/media-fonts_dina_0 : media-fonts/dina:0 X
+package.use : media-fonts/dina:0 X
 
 [media-fonts/dzongkha-fonts:0]
-package.use/media-fonts_dzongkha-fonts_0 : media-fonts/dzongkha-fonts:0 X
+package.use : media-fonts/dzongkha-fonts:0 X
 
 [media-fonts/eb-garamond:0]
-package.use/media-fonts_eb-garamond_0 : media-fonts/eb-garamond:0 X
+package.use : media-fonts/eb-garamond:0 X
 
 [media-fonts/efont-unicode:0]
-package.use/media-fonts_efont-unicode_0 : media-fonts/efont-unicode:0 X
+package.use : media-fonts/efont-unicode:0 X
 
 [media-fonts/ekushey-bangla-fonts:0]
-package.use/media-fonts_ekushey-bangla-fonts_0 : media-fonts/ekushey-bangla-fonts:0 X
+package.use : media-fonts/ekushey-bangla-fonts:0 X
 
 [media-fonts/essays1743:0]
-package.use/media-fonts_essays1743_0 : media-fonts/essays1743:0 X
+package.use : media-fonts/essays1743:0 X
 
 [media-fonts/exo:0]
-package.use/media-fonts_exo_0 : media-fonts/exo:0 X
+package.use : media-fonts/exo:0 X
 
 [media-fonts/farsi-fonts:0]
-package.use/media-fonts_farsi-fonts_0 : media-fonts/farsi-fonts:0 X
+package.use : media-fonts/farsi-fonts:0 X
 
 [media-fonts/fgdc-emergency:0]
-package.use/media-fonts_fgdc-emergency_0 : media-fonts/fgdc-emergency:0 X
+package.use : media-fonts/fgdc-emergency:0 X
 
 [media-fonts/fira-sans:0]
-package.use/media-fonts_fira-sans_0 : media-fonts/fira-sans:0 X
+package.use : media-fonts/fira-sans:0 X
 
 [media-fonts/font-adobe-100dpi:0]
-package.use/media-fonts_font-adobe-100dpi_0 : media-fonts/font-adobe-100dpi:0 -nls X
+package.use : media-fonts/font-adobe-100dpi:0 -nls X
 
 [media-fonts/font-bitstream-100dpi:0]
-package.use/media-fonts_font-bitstream-100dpi_0 : media-fonts/font-bitstream-100dpi:0 -nls X
+package.use : media-fonts/font-bitstream-100dpi:0 -nls X
 
 [media-fonts/font-cursor-misc:0]
-package.use/media-fonts_font-cursor-misc_0 : media-fonts/font-cursor-misc:0 -nls X
+package.use : media-fonts/font-cursor-misc:0 -nls X
 
 [media-fonts/font-misc-misc:0]
-package.use/media-fonts_font-misc-misc_0 : media-fonts/font-misc-misc:0 -nls X
+package.use : media-fonts/font-misc-misc:0 -nls X
 
 [media-fonts/font-schumacher-misc:0]
-package.use/media-fonts_font-schumacher-misc_0 : media-fonts/font-schumacher-misc:0 -nls X
+package.use : media-fonts/font-schumacher-misc:0 -nls X
 
 [media-fonts/font-sony-misc:0]
-package.use/media-fonts_font-sony-misc_0 : media-fonts/font-sony-misc:0 -nls X
+package.use : media-fonts/font-sony-misc:0 -nls X
 
 [media-fonts/free-bangla-font:0]
-package.use/media-fonts_free-bangla-font_0 : media-fonts/free-bangla-font:0 X
+package.use : media-fonts/free-bangla-font:0 X
 
 [media-fonts/freefont:0]
-package.use/media-fonts_freefont_0 : media-fonts/freefont:0 X
+package.use : media-fonts/freefont:0 X
 
 [media-fonts/fs-fonts:0]
-package.use/media-fonts_fs-fonts_0 : media-fonts/fs-fonts:0 X
+package.use : media-fonts/fs-fonts:0 X
 
 [media-fonts/gidole:0]
-package.use/media-fonts_gidole_0 : media-fonts/gidole:0 X
+package.use : media-fonts/gidole:0 X
 
 [media-fonts/hunkyfonts:0]
-package.use/media-fonts_hunkyfonts_0 : media-fonts/hunkyfonts:0 X
+package.use : media-fonts/hunkyfonts:0 X
 
 [media-fonts/inconsolata:0]
-package.use/media-fonts_inconsolata_0 : media-fonts/inconsolata:0 X
+package.use : media-fonts/inconsolata:0 X
 
 [media-fonts/intlfonts:0]
-package.use/media-fonts_intlfonts_0 : media-fonts/intlfonts:0 -bdf X
+package.use : media-fonts/intlfonts:0 -bdf X
 
 [media-fonts/ipaex:0]
-package.use/media-fonts_ipaex_0 : media-fonts/ipaex:0 X
+package.use : media-fonts/ipaex:0 X
 
 [media-fonts/ipamonafont:0]
-package.use/media-fonts_ipamonafont_0 : media-fonts/ipamonafont:0 X
+package.use : media-fonts/ipamonafont:0 X
 
 [media-fonts/jisx0213-fonts:0]
-package.use/media-fonts_jisx0213-fonts_0 : media-fonts/jisx0213-fonts:0 X
+package.use : media-fonts/jisx0213-fonts:0 X
 
 [media-fonts/kacst-fonts:0]
-package.use/media-fonts_kacst-fonts_0 : media-fonts/kacst-fonts:0 X
+package.use : media-fonts/kacst-fonts:0 X
 
 [media-fonts/kanjistrokeorders:0]
-package.use/media-fonts_kanjistrokeorders_0 : media-fonts/kanjistrokeorders:0 X
+package.use : media-fonts/kanjistrokeorders:0 X
 
 [media-fonts/khmer:0]
-package.use/media-fonts_khmer_0 : media-fonts/khmer:0 X
+package.use : media-fonts/khmer:0 X
 
 [media-fonts/kochi-substitute:0]
-package.use/media-fonts_kochi-substitute_0 : media-fonts/kochi-substitute:0 X
+package.use : media-fonts/kochi-substitute:0 X
 
 [media-fonts/lfpfonts-fix:0]
-package.use/media-fonts_lfpfonts-fix_0 : media-fonts/lfpfonts-fix:0 X
+package.use : media-fonts/lfpfonts-fix:0 X
 
 [media-fonts/lfpfonts-var:0]
-package.use/media-fonts_lfpfonts-var_0 : media-fonts/lfpfonts-var:0 X
+package.use : media-fonts/lfpfonts-var:0 X
 
 [media-fonts/liberation-fonts:0]
-package.use/media-fonts_liberation-fonts_0 : media-fonts/liberation-fonts:0 X fontforge
+package.use : media-fonts/liberation-fonts:0 X fontforge
 
 [media-fonts/libertine:0]
-package.use/media-fonts_libertine_0 : media-fonts/libertine:0 X
+package.use : media-fonts/libertine:0 X
 
 [media-fonts/mgopen:0]
-package.use/media-fonts_mgopen_0 : media-fonts/mgopen:0 X
+package.use : media-fonts/mgopen:0 X
 
 [media-fonts/mikachan-font-otf:0]
-package.use/media-fonts_mikachan-font-otf_0 : media-fonts/mikachan-font-otf:0 X
+package.use : media-fonts/mikachan-font-otf:0 X
 
 [media-fonts/mikachan-font-ttc:0]
-package.use/media-fonts_mikachan-font-ttc_0 : media-fonts/mikachan-font-ttc:0 X
+package.use : media-fonts/mikachan-font-ttc:0 X
 
 [media-fonts/mikachan-font-ttf:0]
-package.use/media-fonts_mikachan-font-ttf_0 : media-fonts/mikachan-font-ttf:0 X
+package.use : media-fonts/mikachan-font-ttf:0 X
 
 [media-fonts/monafont:0]
-package.use/media-fonts_monafont_0 : media-fonts/monafont:0 -truetype X
+package.use : media-fonts/monafont:0 -truetype X
 
 [media-fonts/mplus-fonts:0]
-package.use/media-fonts_mplus-fonts_0 : media-fonts/mplus-fonts:0 X
+package.use : media-fonts/mplus-fonts:0 X
 
 [media-fonts/nanumfont:0]
-package.use/media-fonts_nanumfont_0 : media-fonts/nanumfont:0 X
+package.use : media-fonts/nanumfont:0 X
 
 [media-fonts/nepali-fonts:0]
-package.use/media-fonts_nepali-fonts_0 : media-fonts/nepali-fonts:0 X
+package.use : media-fonts/nepali-fonts:0 X
 
 [media-fonts/noto:0]
-package.use/media-fonts_noto_0 : media-fonts/noto:0 X
+package.use : media-fonts/noto:0 X
 
 [media-fonts/oldstandard:0]
-package.use/media-fonts_oldstandard_0 : media-fonts/oldstandard:0 X
+package.use : media-fonts/oldstandard:0 X
 
 [media-fonts/open-sans:0]
-package.use/media-fonts_open-sans_0 : media-fonts/open-sans:0 X
+package.use : media-fonts/open-sans:0 X
 
 [media-fonts/opendesktop-fonts:0]
-package.use/media-fonts_opendesktop-fonts_0 : media-fonts/opendesktop-fonts:0 X
+package.use : media-fonts/opendesktop-fonts:0 X
 
 [media-fonts/pigiarniq:0]
-package.use/media-fonts_pigiarniq_0 : media-fonts/pigiarniq:0 X
+package.use : media-fonts/pigiarniq:0 X
 
 [media-fonts/pothana2k:0]
-package.use/media-fonts_pothana2k_0 : media-fonts/pothana2k:0 -doc X
+package.use : media-fonts/pothana2k:0 -doc X
 
 [media-fonts/proggy-fonts:0]
-package.use/media-fonts_proggy-fonts_0 : media-fonts/proggy-fonts:0 X
+package.use : media-fonts/proggy-fonts:0 X
 
 [media-fonts/sgi-fonts:0]
-package.use/media-fonts_sgi-fonts_0 : media-fonts/sgi-fonts:0 X
+package.use : media-fonts/sgi-fonts:0 X
 
 [media-fonts/shinonome:0]
-package.use/media-fonts_shinonome_0 : media-fonts/shinonome:0 X
+package.use : media-fonts/shinonome:0 X
 
 [media-fonts/sil-abyssinica:0]
-package.use/media-fonts_sil-abyssinica_0 : media-fonts/sil-abyssinica:0 -doc X
+package.use : media-fonts/sil-abyssinica:0 -doc X
 
 [media-fonts/sil-arabicfonts:0]
-package.use/media-fonts_sil-arabicfonts_0 : media-fonts/sil-arabicfonts:0 X
+package.use : media-fonts/sil-arabicfonts:0 X
 
 [media-fonts/sil-charis:0]
-package.use/media-fonts_sil-charis_0 : media-fonts/sil-charis:0 -compact -doc X
+package.use : media-fonts/sil-charis:0 -compact -doc X
 
 [media-fonts/sil-doulos:0]
-package.use/media-fonts_sil-doulos_0 : media-fonts/sil-doulos:0 -doc X
+package.use : media-fonts/sil-doulos:0 -doc X
 
 [media-fonts/sil-ezra:0]
-package.use/media-fonts_sil-ezra_0 : media-fonts/sil-ezra:0 -doc X
+package.use : media-fonts/sil-ezra:0 -doc X
 
 [media-fonts/sil-galatia:0]
-package.use/media-fonts_sil-galatia_0 : media-fonts/sil-galatia:0 X
+package.use : media-fonts/sil-galatia:0 X
 
 [media-fonts/sil-gentium:0]
-package.use/media-fonts_sil-gentium_0 : media-fonts/sil-gentium:0 -compact -doc X
+package.use : media-fonts/sil-gentium:0 -compact -doc X
 
 [media-fonts/sil-padauk:0]
-package.use/media-fonts_sil-padauk_0 : media-fonts/sil-padauk:0 X
+package.use : media-fonts/sil-padauk:0 X
 
 [media-fonts/symbola:0]
-package.use/media-fonts_symbola_0 : media-fonts/symbola:0 -doc X
+package.use : media-fonts/symbola:0 -doc X
 
 [media-fonts/tengwar-fonts:0]
-package.use/media-fonts_tengwar-fonts_0 : media-fonts/tengwar-fonts:0 X
+package.use : media-fonts/tengwar-fonts:0 X
 
 [media-fonts/terminus-font:0]
-package.use/media-fonts_terminus-font_0 : media-fonts/terminus-font:0 -a-like-o -distinct-l -quote -raw-font-data -ru-dv -ru-i -ru-k X center-tilde pcf pcf-unicode-only psf ru-g
+package.use : media-fonts/terminus-font:0 -a-like-o -distinct-l -quote -raw-font-data -ru-dv -ru-i -ru-k X center-tilde pcf pcf-unicode-only psf ru-g
 
 [media-fonts/thaifonts-scalable:0]
-package.use/media-fonts_thaifonts-scalable_0 : media-fonts/thaifonts-scalable:0 X
+package.use : media-fonts/thaifonts-scalable:0 X
 
 [media-fonts/tibetan-machine-font:0]
-package.use/media-fonts_tibetan-machine-font_0 : media-fonts/tibetan-machine-font:0 X
+package.use : media-fonts/tibetan-machine-font:0 X
 
 [media-fonts/umeplus-fonts:0]
-package.use/media-fonts_umeplus-fonts_0 : media-fonts/umeplus-fonts:0 X
+package.use : media-fonts/umeplus-fonts:0 X
 
 [media-fonts/unfonts-extra:0]
-package.use/media-fonts_unfonts-extra_0 : media-fonts/unfonts-extra:0 X
+package.use : media-fonts/unfonts-extra:0 X
 
 [media-fonts/unfonts:0]
-package.use/media-fonts_unfonts_0 : media-fonts/unfonts:0 X
+package.use : media-fonts/unfonts:0 X
 
 [media-fonts/urw-fonts:0]
-package.use/media-fonts_urw-fonts_0 : media-fonts/urw-fonts:0 X
+package.use : media-fonts/urw-fonts:0 X
 
 [media-fonts/urwvn-fonts:0]
-package.use/media-fonts_urwvn-fonts_0 : media-fonts/urwvn-fonts:0 X
+package.use : media-fonts/urwvn-fonts:0 X
 
 [media-fonts/vc-fonts:0]
-package.use/media-fonts_vc-fonts_0 : media-fonts/vc-fonts:0 X
+package.use : media-fonts/vc-fonts:0 X
 
 [media-fonts/vdrsymbols-ttf:0]
-package.use/media-fonts_vdrsymbols-ttf_0 : media-fonts/vdrsymbols-ttf:0 X
+package.use : media-fonts/vdrsymbols-ttf:0 X
 
 [media-fonts/vlgothic:0]
-package.use/media-fonts_vlgothic_0 : media-fonts/vlgothic:0 X
+package.use : media-fonts/vlgothic:0 X
 
 [media-fonts/webby-fonts:0]
-package.use/media-fonts_webby-fonts_0 : media-fonts/webby-fonts:0 X
+package.use : media-fonts/webby-fonts:0 X
 
 [media-fonts/wqy-bitmapfont:0]
-package.use/media-fonts_wqy-bitmapfont_0 : media-fonts/wqy-bitmapfont:0 X
+package.use : media-fonts/wqy-bitmapfont:0 X
 
 [media-fonts/wqy-microhei:0]
-package.use/media-fonts_wqy-microhei_0 : media-fonts/wqy-microhei:0 X
+package.use : media-fonts/wqy-microhei:0 X
 
 [media-fonts/wqy-unibit:0]
-package.use/media-fonts_wqy-unibit_0 : media-fonts/wqy-unibit:0 X
+package.use : media-fonts/wqy-unibit:0 X
 
 [media-fonts/zh-kcfonts:0]
-package.use/media-fonts_zh-kcfonts_0 : media-fonts/zh-kcfonts:0 X
+package.use : media-fonts/zh-kcfonts:0 X
 
 [media-gfx/argyllcms:0]
-package.use/media-gfx_argyllcms_0 : media-gfx/argyllcms:0 -doc
+package.use : media-gfx/argyllcms:0 -doc
 
 [media-gfx/comix:0]
-package.use/media-gfx_comix_0 : media-gfx/comix:0 -rar
+package.use : media-gfx/comix:0 -rar
 
 [media-gfx/eog-plugins:0]
-package.use/media-gfx_eog-plugins_0 : media-gfx/eog-plugins:0 -map exif flickr picasa python
+package.use : media-gfx/eog-plugins:0 -map exif flickr picasa python
 
 [media-gfx/eog:1]
-package.use/media-gfx_eog_1 : media-gfx/eog:1 -debug exif introspection jpeg lcms svg tiff xmp
+package.use : media-gfx/eog:1 -debug exif introspection jpeg lcms svg tiff xmp
 
 [media-gfx/exiv2:0]
-package.use/media-gfx_exiv2_0 : media-gfx/exiv2:0 -contrib -doc -examples -nls static-libs xmp zlib
+package.use : media-gfx/exiv2:0 -contrib -doc -examples -nls static-libs xmp zlib
 
 [media-gfx/feh:0]
-package.use/media-gfx_feh_0 : media-gfx/feh:0 -debug -test curl exif xinerama
+package.use : media-gfx/feh:0 -debug -test curl exif xinerama
 
 [media-gfx/fontforge:0]
-package.use/media-gfx_fontforge_0 : media-gfx/fontforge:0 -cjk -debug -doc -nls -pango -pasteafter -tilepath -truetype -truetype-debugger -type3 X cairo gif jpeg png python svg tiff unicode
-+package.env : media-gfx/fontforge:0 media-gfx_fontforge_0
-env/media-gfx_fontforge_0 : LDFLAGS="-lintl"
+package.use : media-gfx/fontforge:0 -cjk -debug -doc -nls -pango -pasteafter -tilepath -truetype -truetype-debugger -type3 X cairo gif jpeg png python svg tiff unicode
+package.env : media-gfx/fontforge:0 media-gfx_fontforge_0
+env : LDFLAGS="-lintl"
 
 [media-gfx/fotowall:0]
-package.use/media-gfx_fotowall_0 : media-gfx/fotowall:0 -debug -webcam opengl
+package.use : media-gfx/fotowall:0 -debug -webcam opengl
 
 [media-gfx/geeqie:0]
-package.use/media-gfx_geeqie_0 : media-gfx/geeqie:0 -doc -lirc exif jpeg lcms lua tiff xmp
+package.use : media-gfx/geeqie:0 -doc -lirc exif jpeg lcms lua tiff xmp
 
 [media-gfx/gifsicle:0]
-package.use/media-gfx_gifsicle_0 : media-gfx/gifsicle:0 X
+package.use : media-gfx/gifsicle:0 X
 
 [media-gfx/gimageview:0]
-package.use/media-gfx_gimageview_0 : media-gfx/gimageview:0 -mplayer -nls mng svg wmf
+package.use : media-gfx/gimageview:0 -mplayer -nls mng svg wmf
 
 [media-gfx/gimmage:0]
-package.use/media-gfx_gimmage_0 : media-gfx/gimmage:0 -debug
+package.use : media-gfx/gimmage:0 -debug
 
 [media-gfx/gimp:2]
-package.use/media-gfx_gimp_2 : media-gfx/gimp:2 -altivec -aqua -debug -doc -gnome -udev aalib alsa bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse curl dbus exif jpeg jpeg2k lcms mng pdf png postscript python smp svg tiff webkit wmf xpm
+package.use : media-gfx/gimp:2 -altivec -aqua -debug -doc -gnome -udev aalib alsa bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse curl dbus exif jpeg jpeg2k lcms mng pdf png postscript python smp svg tiff webkit wmf xpm
 
 [media-gfx/gliv:0]
-package.use/media-gfx_gliv_0 : media-gfx/gliv:0 -nls
+package.use : media-gfx/gliv:0 -nls
 
 [media-gfx/gphoto2:0]
-package.use/media-gfx_gphoto2_0 : media-gfx/gphoto2:0 -nls aalib exif ncurses readline
+package.use : media-gfx/gphoto2:0 -nls aalib exif ncurses readline
 
 [media-gfx/graphite2:0]
-package.use/media-gfx_graphite2_0 : media-gfx/graphite2:0 -test perl
+package.use : media-gfx/graphite2:0 -test perl
 
 [media-gfx/gthumb:0]
-package.use/media-gfx_gthumb_0 : media-gfx/gthumb:0 -cdr -debug -gstreamer -http -json -libsecret -slideshow -test exif jpeg raw svg tiff webkit webp
+package.use : media-gfx/gthumb:0 -cdr -debug -gstreamer -http -json -libsecret -slideshow -test exif jpeg raw svg tiff webkit webp
 
 [media-gfx/gtkam:0]
-package.use/media-gfx_gtkam_0 : media-gfx/gtkam:0 -debug -gimp -gnome -nls
+package.use : media-gfx/gtkam:0 -debug -gimp -gnome -nls
 
 [media-gfx/imagemagick:0]
-package.use/media-gfx_imagemagick_0 : media-gfx/imagemagick:0 -X -autotrace -bzip2 -corefonts -djvu -fftw -fontconfig -fpx -graphviz -hdri -jbig -jpeg -jpeg2k -lcms -lqr -lzma -opencl -openexr -pango -perl -png -postscript -q32 -q64 -q8 -raw -static-libs -svg -test -tiff -truetype -webp -wmf -xml cxx openmp zlib
+package.use : media-gfx/imagemagick:0 -X -autotrace -bzip2 -corefonts -djvu -fftw -fontconfig -fpx -graphviz -hdri -jbig -jpeg -jpeg2k -lcms -lqr -lzma -opencl -openexr -pango -perl -png -postscript -q32 -q64 -q8 -raw -static-libs -svg -test -tiff -truetype -webp -wmf -xml cxx openmp zlib
 
 [media-gfx/imageworsener:0]
-package.use/media-gfx_imageworsener_0 : media-gfx/imageworsener:0 -test jpeg png static-libs webp zlib
+package.use : media-gfx/imageworsener:0 -test jpeg png static-libs webp zlib
 
 [media-gfx/jp2a:0]
-package.use/media-gfx_jp2a_0 : media-gfx/jp2a:0 curl
+package.use : media-gfx/jp2a:0 curl
 
 [media-gfx/librecad:0]
-package.use/media-gfx_librecad_0 : media-gfx/librecad:0 -debug -doc -tools
+package.use : media-gfx/librecad:0 -debug -doc -tools
 
 [media-gfx/mscgen:0]
-package.use/media-gfx_mscgen_0 : media-gfx/mscgen:0 -truetype png
+package.use : media-gfx/mscgen:0 -truetype png
 
 [media-gfx/openclipart:0]
-package.use/media-gfx_openclipart_0 : media-gfx/openclipart:0 -gzip png svg
+package.use : media-gfx/openclipart:0 -gzip png svg
 
 [media-gfx/openexr_viewers:0]
-package.use/media-gfx_openexr_viewers_0 : media-gfx/openexr_viewers:0 -cg opengl
+package.use : media-gfx/openexr_viewers:0 -cg opengl
 
 [media-gfx/openmesh:0]
-package.use/media-gfx_openmesh_0 : media-gfx/openmesh:0 qt4 static-libs
+package.use : media-gfx/openmesh:0 qt4 static-libs
 
 [media-gfx/peps:0]
-package.use/media-gfx_peps_0 : media-gfx/peps:0 X
+package.use : media-gfx/peps:0 X
 
 [media-gfx/pictureflow:0]
-package.use/media-gfx_pictureflow_0 : media-gfx/pictureflow:0 -debug
+package.use : media-gfx/pictureflow:0 -debug
 
 [media-gfx/picturewall:0]
-package.use/media-gfx_picturewall_0 : media-gfx/picturewall:0 -debug -doc
+package.use : media-gfx/picturewall:0 -debug -doc
 
 [media-gfx/pixie:0]
-package.use/media-gfx_pixie_0 : media-gfx/pixie:0 X static-libs
+package.use : media-gfx/pixie:0 X static-libs
 
 [media-gfx/pngcrush:0]
-package.use/media-gfx_pngcrush_0 : media-gfx/pngcrush:0 system-libs
+package.use : media-gfx/pngcrush:0 system-libs
 
 [media-gfx/pornview:0]
-package.use/media-gfx_pornview_0 : media-gfx/pornview:0 -nls exif
+package.use : media-gfx/pornview:0 -nls exif
 
 [media-gfx/potrace:0]
-package.use/media-gfx_potrace_0 : media-gfx/potrace:0 -metric static-libs
+package.use : media-gfx/potrace:0 -metric static-libs
 
 [media-gfx/povray:0]
-package.use/media-gfx_povray_0 : media-gfx/povray:0 -debug -mkl -test X io-restrictions openexr static-libs tiff
+package.use : media-gfx/povray:0 -debug -mkl -test X io-restrictions openexr static-libs tiff
 
 [media-gfx/pstoedit:0]
-package.use/media-gfx_pstoedit_0 : media-gfx/pstoedit:0 -emf -flash -imagemagick -plotutils -pptx static-libs
+package.use : media-gfx/pstoedit:0 -emf -flash -imagemagick -plotutils -pptx static-libs
 
 [media-gfx/quat:0]
-package.use/media-gfx_quat_0 : media-gfx/quat:0 -debug X
+package.use : media-gfx/quat:0 -debug X
 
 [media-gfx/ristretto:0]
-package.use/media-gfx_ristretto_0 : media-gfx/ristretto:0 -debug
+package.use : media-gfx/ristretto:0 -debug
 
 [media-gfx/sam2p:0]
-package.use/media-gfx_sam2p_0 : media-gfx/sam2p:0 -examples gif
+package.use : media-gfx/sam2p:0 -examples gif
 
 [media-gfx/scantailor:0]
-package.use/media-gfx_scantailor_0 : media-gfx/scantailor:0 -test opengl
+package.use : media-gfx/scantailor:0 -test opengl
 
 [media-gfx/skencil:0]
-package.use/media-gfx_skencil_0 : media-gfx/skencil:0 -nls
+package.use : media-gfx/skencil:0 -nls
 
 [media-gfx/splashutils:0]
-package.use/media-gfx_splashutils_0 : media-gfx/splashutils:0 -fbcondecor -gpm hardened png truetype
+package.use : media-gfx/splashutils:0 -fbcondecor -gpm hardened png truetype
 
 [media-gfx/sxiv:0]
-package.use/media-gfx_sxiv_0 : media-gfx/sxiv:0 -savedconfig
+package.use : media-gfx/sxiv:0 -savedconfig
 
 [media-gfx/tuxpaint:0]
-package.use/media-gfx_tuxpaint_0 : media-gfx/tuxpaint:0 -nls
+package.use : media-gfx/tuxpaint:0 -nls
 
 [media-gfx/wally:4]
-package.use/media-gfx_wally_4 : media-gfx/wally:4 -aqua -debug -kde
+package.use : media-gfx/wally:4 -aqua -debug -kde
 
 [media-gfx/xfig:0]
-package.use/media-gfx_xfig_0 : media-gfx/xfig:0 -nls
+package.use : media-gfx/xfig:0 -nls
 
 [media-gfx/xpaint:0]
-package.use/media-gfx_xpaint_0 : media-gfx/xpaint:0 -pgf jpeg2k tiff
+package.use : media-gfx/xpaint:0 -pgf jpeg2k tiff
 
 [media-gfx/xv:0]
-package.use/media-gfx_xv_0 : media-gfx/xv:0 jpeg png tiff
+package.use : media-gfx/xv:0 jpeg png tiff
 
 [media-gfx/zbar:0]
-package.use/media-gfx_zbar_0 : media-gfx/zbar:0 -imagemagick X gtk jpeg python qt4 static-libs threads v4l xv
+package.use : media-gfx/zbar:0 -imagemagick X gtk jpeg python qt4 static-libs threads v4l xv
 
 [media-libs/a52dec:0]
-package.use/media-libs_a52dec_0 : media-libs/a52dec:0 -djbfft oss static-libs
+package.use : media-libs/a52dec:0 -djbfft oss static-libs
 
 [media-libs/aalib:0]
-package.use/media-libs_aalib_0 : media-libs/aalib:0 -gpm X slang static-libs
+package.use : media-libs/aalib:0 -gpm X slang static-libs
 
 [media-libs/adplug:0]
-package.use/media-libs_adplug_0 : media-libs/adplug:0 -debug static-libs
+package.use : media-libs/adplug:0 -debug static-libs
 
 [media-libs/aldumb:0]
-package.use/media-libs_aldumb_0 : media-libs/aldumb:0 -debug
+package.use : media-libs/aldumb:0 -debug
 
 [media-libs/allegro:0]
-package.use/media-libs_allegro_0 : media-libs/allegro:0 -svga -test -vga X alsa fbcon jack jpeg opengl oss png vorbis
+package.use : media-libs/allegro:0 -svga -test -vga X alsa fbcon jack jpeg opengl oss png vorbis
 
 [media-libs/alsa-lib:0]
-package.use/media-libs_alsa-lib_0 : media-libs/alsa-lib:0 -alisp -debug -doc python
+package.use : media-libs/alsa-lib:0 -alisp -debug -doc python
 
 [media-libs/alure:0]
-package.use/media-libs_alure_0 : media-libs/alure:0 -dumb -examples -fluidsynth -sndfile flac mp3 static-libs vorbis
+package.use : media-libs/alure:0 -dumb -examples -fluidsynth -sndfile flac mp3 static-libs vorbis
 
 [media-libs/audiofile:0]
-package.use/media-libs_audiofile_0 : media-libs/audiofile:0 -test flac static-libs
+package.use : media-libs/audiofile:0 -test flac static-libs
 
 [media-libs/babl:0]
-package.use/media-libs_babl_0 : media-libs/babl:0 -altivec cpu_flags_x86_mmx cpu_flags_x86_sse
+package.use : media-libs/babl:0 -altivec cpu_flags_x86_mmx cpu_flags_x86_sse
 
 [media-libs/blib:0]
-package.use/media-libs_blib_0 : media-libs/blib:0 aalib directfb gtk
+package.use : media-libs/blib:0 aalib directfb gtk
 
 [media-libs/celt:0]
-package.use/media-libs_celt_0 : media-libs/celt:0 ogg static-libs
+package.use : media-libs/celt:0 ogg static-libs
 
 [media-libs/clutter-gst:2.0]
-package.use/media-libs_clutter-gst_2.0 : media-libs/clutter-gst:2.0 -debug -examples introspection
+package.use : media-libs/clutter-gst:2.0 -debug -examples introspection
 
 [media-libs/clutter-gtk:1.0]
-package.use/media-libs_clutter-gtk_1.0 : media-libs/clutter-gtk:1.0 -debug -examples introspection
+package.use : media-libs/clutter-gtk:1.0 -debug -examples introspection
 
 [media-libs/clutter:1.0]
-package.use/media-libs_clutter_1.0 : media-libs/clutter:1.0 -aqua -debug -doc -egl -test -wayland X gtk introspection
+package.use : media-libs/clutter:1.0 -aqua -debug -doc -egl -test -wayland X gtk introspection
 
 [media-libs/cogl:1.0]
-package.use/media-libs_cogl_1.0 : media-libs/cogl:1.0 -debug -examples -gles2 -gstreamer -test -wayland introspection kms opengl pango
+package.use : media-libs/cogl:1.0 -debug -examples -gles2 -gstreamer -test -wayland introspection kms opengl pango
 
 [media-libs/ctl:0]
-package.use/media-libs_ctl_0 : media-libs/ctl:0 static-libs
+package.use : media-libs/ctl:0 static-libs
 
 [media-libs/devil:0]
-package.use/media-libs_devil_0 : media-libs/devil:0 -allegro -cpu_flags_x86_sse3 -glut -nvtt X cpu_flags_x86_sse cpu_flags_x86_sse2 gif jpeg jpeg2k mng openexr opengl png sdl static-libs tiff xpm
+package.use : media-libs/devil:0 -allegro -cpu_flags_x86_sse3 -glut -nvtt X cpu_flags_x86_sse cpu_flags_x86_sse2 gif jpeg jpeg2k mng openexr opengl png sdl static-libs tiff xpm
 
 [media-libs/dssi:0]
-package.use/media-libs_dssi_0 : media-libs/dssi:0 qt4
+package.use : media-libs/dssi:0 qt4
 
 [media-libs/dumb:0]
-package.use/media-libs_dumb_0 : media-libs/dumb:0 -debug
+package.use : media-libs/dumb:0 -debug
 
 [media-libs/exempi:2]
-package.use/media-libs_exempi_2 : media-libs/exempi:2 -examples static-libs
+package.use : media-libs/exempi:2 -examples static-libs
 
 [media-libs/faac:0]
-package.use/media-libs_faac_0 : media-libs/faac:0 static-libs
+package.use : media-libs/faac:0 static-libs
 
 [media-libs/faad2:0]
-package.use/media-libs_faad2_0 : media-libs/faad2:0 -digitalradio static-libs
+package.use : media-libs/faad2:0 -digitalradio static-libs
 
 [media-libs/flac:0]
-package.use/media-libs_flac_0 : media-libs/flac:0 -altivec -debug cpu_flags_x86_sse cxx ogg static-libs
+package.use : media-libs/flac:0 -altivec -debug cpu_flags_x86_sse cxx ogg static-libs
 
 [media-libs/flickcurl:0]
-package.use/media-libs_flickcurl_0 : media-libs/flickcurl:0 -doc -raptor static-libs
+package.use : media-libs/flickcurl:0 -doc -raptor static-libs
 
 [media-libs/fmod:1]
-package.use/media-libs_fmod_1 : media-libs/fmod:1 -examples
+package.use : media-libs/fmod:1 -examples
 
 [media-libs/fontconfig:1.0]
-package.use/media-libs_fontconfig_1.0 : media-libs/fontconfig:1.0 -doc static-libs
+package.use : media-libs/fontconfig:1.0 -doc static-libs
 
 [media-libs/freealut:0]
-package.use/media-libs_freealut_0 : media-libs/freealut:0 static-libs
+package.use : media-libs/freealut:0 static-libs
 
 [media-libs/freeglut:0]
-package.use/media-libs_freeglut_0 : media-libs/freeglut:0 -debug static-libs
+package.use : media-libs/freeglut:0 -debug static-libs
 
 [media-libs/freetype:2]
-package.use/media-libs_freetype_2 : media-libs/freetype:2 -auto-hinter -debug -doc -harfbuzz -infinality X adobe-cff bindist bzip2 fontforge png static-libs utils
+package.use : media-libs/freetype:2 -auto-hinter -debug -doc -harfbuzz -infinality X adobe-cff bindist bzip2 fontforge png static-libs utils
 
 [media-libs/freeverb3:0]
-package.use/media-libs_freeverb3_0 : media-libs/freeverb3:0 -audacious -cpu_flags_x86_3dnow -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -forcefpu -plugdouble cpu_flags_x86_sse cpu_flags_x86_sse2 jack
+package.use : media-libs/freeverb3:0 -audacious -cpu_flags_x86_3dnow -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -forcefpu -plugdouble cpu_flags_x86_sse cpu_flags_x86_sse2 jack
 
 [media-libs/ftgl:0]
-package.use/media-libs_ftgl_0 : media-libs/ftgl:0 static-libs
+package.use : media-libs/ftgl:0 static-libs
 
 [media-libs/gd:2]
-package.use/media-libs_gd_2 : media-libs/gd:2 -truetype fontconfig jpeg png static-libs xpm zlib
-+package.env : media-libs/gd:2 media-libs_gd_2
-env/media-libs_gd_2 : MAKEOPTS="-j1"
+package.use : media-libs/gd:2 -truetype fontconfig jpeg png static-libs xpm zlib
+package.env : media-libs/gd:2 media-libs_gd_2
+env : MAKEOPTS="-j1"
 
 [media-libs/gegl:0]
-package.use/media-libs_gegl_0 : media-libs/gegl:0 -debug -libav -umfpack cairo cpu_flags_x86_mmx cpu_flags_x86_sse ffmpeg jpeg jpeg2k lensfun openexr png raw sdl svg
+package.use : media-libs/gegl:0 -debug -libav -umfpack cairo cpu_flags_x86_mmx cpu_flags_x86_sse ffmpeg jpeg jpeg2k lensfun openexr png raw sdl svg
 
 [media-libs/giflib:0]
-package.use/media-libs_giflib_0 : media-libs/giflib:0 -rle X static-libs
+package.use : media-libs/giflib:0 -rle X static-libs
 
 [media-libs/glew:0]
-package.use/media-libs_glew_0 : media-libs/glew:0 -doc static-libs
+package.use : media-libs/glew:0 -doc static-libs
 
 [media-libs/glu:0]
-package.use/media-libs_glu_0 : media-libs/glu:0 static-libs
+package.use : media-libs/glu:0 static-libs
 
 [media-libs/gmtk:0]
-package.use/media-libs_gmtk_0 : media-libs/gmtk:0 -pulseaudio alsa dconf
+package.use : media-libs/gmtk:0 -pulseaudio alsa dconf
 
 [media-libs/gnonlin:0.10]
-package.use/media-libs_gnonlin_0.10 : media-libs/gnonlin:0.10 -doc -test
+package.use : media-libs/gnonlin:0.10 -doc -test
 
 [media-libs/gnonlin:1.0]
-package.use/media-libs_gnonlin_1.0 : media-libs/gnonlin:1.0 -nls -test
+package.use : media-libs/gnonlin:1.0 -nls -test
 
 [media-libs/gst-plugins-bad:0.10]
-package.use/media-libs_gst-plugins-bad_0.10 : media-libs/gst-plugins-bad:0.10 -nls -orc
+package.use : media-libs/gst-plugins-bad:0.10 -nls -orc
 
 [media-libs/gst-plugins-bad:1.0]
-package.use/media-libs_gst-plugins-bad_1.0 : media-libs/gst-plugins-bad:1.0 -egl -gles2 -nls -orc -vnc -wayland X introspection opengl
+package.use : media-libs/gst-plugins-bad:1.0 -egl -gles2 -nls -orc -vnc -wayland X introspection opengl
 
 [media-libs/gst-plugins-base:0.10]
-package.use/media-libs_gst-plugins-base_0.10 : media-libs/gst-plugins-base:0.10 -nls -orc introspection
+package.use : media-libs/gst-plugins-base:0.10 -nls -orc introspection
 
 [media-libs/gst-plugins-base:1.0]
-package.use/media-libs_gst-plugins-base_1.0 : media-libs/gst-plugins-base:1.0 -ivorbis -nls -orc X alsa introspection ogg pango theora vorbis
+package.use : media-libs/gst-plugins-base:1.0 -ivorbis -nls -orc X alsa introspection ogg pango theora vorbis
 
 [media-libs/gst-plugins-good:0.10]
-package.use/media-libs_gst-plugins-good_0.10 : media-libs/gst-plugins-good:0.10 -nls -orc
+package.use : media-libs/gst-plugins-good:0.10 -nls -orc
 
 [media-libs/gst-plugins-good:1.0]
-package.use/media-libs_gst-plugins-good_1.0 : media-libs/gst-plugins-good:1.0 -nls -orc
+package.use : media-libs/gst-plugins-good:1.0 -nls -orc
 
 [media-libs/gst-plugins-ugly:0.10]
-package.use/media-libs_gst-plugins-ugly_0.10 : media-libs/gst-plugins-ugly:0.10 -nls -orc
+package.use : media-libs/gst-plugins-ugly:0.10 -nls -orc
 
 [media-libs/gst-plugins-ugly:1.0]
-package.use/media-libs_gst-plugins-ugly_1.0 : media-libs/gst-plugins-ugly:1.0 -nls -orc
+package.use : media-libs/gst-plugins-ugly:1.0 -nls -orc
 
 [media-libs/gst-rtsp-server:0.10]
-package.use/media-libs_gst-rtsp-server_0.10 : media-libs/gst-rtsp-server:0.10 -examples -nls -test introspection python static-libs vala
+package.use : media-libs/gst-rtsp-server:0.10 -examples -nls -test introspection python static-libs vala
 
 [media-libs/gstreamer-editing-services:1.0]
-package.use/media-libs_gstreamer-editing-services_1.0 : media-libs/gstreamer-editing-services:1.0 introspection
+package.use : media-libs/gstreamer-editing-services:1.0 introspection
 
 [media-libs/gstreamer:0.10]
-package.use/media-libs_gstreamer_0.10 : media-libs/gstreamer:0.10 -nls -orc -test introspection
+package.use : media-libs/gstreamer:0.10 -nls -orc -test introspection
 
 [media-libs/gstreamer:1.0]
-package.use/media-libs_gstreamer_1.0 : media-libs/gstreamer:1.0 -nls -orc -test introspection
+package.use : media-libs/gstreamer:1.0 -nls -orc -test introspection
 
 [media-libs/guilib:0]
-package.use/media-libs_guilib_0 : media-libs/guilib:0 static-libs
+package.use : media-libs/guilib:0 static-libs
 
 [media-libs/harfbuzz:0]
-package.use/media-libs_harfbuzz_0 : media-libs/harfbuzz:0 -test cairo glib graphite icu introspection static-libs truetype
+package.use : media-libs/harfbuzz:0 -test cairo glib graphite icu introspection static-libs truetype
 
 [media-libs/id3lib:0]
-package.use/media-libs_id3lib_0 : media-libs/id3lib:0 -doc static-libs
+package.use : media-libs/id3lib:0 -doc static-libs
 
 [media-libs/ilmbase:0]
-package.use/media-libs_ilmbase_0 : media-libs/ilmbase:0 static-libs
+package.use : media-libs/ilmbase:0 static-libs
 
 [media-libs/imlib2:0]
-package.use/media-libs_imlib2_0 : media-libs/imlib2:0 -doc -nls X bzip2 cpu_flags_x86_mmx gif jpeg mp3 png static-libs tiff zlib
+package.use : media-libs/imlib2:0 -doc -nls X bzip2 cpu_flags_x86_mmx gif jpeg mp3 png static-libs tiff zlib
 
 [media-libs/imlib:0]
-package.use/media-libs_imlib_0 : media-libs/imlib:0 -doc static-libs
+package.use : media-libs/imlib:0 -doc static-libs
 
 [media-libs/iulib:0]
-package.use/media-libs_iulib_0 : media-libs/iulib:0 sdl
+package.use : media-libs/iulib:0 sdl
 
 [media-libs/jasper:0]
-package.use/media-libs_jasper_0 : media-libs/jasper:0 jpeg opengl static-libs
+package.use : media-libs/jasper:0 jpeg opengl static-libs
 
 [media-libs/jbig2dec:0]
-package.use/media-libs_jbig2dec_0 : media-libs/jbig2dec:0 -test png static-libs
+package.use : media-libs/jbig2dec:0 -test png static-libs
 
 [media-libs/jbig2enc:0]
-package.use/media-libs_jbig2enc_0 : media-libs/jbig2enc:0 gif jpeg png static-libs tiff webp
+package.use : media-libs/jbig2enc:0 gif jpeg png static-libs tiff webp
 
 [media-libs/jbigkit:0]
-package.use/media-libs_jbigkit_0 : media-libs/jbigkit:0 static-libs
+package.use : media-libs/jbigkit:0 static-libs
 
 [media-libs/lcms:2]
-package.use/media-libs_lcms_2 : media-libs/lcms:2 -doc -test jpeg static-libs threads tiff zlib
+package.use : media-libs/lcms:2 -doc -test jpeg static-libs threads tiff zlib
 
 [media-libs/lensfun:0]
-package.use/media-libs_lensfun_0 : media-libs/lensfun:0 -doc cpu_flags_x86_sse cpu_flags_x86_sse2
+package.use : media-libs/lensfun:0 -doc cpu_flags_x86_sse cpu_flags_x86_sse2
 
 [media-libs/leptonica:0]
-package.use/media-libs_leptonica_0 : media-libs/leptonica:0 -test gif jpeg jpeg2k png static-libs tiff utils webp zlib
+package.use : media-libs/leptonica:0 -test gif jpeg jpeg2k png static-libs tiff utils webp zlib
 
 [media-libs/libaacplus:0]
-package.use/media-libs_libaacplus_0 : media-libs/libaacplus:0 -fftw static-libs
+package.use : media-libs/libaacplus:0 -fftw static-libs
 
 [media-libs/libao:0]
-package.use/media-libs_libao_0 : media-libs/libao:0 -mmap -pulseaudio alsa nas static-libs
+package.use : media-libs/libao:0 -mmap -pulseaudio alsa nas static-libs
 
 [media-libs/libass:0]
-package.use/media-libs_libass_0 : media-libs/libass:0 enca fontconfig harfbuzz static-libs
+package.use : media-libs/libass:0 enca fontconfig harfbuzz static-libs
 
 [media-libs/libbluray:0]
-package.use/media-libs_libbluray_0 : media-libs/libbluray:0 -aacs -java static-libs truetype utils xml
+package.use : media-libs/libbluray:0 -aacs -java static-libs truetype utils xml
 
 [media-libs/libcaca:0]
-package.use/media-libs_libcaca_0 : media-libs/libcaca:0 -doc -java -mono -ruby -test -truetype X cxx imlib ncurses opengl python slang static-libs
+package.use : media-libs/libcaca:0 -doc -java -mono -ruby -test -truetype X cxx imlib ncurses opengl python slang static-libs
 
 [media-libs/libcanberra:0]
-package.use/media-libs_libcanberra_0 : media-libs/libcanberra:0 -gnome -gstreamer -pulseaudio -tdb -udev alsa gtk gtk3 oss sound
+package.use : media-libs/libcanberra:0 -gnome -gstreamer -pulseaudio -tdb -udev alsa gtk gtk3 oss sound
 
 [media-libs/libcddb:0]
-package.use/media-libs_libcddb_0 : media-libs/libcddb:0 -doc static-libs
+package.use : media-libs/libcddb:0 -doc static-libs
 
 [media-libs/libdc1394:2]
-package.use/media-libs_libdc1394_2 : media-libs/libdc1394:2 -doc X static-libs
+package.use : media-libs/libdc1394:2 -doc X static-libs
 
 [media-libs/libdca:0]
-package.use/media-libs_libdca_0 : media-libs/libdca:0 -debug oss static-libs
+package.use : media-libs/libdca:0 -debug oss static-libs
 
 [media-libs/libdiscid:0]
-package.use/media-libs_libdiscid_0 : media-libs/libdiscid:0 static-libs
+package.use : media-libs/libdiscid:0 static-libs
 
 [media-libs/libdv:0]
-package.use/media-libs_libdv_0 : media-libs/libdv:0 static-libs
+package.use : media-libs/libdv:0 static-libs
 
 [media-libs/libdvdcss:1.2]
-package.use/media-libs_libdvdcss_1.2 : media-libs/libdvdcss:1.2 -doc static-libs
+package.use : media-libs/libdvdcss:1.2 -doc static-libs
 
 [media-libs/libdvdnav:0]
-package.use/media-libs_libdvdnav_0 : media-libs/libdvdnav:0 static-libs
+package.use : media-libs/libdvdnav:0 static-libs
 
 [media-libs/libdvdread:0]
-package.use/media-libs_libdvdread_0 : media-libs/libdvdread:0 css static-libs
+package.use : media-libs/libdvdread:0 css static-libs
 
 [media-libs/libexif-gtk:0]
-package.use/media-libs_libexif-gtk_0 : media-libs/libexif-gtk:0 -nls static-libs
+package.use : media-libs/libexif-gtk:0 -nls static-libs
 
 [media-libs/libexif:0]
-package.use/media-libs_libexif_0 : media-libs/libexif:0 -doc -nls static-libs
+package.use : media-libs/libexif:0 -doc -nls static-libs
 
 [media-libs/libextractor:0]
-package.use/media-libs_libextractor_0 : media-libs/libextractor:0 -gsf -midi -mp4 -tidy archive bzip2 ffmpeg flac gif gtk jpeg magic mpeg tiff vorbis zlib
+package.use : media-libs/libextractor:0 -gsf -midi -mp4 -tidy archive bzip2 ffmpeg flac gif gtk jpeg magic mpeg tiff vorbis zlib
 
 [media-libs/libfishsound:0]
-package.use/media-libs_libfishsound_0 : media-libs/libfishsound:0 flac speex
+package.use : media-libs/libfishsound:0 flac speex
 
 [media-libs/libggi:0]
-package.use/media-libs_libggi_0 : media-libs/libggi:0 -debug -svga -vis 3dfx X aalib cpu_flags_x86_mmx directfb fbcon
+package.use : media-libs/libggi:0 -debug -svga -vis 3dfx X aalib cpu_flags_x86_mmx directfb fbcon
 
 [media-libs/libggimisc:0]
-package.use/media-libs_libggimisc_0 : media-libs/libggimisc:0 -svga fbcon
+package.use : media-libs/libggimisc:0 -svga fbcon
 
 [media-libs/libggiwmh:0]
-package.use/media-libs_libggiwmh_0 : media-libs/libggiwmh:0 X
+package.use : media-libs/libggiwmh:0 X
 
 [media-libs/libgig:0]
-package.use/media-libs_libgig_0 : media-libs/libgig:0 -doc
+package.use : media-libs/libgig:0 -doc
 
 [media-libs/libgii:0]
-package.use/media-libs_libgii_0 : media-libs/libgii:0 X
+package.use : media-libs/libgii:0 X
 
 [media-libs/libgphoto2:0]
-package.use/media-libs_libgphoto2_0 : media-libs/libgphoto2:0 -cameras_adc65 -cameras_agfa_cl20 -cameras_aox -cameras_ax203 -cameras_barbie -cameras_canon -cameras_casio_qv -cameras_clicksmart310 -cameras_digigr8 -cameras_digita -cameras_dimagev -cameras_dimera3500 -cameras_directory -cameras_enigma13 -cameras_fuji -cameras_gsmart300 -cameras_hp215 -cameras_iclick -cameras_jamcam -cameras_jd11 -cameras_jl2005a -cameras_jl2005c -cameras_kodak_dc120 -cameras_kodak_dc210 -cameras_kodak_dc240 -cameras_kodak_dc3200 -cameras_kodak_ez200 -cameras_konica -cameras_konica_qm150 -cameras_largan -cameras_lg_gsm -cameras_mars -cameras_mustek -cameras_panasonic_coolshot -cameras_panasonic_dc1000 -cameras_panasonic_dc1580 -cameras_panasonic_l859 -cameras_pccam300 -cameras_pccam600 -cameras_pentax -cameras_polaroid_pdc320 -cameras_polaroid_pdc640 -cameras_polaroid_pdc700 -cameras_ricoh -cameras_ricoh_g3 -cameras_samsung -cameras_sierra -cameras_sipix_blink2 -cameras_sipix_web2 -cameras_smal -camera
 s_sonix -cameras_sony_dscf1 -cameras_sony_dscf55 -cameras_soundvision -cameras_spca50x -cameras_sq905 -cameras_st2205 -cameras_stv0674 -cameras_stv0680 -cameras_sx330z -cameras_topfield -cameras_toshiba_pdrm11 -cameras_tp6801 -doc -examples -gd -nls -serial cameras_ptp2 exif jpeg zeroconf
+package.use : media-libs/libgphoto2:0 -cameras_adc65 -cameras_agfa_cl20 -cameras_aox -cameras_ax203 -cameras_barbie -cameras_canon -cameras_casio_qv -cameras_clicksmart310 -cameras_digigr8 -cameras_digita -cameras_dimagev -cameras_dimera3500 -cameras_directory -cameras_enigma13 -cameras_fuji -cameras_gsmart300 -cameras_hp215 -cameras_iclick -cameras_jamcam -cameras_jd11 -cameras_jl2005a -cameras_jl2005c -cameras_kodak_dc120 -cameras_kodak_dc210 -cameras_kodak_dc240 -cameras_kodak_dc3200 -cameras_kodak_ez200 -cameras_konica -cameras_konica_qm150 -cameras_largan -cameras_lg_gsm -cameras_mars -cameras_mustek -cameras_panasonic_coolshot -cameras_panasonic_dc1000 -cameras_panasonic_dc1580 -cameras_panasonic_l859 -cameras_pccam300 -cameras_pccam600 -cameras_pentax -cameras_polaroid_pdc320 -cameras_polaroid_pdc640 -cameras_polaroid_pdc700 -cameras_ricoh -cameras_ricoh_g3 -cameras_samsung -cameras_sierra -cameras_sipix_blink2 -cameras_sipix_web2 -cameras_smal -cameras_sonix -cameras_sony_ds
 cf1 -cameras_sony_dscf55 -cameras_soundvision -cameras_spca50x -cameras_sq905 -cameras_st2205 -cameras_stv0674 -cameras_stv0680 -cameras_sx330z -cameras_topfield -cameras_toshiba_pdrm11 -cameras_tp6801 -doc -examples -gd -nls -serial cameras_ptp2 exif jpeg zeroconf
 
 [media-libs/libharu:0]
-package.use/media-libs_libharu_0 : media-libs/libharu:0 png static-libs zlib
+package.use : media-libs/libharu:0 png static-libs zlib
 
 [media-libs/libid3tag:0]
-package.use/media-libs_libid3tag_0 : media-libs/libid3tag:0 -debug static-libs
+package.use : media-libs/libid3tag:0 -debug static-libs
 
 [media-libs/libiec61883:0]
-package.use/media-libs_libiec61883_0 : media-libs/libiec61883:0 -examples static-libs
+package.use : media-libs/libiec61883:0 -examples static-libs
 
 [media-libs/libirman:0]
-package.use/media-libs_libirman_0 : media-libs/libirman:0 static-libs
+package.use : media-libs/libirman:0 static-libs
 
 [media-libs/libjackasyn:0]
-package.use/media-libs_libjackasyn_0 : media-libs/libjackasyn:0 -debug
+package.use : media-libs/libjackasyn:0 -debug
 
 [media-libs/libjpeg-turbo:0]
-package.use/media-libs_libjpeg-turbo_0 : media-libs/libjpeg-turbo:0 -java static-libs
+package.use : media-libs/libjpeg-turbo:0 -java static-libs
 
 [media-libs/liblingoteach:0]
-package.use/media-libs_liblingoteach_0 : media-libs/liblingoteach:0 -debug zlib
+package.use : media-libs/liblingoteach:0 -debug zlib
 
 [media-libs/liblo:0]
-package.use/media-libs_liblo_0 : media-libs/liblo:0 -doc ipv6 static-libs
+package.use : media-libs/liblo:0 -doc ipv6 static-libs
 
 [media-libs/liblrdf:0]
-package.use/media-libs_liblrdf_0 : media-libs/liblrdf:0 static-libs
+package.use : media-libs/liblrdf:0 static-libs
 
 [media-libs/liblscp:0]
-package.use/media-libs_liblscp_0 : media-libs/liblscp:0 -doc
+package.use : media-libs/liblscp:0 -doc
 
 [media-libs/libmad:0]
-package.use/media-libs_libmad_0 : media-libs/libmad:0 -debug static-libs
+package.use : media-libs/libmad:0 -debug static-libs
 
 [media-libs/libmediainfo:0]
-package.use/media-libs_libmediainfo_0 : media-libs/libmediainfo:0 -doc curl mms static-libs
+package.use : media-libs/libmediainfo:0 -doc curl mms static-libs
 
 [media-libs/libmikmod:0]
-package.use/media-libs_libmikmod_0 : media-libs/libmikmod:0 -altivec -coreaudio -debug -pulseaudio alsa cpu_flags_x86_sse2 nas openal oss static-libs threads
+package.use : media-libs/libmikmod:0 -altivec -coreaudio -debug -pulseaudio alsa cpu_flags_x86_sse2 nas openal oss static-libs threads
 
 [media-libs/libmms:0]
-package.use/media-libs_libmms_0 : media-libs/libmms:0 static-libs
+package.use : media-libs/libmms:0 static-libs
 
 [media-libs/libmng:0]
-package.use/media-libs_libmng_0 : media-libs/libmng:0 lcms static-libs
+package.use : media-libs/libmng:0 lcms static-libs
 
 [media-libs/libmodplug:0]
-package.use/media-libs_libmodplug_0 : media-libs/libmodplug:0 static-libs
+package.use : media-libs/libmodplug:0 static-libs
 
 [media-libs/libmp4v2:0]
-package.use/media-libs_libmp4v2_0 : media-libs/libmp4v2:0 -test static-libs utils
+package.use : media-libs/libmp4v2:0 -test static-libs utils
 
 [media-libs/libmpd:0]
-package.use/media-libs_libmpd_0 : media-libs/libmpd:0 -doc static-libs
+package.use : media-libs/libmpd:0 -doc static-libs
 
 [media-libs/libmpdclient:0]
-package.use/media-libs_libmpdclient_0 : media-libs/libmpdclient:0 -doc -examples static-libs
+package.use : media-libs/libmpdclient:0 -doc -examples static-libs
 
 [media-libs/libmpeg2:0]
-package.use/media-libs_libmpeg2_0 : media-libs/libmpeg2:0 X sdl static-libs
+package.use : media-libs/libmpeg2:0 X sdl static-libs
 
 [media-libs/libmtp:0]
-package.use/media-libs_libmtp_0 : media-libs/libmtp:0 -doc -examples crypt static-libs
+package.use : media-libs/libmtp:0 -doc -examples crypt static-libs
 
 [media-libs/libnjb:0]
-package.use/media-libs_libnjb_0 : media-libs/libnjb:0 static-libs
+package.use : media-libs/libnjb:0 static-libs
 
 [media-libs/libogg:0]
-package.use/media-libs_libogg_0 : media-libs/libogg:0 static-libs
+package.use : media-libs/libogg:0 static-libs
 
 [media-libs/liboggz:0]
-package.use/media-libs_liboggz_0 : media-libs/liboggz:0 -doc -test static-libs
+package.use : media-libs/liboggz:0 -doc -test static-libs
 
 [media-libs/libopenraw:0]
-package.use/media-libs_libopenraw_0 : media-libs/libopenraw:0 -test gtk static-libs
+package.use : media-libs/libopenraw:0 -test gtk static-libs
 
 [media-libs/libpng:0]
-package.use/media-libs_libpng_0 : media-libs/libpng:0 -neon apng static-libs
+package.use : media-libs/libpng:0 -neon apng static-libs
 
 [media-libs/libquicktime:0]
-package.use/media-libs_libquicktime_0 : media-libs/libquicktime:0 -doc -x264 X aac alsa cpu_flags_x86_mmx dv encode ffmpeg gtk jpeg lame opengl png schroedinger static-libs vorbis
-+package.env : media-libs/libquicktime:0 media-libs_libquicktime_0
-env/media-libs_libquicktime_0 : LDFLAGS="-lintl"
+package.use : media-libs/libquicktime:0 -doc -x264 X aac alsa cpu_flags_x86_mmx dv encode ffmpeg gtk jpeg lame opengl png schroedinger static-libs vorbis
+package.env : media-libs/libquicktime:0 media-libs_libquicktime_0
+env : LDFLAGS="-lintl"
 
 [media-libs/libquvi-scripts:0]
-package.use/media-libs_libquvi-scripts_0 : media-libs/libquvi-scripts:0 -offensive
+package.use : media-libs/libquvi-scripts:0 -offensive
 
 [media-libs/libquvi-scripts:0.4]
-package.use/media-libs_libquvi-scripts_0.4 : media-libs/libquvi-scripts:0.4 -offensive
+package.use : media-libs/libquvi-scripts:0.4 -offensive
 
 [media-libs/libquvi:0]
-package.use/media-libs_libquvi_0 : media-libs/libquvi:0 -examples -nls static-libs
+package.use : media-libs/libquvi:0 -examples -nls static-libs
 
 [media-libs/libquvi:0.4]
-package.use/media-libs_libquvi_0.4 : media-libs/libquvi:0.4 -examples static-libs
+package.use : media-libs/libquvi:0.4 -examples static-libs
 
 [media-libs/libsamplerate:0]
-package.use/media-libs_libsamplerate_0 : media-libs/libsamplerate:0 -sndfile static-libs
+package.use : media-libs/libsamplerate:0 -sndfile static-libs
 
 [media-libs/libsdl2:0]
-package.use/media-libs_libsdl2_0 : media-libs/libsdl2:0 -altivec -cpu_flags_x86_3dnow -custom-cflags -fusionsound -gles -haptic -pulseaudio -tslib -udev -wayland X alsa cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dbus joystick nas opengl oss sound static-libs threads video xinerama xscreensaver
+package.use : media-libs/libsdl2:0 -altivec -cpu_flags_x86_3dnow -custom-cflags -fusionsound -gles -haptic -pulseaudio -tslib -udev -wayland X alsa cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dbus joystick nas opengl oss sound static-libs threads video xinerama xscreensaver
 
 [media-libs/libsdl:0]
-package.use/media-libs_libsdl_0 : media-libs/libsdl:0 -custom-cflags -pulseaudio -tslib X aalib alsa dga fbcon joystick libcaca nas opengl oss sound static-libs video xinerama xv
+package.use : media-libs/libsdl:0 -custom-cflags -pulseaudio -tslib X aalib alsa dga fbcon joystick libcaca nas opengl oss sound static-libs video xinerama xv
 
 [media-libs/libshout:0]
-package.use/media-libs_libshout_0 : media-libs/libshout:0 speex static-libs theora
+package.use : media-libs/libshout:0 speex static-libs theora
 
 [media-libs/libsidplay:1]
-package.use/media-libs_libsidplay_1 : media-libs/libsidplay:1 static-libs
+package.use : media-libs/libsidplay:1 static-libs
 
 [media-libs/libsndfile:0]
-package.use/media-libs_libsndfile_0 : media-libs/libsndfile:0 -minimal -test alsa sqlite static-libs
+package.use : media-libs/libsndfile:0 -minimal -test alsa sqlite static-libs
 
 [media-libs/libsoundtouch:0]
-package.use/media-libs_libsoundtouch_0 : media-libs/libsoundtouch:0 cpu_flags_x86_sse2 static-libs
+package.use : media-libs/libsoundtouch:0 cpu_flags_x86_sse2 static-libs
 
 [media-libs/libtheora:0]
-package.use/media-libs_libtheora_0 : media-libs/libtheora:0 -doc -examples encode static-libs
+package.use : media-libs/libtheora:0 -doc -examples encode static-libs
 
 [media-libs/libv4l:0]
-package.use/media-libs_libv4l_0 : media-libs/libv4l:0 -jpeg
+package.use : media-libs/libv4l:0 -jpeg
 
 [media-libs/libvisual:0.4]
-package.use/media-libs_libvisual_0.4 : media-libs/libvisual:0.4 -debug -nls static-libs threads
+package.use : media-libs/libvisual:0.4 -debug -nls static-libs threads
 
 [media-libs/libvorbis:0]
-package.use/media-libs_libvorbis_0 : media-libs/libvorbis:0 static-libs
+package.use : media-libs/libvorbis:0 static-libs
 
 [media-libs/libvpx:0]
-package.use/media-libs_libvpx_0 : media-libs/libvpx:0 -altivec -cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -cpu_flags_x86_ssse3 -doc -test cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 postproc static-libs threads
+package.use : media-libs/libvpx:0 -altivec -cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -cpu_flags_x86_ssse3 -doc -test cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 postproc static-libs threads
 
 [media-libs/libwebp:0]
-package.use/media-libs_libwebp_0 : media-libs/libwebp:0 -experimental -swap-16bit-csp gif jpeg opengl png static-libs tiff
+package.use : media-libs/libwebp:0 -experimental -swap-16bit-csp gif jpeg opengl png static-libs tiff
 
 [media-libs/libwmf:0]
-package.use/media-libs_libwmf_0 : media-libs/libwmf:0 -debug -doc -expat X xml
+package.use : media-libs/libwmf:0 -debug -doc -expat X xml
 
 [media-libs/libxtract:0]
-package.use/media-libs_libxtract_0 : media-libs/libxtract:0 -doc -fftw static-libs
+package.use : media-libs/libxtract:0 -doc -fftw static-libs
 
 [media-libs/libzen:0]
-package.use/media-libs_libzen_0 : media-libs/libzen:0 -doc static-libs
+package.use : media-libs/libzen:0 -doc static-libs
 
 [media-libs/mash:0.2]
-package.use/media-libs_mash_0.2 : media-libs/mash:0.2 -doc -examples introspection
+package.use : media-libs/mash:0.2 -doc -examples introspection
 
 [media-libs/mesa:0]
-package.use/media-libs_mesa_0 : media-libs/mesa:0 -debug -gles1 -gles2 -llvm -opencl -openmax -openvg -osmesa -selinux -vdpau -video_cards_freedreno -video_cards_i915 -video_cards_i965 -video_cards_ilo -video_cards_r100 -video_cards_r200 -video_cards_r300 -video_cards_r600 -video_cards_radeonsi -video_cards_vmware -wayland -xa bindist classic dri3 egl gallium gbm nptl pax_kernel pic udev video_cards_intel video_cards_nouveau video_cards_radeon xvmc
+package.use : media-libs/mesa:0 -debug -gles1 -gles2 -llvm -opencl -openmax -openvg -osmesa -selinux -vdpau -video_cards_freedreno -video_cards_i915 -video_cards_i965 -video_cards_ilo -video_cards_r100 -video_cards_r200 -video_cards_r300 -video_cards_r600 -video_cards_radeonsi -video_cards_vmware -wayland -xa bindist classic dri3 egl gallium gbm nptl pax_kernel pic udev video_cards_intel video_cards_nouveau video_cards_radeon xvmc
 
 [media-libs/musicbrainz:3]
-package.use/media-libs_musicbrainz_3 : media-libs/musicbrainz:3 -test
+package.use : media-libs/musicbrainz:3 -test
 
 [media-libs/mutagen:0]
-package.use/media-libs_mutagen_0 : media-libs/mutagen:0 -doc -test
+package.use : media-libs/mutagen:0 -doc -test
 
 [media-libs/nas:0]
-package.use/media-libs_nas_0 : media-libs/nas:0 -doc static-libs
-package.accept_keywords/media-libs_nas_0 : >=media-libs/nas-1.9.4-r1 ~amd64
+package.use : media-libs/nas:0 -doc static-libs
+package.accept_keywords : >=media-libs/nas-1.9.4-r1 ~amd64
 
 [media-libs/netpbm:0]
-package.use/media-libs_netpbm_0 : media-libs/netpbm:0 -doc -rle -svga X cpu_flags_x86_sse2 jbig jpeg jpeg2k png static-libs tiff xml zlib
+package.use : media-libs/netpbm:0 -doc -rle -svga X cpu_flags_x86_sse2 jbig jpeg jpeg2k png static-libs tiff xml zlib
 
 [media-libs/openal:0]
-package.use/media-libs_openal_0 : media-libs/openal:0 -coreaudio -debug -neon -pulseaudio alsa cpu_flags_x86_sse oss portaudio
+package.use : media-libs/openal:0 -coreaudio -debug -neon -pulseaudio alsa cpu_flags_x86_sse oss portaudio
 
 [media-libs/opencore-amr:0]
-package.use/media-libs_opencore-amr_0 : media-libs/opencore-amr:0 static-libs
+package.use : media-libs/opencore-amr:0 static-libs
 
 [media-libs/openexr:0]
-package.use/media-libs_openexr_0 : media-libs/openexr:0 -examples static-libs
+package.use : media-libs/openexr:0 -examples static-libs
 
 [media-libs/openexr_ctl:0]
-package.use/media-libs_openexr_ctl_0 : media-libs/openexr_ctl:0 static-libs
+package.use : media-libs/openexr_ctl:0 static-libs
 
 [media-libs/openjpeg:0]
-package.use/media-libs_openjpeg_0 : media-libs/openjpeg:0 -doc -test static-libs
+package.use : media-libs/openjpeg:0 -doc -test static-libs
 
 [media-libs/openjpeg:2]
-package.use/media-libs_openjpeg_2 : media-libs/openjpeg:2 -doc -test static-libs
+package.use : media-libs/openjpeg:2 -doc -test static-libs
 
 [media-libs/opus:0]
-package.use/media-libs_opus_0 : media-libs/opus:0 -custom-modes -doc static-libs
+package.use : media-libs/opus:0 -custom-modes -doc static-libs
 
 [media-libs/phat:0]
-package.use/media-libs_phat_0 : media-libs/phat:0 -debug
+package.use : media-libs/phat:0 -debug
 
 [media-libs/pnglite:0]
-package.use/media-libs_pnglite_0 : media-libs/pnglite:0 static-libs
+package.use : media-libs/pnglite:0 static-libs
 
 [media-libs/portaudio:0]
-package.use/media-libs_portaudio_0 : media-libs/portaudio:0 -debug alsa cxx jack oss static-libs
+package.use : media-libs/portaudio:0 -debug alsa cxx jack oss static-libs
 
 [media-libs/portmidi:0]
-package.use/media-libs_portmidi_0 : media-libs/portmidi:0 -debug -doc -java -test-programs python static-libs
+package.use : media-libs/portmidi:0 -debug -doc -java -test-programs python static-libs
 
 [media-libs/quesoglc:0]
-package.use/media-libs_quesoglc_0 : media-libs/quesoglc:0 -doc -examples static-libs
+package.use : media-libs/quesoglc:0 -doc -examples static-libs
 
 [media-libs/quvi:0]
-package.use/media-libs_quvi_0 : media-libs/quvi:0 -json -nls xml
+package.use : media-libs/quvi:0 -json -nls xml
 
 [media-libs/raptor:2]
-package.use/media-libs_raptor_2 : media-libs/raptor:2 -debug -json curl static-libs unicode
+package.use : media-libs/raptor:2 -debug -json curl static-libs unicode
 
 [media-libs/sampleicc:0]
-package.use/media-libs_sampleicc_0 : media-libs/sampleicc:0 static-libs
+package.use : media-libs/sampleicc:0 static-libs
 
 [media-libs/schroedinger:0]
-package.use/media-libs_schroedinger_0 : media-libs/schroedinger:0 static-libs
+package.use : media-libs/schroedinger:0 static-libs
 
 [media-libs/sdif:0]
-package.use/media-libs_sdif_0 : media-libs/sdif:0 -debug -doc -ftruncate threads
+package.use : media-libs/sdif:0 -debug -doc -ftruncate threads
 
 [media-libs/sdl-gfx:0]
-package.use/media-libs_sdl-gfx_0 : media-libs/sdl-gfx:0 -doc cpu_flags_x86_mmx static-libs
+package.use : media-libs/sdl-gfx:0 -doc cpu_flags_x86_mmx static-libs
 
 [media-libs/sdl-image:0]
-package.use/media-libs_sdl-image_0 : media-libs/sdl-image:0 gif jpeg png static-libs tiff webp
+package.use : media-libs/sdl-image:0 gif jpeg png static-libs tiff webp
 
 [media-libs/sdl-mixer:0]
-package.use/media-libs_sdl-mixer_0 : media-libs/sdl-mixer:0 -fluidsynth -midi -mikmod -playtools -smpeg -timidity flac mad mod modplug mp3 static-libs vorbis wav
+package.use : media-libs/sdl-mixer:0 -fluidsynth -midi -mikmod -playtools -smpeg -timidity flac mad mod modplug mp3 static-libs vorbis wav
 
 [media-libs/sdl-net:0]
-package.use/media-libs_sdl-net_0 : media-libs/sdl-net:0 static-libs
+package.use : media-libs/sdl-net:0 static-libs
 
 [media-libs/sdl-pango:0]
-package.use/media-libs_sdl-pango_0 : media-libs/sdl-pango:0 static-libs
+package.use : media-libs/sdl-pango:0 static-libs
 
 [media-libs/sdl-sound:0]
-package.use/media-libs_sdl-sound_0 : media-libs/sdl-sound:0 -mikmod -physfs flac modplug mp3 mpeg speex static-libs vorbis
+package.use : media-libs/sdl-sound:0 -mikmod -physfs flac modplug mp3 mpeg speex static-libs vorbis
 
 [media-libs/sdl-terminal:0]
-package.use/media-libs_sdl-terminal_0 : media-libs/sdl-terminal:0 static-libs
+package.use : media-libs/sdl-terminal:0 static-libs
 
 [media-libs/sdl-ttf:0]
-package.use/media-libs_sdl-ttf_0 : media-libs/sdl-ttf:0 X static-libs
+package.use : media-libs/sdl-ttf:0 X static-libs
 
 [media-libs/sdl2-image:0]
-package.use/media-libs_sdl2-image_0 : media-libs/sdl2-image:0 gif jpeg png static-libs tiff webp
+package.use : media-libs/sdl2-image:0 gif jpeg png static-libs tiff webp
 
 [media-libs/sdl2-mixer:0]
-package.use/media-libs_sdl2-mixer_0 : media-libs/sdl2-mixer:0 -fluidsynth -midi -mikmod -playtools -smpeg -timidity -tremor flac mad mod modplug mp3 static-libs vorbis wav
+package.use : media-libs/sdl2-mixer:0 -fluidsynth -midi -mikmod -playtools -smpeg -timidity -tremor flac mad mod modplug mp3 static-libs vorbis wav
 
 [media-libs/sdl2-ttf:0]
-package.use/media-libs_sdl2-ttf_0 : media-libs/sdl2-ttf:0 X static-libs
+package.use : media-libs/sdl2-ttf:0 X static-libs
 
 [media-libs/smpeg:0]
-package.use/media-libs_smpeg_0 : media-libs/smpeg:0 -debug X cpu_flags_x86_mmx opengl static-libs
+package.use : media-libs/smpeg:0 -debug X cpu_flags_x86_mmx opengl static-libs
 
 [media-libs/speex:0]
-package.use/media-libs_speex_0 : media-libs/speex:0 cpu_flags_x86_sse ogg static-libs
+package.use : media-libs/speex:0 cpu_flags_x86_sse ogg static-libs
 
 [media-libs/stimg:0]
-package.use/media-libs_stimg_0 : media-libs/stimg:0 static-libs
+package.use : media-libs/stimg:0 static-libs
 
 [media-libs/t1lib:5]
-package.use/media-libs_t1lib_5 : media-libs/t1lib:5 -doc X static-libs
+package.use : media-libs/t1lib:5 -doc X static-libs
 
 [media-libs/taglib:0]
-package.use/media-libs_taglib_0 : media-libs/taglib:0 -debug -examples -test asf mp4
+package.use : media-libs/taglib:0 -debug -examples -test asf mp4
 
 [media-libs/tiff:0]
-package.use/media-libs_tiff_0 : media-libs/tiff:0 -test cxx jbig jpeg lzma static-libs zlib
+package.use : media-libs/tiff:0 -test cxx jbig jpeg lzma static-libs zlib
 
 [media-libs/tse3:0]
-package.use/media-libs_tse3_0 : media-libs/tse3:0 alsa oss
+package.use : media-libs/tse3:0 alsa oss
 
 [media-libs/vamp-plugin-sdk:0]
-package.use/media-libs_vamp-plugin-sdk_0 : media-libs/vamp-plugin-sdk:0 -doc
+package.use : media-libs/vamp-plugin-sdk:0 -doc
 
 [media-libs/vo-aacenc:0]
-package.use/media-libs_vo-aacenc_0 : media-libs/vo-aacenc:0 -examples -neon static-libs
+package.use : media-libs/vo-aacenc:0 -examples -neon static-libs
 
 [media-libs/vo-amrwbenc:0]
-package.use/media-libs_vo-amrwbenc_0 : media-libs/vo-amrwbenc:0 -examples static-libs
+package.use : media-libs/vo-amrwbenc:0 -examples static-libs
 
 [media-libs/x264:0]
-package.use/media-libs_x264_0 : media-libs/x264:0 -10bit -opencl cpu_flags_x86_sse interlaced pic static-libs threads
+package.use : media-libs/x264:0 -10bit -opencl cpu_flags_x86_sse interlaced pic static-libs threads
 
 [media-libs/x265:0]
-package.use/media-libs_x265_0 : media-libs/x265:0 -test 10bit
+package.use : media-libs/x265:0 -test 10bit
 
 [media-libs/xvid:0]
-package.use/media-libs_xvid_0 : media-libs/xvid:0 -examples pic threads
+package.use : media-libs/xvid:0 -examples pic threads
 
 [media-plugins/alsa-plugins:0]
-package.use/media-plugins_alsa-plugins_0 : media-plugins/alsa-plugins:0 -debug -ffmpeg -jack -libsamplerate -speex pulseaudio
+package.use : media-plugins/alsa-plugins:0 -debug -ffmpeg -jack -libsamplerate -speex pulseaudio
 
 [media-plugins/gkrellmpc:0]
-package.use/media-plugins_gkrellmpc_0 : media-plugins/gkrellmpc:0 threads
+package.use : media-plugins/gkrellmpc:0 threads
 
 [media-plugins/gmpc-alarm:0]
-package.use/media-plugins_gmpc-alarm_0 : media-plugins/gmpc-alarm:0 -nls
+package.use : media-plugins/gmpc-alarm:0 -nls
 
 [media-plugins/gmpc-albumview:0]
-package.use/media-plugins_gmpc-albumview_0 : media-plugins/gmpc-albumview:0 -nls
+package.use : media-plugins/gmpc-albumview:0 -nls
 
 [media-plugins/gmpc-avahi:0]
-package.use/media-plugins_gmpc-avahi_0 : media-plugins/gmpc-avahi:0 -nls
+package.use : media-plugins/gmpc-avahi:0 -nls
 
 [media-plugins/gmpc-awn:0]
-package.use/media-plugins_gmpc-awn_0 : media-plugins/gmpc-awn:0 -nls
+package.use : media-plugins/gmpc-awn:0 -nls
 
 [media-plugins/gmpc-jamendo:0]
-package.use/media-plugins_gmpc-jamendo_0 : media-plugins/gmpc-jamendo:0 -nls
+package.use : media-plugins/gmpc-jamendo:0 -nls
 
 [media-plugins/gmpc-libnotify:0]
-package.use/media-plugins_gmpc-libnotify_0 : media-plugins/gmpc-libnotify:0 -nls
+package.use : media-plugins/gmpc-libnotify:0 -nls
 
 [media-plugins/gmpc-lyrics:0]
-package.use/media-plugins_gmpc-lyrics_0 : media-plugins/gmpc-lyrics:0 -nls
+package.use : media-plugins/gmpc-lyrics:0 -nls
 
 [media-plugins/gmpc-lyricwiki:0]
-package.use/media-plugins_gmpc-lyricwiki_0 : media-plugins/gmpc-lyricwiki:0 -nls
+package.use : media-plugins/gmpc-lyricwiki:0 -nls
 
 [media-plugins/gmpc-magnatune:0]
-package.use/media-plugins_gmpc-magnatune_0 : media-plugins/gmpc-magnatune:0 -nls
+package.use : media-plugins/gmpc-magnatune:0 -nls
 
 [media-plugins/gmpc-mdcover:0]
-package.use/media-plugins_gmpc-mdcover_0 : media-plugins/gmpc-mdcover:0 -nls
+package.use : media-plugins/gmpc-mdcover:0 -nls
 
 [media-plugins/gmpc-shout:0]
-package.use/media-plugins_gmpc-shout_0 : media-plugins/gmpc-shout:0 -nls
+package.use : media-plugins/gmpc-shout:0 -nls
 
 [media-plugins/gmpc-tagedit:0]
-package.use/media-plugins_gmpc-tagedit_0 : media-plugins/gmpc-tagedit:0 -nls
+package.use : media-plugins/gmpc-tagedit:0 -nls
 
 [media-plugins/gmpc-wikipedia:0]
-package.use/media-plugins_gmpc-wikipedia_0 : media-plugins/gmpc-wikipedia:0 -nls
+package.use : media-plugins/gmpc-wikipedia:0 -nls
 
 [media-plugins/gst-plugins-a52dec:0.10]
-package.use/media-plugins_gst-plugins-a52dec_0.10 : media-plugins/gst-plugins-a52dec:0.10 -orc
+package.use : media-plugins/gst-plugins-a52dec:0.10 -orc
 
 [media-plugins/gst-plugins-a52dec:1.0]
-package.use/media-plugins_gst-plugins-a52dec_1.0 : media-plugins/gst-plugins-a52dec:1.0 -orc
+package.use : media-plugins/gst-plugins-a52dec:1.0 -orc
 
 [media-plugins/gst-plugins-dts:0.10]
-package.use/media-plugins_gst-plugins-dts_0.10 : media-plugins/gst-plugins-dts:0.10 -orc
+package.use : media-plugins/gst-plugins-dts:0.10 -orc
 
 [media-plugins/gst-plugins-dts:1.0]
-package.use/media-plugins_gst-plugins-dts_1.0 : media-plugins/gst-plugins-dts:1.0 -orc
+package.use : media-plugins/gst-plugins-dts:1.0 -orc
 
 [media-plugins/gst-plugins-ffmpeg:0.10]
-package.use/media-plugins_gst-plugins-ffmpeg_0.10 : media-plugins/gst-plugins-ffmpeg:0.10 -libav -orc
+package.use : media-plugins/gst-plugins-ffmpeg:0.10 -libav -orc
 
 [media-plugins/gst-plugins-gl:0]
-package.use/media-plugins_gst-plugins-gl_0 : media-plugins/gst-plugins-gl:0 -nls libvisual
+package.use : media-plugins/gst-plugins-gl:0 -nls libvisual
 
 [media-plugins/gst-plugins-libav:1.0]
-package.use/media-plugins_gst-plugins-libav_1.0 : media-plugins/gst-plugins-libav:1.0 -libav -orc
+package.use : media-plugins/gst-plugins-libav:1.0 -libav -orc
 
 [media-plugins/gst-plugins-meta:0.10]
-package.use/media-plugins_gst-plugins-meta_0.10 : media-plugins/gst-plugins-meta:0.10 -http -pulseaudio -x264 X a52 aac alsa cdda dts dv dvb dvd ffmpeg flac jack lame libass libvisual mms modplug mp3 mpeg musepack ogg opus oss taglib theora v4l vcd vorbis vpx wavpack xv xvid
+package.use : media-plugins/gst-plugins-meta:0.10 -http -pulseaudio -x264 X a52 aac alsa cdda dts dv dvb dvd ffmpeg flac jack lame libass libvisual mms modplug mp3 mpeg musepack ogg opus oss taglib theora v4l vcd vorbis vpx wavpack xv xvid
 
 [media-plugins/gst-plugins-meta:1.0]
-package.use/media-plugins_gst-plugins-meta_1.0 : media-plugins/gst-plugins-meta:1.0 -http -pulseaudio -x264 X a52 aac alsa cdda dts dv dvb dvd ffmpeg flac jack lame libass libvisual mms mp3 mpeg ogg opus oss taglib theora v4l vcd vorbis vpx wavpack
+package.use : media-plugins/gst-plugins-meta:1.0 -http -pulseaudio -x264 X a52 aac alsa cdda dts dv dvb dvd ffmpeg flac jack lame libass libvisual mms mp3 mpeg ogg opus oss taglib theora v4l vcd vorbis vpx wavpack
 
 [media-plugins/gst-plugins-v4l2:0.10]
-package.use/media-plugins_gst-plugins-v4l2_0.10 : media-plugins/gst-plugins-v4l2:0.10 -udev
+package.use : media-plugins/gst-plugins-v4l2:0.10 -udev
 
 [media-plugins/gst-plugins-v4l2:1.0]
-package.use/media-plugins_gst-plugins-v4l2_1.0 : media-plugins/gst-plugins-v4l2:1.0 -udev
+package.use : media-plugins/gst-plugins-v4l2:1.0 -udev
 
 [media-plugins/hexter:0]
-package.use/media-plugins_hexter_0 : media-plugins/hexter:0 gtk readline
+package.use : media-plugins/hexter:0 gtk readline
 
 [media-plugins/libvisual-plugins:0.4]
-package.use/media-plugins_libvisual-plugins_0.4 : media-plugins/libvisual-plugins:0.4 -debug -mplayer alsa gtk jack opengl
+package.use : media-plugins/libvisual-plugins:0.4 -debug -mplayer alsa gtk jack opengl
 
 [media-radio/adifmerg:0]
-package.use/media-radio_adifmerg_0 : media-radio/adifmerg:0 -examples
+package.use : media-radio/adifmerg:0 -examples
 
 [media-radio/ax25-tools:0]
-package.use/media-radio_ax25-tools_0 : media-radio/ax25-tools:0 X
+package.use : media-radio/ax25-tools:0 X
 
 [media-radio/dxcc:0]
-package.use/media-radio_dxcc_0 : media-radio/dxcc:0 tk
+package.use : media-radio/dxcc:0 tk
 
 [media-radio/flrig:0]
-package.use/media-radio_flrig_0 : media-radio/flrig:0 -nls
+package.use : media-radio/flrig:0 -nls
 
 [media-radio/ibp:0]
-package.use/media-radio_ibp_0 : media-radio/ibp:0 X
+package.use : media-radio/ibp:0 X
 
 [media-radio/qrq:0]
-package.use/media-radio_qrq_0 : media-radio/qrq:0 -pulseaudio
+package.use : media-radio/qrq:0 -pulseaudio
 
 [media-radio/xdx:0]
-package.use/media-radio_xdx_0 : media-radio/xdx:0 -nls
+package.use : media-radio/xdx:0 -nls
 
 [media-sound/a2jmidid:0]
-package.use/media-sound_a2jmidid_0 : media-sound/a2jmidid:0 dbus
+package.use : media-sound/a2jmidid:0 dbus
 
 [media-sound/abcm2ps:0]
-package.use/media-sound_abcm2ps_0 : media-sound/abcm2ps:0 -examples -pango
+package.use : media-sound/abcm2ps:0 -examples -pango
 
 [media-sound/adplay:0]
-package.use/media-sound_adplay_0 : media-sound/adplay:0 -ao alsa oss sdl
+package.use : media-sound/adplay:0 -ao alsa oss sdl
 
 [media-sound/alsa-utils:0.9]
-package.use/media-sound_alsa-utils_0.9 : media-sound/alsa-utils:0.9 -doc -nls -selinux libsamplerate ncurses
+package.use : media-sound/alsa-utils:0.9 -doc -nls -selinux libsamplerate ncurses
 
 [media-sound/alsaplayer:0]
-package.use/media-sound_alsaplayer_0 : media-sound/alsaplayer:0 -audiofile -doc -id3tag -mikmod -nls -xosd alsa flac gtk jack mad nas ogg opengl oss vorbis
+package.use : media-sound/alsaplayer:0 -audiofile -doc -id3tag -mikmod -nls -xosd alsa flac gtk jack mad nas ogg opengl oss vorbis
 
 [media-sound/aqualung:0]
-package.use/media-sound_aqualung_0 : media-sound/aqualung:0 -debug -ifp -libsamplerate -mac -podcast -pulseaudio -sndfile -systray alsa cdda cddb ffmpeg flac jack ladspa lame lua modplug mp3 musepack oss speex vorbis wavpack
+package.use : media-sound/aqualung:0 -debug -ifp -libsamplerate -mac -podcast -pulseaudio -sndfile -systray alsa cdda cddb ffmpeg flac jack ladspa lame lua modplug mp3 musepack oss speex vorbis wavpack
 
 [media-sound/ario:0]
-package.use/media-sound_ario_0 : media-sound/ario:0 -audioscrobbler -debug -nls dbus idle libnotify python taglib zeroconf
+package.use : media-sound/ario:0 -audioscrobbler -debug -nls dbus idle libnotify python taglib zeroconf
 
 [media-sound/asunder:0]
-package.use/media-sound_asunder_0 : media-sound/asunder:0 flac mp3 vorbis wavpack
+package.use : media-sound/asunder:0 flac mp3 vorbis wavpack
 
 [media-sound/audacity:0]
-package.use/media-sound_audacity_0 : media-sound/audacity:0 -ffmpeg -id3tag -libsamplerate -midi -sbsms -soundtouch -vamp alsa flac jack ladspa mp3 twolame vorbis
+package.use : media-sound/audacity:0 -ffmpeg -id3tag -libsamplerate -midi -sbsms -soundtouch -vamp alsa flac jack ladspa mp3 twolame vorbis
 
 [media-sound/aylet:0]
-package.use/media-sound_aylet_0 : media-sound/aylet:0 gtk
+package.use : media-sound/aylet:0 gtk
 
 [media-sound/cdparanoia:0]
-package.use/media-sound_cdparanoia_0 : media-sound/cdparanoia:0 static-libs
+package.use : media-sound/cdparanoia:0 static-libs
 
 [media-sound/cplay:0]
-package.use/media-sound_cplay_0 : media-sound/cplay:0 mp3 vorbis
+package.use : media-sound/cplay:0 mp3 vorbis
 
 [media-sound/darkice:0]
-package.use/media-sound_darkice_0 : media-sound/darkice:0 -debug -libsamplerate -pulseaudio aac aacplus alsa jack mp3 opus twolame vorbis
+package.use : media-sound/darkice:0 -debug -libsamplerate -pulseaudio aac aacplus alsa jack mp3 opus twolame vorbis
 
 [media-sound/dir2ogg:0]
-package.use/media-sound_dir2ogg_0 : media-sound/dir2ogg:0 -wma aac cdparanoia mp3
+package.use : media-sound/dir2ogg:0 -wma aac cdparanoia mp3
 
 [media-sound/easytag:0]
-package.use/media-sound_easytag_0 : media-sound/easytag:0 -mp4 -nls flac mp3 speex vorbis wavpack
+package.use : media-sound/easytag:0 -mp4 -nls flac mp3 speex vorbis wavpack
 
 [media-sound/ecasound:1]
-package.use/media-sound_ecasound_1 : media-sound/ecasound:1 -audiofile -debug -doc -libsamplerate -mikmod -sndfile alsa jack ncurses oss python ruby vorbis
+package.use : media-sound/ecasound:1 -audiofile -debug -doc -libsamplerate -mikmod -sndfile alsa jack ncurses oss python ruby vorbis
 
 [media-sound/edna:0]
-package.use/media-sound_edna_0 : media-sound/edna:0 flac ogg
+package.use : media-sound/edna:0 flac ogg
 
 [media-sound/exaile:0]
-package.use/media-sound_exaile_0 : media-sound/exaile:0 -nls cddb libnotify
+package.use : media-sound/exaile:0 -nls cddb libnotify
 
 [media-sound/fapg:0]
-package.use/media-sound_fapg_0 : media-sound/fapg:0 -xspf
+package.use : media-sound/fapg:0 -xspf
 
 [media-sound/flacon:0]
-package.use/media-sound_flacon_0 : media-sound/flacon:0 -mac -mp4 -replaygain -tta flac mp3 ogg wavpack
+package.use : media-sound/flacon:0 -mac -mp4 -replaygain -tta flac mp3 ogg wavpack
 
 [media-sound/fluidsynth:0]
-package.use/media-sound_fluidsynth_0 : media-sound/fluidsynth:0 -debug -examples -lash -pulseaudio -sndfile alsa dbus jack ladspa portaudio readline
+package.use : media-sound/fluidsynth:0 -debug -examples -lash -pulseaudio -sndfile alsa dbus jack ladspa portaudio readline
 
 [media-sound/gimmix:0]
-package.use/media-sound_gimmix_0 : media-sound/gimmix:0 -cover -lyrics taglib
+package.use : media-sound/gimmix:0 -cover -lyrics taglib
 
 [media-sound/glurp:0]
-package.use/media-sound_glurp_0 : media-sound/glurp:0 -debug
+package.use : media-sound/glurp:0 -debug
 
 [media-sound/gmpc:0]
-package.use/media-sound_gmpc_0 : media-sound/gmpc:0 -nls -xspf unique
+package.use : media-sound/gmpc:0 -nls -xspf unique
 
 [media-sound/gnaural:0]
-package.use/media-sound_gnaural_0 : media-sound/gnaural:0 -nls
+package.use : media-sound/gnaural:0 -nls
 
 [media-sound/gnomad:0]
-package.use/media-sound_gnomad_0 : media-sound/gnomad:0 -nls
+package.use : media-sound/gnomad:0 -nls
 
 [media-sound/gnomoradio:0]
-package.use/media-sound_gnomoradio_0 : media-sound/gnomoradio:0 vorbis
+package.use : media-sound/gnomoradio:0 vorbis
 
 [media-sound/gnump3d:0]
-package.use/media-sound_gnump3d_0 : media-sound/gnump3d:0 -sox
+package.use : media-sound/gnump3d:0 -sox
 
 [media-sound/gom:0]
-package.use/media-sound_gom_0 : media-sound/gom:0 -examples
+package.use : media-sound/gom:0 -examples
 
 [media-sound/grip:0]
-package.use/media-sound_grip_0 : media-sound/grip:0 -nls vorbis
+package.use : media-sound/grip:0 -nls vorbis
 
 [media-sound/guayadeque:0]
-package.use/media-sound_guayadeque_0 : media-sound/guayadeque:0 -ayatana -ipod
+package.use : media-sound/guayadeque:0 -ayatana -ipod
 
 [media-sound/hydrogen:0]
-package.use/media-sound_hydrogen_0 : media-sound/hydrogen:0 -lash alsa archive jack ladspa oss portaudio
+package.use : media-sound/hydrogen:0 -lash alsa archive jack ladspa oss portaudio
 
 [media-sound/jack-audio-connection-kit:0]
-package.use/media-sound_jack-audio-connection-kit_0 : media-sound/jack-audio-connection-kit:0 -altivec -coreaudio -cpu_flags_x86_3dnow -debug -doc -examples -pam alsa cpu_flags_x86_mmx cpu_flags_x86_sse cpudetection oss
+package.use : media-sound/jack-audio-connection-kit:0 -altivec -coreaudio -cpu_flags_x86_3dnow -debug -doc -examples -pam alsa cpu_flags_x86_mmx cpu_flags_x86_sse cpudetection oss
 
 [media-sound/jack-rack:0]
-package.use/media-sound_jack-rack_0 : media-sound/jack-rack:0 -gnome -lash alsa xml
+package.use : media-sound/jack-rack:0 -gnome -lash alsa xml
 
 [media-sound/jokosher:0]
-package.use/media-sound_jokosher_0 : media-sound/jokosher:0 -gnome
+package.use : media-sound/jokosher:0 -gnome
 
 [media-sound/lame:0]
-package.use/media-sound_lame_0 : media-sound/lame:0 -debug -mp3rtp -sndfile cpu_flags_x86_mmx static-libs
+package.use : media-sound/lame:0 -debug -mp3rtp -sndfile cpu_flags_x86_mmx static-libs
 
 [media-sound/lastfmplayer:0]
-package.use/media-sound_lastfmplayer_0 : media-sound/lastfmplayer:0 -ipod dbus
+package.use : media-sound/lastfmplayer:0 -ipod dbus
 
 [media-sound/lyvi:0]
-package.use/media-sound_lyvi_0 : media-sound/lyvi:0 -mpris
+package.use : media-sound/lyvi:0 -mpris
 
 [media-sound/mangler:0]
-package.use/media-sound_mangler_0 : media-sound/mangler:0 -espeak -g15 -pulseaudio alsa gsm opus oss speex static-libs xosd
+package.use : media-sound/mangler:0 -espeak -g15 -pulseaudio alsa gsm opus oss speex static-libs xosd
 
 [media-sound/mhwaveedit:0]
-package.use/media-sound_mhwaveedit_0 : media-sound/mhwaveedit:0 -libsamplerate -nls -pulseaudio -sndfile -sox alsa jack ladspa oss sdl
+package.use : media-sound/mhwaveedit:0 -libsamplerate -nls -pulseaudio -sndfile -sox alsa jack ladspa oss sdl
 
 [media-sound/miniaudicle:0]
-package.use/media-sound_miniaudicle_0 : media-sound/miniaudicle:0 alsa jack oss
+package.use : media-sound/miniaudicle:0 alsa jack oss
 
 [media-sound/mixxx:0]
-package.use/media-sound_mixxx_0 : media-sound/mixxx:0 -debug -doc -pulseaudio -shout aac mp3 wavpack
+package.use : media-sound/mixxx:0 -debug -doc -pulseaudio -shout aac mp3 wavpack
 
 [media-sound/moodbar:0]
-package.use/media-sound_moodbar_0 : media-sound/moodbar:0 flac mp3 ogg vorbis
+package.use : media-sound/moodbar:0 flac mp3 ogg vorbis
 
 [media-sound/moosic:0]
-package.use/media-sound_moosic_0 : media-sound/moosic:0 -doc
+package.use : media-sound/moosic:0 -doc
 
 [media-sound/mp3blaster:0]
-package.use/media-sound_mp3blaster_0 : media-sound/mp3blaster:0 -lirc -sid oss sdl vorbis
+package.use : media-sound/mp3blaster:0 -lirc -sid oss sdl vorbis
 
 [media-sound/mpc:0]
-package.use/media-sound_mpc_0 : media-sound/mpc:0 iconv
+package.use : media-sound/mpc:0 iconv
 
 [media-sound/mpd:0]
-package.use/media-sound_mpd_0 : media-sound/mpd:0 -adplug -ao -audiofile -debug -faad -fluidsynth -libav -libmpdclient -libsamplerate -libsoxr -mikmod -mpg123 -nfs -pipe -pulseaudio -recorder -selinux -sid -sndfile -soundcloud -systemd -wildmidi -zip alsa bzip2 cdio curl expat ffmpeg fifo flac glib gme icu id3tag inotify ipv6 jack lame mad mms modplug musepack network ogg openal opus oss samba sqlite tcpd twolame unicode upnp vorbis wavpack zeroconf
+package.use : media-sound/mpd:0 -adplug -ao -audiofile -debug -faad -fluidsynth -libav -libmpdclient -libsamplerate -libsoxr -mikmod -mpg123 -nfs -pipe -pulseaudio -recorder -selinux -sid -sndfile -soundcloud -systemd -wildmidi -zip alsa bzip2 cdio curl expat ffmpeg fifo flac glib gme icu id3tag inotify ipv6 jack lame mad mms modplug musepack network ogg openal opus oss samba sqlite tcpd twolame unicode upnp vorbis wavpack zeroconf
 
 [media-sound/mpdscribble:0]
-package.use/media-sound_mpdscribble_0 : media-sound/mpdscribble:0 curl
+package.use : media-sound/mpdscribble:0 curl
 
 [media-sound/mpg123:0]
-package.use/media-sound_mpg123_0 : media-sound/mpg123:0 -altivec -coreaudio -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -int-quality -pulseaudio alsa cpu_flags_x86_mmx cpu_flags_x86_sse ipv6 jack nas oss portaudio sdl
+package.use : media-sound/mpg123:0 -altivec -coreaudio -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -int-quality -pulseaudio alsa cpu_flags_x86_mmx cpu_flags_x86_sse ipv6 jack nas oss portaudio sdl
 
 [media-sound/mserv:0]
-package.use/media-sound_mserv_0 : media-sound/mserv:0 -vhosts vorbis
+package.use : media-sound/mserv:0 -vhosts vorbis
 
 [media-sound/mt-daapd:0]
-package.use/media-sound_mt-daapd_0 : media-sound/mt-daapd:0 vorbis
+package.use : media-sound/mt-daapd:0 vorbis
 
 [media-sound/muse:0]
-package.use/media-sound_muse_0 : media-sound/muse:0 -debug gtk
+package.use : media-sound/muse:0 -debug gtk
 
 [media-sound/ncmpc:0]
-package.use/media-sound_ncmpc_0 : media-sound/ncmpc:0 -artist-screen -chat-screen -colors -debug -key-screen -lirc -lyrics-screen -mouse -nls -search-screen -song-screen help-screen
+package.use : media-sound/ncmpc:0 -artist-screen -chat-screen -colors -debug -key-screen -lirc -lyrics-screen -mouse -nls -search-screen -song-screen help-screen
 
 [media-sound/nted:0]
-package.use/media-sound_nted_0 : media-sound/nted:0 -debug -doc -nls
+package.use : media-sound/nted:0 -debug -doc -nls
 
 [media-sound/pianobar:0]
-package.use/media-sound_pianobar_0 : media-sound/pianobar:0 static-libs
+package.use : media-sound/pianobar:0 static-libs
 
 [media-sound/playmidi:0]
-package.use/media-sound_playmidi_0 : media-sound/playmidi:0 -svga X
+package.use : media-sound/playmidi:0 -svga X
 
 [media-sound/pnmixer:0]
-package.use/media-sound_pnmixer_0 : media-sound/pnmixer:0 -debug libnotify
+package.use : media-sound/pnmixer:0 -debug libnotify
 
 [media-sound/positron:0]
-package.use/media-sound_positron_0 : media-sound/positron:0 vorbis
+package.use : media-sound/positron:0 vorbis
 
 [media-sound/pragha:0]
-package.use/media-sound_pragha_0 : media-sound/pragha:0 -debug -grilo -lastfm -libnotify -mtp -rygel -soup glyr keybinder peas playlist udev
+package.use : media-sound/pragha:0 -debug -grilo -lastfm -libnotify -mtp -rygel -soup glyr keybinder peas playlist udev
 
 [media-sound/pulseaudio:0]
-package.use/media-sound_pulseaudio_0 : media-sound/pulseaudio:0 -bluetooth -dbus -doc -equalizer -gnome -gtk -jack -libsamplerate -lirc -neon -orc -oss -qt4 -realtime -system-wide -systemd -test -webrtc-aec -xen -zeroconf X alsa alsa-plugin asyncns caps gdbm glib ipv6 ssl tcpd udev
+package.use : media-sound/pulseaudio:0 -bluetooth -dbus -doc -equalizer -gnome -gtk -jack -libsamplerate -lirc -neon -orc -oss -qt4 -realtime -system-wide -systemd -test -webrtc-aec -xen -zeroconf X alsa alsa-plugin asyncns caps gdbm glib ipv6 ssl tcpd udev
 
 [media-sound/qjackctl:0]
-package.use/media-sound_qjackctl_0 : media-sound/qjackctl:0 -debug alsa dbus portaudio
+package.use : media-sound/qjackctl:0 -debug alsa dbus portaudio
 
 [media-sound/qmpdclient:0]
-package.use/media-sound_qmpdclient_0 : media-sound/qmpdclient:0 -debug
+package.use : media-sound/qmpdclient:0 -debug
 
 [media-sound/qsynth:0]
-package.use/media-sound_qsynth_0 : media-sound/qsynth:0 -debug -pulseaudio alsa jack
+package.use : media-sound/qsynth:0 -debug -pulseaudio alsa jack
 
 [media-sound/qtscrobbler:0]
-package.use/media-sound_qtscrobbler_0 : media-sound/qtscrobbler:0 cli qt4
+package.use : media-sound/qtscrobbler:0 cli qt4
 
 [media-sound/rezound:0]
-package.use/media-sound_rezound_0 : media-sound/rezound:0 -16bittmp -nls -soundtouch alsa flac jack oss portaudio vorbis
+package.use : media-sound/rezound:0 -16bittmp -nls -soundtouch alsa flac jack oss portaudio vorbis
 
 [media-sound/rhythmbox:0]
-package.use/media-sound_rhythmbox_0 : media-sound/rhythmbox:0 -cdr -daap -html -ipod -lirc -nsplugin -test -upnp-av -visualizer -zeitgeist dbus libnotify libsecret mtp python udev webkit
+package.use : media-sound/rhythmbox:0 -cdr -daap -html -ipod -lirc -nsplugin -test -upnp-av -visualizer -zeitgeist dbus libnotify libsecret mtp python udev webkit
 
 [media-sound/ripperx:0]
-package.use/media-sound_ripperx_0 : media-sound/ripperx:0 -nls
+package.use : media-sound/ripperx:0 -nls
 
 [media-sound/seq24:0]
-package.use/media-sound_seq24_0 : media-sound/seq24:0 -lash jack
+package.use : media-sound/seq24:0 -lash jack
 
 [media-sound/shntool:0]
-package.use/media-sound_shntool_0 : media-sound/shntool:0 -alac -mac -shorten -sox flac wavpack
+package.use : media-sound/shntool:0 -alac -mac -shorten -sox flac wavpack
 
 [media-sound/solfege:0]
-package.use/media-sound_solfege_0 : media-sound/solfege:0 alsa oss
+package.use : media-sound/solfege:0 alsa oss
 
 [media-sound/sonata:0]
-package.use/media-sound_sonata_0 : media-sound/sonata:0 -lyrics dbus taglib trayicon
+package.use : media-sound/sonata:0 -lyrics dbus taglib trayicon
 
 [media-sound/soundconverter:0]
-package.use/media-sound_soundconverter_0 : media-sound/soundconverter:0 aac flac mp3 opus vorbis
+package.use : media-sound/soundconverter:0 aac flac mp3 opus vorbis
 
 [media-sound/sox:0]
-package.use/media-sound_sox_0 : media-sound/sox:0 -ao -debug -id3tag -pulseaudio -sndfile alsa amr encode ffmpeg flac ladspa mad ogg openmp oss png static-libs twolame wavpack
+package.use : media-sound/sox:0 -ao -debug -id3tag -pulseaudio -sndfile alsa amr encode ffmpeg flac ladspa mad ogg openmp oss png static-libs twolame wavpack
 
 [media-sound/streamripper:0]
-package.use/media-sound_streamripper_0 : media-sound/streamripper:0 vorbis
+package.use : media-sound/streamripper:0 vorbis
 
 [media-sound/synaesthesia:0]
-package.use/media-sound_synaesthesia_0 : media-sound/synaesthesia:0 -svga sdl
+package.use : media-sound/synaesthesia:0 -svga sdl
 
 [media-sound/twolame:0]
-package.use/media-sound_twolame_0 : media-sound/twolame:0 static-libs
+package.use : media-sound/twolame:0 static-libs
 
 [media-sound/umix:0]
-package.use/media-sound_umix_0 : media-sound/umix:0 ncurses oss
+package.use : media-sound/umix:0 ncurses oss
 
 [media-sound/umurmur:0]
-package.use/media-sound_umurmur_0 : media-sound/umurmur:0 -polarssl -shm gnutls
+package.use : media-sound/umurmur:0 -polarssl -shm gnutls
 
 [media-sound/vimpc:0]
-package.use/media-sound_vimpc_0 : media-sound/vimpc:0 -boost taglib
+package.use : media-sound/vimpc:0 -boost taglib
 
 [media-sound/vkeybd:0]
-package.use/media-sound_vkeybd_0 : media-sound/vkeybd:0 -lash alsa oss
+package.use : media-sound/vkeybd:0 -lash alsa oss
 
 [media-sound/vlorb:0]
-package.use/media-sound_vlorb_0 : media-sound/vlorb:0 ogg
+package.use : media-sound/vlorb:0 ogg
 
 [media-sound/volti:0]
-package.use/media-sound_volti_0 : media-sound/volti:0 X libnotify
+package.use : media-sound/volti:0 X libnotify
 
 [media-sound/volumeicon:0]
-package.use/media-sound_volumeicon_0 : media-sound/volumeicon:0 libnotify
+package.use : media-sound/volumeicon:0 libnotify
 
 [media-sound/volwheel:0]
-package.use/media-sound_volwheel_0 : media-sound/volwheel:0 alsa
+package.use : media-sound/volwheel:0 alsa
 
 [media-sound/vorbis-tools:0]
-package.use/media-sound_vorbis-tools_0 : media-sound/vorbis-tools:0 -kate -nls flac ogg123 speex
+package.use : media-sound/vorbis-tools:0 -kate -nls flac ogg123 speex
 
 [media-sound/wavbreaker:0]
-package.use/media-sound_wavbreaker_0 : media-sound/wavbreaker:0 -nls -pulseaudio alsa oss
+package.use : media-sound/wavbreaker:0 -nls -pulseaudio alsa oss
 
 [media-sound/wavpack:0]
-package.use/media-sound_wavpack_0 : media-sound/wavpack:0 cpu_flags_x86_mmx static-libs
-+package.env : media-sound/wavpack:0 media-sound_wavpack_0
-env/media-sound_wavpack_0 : LDFLAGS="-liconv"
+package.use : media-sound/wavpack:0 cpu_flags_x86_mmx static-libs
+package.env : media-sound/wavpack:0 media-sound_wavpack_0
+env : LDFLAGS="-liconv"
 
 [media-sound/xfmpc:0]
-package.use/media-sound_xfmpc_0 : media-sound/xfmpc:0 -debug
+package.use : media-sound/xfmpc:0 -debug
 
 [media-sound/zynaddsubfx:0]
-package.use/media-sound_zynaddsubfx_0 : media-sound/zynaddsubfx:0 -lash alsa fltk jack
+package.use : media-sound/zynaddsubfx:0 -lash alsa fltk jack
 
 [media-tv/dvbtune:0]
-package.use/media-tv_dvbtune_0 : media-tv/dvbtune:0 xml
+package.use : media-tv/dvbtune:0 xml
 
 [media-video/acidrip:0]
-package.use/media-video_acidrip_0 : media-video/acidrip:0 encode
+package.use : media-video/acidrip:0 encode
 
 [media-video/arista:0]
-package.use/media-video_arista_0 : media-video/arista:0 -kde -nautilus -x264 faac xvid
+package.use : media-video/arista:0 -kde -nautilus -x264 faac xvid
 
 [media-video/camorama:0]
-package.use/media-video_camorama_0 : media-video/camorama:0 -debug
+package.use : media-video/camorama:0 -debug
 
 [media-video/clive:0]
-package.use/media-video_clive_0 : media-video/clive:0 -clipboard -pager -password -test
+package.use : media-video/clive:0 -clipboard -pager -password -test
 
 [media-video/dvgrab:0]
-package.use/media-video_dvgrab_0 : media-video/dvgrab:0 jpeg quicktime
+package.use : media-video/dvgrab:0 jpeg quicktime
 
 [media-video/ffdiaporama:0]
-package.use/media-video_ffdiaporama_0 : media-video/ffdiaporama:0 -libav -openclipart -texturemate
+package.use : media-video/ffdiaporama:0 -libav -openclipart -texturemate
 
 [media-video/ffmpeg:0]
-package.use/media-video_ffmpeg_0 : media-video/ffmpeg:0 -altivec -amrenc -armv5te -armv6 -armv6t2 -armvfp -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_flags_x86_fma3 -cpu_flags_x86_fma4 -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -cpu_flags_x86_sse4_2 -cpu_flags_x86_ssse3 -cpu_flags_x86_xop -debug -doc -examples -fdk -flite -frei0r -fribidi -libsoxr -mipsdspr1 -mipsdspr2 -mipsfpu -neon -openssl -pulseaudio -ssh -test -truetype -vdpau -x264 -zvbi X aac aacplus alsa amr bluray bs2b bzip2 cdio celt cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpudetection encode faac fftools_aviocat fftools_cws2fws fftools_ffescape fftools_ffeval fftools_ffhash fftools_fourcc2pixfmt fftools_graph2dot fftools_ismindex fftools_pktdumper fftools_qt-faststart fftools_trasher fontconfig gme gnutls gpl gsm hardcoded-tables iconv iec61883 ieee1394 jack jpeg2k ladspa libass libcaca libv4l lzma modplug mp3 network openal opengl opus oss pi
 c postproc quvi rtmp samba schroedinger sdl speex static-libs theora threads twolame v4l vaapi vorbis vpx wavpack webp x265 xcb xvid zlib
+package.use : media-video/ffmpeg:0 -altivec -amrenc -armv5te -armv6 -armv6t2 -armvfp -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_flags_x86_fma3 -cpu_flags_x86_fma4 -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -cpu_flags_x86_sse4_2 -cpu_flags_x86_ssse3 -cpu_flags_x86_xop -debug -doc -examples -fdk -flite -frei0r -fribidi -libsoxr -mipsdspr1 -mipsdspr2 -mipsfpu -neon -openssl -pulseaudio -ssh -test -truetype -vdpau -x264 -zvbi X aac aacplus alsa amr bluray bs2b bzip2 cdio celt cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpudetection encode faac fftools_aviocat fftools_cws2fws fftools_ffescape fftools_ffeval fftools_ffhash fftools_fourcc2pixfmt fftools_graph2dot fftools_ismindex fftools_pktdumper fftools_qt-faststart fftools_trasher fontconfig gme gnutls gpl gsm hardcoded-tables iconv iec61883 ieee1394 jack jpeg2k ladspa libass libcaca libv4l lzma modplug mp3 network openal opengl opus oss pic postproc quvi rtmp 
 samba schroedinger sdl speex static-libs theora threads twolame v4l vaapi vorbis vpx wavpack webp x265 xcb xvid zlib
 
 [media-video/ffmpegthumbnailer:0]
-package.use/media-video_ffmpegthumbnailer_0 : media-video/ffmpegthumbnailer:0 -gnome gtk jpeg png
+package.use : media-video/ffmpegthumbnailer:0 -gnome gtk jpeg png
 
 [media-video/flumotion:0]
-package.use/media-video_flumotion_0 : media-video/flumotion:0 -doc -test
+package.use : media-video/flumotion:0 -doc -test
 
 [media-video/gaupol:0]
-package.use/media-video_gaupol_0 : media-video/gaupol:0 spell
+package.use : media-video/gaupol:0 spell
 
 [media-video/gnome-mplayer:0]
-package.use/media-video_gnome-mplayer_0 : media-video/gnome-mplayer:0 -gda -gnome -ipod -pulseaudio alsa dbus dconf libnotify musicbrainz
+package.use : media-video/gnome-mplayer:0 -gda -gnome -ipod -pulseaudio alsa dbus dconf libnotify musicbrainz
 
 [media-video/guvcview:0]
-package.use/media-video_guvcview_0 : media-video/guvcview:0 -pulseaudio
+package.use : media-video/guvcview:0 -pulseaudio
 
 [media-video/kino:0]
-package.use/media-video_kino_0 : media-video/kino:0 -dvdr -gpac -gstreamer -sox alsa lame quicktime vorbis
+package.use : media-video/kino:0 -dvdr -gpac -gstreamer -sox alsa lame quicktime vorbis
 
 [media-video/mediainfo:0]
-package.use/media-video_mediainfo_0 : media-video/mediainfo:0 -wxwidgets curl mms
+package.use : media-video/mediainfo:0 -wxwidgets curl mms
 
 [media-video/mjpegtools:1]
-package.use/media-video_mjpegtools_1 : media-video/mjpegtools:1 cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs
+package.use : media-video/mjpegtools:1 cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs
 
 [media-video/motion:0]
-package.use/media-video_motion_0 : media-video/motion:0 -libav -mysql -postgres ffmpeg v4l
+package.use : media-video/motion:0 -libav -mysql -postgres ffmpeg v4l
 
 [media-video/mplayer:0]
-package.use/media-video_mplayer_0 : media-video/mplayer:0 -altivec -aqua -bluray -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_ssse3 -cpudetection -debug -doc -faad -lirc -live -pulseaudio -rar -rtc -selinux -toolame -tremor -vdpau -vidix -x264 X a52 aalib alsa bidi bl bs2b cddb cdio cdparanoia cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 dga directfb dts dv dvb dvd dvdnav enca encode faac fbcon ftp ggi gif gsm iconv ipv6 jack joystick jpeg jpeg2k ladspa libass libcaca libmpeg2 lzo mad md5sum mng mp3 nas network nut openal opengl osdmenu oss png pnm pvr radio rtmp samba sdl shm speex tga theora truetype twolame unicode v4l video_cards_mga video_cards_s3virge video_cards_tdfx vorbis xanim xinerama xscreensaver xv xvid xvmc zoran
-+package.env : media-video/mplayer:0 media-video_mplayer_0
-env/media-video_mplayer_0 : LDFLAGS="-lintl"
+package.use : media-video/mplayer:0 -altivec -aqua -bluray -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_ssse3 -cpudetection -debug -doc -faad -lirc -live -pulseaudio -rar -rtc -selinux -toolame -tremor -vdpau -vidix -x264 X a52 aalib alsa bidi bl bs2b cddb cdio cdparanoia cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 dga directfb dts dv dvb dvd dvdnav enca encode faac fbcon ftp ggi gif gsm iconv ipv6 jack joystick jpeg jpeg2k ladspa libass libcaca libmpeg2 lzo mad md5sum mng mp3 nas network nut openal opengl osdmenu oss png pnm pvr radio rtmp samba sdl shm speex tga theora truetype twolame unicode v4l video_cards_mga video_cards_s3virge video_cards_tdfx vorbis xanim xinerama xscreensaver xv xvid xvmc zoran
+package.env : media-video/mplayer:0 media-video_mplayer_0
+env : LDFLAGS="-lintl"
 
 [media-video/parole:0]
-package.use/media-video_parole_0 : media-video/parole:0 -clutter -debug libnotify taglib
+package.use : media-video/parole:0 -clutter -debug libnotify taglib
 
 [media-video/rtmpdump:0]
-package.use/media-video_rtmpdump_0 : media-video/rtmpdump:0 -polarssl gnutls ssl
+package.use : media-video/rtmpdump:0 -polarssl gnutls ssl
 
 [media-video/smplayer:0]
-package.use/media-video_smplayer_0 : media-video/smplayer:0 -autoshutdown -debug bidi
+package.use : media-video/smplayer:0 -autoshutdown -debug bidi
 
 [media-video/subtitleeditor:0]
-package.use/media-video_subtitleeditor_0 : media-video/subtitleeditor:0 -debug -nls opengl
+package.use : media-video/subtitleeditor:0 -debug -nls opengl
 
 [media-video/transcode:0]
-package.use/media-video_transcode_0 : media-video/transcode:0 -altivec -cpu_flags_x86_3dnow -imagemagick -mjpeg -nuv -pic -truetype -x264 X a52 aac alsa cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dv dvd iconv jpeg lzo mp3 mpeg ogg oss postproc quicktime sdl theora v4l vorbis xml xvid
+package.use : media-video/transcode:0 -altivec -cpu_flags_x86_3dnow -imagemagick -mjpeg -nuv -pic -truetype -x264 X a52 aac alsa cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dv dvd iconv jpeg lzo mp3 mpeg ogg oss postproc quicktime sdl theora v4l vorbis xml xvid
 
 [media-video/ushare:0]
-package.use/media-video_ushare_0 : media-video/ushare:0 -dlna -nls
+package.use : media-video/ushare:0 -dlna -nls
 
 [media-video/x264-encoder:0]
-package.use/media-video_x264-encoder_0 : media-video/x264-encoder:0 -10bit -avs -custom-cflags -ffmpegsource -mp4 ffmpeg interlaced threads
+package.use : media-video/x264-encoder:0 -10bit -avs -custom-cflags -ffmpegsource -mp4 ffmpeg interlaced threads
 
 [media-video/xanim:0]
-+package.env : media-video/xanim:0 media-video_xanim_0
-env/media-video_xanim_0 : LDFLAGS="-ldl"
+package.env : media-video/xanim:0 media-video_xanim_0
+env : LDFLAGS="-ldl"
 
 [net-analyzer/amap:0]
-package.use/net-analyzer_amap_0 : net-analyzer/amap:0 ssl
+package.use : net-analyzer/amap:0 ssl
 
 [net-analyzer/argus-clients:0]
-package.use/net-analyzer_argus-clients_0 : net-analyzer/argus-clients:0 -debug -ft -mysql geoip sasl tcpd
+package.use : net-analyzer/argus-clients:0 -debug -ft -mysql geoip sasl tcpd
 
 [net-analyzer/argus:0]
-package.use/net-analyzer_argus_0 : net-analyzer/argus:0 -debug sasl tcpd
+package.use : net-analyzer/argus:0 -debug sasl tcpd
 
 [net-analyzer/arpwatch:0]
-package.use/net-analyzer_arpwatch_0 : net-analyzer/arpwatch:0 -selinux
+package.use : net-analyzer/arpwatch:0 -selinux
 
 [net-analyzer/authforce:0]
-package.use/net-analyzer_authforce_0 : net-analyzer/authforce:0 -nls curl
+package.use : net-analyzer/authforce:0 -nls curl
 
 [net-analyzer/bwm-ng:0]
-package.use/net-analyzer_bwm-ng_0 : net-analyzer/bwm-ng:0 -csv -html
+package.use : net-analyzer/bwm-ng:0 -csv -html
 
 [net-analyzer/bwping:0]
-package.use/net-analyzer_bwping_0 : net-analyzer/bwping:0 ipv6
+package.use : net-analyzer/bwping:0 ipv6
 
 [net-analyzer/dnstracer:0]
-package.use/net-analyzer_dnstracer_0 : net-analyzer/dnstracer:0 ipv6
+package.use : net-analyzer/dnstracer:0 ipv6
 
 [net-analyzer/ettercap:0]
-package.use/net-analyzer_ettercap_0 : net-analyzer/ettercap:0 gtk ipv6 ncurses plugins
+package.use : net-analyzer/ettercap:0 gtk ipv6 ncurses plugins
 
 [net-analyzer/fping:0]
-package.use/net-analyzer_fping_0 : net-analyzer/fping:0 ipv6 suid
+package.use : net-analyzer/fping:0 ipv6 suid
 
 [net-analyzer/fwlogwatch:0]
-package.use/net-analyzer_fwlogwatch_0 : net-analyzer/fwlogwatch:0 -nls zlib
+package.use : net-analyzer/fwlogwatch:0 -nls zlib
 
 [net-analyzer/hping:0]
-package.use/net-analyzer_hping_0 : net-analyzer/hping:0 tcl
+package.use : net-analyzer/hping:0 tcl
 
 [net-analyzer/ifstat:0]
-package.use/net-analyzer_ifstat_0 : net-analyzer/ifstat:0 -snmp
+package.use : net-analyzer/ifstat:0 -snmp
 
 [net-analyzer/iptraf-ng:0]
-package.use/net-analyzer_iptraf-ng_0 : net-analyzer/iptraf-ng:0 -doc
+package.use : net-analyzer/iptraf-ng:0 -doc
 
 [net-analyzer/jnettop:0]
-package.use/net-analyzer_jnettop_0 : net-analyzer/jnettop:0 berkdb ncurses syslog
+package.use : net-analyzer/jnettop:0 berkdb ncurses syslog
 
 [net-analyzer/mrtg:0]
-package.use/net-analyzer_mrtg_0 : net-analyzer/mrtg:0 -selinux
+package.use : net-analyzer/mrtg:0 -selinux
 
 [net-analyzer/munin:0]
-package.use/net-analyzer_munin_0 : net-analyzer/munin:0 -apache -asterisk -dhcpd -doc -http -ipmi -irc -java -memcached -minimal -mysql -postgres -test cgi ipv6 ssl syslog
+package.use : net-analyzer/munin:0 -apache -asterisk -dhcpd -doc -http -ipmi -irc -java -memcached -minimal -mysql -postgres -test cgi ipv6 ssl syslog
 
 [net-analyzer/nagios-core:0]
-package.use/net-analyzer_nagios-core_0 : net-analyzer/nagios-core:0 -apache2 -debug -lighttpd perl vim-syntax web
+package.use : net-analyzer/nagios-core:0 -apache2 -debug -lighttpd perl vim-syntax web
 
 [net-analyzer/nagios-plugins:0]
-package.use/net-analyzer_nagios-plugins_0 : net-analyzer/nagios-plugins:0 -mysql -nagios-dns -nagios-game -nagios-ntp -nagios-ping -nagios-ssh -postgres -radius -smart -snmp -sudo -ups -xmpp gnutls ipv6 ldap samba ssl suid
-package.mask/net-analyzer_nagios-plugins_0 : >net-analyzer/nagios-plugins-1.4.16-r2
+package.use : net-analyzer/nagios-plugins:0 -mysql -nagios-dns -nagios-game -nagios-ntp -nagios-ping -nagios-ssh -postgres -radius -smart -snmp -sudo -ups -xmpp gnutls ipv6 ldap samba ssl suid
+package.mask : >net-analyzer/nagios-plugins-1.4.16-r2
 
 [net-analyzer/nagstamon:0]
-package.use/net-analyzer_nagstamon_0 : net-analyzer/nagstamon:0 -gnome -sound
+package.use : net-analyzer/nagstamon:0 -gnome -sound
 
 [net-analyzer/net-snmp:0]
-package.use/net-analyzer_net-snmp_0 : net-analyzer/net-snmp:0 -doc -elf -lm_sensors -mfd-rewrites -minimal -mysql -netlink -pci -rpm -selinux -ucd-compat X bzip2 ipv6 perl python ssl tcpd zlib
+package.use : net-analyzer/net-snmp:0 -doc -elf -lm_sensors -mfd-rewrites -minimal -mysql -netlink -pci -rpm -selinux -ucd-compat X bzip2 ipv6 perl python ssl tcpd zlib
 
 [net-analyzer/netcat:0]
-package.use/net-analyzer_netcat_0 : net-analyzer/netcat:0 -static crypt ipv6
+package.use : net-analyzer/netcat:0 -static crypt ipv6
 
 [net-analyzer/netperf:0]
-package.use/net-analyzer_netperf_0 : net-analyzer/netperf:0 -demo -sctp
+package.use : net-analyzer/netperf:0 -demo -sctp
 
 [net-analyzer/netwatch:0]
-package.use/net-analyzer_netwatch_0 : net-analyzer/netwatch:0 -doc
+package.use : net-analyzer/netwatch:0 -doc
 
 [net-analyzer/nfdump:0]
-package.use/net-analyzer_nfdump_0 : net-analyzer/nfdump:0 -compat15 -debug -ftconv -nfprofile -nftrack -readpcap -sflow
+package.use : net-analyzer/nfdump:0 -compat15 -debug -ftconv -nfprofile -nftrack -readpcap -sflow
 
 [net-analyzer/ngrep:0]
-package.use/net-analyzer_ngrep_0 : net-analyzer/ngrep:0 ipv6
+package.use : net-analyzer/ngrep:0 ipv6
 
 [net-analyzer/nmap:0]
-package.use/net-analyzer_nmap_0 : net-analyzer/nmap:0 -ncat -ndiff -nls -nmap-update -nping -system-lua -zenmap ipv6 lua ssl
+package.use : net-analyzer/nmap:0 -ncat -ndiff -nls -nmap-update -nping -system-lua -zenmap ipv6 lua ssl
 
 [net-analyzer/nrpe:0]
-package.use/net-analyzer_nrpe_0 : net-analyzer/nrpe:0 -command-args -minimal ssl tcpd
+package.use : net-analyzer/nrpe:0 -command-args -minimal ssl tcpd
 
 [net-analyzer/nsca:0]
-package.use/net-analyzer_nsca_0 : net-analyzer/nsca:0 -minimal crypt tcpd
+package.use : net-analyzer/nsca:0 -minimal crypt tcpd
 
 [net-analyzer/oinkmaster:0]
-package.use/net-analyzer_oinkmaster_0 : net-analyzer/oinkmaster:0 X
+package.use : net-analyzer/oinkmaster:0 X
 
 [net-analyzer/p0f:0]
-package.use/net-analyzer_p0f_0 : net-analyzer/p0f:0 -static
+package.use : net-analyzer/p0f:0 -static
 
 [net-analyzer/pinger:0]
-package.use/net-analyzer_pinger_0 : net-analyzer/pinger:0 -gtk2 -nls gtk3 ncurses
+package.use : net-analyzer/pinger:0 -gtk2 -nls gtk3 ncurses
 
 [net-analyzer/pmacct:0]
-package.use/net-analyzer_pmacct_0 : net-analyzer/pmacct:0 -64bit -debug -mongodb -mysql -postgres -ulog geoip ipv6 sqlite threads
+package.use : net-analyzer/pmacct:0 -64bit -debug -mongodb -mysql -postgres -ulog geoip ipv6 sqlite threads
 
 [net-analyzer/rrdtool:0]
-package.use/net-analyzer_rrdtool_0 : net-analyzer/rrdtool:0 -doc -rrdcgi dbi graph lua perl python ruby static-libs tcl tcpd
+package.use : net-analyzer/rrdtool:0 -doc -rrdcgi dbi graph lua perl python ruby static-libs tcl tcpd
 
 [net-analyzer/scapy:0]
-package.use/net-analyzer_scapy_0 : net-analyzer/scapy:0 -gnuplot -graphviz -imagemagick -pyx -tcpreplay -visual crypt
+package.use : net-analyzer/scapy:0 -gnuplot -graphviz -imagemagick -pyx -tcpreplay -visual crypt
 
 [net-analyzer/sflowtool:0]
-package.use/net-analyzer_sflowtool_0 : net-analyzer/sflowtool:0 -debug
+package.use : net-analyzer/sflowtool:0 -debug
 
 [net-analyzer/ssldump:0]
-package.use/net-analyzer_ssldump_0 : net-analyzer/ssldump:0 ssl
+package.use : net-analyzer/ssldump:0 ssl
 
 [net-analyzer/tcpdump:0]
-package.use/net-analyzer_tcpdump_0 : net-analyzer/tcpdump:0 -smi -test drop-root ipv6 samba ssl suid
+package.use : net-analyzer/tcpdump:0 -smi -test drop-root ipv6 samba ssl suid
 
 [net-analyzer/tcpstat:0]
-package.use/net-analyzer_tcpstat_0 : net-analyzer/tcpstat:0 ipv6
+package.use : net-analyzer/tcpstat:0 ipv6
 
 [net-analyzer/tleds:0]
-package.use/net-analyzer_tleds_0 : net-analyzer/tleds:0 X
+package.use : net-analyzer/tleds:0 X
 
 [net-analyzer/trafshow:3]
-package.use/net-analyzer_trafshow_3 : net-analyzer/trafshow:3 slang
+package.use : net-analyzer/trafshow:3 slang
 
 [net-analyzer/vnstat:0]
-package.use/net-analyzer_vnstat_0 : net-analyzer/vnstat:0 -gd -selinux -test
+package.use : net-analyzer/vnstat:0 -gd -selinux -test
 
 [net-analyzer/yersinia:0]
-package.use/net-analyzer_yersinia_0 : net-analyzer/yersinia:0 gtk ncurses
+package.use : net-analyzer/yersinia:0 gtk ncurses
 
 [net-analyzer/zabbix:0]
-package.use/net-analyzer_zabbix_0 : net-analyzer/zabbix:0 -agent -frontend -java -libxml2 -mysql -openipmi -oracle -postgres -proxy -server -snmp -ssh -static -xmpp curl ipv6 ldap odbc sqlite
+package.use : net-analyzer/zabbix:0 -agent -frontend -java -libxml2 -mysql -openipmi -oracle -postgres -proxy -server -snmp -ssh -static -xmpp curl ipv6 ldap odbc sqlite
 
 [net-dialup/capi4k-utils:0]
-package.use/net-dialup_capi4k-utils_0 : net-dialup/capi4k-utils:0 -fax -rcapid pppd
+package.use : net-dialup/capi4k-utils:0 -fax -rcapid pppd
 
 [net-dialup/freeradius:0]
-package.use/net-dialup_freeradius_0 : net-dialup/freeradius:0 -debug -firebird -kerberos -mysql -oracle -pam -pcap -postgres iodbc ldap odbc python readline sqlite ssl
+package.use : net-dialup/freeradius:0 -debug -firebird -kerberos -mysql -oracle -pam -pcap -postgres iodbc ldap odbc python readline sqlite ssl
 
 [net-dialup/globespan-adsl:0]
-package.use/net-dialup_globespan-adsl_0 : net-dialup/globespan-adsl:0 tk
+package.use : net-dialup/globespan-adsl:0 tk
 
 [net-dialup/lrzsz:0]
-package.use/net-dialup_lrzsz_0 : net-dialup/lrzsz:0 -nls
+package.use : net-dialup/lrzsz:0 -nls
 
 [net-dialup/minicom:0]
-package.use/net-dialup_minicom_0 : net-dialup/minicom:0 -nls
+package.use : net-dialup/minicom:0 -nls
 
 [net-dialup/ppp:0]
-package.use/net-dialup_ppp_0 : net-dialup/ppp:0 -activefilter -dhcp -eap-tls -pam -radius atm gtk ipv6
+package.use : net-dialup/ppp:0 -activefilter -dhcp -eap-tls -pam -radius atm gtk ipv6
 
 [net-dialup/pppconfig:0]
-package.use/net-dialup_pppconfig_0 : net-dialup/pppconfig:0 -nls
+package.use : net-dialup/pppconfig:0 -nls
 
 [net-dialup/pptpd:0]
-package.use/net-dialup_pptpd_0 : net-dialup/pptpd:0 -gre-extreme-debug tcpd
+package.use : net-dialup/pptpd:0 -gre-extreme-debug tcpd
 
 [net-dns/avahi:0]
-package.use/net-dns_avahi_0 : net-dns/avahi:0 -bookmarks -doc -howl-compat -mono -nls -selinux -test autoipd dbus gdbm gtk gtk3 introspection ipv6 mdnsresponder-compat python qt4 utils
+package.use : net-dns/avahi:0 -bookmarks -doc -howl-compat -mono -nls -selinux -test autoipd dbus gdbm gtk gtk3 introspection ipv6 mdnsresponder-compat python qt4 utils
 
 [net-dns/bind-tools:0]
-package.use/net-dns_bind-tools_0 : net-dns/bind-tools:0 -doc -gost -gssapi -urandom idn ipv6 readline ssl xml
-+package.env : net-dns/bind-tools:0 net-dns_bind-tools_0
-env/net-dns_bind-tools_0 : LDFLAGS="-liconv"
+package.use : net-dns/bind-tools:0 -doc -gost -gssapi -urandom idn ipv6 readline ssl xml
+package.env : net-dns/bind-tools:0 net-dns_bind-tools_0
+env : LDFLAGS="-liconv"
 
 [net-dns/c-ares:0]
-package.use/net-dns_c-ares_0 : net-dns/c-ares:0 static-libs
+package.use : net-dns/c-ares:0 static-libs
 
 [net-dns/ddclient:0]
-package.use/net-dns_ddclient_0 : net-dns/ddclient:0 hardened
+package.use : net-dns/ddclient:0 hardened
 
 [net-dns/djbdns:0]
-package.use/net-dns_djbdns_0 : net-dns/djbdns:0 -selinux ipv6
+package.use : net-dns/djbdns:0 -selinux ipv6
 
 [net-dns/dnstop:0]
-package.use/net-dns_dnstop_0 : net-dns/dnstop:0 ipv6
+package.use : net-dns/dnstop:0 ipv6
 
 [net-dns/idnkit:0]
-package.use/net-dns_idnkit_0 : net-dns/idnkit:0 static-libs
+package.use : net-dns/idnkit:0 static-libs
 
 [net-dns/libidn:0]
-package.use/net-dns_libidn_0 : net-dns/libidn:0 -doc -emacs -java -mono -nls static-libs
+package.use : net-dns/libidn:0 -doc -emacs -java -mono -nls static-libs
 
 [net-dns/pdnsd:0]
-package.use/net-dns_pdnsd_0 : net-dns/pdnsd:0 -debug -isdn -test ipv6 urandom
+package.use : net-dns/pdnsd:0 -debug -isdn -test ipv6 urandom
 
 [net-dns/rbldnsd:0]
-package.use/net-dns_rbldnsd_0 : net-dns/rbldnsd:0 -test ipv6 zlib
+package.use : net-dns/rbldnsd:0 -test ipv6 zlib
 
 [net-firewall/arno-iptables-firewall:0]
-package.use/net-firewall_arno-iptables-firewall_0 : net-firewall/arno-iptables-firewall:0 plugins
+package.use : net-firewall/arno-iptables-firewall:0 plugins
 
 [net-firewall/conntrack-tools:0]
-package.use/net-firewall_conntrack-tools_0 : net-firewall/conntrack-tools:0 -doc
+package.use : net-firewall/conntrack-tools:0 -doc
 
 [net-firewall/iptables:0]
-package.use/net-firewall_iptables_0 : net-firewall/iptables:0 -netlink ipv6 static-libs
+package.use : net-firewall/iptables:0 -netlink ipv6 static-libs
 
 [net-firewall/ufw:0]
-package.use/net-firewall_ufw_0 : net-firewall/ufw:0 -examples ipv6
+package.use : net-firewall/ufw:0 -examples ipv6
 
 [net-fs/cifs-utils:0]
-package.use/net-fs_cifs-utils_0 : net-fs/cifs-utils:0 -creds acl ads caps caps-ng
+package.use : net-fs/cifs-utils:0 -creds acl ads caps caps-ng
 
 [net-fs/samba:0]
-package.use/net-fs_samba_0 : net-fs/samba:0 -addns -cluster -debug -dmapi -doc -examples -ldb -pam -quota -selinux -smbsharemodes -swat acl ads aio avahi caps client cups fam ldap netapi readline server smbclient syslog winbind
+package.use : net-fs/samba:0 -addns -cluster -debug -dmapi -doc -examples -ldb -pam -quota -selinux -smbsharemodes -swat acl ads aio avahi caps client cups fam ldap netapi readline server smbclient syslog winbind
 
 [net-ftp/filezilla:0]
-package.use/net-ftp_filezilla_0 : net-ftp/filezilla:0 -aqua -nls -test dbus
+package.use : net-ftp/filezilla:0 -aqua -nls -test dbus
 
 [net-ftp/frox:0]
-package.use/net-ftp_frox_0 : net-ftp/frox:0 -clamav -transparent ssl
+package.use : net-ftp/frox:0 -clamav -transparent ssl
 
 [net-ftp/ftpbase:0]
-package.use/net-ftp_ftpbase_0 : net-ftp/ftpbase:0 -pam
+package.use : net-ftp/ftpbase:0 -pam
 
 [net-ftp/lftp:0]
-package.use/net-ftp_lftp_0 : net-ftp/lftp:0 -convert-mozilla-cookies -nls -openssl -socks5 -verify-file gnutls idn ssl
+package.use : net-ftp/lftp:0 -convert-mozilla-cookies -nls -openssl -socks5 -verify-file gnutls idn ssl
 
 [net-ftp/ncftp:0]
-package.use/net-ftp_ncftp_0 : net-ftp/ncftp:0 -pch ipv6
+package.use : net-ftp/ncftp:0 -pch ipv6
 
 [net-ftp/netkit-ftpd:0]
-package.use/net-ftp_netkit-ftpd_0 : net-ftp/netkit-ftpd:0 ssl
+package.use : net-ftp/netkit-ftpd:0 ssl
 
 [net-ftp/oftpd:0]
-package.use/net-ftp_oftpd_0 : net-ftp/oftpd:0 ipv6
+package.use : net-ftp/oftpd:0 ipv6
 
 [net-ftp/pureadmin:0]
-package.use/net-ftp_pureadmin_0 : net-ftp/pureadmin:0 -debug -doc
+package.use : net-ftp/pureadmin:0 -debug -doc
 
 [net-im/bitlbee:0]
-package.use/net-im_bitlbee_0 : net-im/bitlbee:0 -debug -libevent -msn -nss -otr -purple -selinux -skype -test -twitter gnutls ipv6 oscar plugins ssl xinetd xmpp yahoo
+package.use : net-im/bitlbee:0 -debug -libevent -msn -nss -otr -purple -selinux -skype -test -twitter gnutls ipv6 oscar plugins ssl xinetd xmpp yahoo
 
 [net-im/climm:0]
-package.use/net-im_climm_0 : net-im/climm:0 -otr -xmpp gnutls ssl tcl
+package.use : net-im/climm:0 -otr -xmpp gnutls ssl tcl
 
 [net-im/mcabber:0]
-package.use/net-im_mcabber_0 : net-im/mcabber:0 -aspell -otr crypt idn modules spell ssl vim-syntax
+package.use : net-im/mcabber:0 -aspell -otr crypt idn modules spell ssl vim-syntax
 
 [net-im/minbif:0]
-package.use/net-im_minbif_0 : net-im/minbif:0 -pam gnutls imlib libcaca xinetd
+package.use : net-im/minbif:0 -pam gnutls imlib libcaca xinetd
 
 [net-im/pidgin:0]
-package.use/net-im_pidgin_0 : net-im/pidgin:0 -aqua -debug -doc -eds -gadu -groupwise -meanwhile -mxit -networkmanager -nls -prediction -silc -zephyr dbus gnutls gstreamer gtk idn ncurses perl python sasl spell tcl tk xscreensaver zeroconf
+package.use : net-im/pidgin:0 -aqua -debug -doc -eds -gadu -groupwise -meanwhile -mxit -networkmanager -nls -prediction -silc -zephyr dbus gnutls gstreamer gtk idn ncurses perl python sasl spell tcl tk xscreensaver zeroconf
 
 [net-im/pork:0]
-package.use/net-im_pork_0 : net-im/pork:0 perl
+package.use : net-im/pork:0 perl
 
 [net-im/prosody:0]
-package.use/net-im_prosody_0 : net-im/prosody:0 -jit -libevent -mysql -postgres ipv6 sqlite ssl zlib
+package.use : net-im/prosody:0 -jit -libevent -mysql -postgres ipv6 sqlite ssl zlib
 
 [net-im/pyaim-t:0]
-package.use/net-im_pyaim-t_0 : net-im/pyaim-t:0 -webinterface
+package.use : net-im/pyaim-t:0 -webinterface
 
 [net-im/pyicq-t:0]
-package.use/net-im_pyicq-t_0 : net-im/pyicq-t:0 -webinterface
+package.use : net-im/pyicq-t:0 -webinterface
 
 [net-im/telepathy-mission-control:0]
-package.use/net-im_telepathy-mission-control_0 : net-im/telepathy-mission-control:0 -debug -networkmanager -systemd -upower
+package.use : net-im/telepathy-mission-control:0 -debug -networkmanager -systemd -upower
 
 [net-im/tkabber:0]
-package.use/net-im_tkabber_0 : net-im/tkabber:0 -plugins ssl
+package.use : net-im/tkabber:0 -plugins ssl
 
 [net-irc/atheme-services:0]
-package.use/net-irc_atheme-services_0 : net-irc/atheme-services:0 -largenet -nls -profile cracklib ldap pcre perl ssl
+package.use : net-irc/atheme-services:0 -largenet -nls -profile cracklib ldap pcre perl ssl
 
 [net-irc/bip:0]
-package.use/net-irc_bip_0 : net-irc/bip:0 -debug -freenode -noctcp -oidentd ssl vim-syntax
+package.use : net-irc/bip:0 -debug -freenode -noctcp -oidentd ssl vim-syntax
 
 [net-irc/bnc:0]
-package.use/net-irc_bnc_0 : net-irc/bnc:0 ssl
+package.use : net-irc/bnc:0 ssl
 
 [net-irc/bobotpp:0]
-package.use/net-irc_bobotpp_0 : net-irc/bobotpp:0 guile
+package.use : net-irc/bobotpp:0 guile
 
 [net-irc/charybdis:0]
-package.use/net-irc_charybdis_0 : net-irc/charybdis:0 -debug -largenet ipv6 ssl zlib
+package.use : net-irc/charybdis:0 -debug -largenet ipv6 ssl zlib
 
 [net-irc/eggdrop:0]
-package.use/net-irc_eggdrop_0 : net-irc/eggdrop:0 -debug -mysql -postgres -static -vanilla ssl
+package.use : net-irc/eggdrop:0 -debug -mysql -postgres -static -vanilla ssl
 
 [net-irc/eiwic:0]
-package.use/net-irc_eiwic_0 : net-irc/eiwic:0 -debug -doc ipv6
+package.use : net-irc/eiwic:0 -debug -doc ipv6
 
 [net-irc/emech:0]
-package.use/net-irc_emech_0 : net-irc/emech:0 -debug session tcl
+package.use : net-irc/emech:0 -debug session tcl
 
 [net-irc/epic4:0]
-package.use/net-irc_epic4_0 : net-irc/epic4:0 ipv6 perl ssl
+package.use : net-irc/epic4:0 ipv6 perl ssl
 
 [net-irc/hexchat:0]
-package.use/net-irc_hexchat_0 : net-irc/hexchat:0 -libcanberra -libproxy -nls -ntlm -plugin-checksum -plugin-doat -plugin-fishlim -plugin-sysinfo -theme-manager dbus gtk ipv6 libnotify perl plugins python spell ssl
+package.use : net-irc/hexchat:0 -libcanberra -libproxy -nls -ntlm -plugin-checksum -plugin-doat -plugin-fishlim -plugin-sysinfo -theme-manager dbus gtk ipv6 libnotify perl plugins python spell ssl
 
 [net-irc/inspircd:0]
-package.use/net-irc_inspircd_0 : net-irc/inspircd:0 -mysql -posix -postgres -tre geoip gnutls ipv6 ldap pcre sqlite ssl
+package.use : net-irc/inspircd:0 -mysql -posix -postgres -tre geoip gnutls ipv6 ldap pcre sqlite ssl
 
 [net-irc/ircii:0]
-package.use/net-irc_ircii_0 : net-irc/ircii:0 ipv6
+package.use : net-irc/ircii:0 ipv6
 
 [net-irc/irssi-otr:0]
-package.use/net-irc_irssi-otr_0 : net-irc/irssi-otr:0 -debug
+package.use : net-irc/irssi-otr:0 -debug
 
 [net-irc/irssi:0]
-package.use/net-irc_irssi_0 : net-irc/irssi:0 -selinux -socks5 ipv6 perl proxy ssl
+package.use : net-irc/irssi:0 -selinux -socks5 ipv6 perl proxy ssl
 
 [net-irc/scrollz:0]
-package.use/net-irc_scrollz_0 : net-irc/scrollz:0 -socks5 gmp gnutls ipv6 ssl
+package.use : net-irc/scrollz:0 -socks5 gmp gnutls ipv6 ssl
 
 [net-irc/shadowircd:0]
-package.use/net-irc_shadowircd_0 : net-irc/shadowircd:0 -debug -largenet ipv6 ssl zlib
+package.use : net-irc/shadowircd:0 -debug -largenet ipv6 ssl zlib
 
 [net-irc/weechat:0]
-package.use/net-irc_weechat_0 : net-irc/weechat:0 -doc -nls -test alias charset exec fifo guile irc logger lua perl python relay ruby scripts spell ssl tcl trigger xfer
+package.use : net-irc/weechat:0 -doc -nls -test alias charset exec fifo guile irc logger lua perl python relay ruby scripts spell ssl tcl trigger xfer
 
 [net-irc/znc:0]
-package.use/net-irc_znc_0 : net-irc/znc:0 -daemon -debug ipv6 perl python sasl ssl tcl python_targets_python3_3
+package.use : net-irc/znc:0 -daemon -debug ipv6 perl python sasl ssl tcl python_targets_python3_3
 
 [net-libs/daq:0]
-package.use/net-libs_daq_0 : net-libs/daq:0 -ipq -nfq afpacket dump ipv6 pcap static-libs
+package.use : net-libs/daq:0 -ipq -nfq afpacket dump ipv6 pcap static-libs
 
 [net-libs/enet:1.3]
-package.use/net-libs_enet_1.3 : net-libs/enet:1.3 static-libs
+package.use : net-libs/enet:1.3 static-libs
 
 [net-libs/farstream:0.1]
-package.use/net-libs_farstream_0.1 : net-libs/farstream:0.1 -test introspection python upnp
+package.use : net-libs/farstream:0.1 -test introspection python upnp
 
 [net-libs/glib-networking:0]
-package.use/net-libs_glib-networking_0 : net-libs/glib-networking:0 -libproxy -test gnome smartcard ssl
+package.use : net-libs/glib-networking:0 -libproxy -test gnome smartcard ssl
 
 [net-libs/gnet:2]
-package.use/net-libs_gnet_2 : net-libs/gnet:2 -debug -test
+package.use : net-libs/gnet:2 -debug -test
 
 [net-libs/gnome-online-accounts:0]
-package.use/net-libs_gnome-online-accounts_0 : net-libs/gnome-online-accounts:0 -debug -gnome -kerberos introspection
+package.use : net-libs/gnome-online-accounts:0 -debug -gnome -kerberos introspection
 
 [net-libs/gnutls:0]
-package.use/net-libs_gnutls_0 : net-libs/gnutls:0 -dane -doc -examples -nls -test crywrap cxx guile openssl pkcs11 static-libs zlib
+package.use : net-libs/gnutls:0 -dane -doc -examples -nls -test crywrap cxx guile openssl pkcs11 static-libs zlib
 
 [net-libs/gsnmp:0]
-package.use/net-libs_gsnmp_0 : net-libs/gsnmp:0 static-libs
+package.use : net-libs/gsnmp:0 static-libs
 
 [net-libs/gssdp:0]
-package.use/net-libs_gssdp_0 : net-libs/gssdp:0 gtk introspection
+package.use : net-libs/gssdp:0 gtk introspection
 
 [net-libs/gtk-vnc:0]
-package.use/net-libs_gtk-vnc_0 : net-libs/gtk-vnc:0 -examples -pulseaudio gtk3 introspection python sasl vala
+package.use : net-libs/gtk-vnc:0 -examples -pulseaudio gtk3 introspection python sasl vala
 
 [net-libs/gupnp-av:0]
-package.use/net-libs_gupnp-av_0 : net-libs/gupnp-av:0 introspection
+package.use : net-libs/gupnp-av:0 introspection
 
 [net-libs/gupnp-igd:0]
-package.use/net-libs_gupnp-igd_0 : net-libs/gupnp-igd:0 introspection python
+package.use : net-libs/gupnp-igd:0 introspection python
 
 [net-libs/gupnp:0]
-package.use/net-libs_gupnp_0 : net-libs/gupnp:0 -connman -networkmanager introspection
+package.use : net-libs/gupnp:0 -connman -networkmanager introspection
 
 [net-libs/http-parser:0]
-package.use/net-libs_http-parser_0 : net-libs/http-parser:0 static-libs
+package.use : net-libs/http-parser:0 static-libs
 
 [net-libs/jreen:0]
-package.use/net-libs_jreen_0 : net-libs/jreen:0 -debug -qt5 qt4
+package.use : net-libs/jreen:0 -debug -qt5 qt4
 
 [net-libs/libasyncns:0]
-package.use/net-libs_libasyncns_0 : net-libs/libasyncns:0 -debug -doc
+package.use : net-libs/libasyncns:0 -debug -doc
 
 [net-libs/libesmtp:0]
-package.use/net-libs_libesmtp_0 : net-libs/libesmtp:0 -debug -ntlm ssl static-libs threads
+package.use : net-libs/libesmtp:0 -debug -ntlm ssl static-libs threads
 
 [net-libs/libetpan:0]
-package.use/net-libs_libetpan_0 : net-libs/libetpan:0 -debug -liblockfile berkdb gnutls ipv6 sasl ssl static-libs
+package.use : net-libs/libetpan:0 -debug -liblockfile berkdb gnutls ipv6 sasl ssl static-libs
 
 [net-libs/libgadu:0]
-package.use/net-libs_libgadu_0 : net-libs/libgadu:0 -doc -test gnutls ssl static-libs threads
+package.use : net-libs/libgadu:0 -doc -test gnutls ssl static-libs threads
 
 [net-libs/libgsasl:0]
-package.use/net-libs_libgsasl_0 : net-libs/libgsasl:0 -gcrypt -kerberos -nls -ntlm idn static-libs
+package.use : net-libs/libgsasl:0 -gcrypt -kerberos -nls -ntlm idn static-libs
 
 [net-libs/libmnl:0]
-package.use/net-libs_libmnl_0 : net-libs/libmnl:0 -examples static-libs
+package.use : net-libs/libmnl:0 -examples static-libs
 
 [net-libs/libmrss:0]
-package.use/net-libs_libmrss_0 : net-libs/libmrss:0 -doc -examples static-libs
+package.use : net-libs/libmrss:0 -doc -examples static-libs
 
 [net-libs/libnatpmp:0]
-package.use/net-libs_libnatpmp_0 : net-libs/libnatpmp:0 static-libs
+package.use : net-libs/libnatpmp:0 static-libs
 
 [net-libs/libnet:1.1]
-package.use/net-libs_libnet_1.1 : net-libs/libnet:1.1 -doc static-libs
+package.use : net-libs/libnet:1.1 -doc static-libs
 
 [net-libs/libnetfilter_acct:0]
-package.use/net-libs_libnetfilter_acct_0 : net-libs/libnetfilter_acct:0 -examples
+package.use : net-libs/libnetfilter_acct:0 -examples
 
 [net-libs/libnetfilter_conntrack:0]
-package.use/net-libs_libnetfilter_conntrack_0 : net-libs/libnetfilter_conntrack:0 static-libs
+package.use : net-libs/libnetfilter_conntrack:0 static-libs
 
 [net-libs/libnetfilter_cthelper:0]
-package.use/net-libs_libnetfilter_cthelper_0 : net-libs/libnetfilter_cthelper:0 static-libs
+package.use : net-libs/libnetfilter_cthelper:0 static-libs
 
 [net-libs/libnetfilter_cttimeout:0]
-package.use/net-libs_libnetfilter_cttimeout_0 : net-libs/libnetfilter_cttimeout:0 static-libs
+package.use : net-libs/libnetfilter_cttimeout:0 static-libs
 
 [net-libs/libnetfilter_log:0]
-package.use/net-libs_libnetfilter_log_0 : net-libs/libnetfilter_log:0 static-libs
+package.use : net-libs/libnetfilter_log:0 static-libs
 
 [net-libs/libnetfilter_queue:0]
-package.use/net-libs_libnetfilter_queue_0 : net-libs/libnetfilter_queue:0 static-libs
+package.use : net-libs/libnetfilter_queue:0 static-libs
 
 [net-libs/libnfnetlink:0]
-package.use/net-libs_libnfnetlink_0 : net-libs/libnfnetlink:0 static-libs
+package.use : net-libs/libnfnetlink:0 static-libs
 
 [net-libs/libnice:0]
-package.use/net-libs_libnice_0 : net-libs/libnice:0 introspection upnp
+package.use : net-libs/libnice:0 introspection upnp
 
 [net-libs/libnxml:0]
-package.use/net-libs_libnxml_0 : net-libs/libnxml:0 -doc -examples static-libs
+package.use : net-libs/libnxml:0 -doc -examples static-libs
 
 [net-libs/liboauth:0]
-package.use/net-libs_liboauth_0 : net-libs/liboauth:0 -doc bindist curl nss
+package.use : net-libs/liboauth:0 -doc bindist curl nss
 
 [net-libs/liboping:0]
-package.use/net-libs_liboping_0 : net-libs/liboping:0 perl
+package.use : net-libs/liboping:0 perl
 
 [net-libs/libosip:2]
-package.use/net-libs_libosip_2 : net-libs/libosip:2 -test
+package.use : net-libs/libosip:2 -test
 
 [net-libs/libpcap:0]
-package.use/net-libs_libpcap_0 : net-libs/libpcap:0 -canusb -netlink bluetooth dbus ipv6 static-libs
+package.use : net-libs/libpcap:0 -canusb -netlink bluetooth dbus ipv6 static-libs
 
 [net-libs/libproxy:0]
-package.use/net-libs_libproxy_0 : net-libs/libproxy:0 -gnome -kde -mono -networkmanager -spidermonkey -test perl python webkit
+package.use : net-libs/libproxy:0 -gnome -kde -mono -networkmanager -spidermonkey -test perl python webkit
 
 [net-libs/libqmi:0]
-package.use/net-libs_libqmi_0 : net-libs/libqmi:0 -doc static-libs
+package.use : net-libs/libqmi:0 -doc static-libs
 
 [net-libs/librouteros:0]
-package.use/net-libs_librouteros_0 : net-libs/librouteros:0 -debug static-libs
+package.use : net-libs/librouteros:0 -debug static-libs
 
 [net-libs/librsync:0]
-package.use/net-libs_librsync_0 : net-libs/librsync:0 static-libs
+package.use : net-libs/librsync:0 static-libs
 
 [net-libs/libsoup-gnome:2.4]
-package.use/net-libs_libsoup-gnome_2.4 : net-libs/libsoup-gnome:2.4 -debug introspection
+package.use : net-libs/libsoup-gnome:2.4 -debug introspection
 
 [net-libs/libsoup:2.4]
-package.use/net-libs_libsoup_2.4 : net-libs/libsoup:2.4 -debug -test introspection samba ssl
+package.use : net-libs/libsoup:2.4 -debug -test introspection samba ssl
 
 [net-libs/libtorrent:0]
-package.use/net-libs_libtorrent_0 : net-libs/libtorrent:0 -debug ipv6 ssl
+package.use : net-libs/libtorrent:0 -debug ipv6 ssl
 
 [net-libs/libupnp:0]
-package.use/net-libs_libupnp_0 : net-libs/libupnp:0 -debug -doc ipv6 static-libs
+package.use : net-libs/libupnp:0 -debug -doc ipv6 static-libs
 
 [net-libs/loudmouth:0]
-package.use/net-libs_loudmouth_0 : net-libs/loudmouth:0 -asyncns -debug -test ssl static-libs
+package.use : net-libs/loudmouth:0 -asyncns -debug -test ssl static-libs
 
 [net-libs/miniupnpc:0]
-package.use/net-libs_miniupnpc_0 : net-libs/miniupnpc:0 static-libs
+package.use : net-libs/miniupnpc:0 static-libs
 
 [net-libs/neon:0]
-package.use/net-libs_neon_0 : net-libs/neon:0 -doc -expat -kerberos -libproxy -nls gnutls pkcs11 ssl static-libs zlib
+package.use : net-libs/neon:0 -doc -expat -kerberos -libproxy -nls gnutls pkcs11 ssl static-libs zlib
 
 [net-libs/net6:0]
-package.use/net-libs_net6_0 : net-libs/net6:0 -nls static-libs
+package.use : net-libs/net6:0 -nls static-libs
 
 [net-libs/obby:0]
-package.use/net-libs_obby_0 : net-libs/obby:0 -nls avahi ipv6 static-libs
+package.use : net-libs/obby:0 -nls avahi ipv6 static-libs
 
 [net-libs/rest:0.7]
-package.use/net-libs_rest_0.7 : net-libs/rest:0.7 -test gnome introspection
+package.use : net-libs/rest:0.7 -test gnome introspection
 
 [net-libs/serf:1]
-package.use/net-libs_serf_1 : net-libs/serf:1 -kerberos
+package.use : net-libs/serf:1 -kerberos
 
 [net-libs/socket++:0]
-package.use/net-libs_socket++_0 : net-libs/socket++:0 -debug -doc
+package.use : net-libs/socket++:0 -debug -doc
 
 [net-libs/sofia-sip:0]
-package.use/net-libs_sofia-sip_0 : net-libs/sofia-sip:0 ssl static-libs
+package.use : net-libs/sofia-sip:0 ssl static-libs
 
 [net-libs/telepathy-glib:0]
-package.use/net-libs_telepathy-glib_0 : net-libs/telepathy-glib:0 -debug -test introspection vala
+package.use : net-libs/telepathy-glib:0 -debug -test introspection vala
 
 [net-libs/webkit-gtk:2]
-package.use/net-libs_webkit-gtk_2 : net-libs/webkit-gtk:2 -aqua -coverage -debug -gles2 -jit -libsecret -test X egl geoloc gstreamer introspection opengl spell webgl
+package.use : net-libs/webkit-gtk:2 -aqua -coverage -debug -gles2 -jit -libsecret -test X egl geoloc gstreamer introspection opengl spell webgl
 
 [net-libs/webkit-gtk:3]
-package.use/net-libs_webkit-gtk_3 : net-libs/webkit-gtk:3 -aqua -coverage -debug -gles2 -jit -libsecret -test -wayland X egl geoloc gstreamer introspection opengl spell webgl
+package.use : net-libs/webkit-gtk:3 -aqua -coverage -debug -gles2 -jit -libsecret -test -wayland X egl geoloc gstreamer introspection opengl spell webgl
 
 [net-libs/wt:0]
-package.use/net-libs_wt_0 : net-libs/wt:0 -doc -fcgi -graphicsmagick -postgres -resources -test extjs pdf server sqlite ssl zlib
+package.use : net-libs/wt:0 -doc -fcgi -graphicsmagick -postgres -resources -test extjs pdf server sqlite ssl zlib
 
 [net-libs/zeromq:0]
-package.use/net-libs_zeromq_0 : net-libs/zeromq:0 -pgm -test static-libs
+package.use : net-libs/zeromq:0 -pgm -test static-libs
 
 [net-mail/automx:0]
-package.use/net-mail_automx_0 : net-mail/automx:0 -memcached -sql ldap tools
+package.use : net-mail/automx:0 -memcached -sql ldap tools
 
 [net-mail/cyrus-imap-admin:0]
-package.use/net-mail_cyrus-imap-admin_0 : net-mail/cyrus-imap-admin:0 -kerberos berkdb ssl
+package.use : net-mail/cyrus-imap-admin:0 -kerberos berkdb ssl
 
 [net-mail/dbmail:0]
-package.use/net-mail_dbmail_0 : net-mail/dbmail:0 -sieve -static ldap sqlite ssl
+package.use : net-mail/dbmail:0 -sieve -static ldap sqlite ssl
 
 [net-mail/dovecot:0]
-package.use/net-mail_dovecot_0 : net-mail/dovecot:0 -cydir -doc -imapc -kerberos -lucene -lz4 -managesieve -mdbox -mysql -pam -pop3c -postgres -sdbox -selinux -sieve -solr -vpopmail bzip2 caps ipv6 ldap lzma maildir mbox sqlite ssl static-libs suid tcpd zlib
-+package.env : net-mail/dovecot:0 net-mail_dovecot_0
-env/net-mail_dovecot_0 : LDFLAGS="-liconv"
+package.use : net-mail/dovecot:0 -cydir -doc -imapc -kerberos -lucene -lz4 -managesieve -mdbox -mysql -pam -pop3c -postgres -sdbox -selinux -sieve -solr -vpopmail bzip2 caps ipv6 ldap lzma maildir mbox sqlite ssl static-libs suid tcpd zlib
+package.env : net-mail/dovecot:0 net-mail_dovecot_0
+env : LDFLAGS="-liconv"
 
 [net-mail/fetchmail:0]
-package.use/net-mail_fetchmail_0 : net-mail/fetchmail:0 -hesiod -kerberos -nls -socks ssl tk
+package.use : net-mail/fetchmail:0 -hesiod -kerberos -nls -socks ssl tk
 
 [net-mail/getmail:4]
-package.use/net-mail_getmail_4 : net-mail/getmail:4 ssl
+package.use : net-mail/getmail:4 ssl
 
 [net-mail/gnubiff:0]
-package.use/net-mail_gnubiff_0 : net-mail/gnubiff:0 -debug -nls -password fam
+package.use : net-mail/gnubiff:0 -debug -nls -password fam
 
 [net-mail/isync:0]
-package.use/net-mail_isync_0 : net-mail/isync:0 ssl
+package.use : net-mail/isync:0 ssl
 
 [net-mail/mailbase:0]
-package.use/net-mail_mailbase_0 : net-mail/mailbase:0 -pam
+package.use : net-mail/mailbase:0 -pam
 
 [net-mail/mailman:0]
-package.use/net-mail_mailman_0 : net-mail/mailman:0 -selinux
+package.use : net-mail/mailman:0 -selinux
 
 [net-mail/mairix:0]
-package.use/net-mail_mairix_0 : net-mail/mairix:0 -gnus bzip2 zlib
+package.use : net-mail/mairix:0 -gnus bzip2 zlib
 
 [net-mail/mhonarc:0]
-package.use/net-mail_mhonarc_0 : net-mail/mhonarc:0 -examples
+package.use : net-mail/mhonarc:0 -examples
 
 [net-mail/mu:0]
-package.use/net-mail_mu_0 : net-mail/mu:0 -doc -emacs -gui
-+package.env : net-mail/mu:0 net-mail_mu_0
-env/net-mail_mu_0 : LDFLAGS="-lintl"
+package.use : net-mail/mu:0 -doc -emacs -gui
+package.env : net-mail/mu:0 net-mail_mu_0
+env : LDFLAGS="-lintl"
 
 [net-mail/notmuch:0]
-package.use/net-mail_notmuch_0 : net-mail/notmuch:0 -debug -doc -emacs -mutt -nmbug -test crypt python
+package.use : net-mail/notmuch:0 -debug -doc -emacs -mutt -nmbug -test crypt python
 
 [net-mail/offlineimap:0]
-package.use/net-mail_offlineimap_0 : net-mail/offlineimap:0 -doc sqlite ssl
+package.use : net-mail/offlineimap:0 -doc sqlite ssl
 
 [net-mail/qpopper:0]
-package.use/net-mail_qpopper_0 : net-mail/qpopper:0 -apop -debug -drac -mailbox -pam gdbm ssl xinetd
+package.use : net-mail/qpopper:0 -apop -debug -drac -mailbox -pam gdbm ssl xinetd
 
 [net-mail/sendEmail:0]
-package.use/net-mail_sendemail_0 : net-mail/sendEmail:0 ssl
+package.use : net-mail/sendEmail:0 ssl
 
 [net-mail/swaks:0]
-package.use/net-mail_swaks_0 : net-mail/swaks:0 ssl
+package.use : net-mail/swaks:0 ssl
 
 [net-mail/up-imapproxy:0]
-package.use/net-mail_up-imapproxy_0 : net-mail/up-imapproxy:0 -kerberos ssl tcpd
+package.use : net-mail/up-imapproxy:0 -kerberos ssl tcpd
 
 [net-misc/aiccu:0]
-package.use/net-misc_aiccu_0 : net-misc/aiccu:0 -systemd
+package.use : net-misc/aiccu:0 -systemd
 
 [net-misc/aria2:0]
-package.use/net-misc_aria2_0 : net-misc/aria2:0 -adns -bittorrent -metalink -nls -scripts -test -xmlrpc gnutls libxml2 nettle sqlite ssl
+package.use : net-misc/aria2:0 -adns -bittorrent -metalink -nls -scripts -test -xmlrpc gnutls libxml2 nettle sqlite ssl
 
 [net-misc/axel:0]
-package.use/net-misc_axel_0 : net-misc/axel:0 -debug -nls
+package.use : net-misc/axel:0 -debug -nls
 
 [net-misc/badvpn:0]
-package.use/net-misc_badvpn_0 : net-misc/badvpn:0 -debug client ncd server tun2socks udpgw
+package.use : net-misc/badvpn:0 -debug client ncd server tun2socks udpgw
 
 [net-misc/cfengine:3]
-package.use/net-misc_cfengine_3 : net-misc/cfengine:3 -examples -html -libvirt -mysql -postgres -selinux -tests -tokyocabinet qdbm vim-syntax
+package.use : net-misc/cfengine:3 -examples -html -libvirt -mysql -postgres -selinux -tests -tokyocabinet qdbm vim-syntax
 
 [net-misc/clockspeed:0]
-package.use/net-misc_clockspeed_0 : net-misc/clockspeed:0 -selinux -static
+package.use : net-misc/clockspeed:0 -selinux -static
 
 [net-misc/clusterssh:0]
-package.use/net-misc_clusterssh_0 : net-misc/clusterssh:0 -test
+package.use : net-misc/clusterssh:0 -test
 
 [net-misc/curl:0]
-package.use/net-misc_curl_0 : net-misc/curl:0 -adns -curl_ssl_axtls -curl_ssl_gnutls -curl_ssl_openssl -curl_ssl_polarssl -curl_ssl_winssl -kerberos -metalink -ssh -test curl_ssl_nss idn ipv6 ldap rtmp samba ssl static-libs threads
+package.use : net-misc/curl:0 -adns -curl_ssl_axtls -curl_ssl_gnutls -curl_ssl_openssl -curl_ssl_polarssl -curl_ssl_winssl -kerberos -metalink -ssh -test curl_ssl_nss idn ipv6 ldap rtmp samba ssl static-libs threads
 
 [net-misc/dhcpcd:0]
-package.use/net-misc_dhcpcd_0 : net-misc/dhcpcd:0 embedded ipv6 udev
+package.use : net-misc/dhcpcd:0 embedded ipv6 udev
 
 [net-misc/dibbler:0]
-package.use/net-misc_dibbler_0 : net-misc/dibbler:0 -doc
+package.use : net-misc/dibbler:0 -doc
 
 [net-misc/dnetstats:0]
-package.use/net-misc_dnetstats_0 : net-misc/dnetstats:0 -policykit
+package.use : net-misc/dnetstats:0 -policykit
 
 [net-misc/dropbox:0]
-package.use/net-misc_dropbox_0 : net-misc/dropbox:0 X librsync-bundled
+package.use : net-misc/dropbox:0 X librsync-bundled
 
 [net-misc/gogoc:0]
-package.use/net-misc_gogoc_0 : net-misc/gogoc:0 -debug
+package.use : net-misc/gogoc:0 -debug
 
 [net-misc/gwget:0]
-package.use/net-misc_gwget_0 : net-misc/gwget:0 -epiphany libnotify
+package.use : net-misc/gwget:0 -epiphany libnotify
 
 [net-misc/htbinit:0]
-package.use/net-misc_htbinit_0 : net-misc/htbinit:0 -esfq ipv6
+package.use : net-misc/htbinit:0 -esfq ipv6
 
 [net-misc/icecast:0]
-package.use/net-misc_icecast_0 : net-misc/icecast:0 -kate -logrotate speex ssl theora yp
+package.use : net-misc/icecast:0 -kate -logrotate speex ssl theora yp
 
 [net-misc/iperf:3]
-package.use/net-misc_iperf_3 : net-misc/iperf:3 static-libs
+package.use : net-misc/iperf:3 static-libs
 
 [net-misc/iputils:0]
-package.use/net-misc_iputils_0 : net-misc/iputils:0 -SECURITY_HAZARD -doc -static caps filecaps gnutls idn ipv6 ssl
+package.use : net-misc/iputils:0 -SECURITY_HAZARD -doc -static caps filecaps gnutls idn ipv6 ssl
 
 [net-misc/ipv6calc:0]
-package.use/net-misc_ipv6calc_0 : net-misc/ipv6calc:0 -test geoip
+package.use : net-misc/ipv6calc:0 -test geoip
 
 [net-misc/jigdo:0]
-package.use/net-misc_jigdo_0 : net-misc/jigdo:0 -nls berkdb gtk
+package.use : net-misc/jigdo:0 -nls berkdb gtk
 
 [net-misc/knock:0]
-package.use/net-misc_knock_0 : net-misc/knock:0 server
+package.use : net-misc/knock:0 server
 
 [net-misc/linux-identd:0]
-package.use/net-misc_linux-identd_0 : net-misc/linux-identd:0 xinetd
+package.use : net-misc/linux-identd:0 xinetd
 
 [net-misc/lldpd:0]
-package.use/net-misc_lldpd_0 : net-misc/lldpd:0 -cdp -doc -edp -fdp -graph -jansson -json-c -snmp -sonmp -zsh-completion dot1 dot3 lldpmed readline seccomp static-libs xml
+package.use : net-misc/lldpd:0 -cdp -doc -edp -fdp -graph -jansson -json-c -snmp -sonmp -zsh-completion dot1 dot3 lldpmed readline seccomp static-libs xml
 
 [net-misc/mediatomb:0]
-package.use/net-misc_mediatomb_0 : net-misc/mediatomb:0 -debug -id3tag -lastfm -libextractor -mysql -thumbnail curl exif ffmpeg flac inotify javascript magic mp4 sqlite taglib zlib
+package.use : net-misc/mediatomb:0 -debug -id3tag -lastfm -libextractor -mysql -thumbnail curl exif ffmpeg flac inotify javascript magic mp4 sqlite taglib zlib
 
 [net-misc/minidlna:0]
-package.use/net-misc_minidlna_0 : net-misc/minidlna:0 -netgear -readynas
+package.use : net-misc/minidlna:0 -netgear -readynas
 
 [net-misc/miredo:0]
-package.use/net-misc_miredo_0 : net-misc/miredo:0 caps
+package.use : net-misc/miredo:0 caps
 
 [net-misc/modemmanager:0]
-package.use/net-misc_modemmanager_0 : net-misc/modemmanager:0 -mbim -policykit -qmi-newest introspection qmi vala
+package.use : net-misc/modemmanager:0 -mbim -policykit -qmi-newest introspection qmi vala
 
 [net-misc/mosh:0]
-package.use/net-misc_mosh_0 : net-misc/mosh:0 -examples -ufw client mosh-hardening server utempter
+package.use : net-misc/mosh:0 -examples -ufw client mosh-hardening server utempter
 
 [net-misc/netfleet:0]
-package.use/net-misc_netfleet_0 : net-misc/netfleet:0 -debug
+package.use : net-misc/netfleet:0 -debug
 
 [net-misc/netkit-talk:0]
-package.use/net-misc_netkit-talk_0 : net-misc/netkit-talk:0 ipv6
+package.use : net-misc/netkit-talk:0 ipv6
 
 [net-misc/olsrd:0]
-package.use/net-misc_olsrd_0 : net-misc/olsrd:0 gtk
+package.use : net-misc/olsrd:0 gtk
 
 [net-misc/omniORB:0]
-package.use/net-misc_omniorb_0 : net-misc/omniORB:0 -doc ssl static-libs
+package.use : net-misc/omniORB:0 -doc ssl static-libs
 
 [net-misc/openntpd:0]
-package.use/net-misc_openntpd_0 : net-misc/openntpd:0 -selinux ssl
+package.use : net-misc/openntpd:0 -selinux ssl
 
 [net-misc/openssh:0]
-package.use/net-misc_openssh_0 : net-misc/openssh:0 -X509 -kerberos -ldns -libedit -pam -sctp -selinux -static X bindist hpn ldap pie skey
+package.use : net-misc/openssh:0 -X509 -kerberos -ldns -libedit -pam -sctp -selinux -static X bindist hpn ldap pie skey
 
 [net-misc/pen:0]
-package.use/net-misc_pen_0 : net-misc/pen:0 geoip ssl
+package.use : net-misc/pen:0 geoip ssl
 
 [net-misc/pymazon:0]
-package.use/net-misc_pymazon_0 : net-misc/pymazon:0 gtk qt4
+package.use : net-misc/pymazon:0 gtk qt4
 
 [net-misc/qtm:0]
-package.use/net-misc_qtm_0 : net-misc/qtm:0 -debug dbus ssl
+package.use : net-misc/qtm:0 -debug dbus ssl
 
 [net-misc/quagga:0]
-package.use/net-misc_quagga_0 : net-misc/quagga:0 -bgpclassless -doc -multipath -ospfapi -pam -snmp -tcp-zebra caps ipv6 readline
+package.use : net-misc/quagga:0 -bgpclassless -doc -multipath -ospfapi -pam -snmp -tcp-zebra caps ipv6 readline
 
 [net-misc/rdate:0]
-package.use/net-misc_rdate_0 : net-misc/rdate:0 ipv6
+package.use : net-misc/rdate:0 ipv6
 
 [net-misc/rdesktop:0]
-package.use/net-misc_rdesktop_0 : net-misc/rdesktop:0 -ao -debug -kerberos -libsamplerate -pcsc-lite alsa ipv6 oss
+package.use : net-misc/rdesktop:0 -ao -debug -kerberos -libsamplerate -pcsc-lite alsa ipv6 oss
 
 [net-misc/rsync:0]
-package.use/net-misc_rsync_0 : net-misc/rsync:0 -static acl iconv ipv6 xattr
+package.use : net-misc/rsync:0 -static acl iconv ipv6 xattr
 
 [net-misc/scponly:0]
-package.use/net-misc_scponly_0 : net-misc/scponly:0 -gftp -logging -passwd -quota -rsync -scp -unison -wildcards -winscp sftp subversion
+package.use : net-misc/scponly:0 -gftp -logging -passwd -quota -rsync -scp -unison -wildcards -winscp sftp subversion
 
 [net-misc/secpanel:0]
-package.use/net-misc_secpanel_0 : net-misc/secpanel:0 gif
+package.use : net-misc/secpanel:0 gif
 
 [net-misc/shmux:0]
-package.use/net-misc_shmux_0 : net-misc/shmux:0 pcre
+package.use : net-misc/shmux:0 pcre
 
 [net-misc/siproxd:0]
-package.use/net-misc_siproxd_0 : net-misc/siproxd:0 -doc -examples -static
+package.use : net-misc/siproxd:0 -doc -examples -static
 
 [net-misc/sitecopy:0]
-package.use/net-misc_sitecopy_0 : net-misc/sitecopy:0 -expat -nls -rsh -webdav ssl xml zlib
+package.use : net-misc/sitecopy:0 -expat -nls -rsh -webdav ssl xml zlib
 
 [net-misc/sobby:0]
-package.use/net-misc_sobby_0 : net-misc/sobby:0 avahi
+package.use : net-misc/sobby:0 avahi
 
 [net-misc/sslh:0]
-package.use/net-misc_sslh_0 : net-misc/sslh:0 tcpd
+package.use : net-misc/sslh:0 tcpd
 
 [net-misc/ssvnc:0]
-package.use/net-misc_ssvnc_0 : net-misc/ssvnc:0 -java
+package.use : net-misc/ssvnc:0 -java
 
 [net-misc/stone:0]
-package.use/net-misc_stone_0 : net-misc/stone:0 ssl
+package.use : net-misc/stone:0 ssl
 
 [net-misc/streamtuner:0]
-package.use/net-misc_streamtuner_0 : net-misc/streamtuner:0 python shout xiph
+package.use : net-misc/streamtuner:0 python shout xiph
 
 [net-misc/stunnel:0]
-package.use/net-misc_stunnel_0 : net-misc/stunnel:0 -selinux ipv6 ssl tcpd
+package.use : net-misc/stunnel:0 -selinux ipv6 ssl tcpd
 
 [net-misc/suite3270:0]
-package.use/net-misc_suite3270_0 : net-misc/suite3270:0 -cjk -doc X ncurses ssl tcl
+package.use : net-misc/suite3270:0 -cjk -doc X ncurses ssl tcl
 
 [net-misc/tor:0]
-package.use/net-misc_tor_0 : net-misc/tor:0 -bufferevents -nat-pmp -scrypt -selinux -stats -systemd -test -tor-hardening -transparent-proxy -web seccomp upnp
-+package.env : net-misc/tor:0 net-misc_tor_0
-env/net-misc_tor_0 : LDFLAGS="-liconv"
+package.use : net-misc/tor:0 -bufferevents -nat-pmp -scrypt -selinux -stats -systemd -test -tor-hardening -transparent-proxy -web seccomp upnp
+package.env : net-misc/tor:0 net-misc_tor_0
+env : LDFLAGS="-liconv"
 
 [net-misc/vinagre:0]
-package.use/net-misc_vinagre_0 : net-misc/vinagre:0 -rdp -spice -zeroconf ssh telepathy
+package.use : net-misc/vinagre:0 -rdp -spice -zeroconf ssh telepathy
 
 [net-misc/vtun:0]
-package.use/net-misc_vtun_0 : net-misc/vtun:0 -socks5 lzo ssl zlib
+package.use : net-misc/vtun:0 -socks5 lzo ssl zlib
 
 [net-misc/wget:0]
-package.use/net-misc_wget_0 : net-misc/wget:0 -debug -nls -ntlm -static -test gnutls idn ipv6 pcre ssl uuid zlib
+package.use : net-misc/wget:0 -debug -nls -ntlm -static -test gnutls idn ipv6 pcre ssl uuid zlib
 
 [net-misc/wol:0]
-package.use/net-misc_wol_0 : net-misc/wol:0 -nls
+package.use : net-misc/wol:0 -nls
 
 [net-misc/wput:0]
-package.use/net-misc_wput_0 : net-misc/wput:0 -debug -nls ssl
+package.use : net-misc/wput:0 -debug -nls ssl
 
 [net-misc/x2goserver:0]
-package.use/net-misc_x2goserver_0 : net-misc/x2goserver:0 -postgres fuse sqlite
+package.use : net-misc/x2goserver:0 -postgres fuse sqlite
 
 [net-misc/youtube-dl:0]
-package.use/net-misc_youtube-dl_0 : net-misc/youtube-dl:0 -offensive -test
+package.use : net-misc/youtube-dl:0 -offensive -test
 
 [net-misc/youtube-viewer:0]
-package.use/net-misc_youtube-viewer_0 : net-misc/youtube-viewer:0 gtk
+package.use : net-misc/youtube-viewer:0 gtk
 
 [net-misc/zssh:0]
-package.use/net-misc_zssh_0 : net-misc/zssh:0 -nls readline
+package.use : net-misc/zssh:0 -nls readline
 
 [net-nds/ldapvi:0]
-package.use/net-nds_ldapvi_0 : net-nds/ldapvi:0 ssl
+package.use : net-nds/ldapvi:0 ssl
 
 [net-nds/openldap:0]
-package.use/net-nds_openldap_0 : net-nds/openldap:0 -debug -experimental -kerberos -minimal -overlays -selinux -smbkrb5passwd berkdb crypt cxx gnutls icu iodbc ipv6 odbc perl samba sasl slp ssl syslog tcpd
+package.use : net-nds/openldap:0 -debug -experimental -kerberos -minimal -overlays -selinux -smbkrb5passwd berkdb crypt cxx gnutls icu iodbc ipv6 odbc perl samba sasl slp ssl syslog tcpd
 
 [net-news/liferea:0]
-package.use/net-news_liferea_0 : net-news/liferea:0 -ayatana libnotify
+package.use : net-news/liferea:0 -ayatana libnotify
 
 [net-news/quiterss:0]
-package.use/net-news_quiterss_0 : net-news/quiterss:0 -debug -phonon
+package.use : net-news/quiterss:0 -debug -phonon
 
 [net-nntp/nzbget:0]
-package.use/net-nntp_nzbget_0 : net-nntp/nzbget:0 -debug -parcheck gnutls ncurses ssl zlib
+package.use : net-nntp/nzbget:0 -debug -parcheck gnutls ncurses ssl zlib
 
 [net-nntp/slrn:0]
-package.use/net-nntp_slrn_0 : net-nntp/slrn:0 -canlock -nls -uudeview ssl
+package.use : net-nntp/slrn:0 -canlock -nls -uudeview ssl
 
 [net-nntp/tin:0]
-package.use/net-nntp_tin_0 : net-nntp/tin:0 -cancel-locks -debug -doc -evil -forgery -gpg -mime -nls -socks5 etiquette idn ipv6 sasl spell unicode
+package.use : net-nntp/tin:0 -cancel-locks -debug -doc -evil -forgery -gpg -mime -nls -socks5 etiquette idn ipv6 sasl spell unicode
 
 [net-p2p/amule:0]
-package.use/net-p2p_amule_0 : net-p2p/amule:0 -daemon -debug -nls -remote -stats X geoip unicode upnp
+package.use : net-p2p/amule:0 -daemon -debug -nls -remote -stats X geoip unicode upnp
 
 [net-p2p/ed2k_hash:0]
-package.use/net-p2p_ed2k_hash_0 : net-p2p/ed2k_hash:0 -fltk
+package.use : net-p2p/ed2k_hash:0 -fltk
 
 [net-p2p/gift-gnutella:0]
-package.use/net-p2p_gift-gnutella_0 : net-p2p/gift-gnutella:0 xml
+package.use : net-p2p/gift-gnutella:0 xml
 
 [net-p2p/gift-openft:0]
-package.use/net-p2p_gift-openft_0 : net-p2p/gift-openft:0 berkdb
+package.use : net-p2p/gift-openft:0 berkdb
 
 [net-p2p/gift:0]
-package.use/net-p2p_gift_0 : net-p2p/gift:0 -ares -fasttrack -gnutella -imagemagick -openft vorbis
+package.use : net-p2p/gift:0 -ares -fasttrack -gnutella -imagemagick -openft vorbis
 
 [net-p2p/giftcurs:0]
-package.use/net-p2p_giftcurs_0 : net-p2p/giftcurs:0 -gpm -nls unicode
+package.use : net-p2p/giftcurs:0 -gpm -nls unicode
 
 [net-p2p/gtorrentviewer:0]
-package.use/net-p2p_gtorrentviewer_0 : net-p2p/gtorrentviewer:0 -debug
+package.use : net-p2p/gtorrentviewer:0 -debug
 
 [net-p2p/mktorrent:0]
-package.use/net-p2p_mktorrent_0 : net-p2p/mktorrent:0 -debug ssl threads
+package.use : net-p2p/mktorrent:0 -debug ssl threads
 
 [net-p2p/ncdc:0]
-package.use/net-p2p_ncdc_0 : net-p2p/ncdc:0 geoip
+package.use : net-p2p/ncdc:0 geoip
 
 [net-p2p/rtorrent:0]
-package.use/net-p2p_rtorrent_0 : net-p2p/rtorrent:0 -daemon -debug -selinux -test -xmlrpc ipv6
+package.use : net-p2p/rtorrent:0 -daemon -debug -selinux -test -xmlrpc ipv6
 
 [net-p2p/torrentinfo:0]
-package.use/net-p2p_torrentinfo_0 : net-p2p/torrentinfo:0 -test
+package.use : net-p2p/torrentinfo:0 -test
 
 [net-p2p/transmission-remote-gtk:0]
-package.use/net-p2p_transmission-remote-gtk_0 : net-p2p/transmission-remote-gtk:0 -ayatana -debug -libproxy geoip libnotify
+package.use : net-p2p/transmission-remote-gtk:0 -ayatana -debug -libproxy geoip libnotify
 
 [net-p2p/transmission:0]
-package.use/net-p2p_transmission_0 : net-p2p/transmission:0 -ayatana -lightweight -systemd -xfs gtk qt4
-+package.env : net-p2p/transmission:0 net-p2p_transmission_0
-env/net-p2p_transmission_0 : LDFLAGS="-lintl"
+package.use : net-p2p/transmission:0 -ayatana -lightweight -systemd -xfs gtk qt4
+package.env : net-p2p/transmission:0 net-p2p_transmission_0
+env : LDFLAGS="-lintl"
 
 [net-p2p/tribler:0]
-package.use/net-p2p_tribler_0 : net-p2p/tribler:0 -vlc
+package.use : net-p2p/tribler:0 -vlc
 
 [net-print/cups-filters:0]
-package.use/net-print_cups-filters_0 : net-print/cups-filters:0 dbus foomatic jpeg perl png static-libs tiff zeroconf
-+package.env : net-print/cups-filters:0 net-print_cups-filters_0
-env/net-print_cups-filters_0 : MAKEOPTS="-j1"
+package.use : net-print/cups-filters:0 dbus foomatic jpeg perl png static-libs tiff zeroconf
+package.env : net-print/cups-filters:0 net-print_cups-filters_0
+env : MAKEOPTS="-j1"
 
 [net-print/cups:0]
-package.use/net-print_cups_0 : net-print/cups:0 -debug -java -kerberos -lprng-compat -pam -selinux -systemd -usb X acl dbus python ssl static-libs threads xinetd zeroconf
-+package.env : net-print/cups:0 net-print_cups_0
-env/net-print_cups_0 : MAKEOPTS="-j1"
+package.use : net-print/cups:0 -debug -java -kerberos -lprng-compat -pam -selinux -systemd -usb X acl dbus python ssl static-libs threads xinetd zeroconf
+package.env : net-print/cups:0 net-print_cups_0
+env : MAKEOPTS="-j1"
 
 [net-print/gtklp:0]
-package.use/net-print_gtklp_0 : net-print/gtklp:0 -nls ssl
+package.use : net-print/gtklp:0 -nls ssl
 
 [net-print/gutenprint:0]
-package.use/net-print_gutenprint_0 : net-print/gutenprint:0 -foomaticdb -gimp -nls -ppds cups gtk readline static-libs
+package.use : net-print/gutenprint:0 -foomaticdb -gimp -nls -ppds cups gtk readline static-libs
 
 [net-print/hplip:0]
-package.use/net-print_hplip_0 : net-print/hplip:0 -doc -fax -hpijs -kde -libusb0 -minimal -parport -policykit -scanner -snmp -static-ppds X hpcups libnotify qt4
+package.use : net-print/hplip:0 -doc -fax -hpijs -kde -libusb0 -minimal -parport -policykit -scanner -snmp -static-ppds X hpcups libnotify qt4
 
 [net-print/libinklevel:0]
-package.use/net-print_libinklevel_0 : net-print/libinklevel:0 -debug
+package.use : net-print/libinklevel:0 -debug
 
 [net-print/magicfilter:0]
-package.use/net-print_magicfilter_0 : net-print/magicfilter:0 -lprng-failsafe
+package.use : net-print/magicfilter:0 -lprng-failsafe
 
 [net-print/mtink:0]
-package.use/net-print_mtink_0 : net-print/mtink:0 -doc X cups
+package.use : net-print/mtink:0 -doc X cups
 
 [net-print/splix:0]
-package.use/net-print_splix_0 : net-print/splix:0 jbig
+package.use : net-print/splix:0 jbig
 
 [net-proxy/bfilter:0]
-package.use/net-proxy_bfilter_0 : net-proxy/bfilter:0 -debug X
+package.use : net-proxy/bfilter:0 -debug X
 
 [net-proxy/c-icap:0]
-package.use/net-proxy_c-icap_0 : net-proxy/c-icap:0 berkdb ipv6 ldap
+package.use : net-proxy/c-icap:0 berkdb ipv6 ldap
 
 [net-proxy/dansguardian:0]
-package.use/net-proxy_dansguardian_0 : net-proxy/dansguardian:0 -avast -backtrace -clamav -commandline -debug -email -icap -kaspersky -logrotate -ntlm -orig-ip -trickledm fancydm lfs pcre static-libs
+package.use : net-proxy/dansguardian:0 -avast -backtrace -clamav -commandline -debug -email -icap -kaspersky -logrotate -ntlm -orig-ip -trickledm fancydm lfs pcre static-libs
 
 [net-proxy/haproxy:0]
-package.use/net-proxy_haproxy_0 : net-proxy/haproxy:0 -examples -tools crypt pcre ssl vim-syntax zlib
+package.use : net-proxy/haproxy:0 -examples -tools crypt pcre ssl vim-syntax zlib
 
 [net-proxy/havp:0]
-package.use/net-proxy_havp_0 : net-proxy/havp:0 -clamav ssl
+package.use : net-proxy/havp:0 -clamav ssl
 
 [net-proxy/privoxy:0]
-package.use/net-proxy_privoxy_0 : net-proxy/privoxy:0 -editor -external-filters -graceful-termination -lfs -png-images -selinux -toggle -whitelists acl fast-redirects force image-blocking ipv6 stats threads zlib
+package.use : net-proxy/privoxy:0 -editor -external-filters -graceful-termination -lfs -png-images -selinux -toggle -whitelists acl fast-redirects force image-blocking ipv6 stats threads zlib
 
 [net-proxy/squid:0]
-package.use/net-proxy_squid_0 : net-proxy/squid:0 -ecap -esi -ipf-transparent -kerberos -kqueue -logrotate -mysql -nis -pam -pf-transparent -postgres -qos -radius -selinux -snmp -ssl-crtd -test -tproxy caps htcp ipv6 ldap samba sasl sqlite ssl wccp wccpv2
+package.use : net-proxy/squid:0 -ecap -esi -ipf-transparent -kerberos -kqueue -logrotate -mysql -nis -pam -pf-transparent -postgres -qos -radius -selinux -snmp -ssl-crtd -test -tproxy caps htcp ipv6 ldap samba sasl sqlite ssl wccp wccpv2
 
 [net-proxy/squidguard:0]
-package.use/net-proxy_squidguard_0 : net-proxy/squidguard:0 ldap
+package.use : net-proxy/squidguard:0 ldap
 
 [net-proxy/tinyproxy:0]
-package.use/net-proxy_tinyproxy_0 : net-proxy/tinyproxy:0 -debug -minimal -reverse-proxy -test -transparent-proxy filter-proxy upstream-proxy xtinyproxy-header
+package.use : net-proxy/tinyproxy:0 -debug -minimal -reverse-proxy -test -transparent-proxy filter-proxy upstream-proxy xtinyproxy-header
 
 [net-proxy/tsocks:0]
-package.use/net-proxy_tsocks_0 : net-proxy/tsocks:0 -tordns
+package.use : net-proxy/tsocks:0 -tordns
 
 [net-proxy/wwwoffle:0]
-package.use/net-proxy_wwwoffle_0 : net-proxy/wwwoffle:0 gnutls ipv6 zlib
+package.use : net-proxy/wwwoffle:0 gnutls ipv6 zlib
 
 [net-voip/homer:0]
-package.use/net-voip_homer_0 : net-voip/homer:0 -pulseaudio
+package.use : net-voip/homer:0 -pulseaudio
 
 [net-wireless/aircrack-ng:0]
-package.use/net-wireless_aircrack-ng_0 : net-wireless/aircrack-ng:0 airdrop-ng airgraph-ng netlink pcre sqlite unstable
+package.use : net-wireless/aircrack-ng:0 airdrop-ng airgraph-ng netlink pcre sqlite unstable
 
 [net-wireless/bluez:0]
-package.use/net-wireless_bluez_0 : net-wireless/bluez:0 -debug -selinux -systemd -test cups obex readline udev
+package.use : net-wireless/bluez:0 -debug -selinux -systemd -test cups obex readline udev
 
 [net-wireless/gnome-bluetooth:2]
-package.use/net-wireless_gnome-bluetooth_2 : net-wireless/gnome-bluetooth:2 -debug introspection
+package.use : net-wireless/gnome-bluetooth:2 -debug introspection
 
 [net-wireless/kismet:0]
-package.use/net-wireless_kismet_0 : net-wireless/kismet:0 -plugin-dot15d4 -selinux -speech client pcre plugin-autowep plugin-btscan plugin-ptw plugin-spectools plugin-syslog ruby suid
+package.use : net-wireless/kismet:0 -plugin-dot15d4 -selinux -speech client pcre plugin-autowep plugin-btscan plugin-ptw plugin-spectools plugin-syslog ruby suid
 
 [net-wireless/lorcon:0]
-package.use/net-wireless_lorcon_0 : net-wireless/lorcon:0 python ruby ruby_targets_ruby19
+package.use : net-wireless/lorcon:0 python ruby ruby_targets_ruby19
 
 [net-wireless/spectools:0]
-package.use/net-wireless_spectools_0 : net-wireless/spectools:0 gtk ncurses
+package.use : net-wireless/spectools:0 gtk ncurses
 
 [net-wireless/wavemon:0]
-package.use/net-wireless_wavemon_0 : net-wireless/wavemon:0 caps
+package.use : net-wireless/wavemon:0 caps
 
 [net-wireless/wepattack:0]
-package.use/net-wireless_wepattack_0 : net-wireless/wepattack:0 -john
+package.use : net-wireless/wepattack:0 -john
 
 [net-wireless/wireless-tools:0]
-package.use/net-wireless_wireless-tools_0 : net-wireless/wireless-tools:0 -multicall
+package.use : net-wireless/wireless-tools:0 -multicall
 
 [net-wireless/wpa_supplicant:0]
-package.use/net-wireless_wpa_supplicant_0 : net-wireless/wpa_supplicant:0 -fasteap -ps3 -selinux ap dbus eap-sim gnutls hs2-0 p2p qt4 readline smartcard ssl tdls uncommon-eap-types wimax wps
+package.use : net-wireless/wpa_supplicant:0 -fasteap -ps3 -selinux ap dbus eap-sim gnutls hs2-0 p2p qt4 readline smartcard ssl tdls uncommon-eap-types wimax wps
 
 [perl-core/libnet:0]
-package.use/perl-core_libnet_0 : perl-core/libnet:0 sasl
+package.use : perl-core/libnet:0 sasl
 
 [sci-astronomy/celestia:0]
-package.use/sci-astronomy_celestia_0 : sci-astronomy/celestia:0 -debug -gnome -nls -pch cairo gtk theora threads
+package.use : sci-astronomy/celestia:0 -debug -gnome -nls -pch cairo gtk theora threads
 
 [sci-astronomy/predict:0]
-package.use/sci-astronomy_predict_0 : sci-astronomy/predict:0 -doc -nls -xforms -xplanet gtk
+package.use : sci-astronomy/predict:0 -doc -nls -xforms -xplanet gtk
 
 [sci-astronomy/stellarium:0]
-package.use/sci-astronomy_stellarium_0 : sci-astronomy/stellarium:0 -debug -nls -sound -stars
+package.use : sci-astronomy/stellarium:0 -debug -nls -sound -stars
 
 [sci-biology/aaindex:0]
-package.use/sci-biology_aaindex_0 : sci-biology/aaindex:0 -emboss -minimal
+package.use : sci-biology/aaindex:0 -emboss -minimal
 
 [sci-biology/amos:0]
-package.use/sci-biology_amos_0 : sci-biology/amos:0 qt4
+package.use : sci-biology/amos:0 qt4
 
 [sci-biology/augustus:0]
-package.use/sci-biology_augustus_0 : sci-biology/augustus:0 -examples
+package.use : sci-biology/augustus:0 -examples
 
 [sci-biology/bioruby:0]
-package.use/sci-biology_bioruby_0 : sci-biology/bioruby:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+package.use : sci-biology/bioruby:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [sci-biology/cutg:0]
-package.use/sci-biology_cutg_0 : sci-biology/cutg:0 -emboss -minimal
+package.use : sci-biology/cutg:0 -emboss -minimal
 
 [sci-biology/fasttree:0]
-package.use/sci-biology_fasttree_0 : sci-biology/fasttree:0 -cpu_flags_x86_sse3 -double-precision openmp
+package.use : sci-biology/fasttree:0 -cpu_flags_x86_sse3 -double-precision openmp
 
 [sci-biology/gibbs:0]
-package.use/sci-biology_gibbs_0 : sci-biology/gibbs:0 -mpi
+package.use : sci-biology/gibbs:0 -mpi
 
 [sci-biology/hmmer:0]
-package.use/sci-biology_hmmer_0 : sci-biology/hmmer:0 -gsl -mpi -static-libs cpu_flags_x86_sse threads
+package.use : sci-biology/hmmer:0 -gsl -mpi -static-libs cpu_flags_x86_sse threads
 
 [sci-biology/infernal:0]
-package.use/sci-biology_infernal_0 : sci-biology/infernal:0 -mpi
+package.use : sci-biology/infernal:0 -mpi
 
 [sci-biology/iqpnni:0]
-package.use/sci-biology_iqpnni_0 : sci-biology/iqpnni:0 -doc
+package.use : sci-biology/iqpnni:0 -doc
 
 [sci-biology/mrbayes:0]
-package.use/sci-biology_mrbayes_0 : sci-biology/mrbayes:0 -debug -mpi readline
+package.use : sci-biology/mrbayes:0 -debug -mpi readline
 
 [sci-biology/mummer:0]
-package.use/sci-biology_mummer_0 : sci-biology/mummer:0 -doc
+package.use : sci-biology/mummer:0 -doc
 
 [sci-biology/ncbi-tools:0]
-package.use/sci-biology_ncbi-tools_0 : sci-biology/ncbi-tools:0 -doc X static-libs
+package.use : sci-biology/ncbi-tools:0 -doc X static-libs
 
 [sci-biology/plink:0]
-package.use/sci-biology_plink_0 : sci-biology/plink:0 -R -lapack -webcheck
+package.use : sci-biology/plink:0 -R -lapack -webcheck
 
 [sci-biology/prints:0]
-package.use/sci-biology_prints_0 : sci-biology/prints:0 -emboss -minimal
+package.use : sci-biology/prints:0 -emboss -minimal
 
 [sci-biology/prosite:0]
-package.use/sci-biology_prosite_0 : sci-biology/prosite:0 -emboss -minimal
+package.use : sci-biology/prosite:0 -emboss -minimal
 
 [sci-biology/rebase:0]
-package.use/sci-biology_rebase_0 : sci-biology/rebase:0 -emboss -minimal
+package.use : sci-biology/rebase:0 -emboss -minimal
 
 [sci-biology/snpfile:0]
-package.use/sci-biology_snpfile_0 : sci-biology/snpfile:0 static-libs
+package.use : sci-biology/snpfile:0 static-libs
 
 [sci-biology/transfac:3]
-package.use/sci-biology_transfac_3 : sci-biology/transfac:3 -emboss -minimal
+package.use : sci-biology/transfac:3 -emboss -minimal
 
 [sci-biology/velvet:0]
-package.use/sci-biology_velvet_0 : sci-biology/velvet:0 -doc
+package.use : sci-biology/velvet:0 -doc
 
 [sci-biology/vienna-rna:0]
-package.use/sci-biology_vienna-rna_0 : sci-biology/vienna-rna:0 -doc openmp python static-libs
+package.use : sci-biology/vienna-rna:0 -doc openmp python static-libs
 
 [sci-calculators/qalculate-gtk:0]
-package.use/sci-calculators_qalculate-gtk_0 : sci-calculators/qalculate-gtk:0 -gnome
+package.use : sci-calculators/qalculate-gtk:0 -gnome
 
 [sci-calculators/speedcrunch:0]
-package.use/sci-calculators_speedcrunch_0 : sci-calculators/speedcrunch:0 -doc
+package.use : sci-calculators/speedcrunch:0 -doc
 
 [sci-calculators/units:0]
-package.use/sci-calculators_units_0 : sci-calculators/units:0 units_cur
+package.use : sci-calculators/units:0 units_cur
 
 [sci-calculators/wcalc:0]
-package.use/sci-calculators_wcalc_0 : sci-calculators/wcalc:0 readline
+package.use : sci-calculators/wcalc:0 readline
 
 [sci-chemistry/autodock_vina:0]
-package.use/sci-chemistry_autodock_vina_0 : sci-chemistry/autodock_vina:0 -debug
+package.use : sci-chemistry/autodock_vina:0 -debug
 
 [sci-chemistry/chemtool:0]
-package.use/sci-chemistry_chemtool_0 : sci-chemistry/chemtool:0 -emf -gnome -nls
+package.use : sci-chemistry/chemtool:0 -emf -gnome -nls
 
 [sci-chemistry/eden:0]
-package.use/sci-chemistry_eden_0 : sci-chemistry/eden:0 -double-precision
+package.use : sci-chemistry/eden:0 -double-precision
 
 [sci-chemistry/gabedit:0]
-package.use/sci-chemistry_gabedit_0 : sci-chemistry/gabedit:0 openmp
+package.use : sci-chemistry/gabedit:0 openmp
 
 [sci-chemistry/gelemental:0]
-package.use/sci-chemistry_gelemental_0 : sci-chemistry/gelemental:0 -doc static-libs
+package.use : sci-chemistry/gelemental:0 -doc static-libs
 
 [sci-chemistry/gperiodic:0]
-package.use/sci-chemistry_gperiodic_0 : sci-chemistry/gperiodic:0 -nls
+package.use : sci-chemistry/gperiodic:0 -nls
 
 [sci-chemistry/moldy:0]
-package.use/sci-chemistry_moldy_0 : sci-chemistry/moldy:0 -doc -examples
+package.use : sci-chemistry/moldy:0 -doc -examples
 
 [sci-electronics/geda-xgsch2pcb:0]
-package.use/sci-electronics_geda-xgsch2pcb_0 : sci-electronics/geda-xgsch2pcb:0 -gnome -nls
+package.use : sci-electronics/geda-xgsch2pcb:0 -gnome -nls
 
 [sci-electronics/geda:0]
-package.use/sci-electronics_geda_0 : sci-electronics/geda:0 -debug -doc -examples -nls -stroke threads
+package.use : sci-electronics/geda:0 -debug -doc -examples -nls -stroke threads
 
 [sci-electronics/gtkwave:0]
-package.use/sci-electronics_gtkwave_0 : sci-electronics/gtkwave:0 -doc -examples -fasttree -fatlines -judy -packed lzma tcl
+package.use : sci-electronics/gtkwave:0 -doc -examples -fasttree -fatlines -judy -packed lzma tcl
 
 [sci-electronics/iverilog:0]
-package.use/sci-electronics_iverilog_0 : sci-electronics/iverilog:0 -examples
+package.use : sci-electronics/iverilog:0 -examples
 
 [sci-electronics/linsmith:0]
-package.use/sci-electronics_linsmith_0 : sci-electronics/linsmith:0 -doc -examples
+package.use : sci-electronics/linsmith:0 -doc -examples
 
 [sci-electronics/pcb:0]
-package.use/sci-electronics_pcb_0 : sci-electronics/pcb:0 -debug -doc -gcode -m4lib-png -motif -nelma -test -toporouter -xrender dbus gif gtk jpeg opengl png tk
+package.use : sci-electronics/pcb:0 -debug -doc -gcode -m4lib-png -motif -nelma -test -toporouter -xrender dbus gif gtk jpeg opengl png tk
 
 [sci-electronics/plcedit:0]
-package.use/sci-electronics_plcedit_0 : sci-electronics/plcedit:0 -debug -doc
+package.use : sci-electronics/plcedit:0 -debug -doc
 
 [sci-electronics/qelectrotech:0]
-package.use/sci-electronics_qelectrotech_0 : sci-electronics/qelectrotech:0 -doc
+package.use : sci-electronics/qelectrotech:0 -doc
 
 [sci-geosciences/congen:0]
-package.use/sci-geosciences_congen_0 : sci-geosciences/congen:0 static-libs
+package.use : sci-geosciences/congen:0 static-libs
 
 [sci-geosciences/foxtrotgps:0]
-package.use/sci-geosciences_foxtrotgps_0 : sci-geosciences/foxtrotgps:0 -debug
+package.use : sci-geosciences/foxtrotgps:0 -debug
 
 [sci-geosciences/geocode-glib:0]
-package.use/sci-geosciences_geocode-glib_0 : sci-geosciences/geocode-glib:0 -test introspection
+package.use : sci-geosciences/geocode-glib:0 -test introspection
 
 [sci-geosciences/gpsd:0]
-package.use/sci-geosciences_gpsd_0 : sci-geosciences/gpsd:0 -debug -gpsd_protocols_fury -gpsd_protocols_geostar -gpsd_protocols_nmea2000 -latency_timing -ntp -systemd -test -udev -usb X bluetooth cxx dbus gpsd_protocols_aivdm gpsd_protocols_ashtech gpsd_protocols_earthmate gpsd_protocols_evermore gpsd_protocols_fv18 gpsd_protocols_garmin gpsd_protocols_garmintxt gpsd_protocols_gpsclock gpsd_protocols_itrax gpsd_protocols_mtk3301 gpsd_protocols_navcom gpsd_protocols_nmea gpsd_protocols_ntrip gpsd_protocols_oceanserver gpsd_protocols_oncore gpsd_protocols_rtcm104v2 gpsd_protocols_rtcm104v3 gpsd_protocols_sirf gpsd_protocols_superstar2 gpsd_protocols_tnt gpsd_protocols_tripmate gpsd_protocols_tsip gpsd_protocols_ubx ipv6 ncurses python qt4 shm sockets
+package.use : sci-geosciences/gpsd:0 -debug -gpsd_protocols_fury -gpsd_protocols_geostar -gpsd_protocols_nmea2000 -latency_timing -ntp -systemd -test -udev -usb X bluetooth cxx dbus gpsd_protocols_aivdm gpsd_protocols_ashtech gpsd_protocols_earthmate gpsd_protocols_evermore gpsd_protocols_fv18 gpsd_protocols_garmin gpsd_protocols_garmintxt gpsd_protocols_gpsclock gpsd_protocols_itrax gpsd_protocols_mtk3301 gpsd_protocols_navcom gpsd_protocols_nmea gpsd_protocols_ntrip gpsd_protocols_oceanserver gpsd_protocols_oncore gpsd_protocols_rtcm104v2 gpsd_protocols_rtcm104v3 gpsd_protocols_sirf gpsd_protocols_superstar2 gpsd_protocols_tnt gpsd_protocols_tripmate gpsd_protocols_tsip gpsd_protocols_ubx ipv6 ncurses python qt4 shm sockets
 
 [sci-geosciences/gtk-g-rays2:0]
-package.use/sci-geosciences_gtk-g-rays2_0 : sci-geosciences/gtk-g-rays2:0 -debug
+package.use : sci-geosciences/gtk-g-rays2:0 -debug
 
 [sci-geosciences/libtcd:0]
-package.use/sci-geosciences_libtcd_0 : sci-geosciences/libtcd:0 -doc static-libs
+package.use : sci-geosciences/libtcd:0 -doc static-libs
 
 [sci-libs/cln:1]
-package.use/sci-libs_cln_1 : sci-libs/cln:1 -doc -examples static-libs
+package.use : sci-libs/cln:1 -doc -examples static-libs
 
 [sci-libs/fftw:2.1]
-package.use/sci-libs_fftw_2.1 : sci-libs/fftw:2.1 -doc -float -fortran -mpi openmp static-libs threads
+package.use : sci-libs/fftw:2.1 -doc -float -fortran -mpi openmp static-libs threads
 
 [sci-libs/fftw:3.0]
-package.use/sci-libs_fftw_3.0 : sci-libs/fftw:3.0 -altivec -cpu_flags_x86_avx -cpu_flags_x86_fma3 -cpu_flags_x86_fma4 -doc -fortran -mpi -neon -quad -test -zbus cpu_flags_x86_sse cpu_flags_x86_sse2 openmp static-libs threads
+package.use : sci-libs/fftw:3.0 -altivec -cpu_flags_x86_avx -cpu_flags_x86_fma3 -cpu_flags_x86_fma4 -doc -fortran -mpi -neon -quad -test -zbus cpu_flags_x86_sse cpu_flags_x86_sse2 openmp static-libs threads
 
 [sci-libs/flann:0]
-package.use/sci-libs_flann_0 : sci-libs/flann:0 -cuda -doc -examples -mpi -octave -test openmp static-libs
+package.use : sci-libs/flann:0 -cuda -doc -examples -mpi -octave -test openmp static-libs
 
 [sci-libs/gsl:0]
-package.use/sci-libs_gsl_0 : sci-libs/gsl:0 -cblas-external
+package.use : sci-libs/gsl:0 -cblas-external
 
 [sci-libs/itpp:0]
-package.use/sci-libs_itpp_0 : sci-libs/itpp:0 -blas -debug -doc -fftw -lapack -minimal static-libs
+package.use : sci-libs/itpp:0 -blas -debug -doc -fftw -lapack -minimal static-libs
 
 [sci-libs/libdap:0]
-package.use/sci-libs_libdap_0 : sci-libs/libdap:0 -doc -test static-libs
+package.use : sci-libs/libdap:0 -doc -test static-libs
 
 [sci-libs/liborigin:2]
-package.use/sci-libs_liborigin_2 : sci-libs/liborigin:2 -doc
+package.use : sci-libs/liborigin:2 -doc
 
 [sci-libs/libqalculate:0]
-package.use/sci-libs_libqalculate_0 : sci-libs/libqalculate:0 -gnuplot readline static-libs
+package.use : sci-libs/libqalculate:0 -gnuplot readline static-libs
 
 [sci-libs/plotmm:0]
-package.use/sci-libs_plotmm_0 : sci-libs/plotmm:0 -doc -examples
+package.use : sci-libs/plotmm:0 -doc -examples
 
 [sci-libs/pymmlib:0]
-package.use/sci-libs_pymmlib_0 : sci-libs/pymmlib:0 -doc
+package.use : sci-libs/pymmlib:0 -doc
 
 [sci-mathematics/drgeo:0]
-package.use/sci-mathematics_drgeo_0 : sci-mathematics/drgeo:0 -nls
+package.use : sci-mathematics/drgeo:0 -nls
 
 [sci-mathematics/mathomatic:0]
-package.use/sci-mathematics_mathomatic_0 : sci-mathematics/mathomatic:0 -doc -gnuplot
+package.use : sci-mathematics/mathomatic:0 -doc -gnuplot
 
 [sci-mathematics/pari:0]
-package.use/sci-mathematics_pari_0 : sci-mathematics/pari:0 -data -doc -fltk X gmp static-libs
+package.use : sci-mathematics/pari:0 -data -doc -fltk X gmp static-libs
 
 [sci-mathematics/snns:0]
-package.use/sci-mathematics_snns_0 : sci-mathematics/snns:0 -doc X python
+package.use : sci-mathematics/snns:0 -doc X python
 
 [sci-mathematics/xmds:0]
-package.use/sci-mathematics_xmds_0 : sci-mathematics/xmds:0 -doc -examples -mpi threads
+package.use : sci-mathematics/xmds:0 -doc -examples -mpi threads
 
 [sci-mathematics/yacas:0]
-package.use/sci-mathematics_yacas_0 : sci-mathematics/yacas:0 -doc -java -server
+package.use : sci-mathematics/yacas:0 -doc -java -server
 
 [sci-physics/heppdt:0]
-package.use/sci-physics_heppdt_0 : sci-physics/heppdt:0 -doc -examples static-libs
+package.use : sci-physics/heppdt:0 -doc -examples static-libs
 
 [sci-visualization/epix:0]
-package.use/sci-visualization_epix_0 : sci-visualization/epix:0 -doc -emacs -examples
+package.use : sci-visualization/epix:0 -doc -emacs -examples
 
 [sci-visualization/gnuplot:0]
-package.use/sci-visualization_gnuplot_0 : sci-visualization/gnuplot:0 -aqua -bitmap -doc -examples -plotutils -svga -thin-splines -wxwidgets X cairo gd ggi latex lua qt4 readline
+package.use : sci-visualization/gnuplot:0 -aqua -bitmap -doc -examples -plotutils -svga -thin-splines -wxwidgets X cairo gd ggi latex lua qt4 readline
 
 [sci-visualization/gwyddion:0]
-package.use/sci-visualization_gwyddion_0 : sci-visualization/gwyddion:0 -doc -fftw -fits -gnome -kde -nls -sourceview X opengl perl python ruby xml
+package.use : sci-visualization/gwyddion:0 -doc -fftw -fits -gnome -kde -nls -sourceview X opengl perl python ruby xml
 
 [sci-visualization/quickplot:0]
-package.use/sci-visualization_quickplot_0 : sci-visualization/quickplot:0 static-libs
+package.use : sci-visualization/quickplot:0 static-libs
 
 [sci-visualization/xgraph:0]
-package.use/sci-visualization_xgraph_0 : sci-visualization/xgraph:0 -examples
+package.use : sci-visualization/xgraph:0 -examples
 
 [sys-apps/ack:0]
-package.use/sys-apps_ack_0 : sys-apps/ack:0 -test
-+package.env : sys-apps/ack:0 sys-apps_ack_0
-env/sys-apps_ack_0 : LDFLAGS="-lintl"
+package.use : sys-apps/ack:0 -test
+package.env : sys-apps/ack:0 sys-apps_ack_0
+env : LDFLAGS="-lintl"
 
 [sys-apps/acl:0]
-package.use/sys-apps_acl_0 : sys-apps/acl:0 -nls static-libs
+package.use : sys-apps/acl:0 -nls static-libs
 
 [sys-apps/apmd:0]
-package.use/sys-apps_apmd_0 : sys-apps/apmd:0 -nls X
+package.use : sys-apps/apmd:0 -nls X
 
 [sys-apps/attr:0]
-package.use/sys-apps_attr_0 : sys-apps/attr:0 -nls static-libs
+package.use : sys-apps/attr:0 -nls static-libs
 
 [sys-apps/audio-entropyd:0]
-package.use/sys-apps_audio-entropyd_0 : sys-apps/audio-entropyd:0 -selinux
+package.use : sys-apps/audio-entropyd:0 -selinux
 
 [sys-apps/bar:0]
-package.use/sys-apps_bar_0 : sys-apps/bar:0 -doc
+package.use : sys-apps/bar:0 -doc
 
 [sys-apps/baselayout:0]
-package.use/sys-apps_baselayout_0 : sys-apps/baselayout:0 -build
+package.use : sys-apps/baselayout:0 -build
 
 [sys-apps/bleachbit:0]
-package.use/sys-apps_bleachbit_0 : sys-apps/bleachbit:0 -nls gtk
+package.use : sys-apps/bleachbit:0 -nls gtk
 
 [sys-apps/busybox:0]
-package.use/sys-apps_busybox_0 : sys-apps/busybox:0 -debug -livecd -make-symlinks -mdev -pam -savedconfig -selinux -sep-usr -static -systemd ipv6 math syslog
+package.use : sys-apps/busybox:0 -debug -livecd -make-symlinks -mdev -pam -savedconfig -selinux -sep-usr -static -systemd ipv6 math syslog
 
 [sys-apps/coreutils:0]
-package.use/sys-apps_coreutils_0 : sys-apps/coreutils:0 -nls -selinux -static -vanilla acl caps gmp xattr
+package.use : sys-apps/coreutils:0 -nls -selinux -static -vanilla acl caps gmp xattr
 
 [sys-apps/dbus:0]
-package.use/sys-apps_dbus_0 : sys-apps/dbus:0 -debug -doc -selinux -systemd -test X static-libs
+package.use : sys-apps/dbus:0 -debug -doc -selinux -systemd -test X static-libs
 
 [sys-apps/debianutils:0]
-package.use/sys-apps_debianutils_0 : sys-apps/debianutils:0 -static
+package.use : sys-apps/debianutils:0 -static
 
 [sys-apps/diffutils:0]
-package.use/sys-apps_diffutils_0 : sys-apps/diffutils:0 -nls -static
+package.use : sys-apps/diffutils:0 -nls -static
 
 [sys-apps/dmidecode:0]
-package.use/sys-apps_dmidecode_0 : sys-apps/dmidecode:0 -selinux
+package.use : sys-apps/dmidecode:0 -selinux
 
 [sys-apps/dnotify:0]
-package.use/sys-apps_dnotify_0 : sys-apps/dnotify:0 -nls
+package.use : sys-apps/dnotify:0 -nls
 
 [sys-apps/dstat:0]
-package.use/sys-apps_dstat_0 : sys-apps/dstat:0 -wifi
+package.use : sys-apps/dstat:0 -wifi
 
 [sys-apps/ed:0]
-+package.env : sys-apps/ed:0 sys-apps_ed_0
-env/sys-apps_ed_0 : LDFLAGS="-liconv"
+package.env : sys-apps/ed:0 sys-apps_ed_0
+env : LDFLAGS="-liconv"
 
 [sys-apps/edac-utils:0]
-package.use/sys-apps_edac-utils_0 : sys-apps/edac-utils:0 -debug
+package.use : sys-apps/edac-utils:0 -debug
 
 [sys-apps/elfix:0]
-package.use/sys-apps_elfix_0 : sys-apps/elfix:0 -ptpax xtpax
+package.use : sys-apps/elfix:0 -ptpax xtpax
 
 [sys-apps/etckeeper:0]
-package.use/sys-apps_etckeeper_0 : sys-apps/etckeeper:0 -bazaar -cron
+package.use : sys-apps/etckeeper:0 -bazaar -cron
 
 [sys-apps/fbset:0]
-package.use/sys-apps_fbset_0 : sys-apps/fbset:0 -static
+package.use : sys-apps/fbset:0 -static
 
 [sys-apps/file:0]
-package.use/sys-apps_file_0 : sys-apps/file:0 python static-libs zlib
+package.use : sys-apps/file:0 python static-libs zlib
 
 [sys-apps/findutils:0]
-package.use/sys-apps_findutils_0 : sys-apps/findutils:0 -nls -selinux -static
+package.use : sys-apps/findutils:0 -nls -selinux -static
 
 [sys-apps/flashrom:0]
-package.use/sys-apps_flashrom_0 : sys-apps/flashrom:0 -atahpt -ft2232_spi -nic3com -nicnatsemi -nicrealtek -rayer_spi -satamv -static -tools -usbblaster bitbang_spi buspirate_spi dediprog drkaiser dummy gfxnvidia internal linux_spi nicintel nicintel_spi ogp_spi pony_spi satasii serprog wiki
+package.use : sys-apps/flashrom:0 -atahpt -ft2232_spi -nic3com -nicnatsemi -nicrealtek -rayer_spi -satamv -static -tools -usbblaster bitbang_spi buspirate_spi dediprog drkaiser dummy gfxnvidia internal linux_spi nicintel nicintel_spi ogp_spi pony_spi satasii serprog wiki
 
 [sys-apps/gawk:0]
-package.use/sys-apps_gawk_0 : sys-apps/gawk:0 -nls readline
+package.use : sys-apps/gawk:0 -nls readline
 
 [sys-apps/gradm:0]
-package.use/sys-apps_gradm_0 : sys-apps/gradm:0 -pam
+package.use : sys-apps/gradm:0 -pam
 
 [sys-apps/grep:0]
-package.use/sys-apps_grep_0 : sys-apps/grep:0 -nls -static pcre
+package.use : sys-apps/grep:0 -nls -static pcre
 
 [sys-apps/groff:0]
-package.use/sys-apps_groff_0 : sys-apps/groff:0 -examples X
+package.use : sys-apps/groff:0 -examples X
 
 [sys-apps/gsmartcontrol:0]
-package.use/sys-apps_gsmartcontrol_0 : sys-apps/gsmartcontrol:0 -test
+package.use : sys-apps/gsmartcontrol:0 -test
 
 [sys-apps/help2man:0]
-package.use/sys-apps_help2man_0 : sys-apps/help2man:0 -nls
+package.use : sys-apps/help2man:0 -nls
 
 [sys-apps/hwdata-gentoo:0]
-package.use/sys-apps_hwdata-gentoo_0 : sys-apps/hwdata-gentoo:0 -binary-drivers opengl
+package.use : sys-apps/hwdata-gentoo:0 -binary-drivers opengl
 
 [sys-apps/hwids:0]
-package.use/sys-apps_hwids_0 : sys-apps/hwids:0 net pci udev usb
+package.use : sys-apps/hwids:0 net pci udev usb
 
 [sys-apps/hwsetup:0]
-package.use/sys-apps_hwsetup_0 : sys-apps/hwsetup:0 zlib
+package.use : sys-apps/hwsetup:0 zlib
 
 [sys-apps/i2c-tools:0]
-package.use/sys-apps_i2c-tools_0 : sys-apps/i2c-tools:0 python
+package.use : sys-apps/i2c-tools:0 python
 
 [sys-apps/ifplugd:0]
-package.use/sys-apps_ifplugd_0 : sys-apps/ifplugd:0 -doc -selinux
+package.use : sys-apps/ifplugd:0 -doc -selinux
 
 [sys-apps/iotools:0]
-package.use/sys-apps_iotools_0 : sys-apps/iotools:0 -make-symlinks -static
+package.use : sys-apps/iotools:0 -make-symlinks -static
 
 [sys-apps/ipmitool:0]
-package.use/sys-apps_ipmitool_0 : sys-apps/ipmitool:0 -openipmi -static
+package.use : sys-apps/ipmitool:0 -openipmi -static
 
 [sys-apps/iproute2:0]
-package.use/sys-apps_iproute2_0 : sys-apps/iproute2:0 -minimal -selinux atm berkdb iptables ipv6
+package.use : sys-apps/iproute2:0 -minimal -selinux atm berkdb iptables ipv6
 
 [sys-apps/irqbalance:0]
-package.use/sys-apps_irqbalance_0 : sys-apps/irqbalance:0 caps numa
+package.use : sys-apps/irqbalance:0 caps numa
 
 [sys-apps/kbd:0]
-package.use/sys-apps_kbd_0 : sys-apps/kbd:0 -nls -pam
+package.use : sys-apps/kbd:0 -nls -pam
 
 [sys-apps/kexec-tools:0]
-package.use/sys-apps_kexec-tools_0 : sys-apps/kexec-tools:0 -booke -xen lzma zlib
+package.use : sys-apps/kexec-tools:0 -booke -xen lzma zlib
 
 [sys-apps/keyutils:0]
-package.use/sys-apps_keyutils_0 : sys-apps/keyutils:0 -test
+package.use : sys-apps/keyutils:0 -test
 
 [sys-apps/kmod:0]
-package.use/sys-apps_kmod_0 : sys-apps/kmod:0 -debug -doc lzma python static-libs tools zlib
+package.use : sys-apps/kmod:0 -debug -doc lzma python static-libs tools zlib
 
 [sys-apps/less:0]
-package.use/sys-apps_less_0 : sys-apps/less:0 pcre unicode
+package.use : sys-apps/less:0 pcre unicode
 
 [sys-apps/lm_sensors:0]
-package.use/sys-apps_lm_sensors_0 : sys-apps/lm_sensors:0 -sensord static-libs
+package.use : sys-apps/lm_sensors:0 -sensord static-libs
 
 [sys-apps/man-db:0]
-package.use/sys-apps_man-db_0 : sys-apps/man-db:0 -nls -selinux berkdb gdbm static-libs zlib
+package.use : sys-apps/man-db:0 -nls -selinux berkdb gdbm static-libs zlib
 
 [sys-apps/miscfiles:0]
-package.use/sys-apps_miscfiles_0 : sys-apps/miscfiles:0 -minimal
+package.use : sys-apps/miscfiles:0 -minimal
 
 [sys-apps/mlocate:0]
-package.use/sys-apps_mlocate_0 : sys-apps/mlocate:0 -nls -selinux
+package.use : sys-apps/mlocate:0 -nls -selinux
 
 [sys-apps/net-tools:0]
-package.use/sys-apps_net-tools_0 : sys-apps/net-tools:0 -nls -old-output -selinux -static
+package.use : sys-apps/net-tools:0 -nls -old-output -selinux -static
 
 [sys-apps/netplug:0]
-package.use/sys-apps_netplug_0 : sys-apps/netplug:0 -debug -doc
+package.use : sys-apps/netplug:0 -debug -doc
 
 [sys-apps/openrc:0]
-package.use/sys-apps_openrc_0 : sys-apps/openrc:0 -audit -debug -newnet -pam -prefix -selinux -tools ncurses netifrc static-libs unicode
+package.use : sys-apps/openrc:0 -audit -debug -newnet -pam -prefix -selinux -tools ncurses netifrc static-libs unicode
 
 [sys-apps/pciutils:0]
-package.use/sys-apps_pciutils_0 : sys-apps/pciutils:0 kmod static-libs zlib
+package.use : sys-apps/pciutils:0 kmod static-libs zlib
 
 [sys-apps/pcsc-lite:0]
-package.use/sys-apps_pcsc-lite_0 : sys-apps/pcsc-lite:0 -libusb -policykit -selinux udev
+package.use : sys-apps/pcsc-lite:0 -libusb -policykit -selinux udev
 
 [sys-apps/portage:0]
-package.use/sys-apps_portage_0 : sys-apps/portage:0 -build -doc -epydoc -selinux ipc xattr
+package.use : sys-apps/portage:0 -build -doc -epydoc -selinux ipc xattr
 
 [sys-apps/preload:0]
-package.use/sys-apps_preload_0 : sys-apps/preload:0 -vanilla
+package.use : sys-apps/preload:0 -vanilla
 
 [sys-apps/proot:0]
-package.use/sys-apps_proot_0 : sys-apps/proot:0 -care -test
+package.use : sys-apps/proot:0 -care -test
 
 [sys-apps/pv:0]
-package.use/sys-apps_pv_0 : sys-apps/pv:0 -debug -nls
+package.use : sys-apps/pv:0 -debug -nls
 
 [sys-apps/qdiskusage:0]
-package.use/sys-apps_qdiskusage_0 : sys-apps/qdiskusage:0 -debug
+package.use : sys-apps/qdiskusage:0 -debug
 
 [sys-apps/qingy:0]
-package.use/sys-apps_qingy_0 : sys-apps/qingy:0 -consolekit -emacs -gpm -opensslcrypt -pam -static X crypt directfb
+package.use : sys-apps/qingy:0 -consolekit -emacs -gpm -opensslcrypt -pam -static X crypt directfb
 
 [sys-apps/readahead-list:0]
-package.use/sys-apps_readahead-list_0 : sys-apps/readahead-list:0 -doc
+package.use : sys-apps/readahead-list:0 -doc
 
 [sys-apps/renameutils:0]
-package.use/sys-apps_renameutils_0 : sys-apps/renameutils:0 -nls
+package.use : sys-apps/renameutils:0 -nls
 
 [sys-apps/rng-tools:0]
-package.use/sys-apps_rng-tools_0 : sys-apps/rng-tools:0 -selinux
+package.use : sys-apps/rng-tools:0 -selinux
 
 [sys-apps/sandbox:0]
-package.use/sys-apps_sandbox_0 : sys-apps/sandbox:0 -multilib
+package.use : sys-apps/sandbox:0 -multilib
 
 [sys-apps/sed:0]
-package.use/sys-apps_sed_0 : sys-apps/sed:0 -nls -selinux -static acl
+package.use : sys-apps/sed:0 -nls -selinux -static acl
 
 [sys-apps/shadow:0]
-package.use/sys-apps_shadow_0 : sys-apps/shadow:0 -audit -nls -pam -selinux acl cracklib skey xattr
+package.use : sys-apps/shadow:0 -audit -nls -pam -selinux acl cracklib skey xattr
 
 [sys-apps/smartmontools:0]
-package.use/sys-apps_smartmontools_0 : sys-apps/smartmontools:0 -minimal -selinux -static caps
+package.use : sys-apps/smartmontools:0 -minimal -selinux -static caps
 
 [sys-apps/sysvinit:0]
-package.use/sys-apps_sysvinit_0 : sys-apps/sysvinit:0 -ibm -selinux -static
+package.use : sys-apps/sysvinit:0 -ibm -selinux -static
 
 [sys-apps/tcp-wrappers:0]
-package.use/sys-apps_tcp-wrappers_0 : sys-apps/tcp-wrappers:0 -netgroups ipv6 static-libs
+package.use : sys-apps/tcp-wrappers:0 -netgroups ipv6 static-libs
 
 [sys-apps/texinfo:0]
-package.use/sys-apps_texinfo_0 : sys-apps/texinfo:0 -nls -static
+package.use : sys-apps/texinfo:0 -nls -static
 
 [sys-apps/the_silver_searcher:0]
-package.use/sys-apps_the_silver_searcher_0 : sys-apps/the_silver_searcher:0 lzma zlib
+package.use : sys-apps/the_silver_searcher:0 lzma zlib
 
 [sys-apps/timer_entropyd:0]
-package.use/sys-apps_timer_entropyd_0 : sys-apps/timer_entropyd:0 -debug
+package.use : sys-apps/timer_entropyd:0 -debug
 
 [sys-apps/tuxonice-userui:0]
-package.use/sys-apps_tuxonice-userui_0 : sys-apps/tuxonice-userui:0 -fbsplash
+package.use : sys-apps/tuxonice-userui:0 -fbsplash
 
 [sys-apps/ucspi-tcp:0]
-package.use/sys-apps_ucspi-tcp_0 : sys-apps/ucspi-tcp:0 -qmail-spp -selinux
+package.use : sys-apps/ucspi-tcp:0 -qmail-spp -selinux
 
 [sys-apps/usb_modeswitch:0]
-package.use/sys-apps_usb_modeswitch_0 : sys-apps/usb_modeswitch:0 -jimtcl
+package.use : sys-apps/usb_modeswitch:0 -jimtcl
 
 [sys-apps/usbutils:0]
-package.use/sys-apps_usbutils_0 : sys-apps/usbutils:0 python
+package.use : sys-apps/usbutils:0 python
 
 [sys-apps/usermode-utilities:0]
-package.use/sys-apps_usermode-utilities_0 : sys-apps/usermode-utilities:0 -fuse
+package.use : sys-apps/usermode-utilities:0 -fuse
 
 [sys-apps/util-linux:0]
-package.use/sys-apps_util-linux_0 : sys-apps/util-linux:0 -fdformat -nls -pam -selinux -systemd -test -tty-helpers -udev caps cramfs ncurses python slang static-libs suid unicode
+package.use : sys-apps/util-linux:0 -fdformat -nls -pam -selinux -systemd -test -tty-helpers -udev caps cramfs ncurses python slang static-libs suid unicode
 
 [sys-apps/watchdog:0]
-package.use/sys-apps_watchdog_0 : sys-apps/watchdog:0 -nfs
-package.mask/sys-apps_watchdog_0 : >sys-apps/watchdog-5.13-r1
+package.use : sys-apps/watchdog:0 -nfs
+package.mask : >sys-apps/watchdog-5.13-r1
 
 [sys-apps/xinetd:0]
-package.use/sys-apps_xinetd_0 : sys-apps/xinetd:0 -rpc perl tcpd
+package.use : sys-apps/xinetd:0 -rpc perl tcpd
 
 [sys-apps/xmbmon:0]
-package.use/sys-apps_xmbmon_0 : sys-apps/xmbmon:0 X
+package.use : sys-apps/xmbmon:0 X
 
 [sys-auth/skey:0]
-package.use/sys-auth_skey_0 : sys-auth/skey:0 static-libs
+package.use : sys-auth/skey:0 static-libs
 
 [sys-block/di:0]
-+package.env : sys-block/di:0 sys-block_di_0
-env/sys-block_di_0 : LDFLAGS="-liconv"
+package.env : sys-block/di:0 sys-block_di_0
+env : LDFLAGS="-liconv"
 
 [sys-block/mbuffer:0]
-package.use/sys-block_mbuffer_0 : sys-block/mbuffer:0 -debug ssl
+package.use : sys-block/mbuffer:0 -debug ssl
 
 [sys-block/nbd:0]
-package.use/sys-block_nbd_0 : sys-block/nbd:0 -debug zlib
+package.use : sys-block/nbd:0 -debug zlib
 
 [sys-block/thin-provisioning-tools:0]
-package.use/sys-block_thin-provisioning-tools_0 : sys-block/thin-provisioning-tools:0 -test
+package.use : sys-block/thin-provisioning-tools:0 -test
 
 [sys-boot/lilo:0]
-package.use/sys-boot_lilo_0 : sys-boot/lilo:0 -device-mapper -minimal -pxeserial -static
+package.use : sys-boot/lilo:0 -device-mapper -minimal -pxeserial -static
 
 [sys-boot/mbr:0]
-package.use/sys-boot_mbr_0 : sys-boot/mbr:0 -test
+package.use : sys-boot/mbr:0 -test
 
 [sys-boot/syslinux:0]
-package.use/sys-boot_syslinux_0 : sys-boot/syslinux:0 -custom-cflags
+package.use : sys-boot/syslinux:0 -custom-cflags
 
 [sys-cluster/csync2:0]
-package.use/sys-cluster_csync2_0 : sys-cluster/csync2:0 ssl xinetd
+package.use : sys-cluster/csync2:0 ssl xinetd
 
 [sys-cluster/ipvsadm:0]
-package.use/sys-cluster_ipvsadm_0 : sys-cluster/ipvsadm:0 static-libs
+package.use : sys-cluster/ipvsadm:0 static-libs
 
 [sys-cluster/keepalived:0]
-package.use/sys-cluster_keepalived_0 : sys-cluster/keepalived:0 -debug -snmp ipv6
+package.use : sys-cluster/keepalived:0 -debug -snmp ipv6
 
 [sys-devel/autoconf:2.5]
-package.use/sys-devel_autoconf_2.5 : sys-devel/autoconf:2.5 -emacs -multislot
+package.use : sys-devel/autoconf:2.5 -emacs -multislot
 
 [sys-devel/autogen:0]
-package.use/sys-devel_autogen_0 : sys-devel/autogen:0 -libopts static-libs
+package.use : sys-devel/autogen:0 -libopts static-libs
 
 [sys-devel/bc:0]
-package.use/sys-devel_bc_0 : sys-devel/bc:0 -libedit -static readline
+package.use : sys-devel/bc:0 -libedit -static readline
 
 [sys-devel/binutils:0]
-package.use/sys-devel_binutils_0 : sys-devel/binutils:0 -multislot -multitarget -nls -test -vanilla cxx static-libs zlib
+package.use : sys-devel/binutils:0 -multislot -multitarget -nls -test -vanilla cxx static-libs zlib
 
 [sys-devel/bison:0]
-package.use/sys-devel_bison_0 : sys-devel/bison:0 -nls -static
+package.use : sys-devel/bison:0 -nls -static
 
 [sys-devel/flex:0]
-package.use/sys-devel_flex_0 : sys-devel/flex:0 -nls -static -test
+package.use : sys-devel/flex:0 -nls -static -test
 
 [sys-devel/gcc:4.8]
-package.use/sys-devel_gcc_4.8 : sys-devel/gcc:4.8 -altivec -debug -doc -fixed-point -go -libssp -mudflap -multilib -multislot -nls -nopie -nossp -regression-test -sanitize -vanilla awt cxx fortran gcj graphite hardened nptl objc objc++ objc-gc openmp
+package.use : sys-devel/gcc:4.8 -altivec -debug -doc -fixed-point -go -libssp -mudflap -multilib -multislot -nls -nopie -nossp -regression-test -sanitize -vanilla awt cxx fortran gcj graphite hardened nptl objc objc++ objc-gc openmp
 
 [sys-devel/gdb:0]
-package.use/sys-devel_gdb_0 : sys-devel/gdb:0 -expat -multitarget -nls -test -vanilla client lzma python server zlib
+package.use : sys-devel/gdb:0 -expat -multitarget -nls -test -vanilla client lzma python server zlib
 
 [sys-devel/gettext:0]
-package.use/sys-devel_gettext_0 : sys-devel/gettext:0 -cvs -doc -emacs -java -nls acl cxx git ncurses openmp static-libs
+package.use : sys-devel/gettext:0 -cvs -doc -emacs -java -nls acl cxx git ncurses openmp static-libs
 
 [sys-devel/libtool:2]
-package.use/sys-devel_libtool_2 : sys-devel/libtool:2 -vanilla
+package.use : sys-devel/libtool:2 -vanilla
 
 [sys-devel/m4:0]
-package.use/sys-devel_m4_0 : sys-devel/m4:0 -examples
+package.use : sys-devel/m4:0 -examples
 
 [sys-devel/make:0]
-package.use/sys-devel_make_0 : sys-devel/make:0 -nls -static guile
-+package.env : sys-devel/make:0 sys-devel_make_0
-env/sys-devel_make_0 : LDFLAGS="-lpthread"
+package.use : sys-devel/make:0 -nls -static guile
+package.env : sys-devel/make:0 sys-devel_make_0
+env : LDFLAGS="-lpthread"
 
 [sys-devel/patch:0]
-package.use/sys-devel_patch_0 : sys-devel/patch:0 -static -test xattr
+package.use : sys-devel/patch:0 -static -test xattr
 
 [sys-devel/remake:0]
-package.use/sys-devel_remake_0 : sys-devel/remake:0 readline
+package.use : sys-devel/remake:0 readline
 
 [sys-devel/sparse:0]
-package.use/sys-devel_sparse_0 : sys-devel/sparse:0 -test gtk xml
+package.use : sys-devel/sparse:0 -test gtk xml
 
 [sys-firmware/atmel-firmware:0]
-package.use/sys-firmware_atmel-firmware_0 : sys-firmware/atmel-firmware:0 -pcmcia -usb
+package.use : sys-firmware/atmel-firmware:0 -pcmcia -usb
 
 [sys-fs/cachefilesd:0]
-package.use/sys-fs_cachefilesd_0 : sys-fs/cachefilesd:0 -doc -selinux
+package.use : sys-fs/cachefilesd:0 -doc -selinux
 
 [sys-fs/cryptsetup:0]
-package.use/sys-fs_cryptsetup_0 : sys-fs/cryptsetup:0 -nettle -nls -openssl -pwquality -reencrypt -static -udev -urandom gcrypt python static-libs
+package.use : sys-fs/cryptsetup:0 -nettle -nls -openssl -pwquality -reencrypt -static -udev -urandom gcrypt python static-libs
 
 [sys-fs/dd-rescue:0]
-package.use/sys-fs_dd-rescue_0 : sys-fs/dd-rescue:0 -static
+package.use : sys-fs/dd-rescue:0 -static
 
 [sys-fs/ddrescue:0]
-package.use/sys-fs_ddrescue_0 : sys-fs/ddrescue:0 -static
+package.use : sys-fs/ddrescue:0 -static
 
 [sys-fs/e2fsprogs:0]
-package.use/sys-fs_e2fsprogs_0 : sys-fs/e2fsprogs:0 -nls static-libs
+package.use : sys-fs/e2fsprogs:0 -nls static-libs
 
 [sys-fs/encfs:0]
-package.use/sys-fs_encfs_0 : sys-fs/encfs:0 xattr
-+package.env : sys-fs/encfs:0 sys-fs_encfs_0
-env/sys-fs_encfs_0 : LDFLAGS="-lpthread"
+package.use : sys-fs/encfs:0 xattr
+package.env : sys-fs/encfs:0 sys-fs_encfs_0
+env : LDFLAGS="-lpthread"
 
 [sys-fs/eudev:0]
-package.use/sys-fs_eudev_0 : sys-fs/eudev:0 -doc -introspection -selinux -test gudev hwdb keymap kmod modutils openrc rule-generator static-libs
+package.use : sys-fs/eudev:0 -doc -introspection -selinux -test gudev hwdb keymap kmod modutils openrc rule-generator static-libs
 
 [sys-fs/ext4magic:0]
-package.use/sys-fs_ext4magic_0 : sys-fs/ext4magic:0 -debug -expert-mode -file-attr
+package.use : sys-fs/ext4magic:0 -debug -expert-mode -file-attr
 
 [sys-fs/fuse:0]
-package.use/sys-fs_fuse_0 : sys-fs/fuse:0 -examples static-libs
+package.use : sys-fs/fuse:0 -examples static-libs
 
 [sys-fs/lvm2:0]
-package.use/sys-fs_lvm2_0 : sys-fs/lvm2:0 -clvm -cman -device-mapper-only -lvm1 -lvm2create_initrd -selinux -static -systemd readline static-libs thin udev
+package.use : sys-fs/lvm2:0 -clvm -cman -device-mapper-only -lvm1 -lvm2create_initrd -selinux -static -systemd readline static-libs thin udev
 
 [sys-fs/mhddfs:0]
-package.use/sys-fs_mhddfs_0 : sys-fs/mhddfs:0 suid
+package.use : sys-fs/mhddfs:0 suid
 
 [sys-fs/mtd-utils:0]
-package.use/sys-fs_mtd-utils_0 : sys-fs/mtd-utils:0 xattr
+package.use : sys-fs/mtd-utils:0 xattr
 
 [sys-fs/mtools:0]
-package.use/sys-fs_mtools_0 : sys-fs/mtools:0 X
-+package.env : sys-fs/mtools:0 sys-fs_mtools_0
-env/sys-fs_mtools_0 : LDFLAGS="-liconv"
+package.use : sys-fs/mtools:0 X
+package.env : sys-fs/mtools:0 sys-fs_mtools_0
+env : LDFLAGS="-liconv"
 
 [sys-fs/mtpfs:0]
-package.use/sys-fs_mtpfs_0 : sys-fs/mtpfs:0 -debug
+package.use : sys-fs/mtpfs:0 -debug
 
 [sys-fs/pysize:0]
-package.use/sys-fs_pysize_0 : sys-fs/pysize:0 gtk ncurses
+package.use : sys-fs/pysize:0 gtk ncurses
 
 [sys-fs/safecopy:0]
-package.use/sys-fs_safecopy_0 : sys-fs/safecopy:0 -test
+package.use : sys-fs/safecopy:0 -test
 
 [sys-fs/sysfsutils:0]
-package.use/sys-fs_sysfsutils_0 : sys-fs/sysfsutils:0 static-libs
+package.use : sys-fs/sysfsutils:0 static-libs
 
 [sys-kernel/genkernel:0]
-package.use/sys-kernel_genkernel_0 : sys-kernel/genkernel:0 -cryptsetup -ibm -selinux crypt
+package.use : sys-kernel/genkernel:0 -cryptsetup -ibm -selinux crypt
 
 [sys-kernel/gentoo-sources:4.0.5]
-package.use/sys-kernel_gentoo-sources_4.0.5 : sys-kernel/gentoo-sources:4.0.5 -build -deblob -experimental -symlink
+package.use : sys-kernel/gentoo-sources:4.0.5 -build -deblob -experimental -symlink
 
 [sys-kernel/linux-firmware:0]
-package.use/sys-kernel_linux-firmware_0 : sys-kernel/linux-firmware:0 -savedconfig
+package.use : sys-kernel/linux-firmware:0 -savedconfig
 
 [sys-libs/cracklib:0]
-package.use/sys-libs_cracklib_0 : sys-libs/cracklib:0 -nls -test python static-libs zlib
+package.use : sys-libs/cracklib:0 -nls -test python static-libs zlib
 
 [sys-libs/db:4.8]
-package.use/sys-libs_db_4.8 : sys-libs/db:4.8 -doc -examples -java -test cxx tcl
+package.use : sys-libs/db:4.8 -doc -examples -java -test cxx tcl
 
 [sys-libs/e2fsprogs-libs:0]
-package.use/sys-libs_e2fsprogs-libs_0 : sys-libs/e2fsprogs-libs:0 -nls static-libs
+package.use : sys-libs/e2fsprogs-libs:0 -nls static-libs
 
 [sys-libs/freeipmi:0]
-package.use/sys-libs_freeipmi_0 : sys-libs/freeipmi:0 -debug -nagios
+package.use : sys-libs/freeipmi:0 -debug -nagios
 
 [sys-libs/gdbm:0]
-package.use/sys-libs_gdbm_0 : sys-libs/gdbm:0 -exporter -nls berkdb static-libs
+package.use : sys-libs/gdbm:0 -exporter -nls berkdb static-libs
 
 [sys-libs/gpm:0]
-package.use/sys-libs_gpm_0 : sys-libs/gpm:0 -selinux static-libs
+package.use : sys-libs/gpm:0 -selinux static-libs
 
 [sys-libs/libavc1394:0]
-package.use/sys-libs_libavc1394_0 : sys-libs/libavc1394:0 static-libs
-+package.env : sys-libs/libavc1394:0 sys-libs_libavc1394_0
-env/sys-libs_libavc1394_0 : LDFLAGS=-largp
+package.use : sys-libs/libavc1394:0 static-libs
+package.env : sys-libs/libavc1394:0 sys-libs_libavc1394_0
+env : LDFLAGS=-largp
 
 [sys-libs/libcap-ng:0]
-package.use/sys-libs_libcap-ng_0 : sys-libs/libcap-ng:0 python static-libs
+package.use : sys-libs/libcap-ng:0 python static-libs
 
 [sys-libs/libcap:0]
-package.use/sys-libs_libcap_0 : sys-libs/libcap:0 -pam
+package.use : sys-libs/libcap:0 -pam
 
 [sys-libs/libieee1284:0]
-package.use/sys-libs_libieee1284_0 : sys-libs/libieee1284:0 -doc python static-libs
+package.use : sys-libs/libieee1284:0 -doc python static-libs
 
 [sys-libs/libkudzu:0]
-package.use/sys-libs_libkudzu_0 : sys-libs/libkudzu:0 zlib
+package.use : sys-libs/libkudzu:0 zlib
 
 [sys-libs/libmath++:1]
-package.use/sys-libs_libmath++_1 : sys-libs/libmath++:1 -doc static-libs
+package.use : sys-libs/libmath++:1 -doc static-libs
 
 [sys-libs/libraw1394:0]
-package.use/sys-libs_libraw1394_0 : sys-libs/libraw1394:0 static-libs
+package.use : sys-libs/libraw1394:0 static-libs
 
 [sys-libs/libseccomp:0]
-package.use/sys-libs_libseccomp_0 : sys-libs/libseccomp:0 static-libs
+package.use : sys-libs/libseccomp:0 static-libs
 
 [sys-libs/libutempter:0]
-package.use/sys-libs_libutempter_0 : sys-libs/libutempter:0 static-libs
+package.use : sys-libs/libutempter:0 static-libs
 
 [sys-libs/mtdev:0]
-package.use/sys-libs_mtdev_0 : sys-libs/mtdev:0 static-libs
+package.use : sys-libs/mtdev:0 static-libs
 
 [sys-libs/ncurses:5]
-package.use/sys-libs_ncurses_5 : sys-libs/ncurses:5 -ada -debug -doc -gpm -minimal -profile -tinfo -trace cxx static-libs unicode
+package.use : sys-libs/ncurses:5 -ada -debug -doc -gpm -minimal -profile -tinfo -trace cxx static-libs unicode
 
 [sys-libs/readline:0]
-package.use/sys-libs_readline_0 : sys-libs/readline:0 static-libs utils
+package.use : sys-libs/readline:0 static-libs utils
 
 [sys-libs/slang:0]
-package.use/sys-libs_slang_0 : sys-libs/slang:0 -cjk pcre png readline static-libs zlib
+package.use : sys-libs/slang:0 -cjk pcre png readline static-libs zlib
 
 [sys-libs/talloc:0]
-package.use/sys-libs_talloc_0 : sys-libs/talloc:0 -compat python
+package.use : sys-libs/talloc:0 -compat python
 
 [sys-libs/tdb:0]
-package.use/sys-libs_tdb_0 : sys-libs/tdb:0 python
+package.use : sys-libs/tdb:0 python
 
 [sys-libs/tevent:0]
-package.use/sys-libs_tevent_0 : sys-libs/tevent:0 python
+package.use : sys-libs/tevent:0 python
 
 [sys-libs/timezone-data:0]
-package.use/sys-libs_timezone-data_0 : sys-libs/timezone-data:0 -nls -right_timezone
+package.use : sys-libs/timezone-data:0 -nls -right_timezone
 
 [sys-libs/uclibc:0]
-package.use/sys-libs_uclibc_0 : sys-libs/uclibc:0 -debug -hardened -iconv -ipv6 -nptl -rpc -ssp -uclibc-compat -wordexp savedconfig
-package.accept_keywords/sys-libs_uclibc_0 : =sys-libs/uclibc-0.9.33.9999 **
+package.use : sys-libs/uclibc:0 -debug -hardened -iconv -ipv6 -nptl -rpc -ssp -uclibc-compat -wordexp savedconfig
+package.accept_keywords : =sys-libs/uclibc-0.9.33.9999 **
 
 [sys-libs/zlib:0]
-package.use/sys-libs_zlib_0 : sys-libs/zlib:0 minizip static-libs
+package.use : sys-libs/zlib:0 minizip static-libs
 
 [sys-power/hibernate-script:0]
-package.use/sys-power_hibernate-script_0 : sys-power/hibernate-script:0 vim-syntax
+package.use : sys-power/hibernate-script:0 vim-syntax
 
 [sys-power/iasl:0]
-package.use/sys-power_iasl_0 : sys-power/iasl:0 -test
+package.use : sys-power/iasl:0 -test
 
 [sys-power/nvclock:0]
-package.use/sys-power_nvclock_0 : sys-power/nvclock:0 -nvcontrol gtk
+package.use : sys-power/nvclock:0 -nvcontrol gtk
 
 [sys-power/pm-utils:0]
-package.use/sys-power_pm-utils_0 : sys-power/pm-utils:0 -debug -ntp -video_cards_intel -video_cards_radeon alsa
+package.use : sys-power/pm-utils:0 -debug -ntp -video_cards_intel -video_cards_radeon alsa
 
 [sys-power/powermgmt-base:0]
-package.use/sys-power_powermgmt-base_0 : sys-power/powermgmt-base:0 pm-utils
+package.use : sys-power/powermgmt-base:0 pm-utils
 
 [sys-power/upower:0]
-package.use/sys-power_upower_0 : sys-power/upower:0 -selinux introspection ios
+package.use : sys-power/upower:0 -selinux introspection ios
 
 [sys-process/at:0]
-package.use/sys-process_at_0 : sys-process/at:0 -pam -selinux
+package.use : sys-process/at:0 -pam -selinux
 
 [sys-process/daemontools:0]
-package.use/sys-process_daemontools_0 : sys-process/daemontools:0 -selinux -static
+package.use : sys-process/daemontools:0 -selinux -static
 
 [sys-process/fcron:0]
-package.use/sys-process_fcron_0 : sys-process/fcron:0 -debug -pam -selinux mta readline system-crontab
+package.use : sys-process/fcron:0 -debug -pam -selinux mta readline system-crontab
 
 [sys-process/htop:0]
-package.use/sys-process_htop_0 : sys-process/htop:0 -oom -openvz -vserver unicode
+package.use : sys-process/htop:0 -oom -openvz -vserver unicode
 
 [sys-process/latencytop:0]
-package.use/sys-process_latencytop_0 : sys-process/latencytop:0 gtk unicode
+package.use : sys-process/latencytop:0 gtk unicode
 
 [sys-process/lsof:0]
-package.use/sys-process_lsof_0 : sys-process/lsof:0 -examples -rpc -selinux -static ipv6
+package.use : sys-process/lsof:0 -examples -rpc -selinux -static ipv6
 
 [sys-process/numactl:0]
-package.use/sys-process_numactl_0 : sys-process/numactl:0 static-libs
+package.use : sys-process/numactl:0 static-libs
 
 [sys-process/procps:0]
-package.use/sys-process_procps_0 : sys-process/procps:0 -nls -selinux -systemd -test ncurses static-libs unicode
+package.use : sys-process/procps:0 -nls -selinux -systemd -test ncurses static-libs unicode
 
 [sys-process/psmisc:0]
-package.use/sys-process_psmisc_0 : sys-process/psmisc:0 -nls -selinux X ipv6
+package.use : sys-process/psmisc:0 -nls -selinux X ipv6
 
 [sys-process/supervise-scripts:0]
-package.use/sys-process_supervise-scripts_0 : sys-process/supervise-scripts:0 -doc
+package.use : sys-process/supervise-scripts:0 -doc
 
 [virtual/acl:0]
-package.use/virtual_acl_0 : virtual/acl:0 static-libs
+package.use : virtual/acl:0 static-libs
 
 [virtual/editor:0]
-+package.env : virtual/editor:0 virtual_editor_0
-env/virtual_editor_0 : LDFLAGS="-liconv"
+package.env : virtual/editor:0 virtual_editor_0
+env : LDFLAGS="-liconv"
 
 [virtual/ffmpeg:0]
-package.use/virtual_ffmpeg_0 : virtual/ffmpeg:0 -libav -truetype -vdpau -x264 X encode gsm jpeg2k mp3 opus sdl speex theora threads vaapi
+package.use : virtual/ffmpeg:0 -libav -truetype -vdpau -x264 X encode gsm jpeg2k mp3 opus sdl speex theora threads vaapi
 
 [virtual/jpeg:0]
-package.use/virtual_jpeg_0 : virtual/jpeg:0 static-libs
+package.use : virtual/jpeg:0 static-libs
 
 [virtual/libgudev:0]
-package.use/virtual_libgudev_0 : virtual/libgudev:0 -introspection -systemd static-libs
+package.use : virtual/libgudev:0 -introspection -systemd static-libs
 
 [virtual/libudev:0]
-package.use/virtual_libudev_0 : virtual/libudev:0 -systemd static-libs
+package.use : virtual/libudev:0 -systemd static-libs
 
 [virtual/libusb:1]
-package.use/virtual_libusb_1 : virtual/libusb:1 -udev
+package.use : virtual/libusb:1 -udev
 
 [virtual/linux-sources:0]
-package.use/virtual_linux-sources_0 : virtual/linux-sources:0 -firmware
+package.use : virtual/linux-sources:0 -firmware
 
 [virtual/mysql:0]
-package.use/virtual_mysql_0 : virtual/mysql:0 -embedded -minimal -static static-libs
+package.use : virtual/mysql:0 -embedded -minimal -static static-libs
 
 [virtual/notification-daemon:0]
-package.use/virtual_notification-daemon_0 : virtual/notification-daemon:0 -gnome
+package.use : virtual/notification-daemon:0 -gnome
 
 [virtual/python-imaging:0]
-package.use/virtual_python-imaging_0 : virtual/python-imaging:0 jpeg tk
+package.use : virtual/python-imaging:0 jpeg tk
 
 [virtual/rubygems:0]
-package.use/virtual_rubygems_0 : virtual/rubygems:0 ruby_targets_ruby19 ruby_targets_ruby20
+package.use : virtual/rubygems:0 ruby_targets_ruby19 ruby_targets_ruby20
 
 [virtual/service-manager:0]
-package.use/virtual_service-manager_0 : virtual/service-manager:0 -prefix
+package.use : virtual/service-manager:0 -prefix
 
 [virtual/ssh:0]
-package.use/virtual_ssh_0 : virtual/ssh:0 -minimal
+package.use : virtual/ssh:0 -minimal
 
 [virtual/udev:0]
-package.use/virtual_udev_0 : virtual/udev:0 -systemd
+package.use : virtual/udev:0 -systemd
 
 [www-apache/mod_extract_forwarded:0]
-package.use/www-apache_mod_extract_forwarded_0 : www-apache/mod_extract_forwarded:0 -mod_proxy
+package.use : www-apache/mod_extract_forwarded:0 -mod_proxy
 
 [www-apache/mod_jk:0]
-package.use/www-apache_mod_jk_0 : www-apache/mod_jk:0 -java
+package.use : www-apache/mod_jk:0 -java
 
 [www-apache/mod_ldap_userdir:0]
-package.use/www-apache_mod_ldap_userdir_0 : www-apache/mod_ldap_userdir:0 ssl
+package.use : www-apache/mod_ldap_userdir:0 ssl
 
 [www-apache/mod_log_sql:0]
-package.use/www-apache_mod_log_sql_0 : www-apache/mod_log_sql:0 dbi ssl
+package.use : www-apache/mod_log_sql:0 dbi ssl
 
 [www-apache/mod_python:0]
-package.use/www-apache_mod_python_0 : www-apache/mod_python:0 -doc -test
+package.use : www-apache/mod_python:0 -doc -test
 
 [www-apache/mod_security:0]
-package.use/www-apache_mod_security_0 : www-apache/mod_security:0 -jit curl geoip lua
+package.use : www-apache/mod_security:0 -jit curl geoip lua
 
 [www-apache/modsecurity-crs:0]
-package.use/www-apache_modsecurity-crs_0 : www-apache/modsecurity-crs:0 geoip lua
+package.use : www-apache/modsecurity-crs:0 geoip lua
 
 [www-apps/collectd-web:0.4.0]
-package.use/www-apps_collectd-web_0.4.0 : www-apps/collectd-web:0.4.0 -vhosts
+package.use : www-apps/collectd-web:0.4.0 -vhosts
 
 [www-apps/moinmoin:0]
-package.use/www-apps_moinmoin_0 : www-apps/moinmoin:0 -vhosts
+package.use : www-apps/moinmoin:0 -vhosts
 
 [www-apps/nikola:0]
-package.use/www-apps_nikola_0 : www-apps/nikola:0 -assets -charts -hyphenation -ipython -jinja -markdown
+package.use : www-apps/nikola:0 -assets -charts -hyphenation -ipython -jinja -markdown
 
 [www-apps/trac:0]
-package.use/www-apps_trac_0 : www-apps/trac:0 -fastcgi -i18n -mysql -postgres -test -vhosts cgi highlight restructuredtext sqlite subversion
+package.use : www-apps/trac:0 -fastcgi -i18n -mysql -postgres -test -vhosts cgi highlight restructuredtext sqlite subversion
 
 [www-apps/viewvc:0]
-package.use/www-apps_viewvc_0 : www-apps/viewvc:0 -cvs -cvsgraph -mod_wsgi -mysql -pygments -vhosts subversion
+package.use : www-apps/viewvc:0 -cvs -cvsgraph -mod_wsgi -mysql -pygments -vhosts subversion
 
 [www-client/httrack:0]
-package.use/www-client_httrack_0 : www-client/httrack:0 static-libs
+package.use : www-client/httrack:0 static-libs
 
 [www-client/links:2]
-package.use/www-client_links_2 : www-client/links:2 -livecd -suid -svga X bzip2 directfb fbcon gpm ipv6 jpeg lzma ssl tiff unicode zlib
+package.use : www-client/links:2 -livecd -suid -svga X bzip2 directfb fbcon gpm ipv6 jpeg lzma ssl tiff unicode zlib
 
 [www-client/lynx:0]
-package.use/www-client_lynx_0 : www-client/lynx:0 -cjk -nls bzip2 gnutls idn ipv6 ssl unicode
+package.use : www-client/lynx:0 -cjk -nls bzip2 gnutls idn ipv6 ssl unicode
 
 [www-client/midori:0]
-package.use/www-client_midori_0 : www-client/midori:0 -deprecated -doc -granite -introspection -jit -zeitgeist webkit2
-package.accept_keywords/www-client_midori_0 : >=www-client/midori-0.5.8-r1 ~amd64
+package.use : www-client/midori:0 -deprecated -doc -granite -introspection -jit -zeitgeist webkit2
+package.accept_keywords : >=www-client/midori-0.5.8-r1 ~amd64
 
 [www-client/opera:0]
-package.use/www-client_opera_0 : www-client/opera:0 -kde -multilib gstreamer gtk
+package.use : www-client/opera:0 -kde -multilib gstreamer gtk
 
 [www-client/pybugz:0]
-package.use/www-client_pybugz_0 : www-client/pybugz:0 -zsh-completion
+package.use : www-client/pybugz:0 -zsh-completion
 
 [www-client/qupzilla:0]
-package.use/www-client_qupzilla_0 : www-client/qupzilla:0 -debug -kde -nonblockdialogs -qt5 dbus gnome-keyring qt4
+package.use : www-client/qupzilla:0 -debug -kde -nonblockdialogs -qt5 dbus gnome-keyring qt4
 
 [www-client/surf:0]
-package.use/www-client_surf_0 : www-client/surf:0 -savedconfig
+package.use : www-client/surf:0 -savedconfig
 
 [www-client/uget:0]
-package.use/www-client_uget_0 : www-client/uget:0 -aria2 -gstreamer -hide-temp-files -nls curl libnotify
+package.use : www-client/uget:0 -aria2 -gstreamer -hide-temp-files -nls curl libnotify
 
 [www-client/uzbl:0]
-package.use/www-client_uzbl_0 : www-client/uzbl:0 -helpers browser gtk3 tabbed vim-syntax
+package.use : www-client/uzbl:0 -helpers browser gtk3 tabbed vim-syntax
 
 [www-client/vimb:0]
-package.use/www-client_vimb_0 : www-client/vimb:0 gtk3
+package.use : www-client/vimb:0 gtk3
 
 [www-misc/awstats:0]
-package.use/www-misc_awstats_0 : www-misc/awstats:0 geoip ipv6
+package.use : www-misc/awstats:0 geoip ipv6
 
 [www-misc/gurlchecker:0]
-package.use/www-misc_gurlchecker_0 : www-misc/gurlchecker:0 -clamav -json -tidy sqlite ssl
+package.use : www-misc/gurlchecker:0 -clamav -json -tidy sqlite ssl
 
 [www-misc/profile-sync-daemon:0]
-package.use/www-misc_profile-sync-daemon_0 : www-misc/profile-sync-daemon:0 -systemd
+package.use : www-misc/profile-sync-daemon:0 -systemd
 
 [www-plugins/gecko-mediaplayer:0]
-package.use/www-plugins_gecko-mediaplayer_0 : www-plugins/gecko-mediaplayer:0 curl
+package.use : www-plugins/gecko-mediaplayer:0 curl
 
 [www-servers/apache:2]
-package.use/www-servers_apache_2 : www-servers/apache:2 -apache2_modules_asis -apache2_modules_auth_digest -apache2_modules_authn_dbd -apache2_modules_cern_meta -apache2_modules_charset_lite -apache2_modules_dbd -apache2_modules_dumpio -apache2_modules_ident -apache2_modules_imagemap -apache2_modules_log_forensic -apache2_modules_proxy -apache2_modules_proxy_ajp -apache2_modules_proxy_balancer -apache2_modules_proxy_connect -apache2_modules_proxy_ftp -apache2_modules_proxy_http -apache2_modules_proxy_scgi -apache2_modules_reqtimeout -apache2_modules_substitute -apache2_modules_version -apache2_mpms_event -apache2_mpms_itk -apache2_mpms_peruser -apache2_mpms_prefork -apache2_mpms_worker -debug -doc -selinux -static -suexec apache2_modules_actions apache2_modules_alias apache2_modules_auth_basic apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_dbm apache2_modules_authn_default apache2_modules_authn_file apache2_modules_authz_dbm apache2_modules_authz_defaul
 t apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_deflate apache2_modules_dir apache2_modules_disk_cache apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_include apache2_modules_info apache2_modules_log_config apache2_modules_logio apache2_modules_mem_cache apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_rewrite apache2_modules_setenvif apache2_modules_speling apache2_modules_status apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_vhost_alias ldap ssl threads
+package.use : www-servers/apache:2 -apache2_modules_asis -apache2_modules_auth_digest -apache2_modules_authn_dbd -apache2_modules_cern_meta -apache2_modules_charset_lite -apache2_modules_dbd -apache2_modules_dumpio -apache2_modules_ident -apache2_modules_imagemap -apache2_modules_log_forensic -apache2_modules_proxy -apache2_modules_proxy_ajp -apache2_modules_proxy_balancer -apache2_modules_proxy_connect -apache2_modules_proxy_ftp -apache2_modules_proxy_http -apache2_modules_proxy_scgi -apache2_modules_reqtimeout -apache2_modules_substitute -apache2_modules_version -apache2_mpms_event -apache2_mpms_itk -apache2_mpms_peruser -apache2_mpms_prefork -apache2_mpms_worker -debug -doc -selinux -static -suexec apache2_modules_actions apache2_modules_alias apache2_modules_auth_basic apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_dbm apache2_modules_authn_default apache2_modules_authn_file apache2_modules_authz_dbm apache2_modules_authz_default apache2_modules_aut
 hz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_deflate apache2_modules_dir apache2_modules_disk_cache apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_include apache2_modules_info apache2_modules_log_config apache2_modules_logio apache2_modules_mem_cache apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_rewrite apache2_modules_setenvif apache2_modules_speling apache2_modules_status apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_vhost_alias ldap ssl threads
 
 [www-servers/gunicorn:0]
-package.use/www-servers_gunicorn_0 : www-servers/gunicorn:0 -doc -examples -test
+package.use : www-servers/gunicorn:0 -doc -examples -test
 
 [www-servers/spawn-fcgi:0]
-package.use/www-servers_spawn-fcgi_0 : www-servers/spawn-fcgi:0 ipv6
+package.use : www-servers/spawn-fcgi:0 ipv6
 
 [www-servers/varnish:0]
-package.use/www-servers_varnish_0 : www-servers/varnish:0 -doc -jemalloc -jit static-libs tools
+package.use : www-servers/varnish:0 -doc -jemalloc -jit static-libs tools
 
 [x11-apps/ico:0]
-+package.env : x11-apps/ico:0 x11-apps_ico_0
-env/x11-apps_ico_0 : LDFLAGS="-liconv"
+package.env : x11-apps/ico:0 x11-apps_ico_0
+env : LDFLAGS="-liconv"
 
 [x11-apps/xauth:0]
-package.use/x11-apps_xauth_0 : x11-apps/xauth:0 ipv6
+package.use : x11-apps/xauth:0 ipv6
 
 [x11-apps/xdm:0]
-package.use/x11-apps_xdm_0 : x11-apps/xdm:0 -consolekit -pam -xdm-auth ipv6
+package.use : x11-apps/xdm:0 -consolekit -pam -xdm-auth ipv6
 
 [x11-apps/xdpyinfo:0]
-package.use/x11-apps_xdpyinfo_0 : x11-apps/xdpyinfo:0 -dmx dga xinerama
+package.use : x11-apps/xdpyinfo:0 -dmx dga xinerama
 
 [x11-apps/xhost:0]
-package.use/x11-apps_xhost_0 : x11-apps/xhost:0 ipv6
+package.use : x11-apps/xhost:0 ipv6
 
 [x11-apps/xinit:0]
-package.use/x11-apps_xinit_0 : x11-apps/xinit:0 minimal
+package.use : x11-apps/xinit:0 minimal
 
 [x11-apps/xinput_calibrator:0]
-package.use/x11-apps_xinput_calibrator_0 : x11-apps/xinput_calibrator:0 gtk
+package.use : x11-apps/xinput_calibrator:0 gtk
 
 [x11-apps/xsm:0]
-package.use/x11-apps_xsm_0 : x11-apps/xsm:0 -rsh
+package.use : x11-apps/xsm:0 -rsh
 
 [x11-base/xorg-drivers:0]
-package.use/x11-base_xorg-drivers_0 : x11-base/xorg-drivers:0 -input_devices_libinput -input_devices_vmmouse -video_cards_dummy -video_cards_fglrx -video_cards_freedreno -video_cards_geode -video_cards_nvidia -video_cards_omap -video_cards_omapfb -video_cards_radeonsi -video_cards_sunbw2 -video_cards_suncg14 -video_cards_suncg3 -video_cards_suncg6 -video_cards_sunffb -video_cards_sunleo -video_cards_suntcx -video_cards_via -video_cards_virtualbox -video_cards_vmware -video_cards_voodoo input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_synaptics input_devices_tslib input_devices_void input_devices_wacom video_cards_apm video_cards_ast video_cards_chips video_cards_cirrus video_cards_epson video_cards_fbdev video_cards_glint video_cards_i128 video_cards_i740 video_cards_intel video_c
 ards_mach64 video_cards_mga video_cards_modesetting video_cards_neomagic video_cards_nouveau video_cards_nv video_cards_qxl video_cards_r128 video_cards_radeon video_cards_rendition video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sisusb video_cards_tdfx video_cards_tga video_cards_trident video_cards_tseng video_cards_v4l video_cards_vesa
+package.use : x11-base/xorg-drivers:0 -input_devices_libinput -input_devices_vmmouse -video_cards_dummy -video_cards_fglrx -video_cards_freedreno -video_cards_geode -video_cards_nvidia -video_cards_omap -video_cards_omapfb -video_cards_radeonsi -video_cards_sunbw2 -video_cards_suncg14 -video_cards_suncg3 -video_cards_suncg6 -video_cards_sunffb -video_cards_sunleo -video_cards_suntcx -video_cards_via -video_cards_virtualbox -video_cards_vmware -video_cards_voodoo input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_synaptics input_devices_tslib input_devices_void input_devices_wacom video_cards_apm video_cards_ast video_cards_chips video_cards_cirrus video_cards_epson video_cards_fbdev video_cards_glint video_cards_i128 video_cards_i740 video_cards_intel video_cards_mach64 video_cards_
 mga video_cards_modesetting video_cards_neomagic video_cards_nouveau video_cards_nv video_cards_qxl video_cards_r128 video_cards_radeon video_cards_rendition video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sisusb video_cards_tdfx video_cards_tga video_cards_trident video_cards_tseng video_cards_v4l video_cards_vesa
 
 [x11-base/xorg-server:0]
-package.use/x11-base_xorg-server_0 : x11-base/xorg-server:0 -dmx -doc -glamor -kdrive -minimal -selinux -systemd -tslib -unwind -wayland -xnest -xvfb ipv6 nptl static-libs suid udev xorg
+package.use : x11-base/xorg-server:0 -dmx -doc -glamor -kdrive -minimal -selinux -systemd -tslib -unwind -wayland -xnest -xvfb ipv6 nptl static-libs suid udev xorg
 
 [x11-drivers/xf86-input-mtrack:0]
-package.use/x11-drivers_xf86-input-mtrack_0 : x11-drivers/xf86-input-mtrack:0 -debug
+package.use : x11-drivers/xf86-input-mtrack:0 -debug
 
 [x11-drivers/xf86-input-wacom:0]
-package.use/x11-drivers_xf86-input-wacom_0 : x11-drivers/xf86-input-wacom:0 -debug
+package.use : x11-drivers/xf86-input-wacom:0 -debug
 
 [x11-drivers/xf86-video-ati:0]
-package.use/x11-drivers_xf86-video-ati_0 : x11-drivers/xf86-video-ati:0 -udev glamor
+package.use : x11-drivers/xf86-video-ati:0 -udev glamor
 
 [x11-drivers/xf86-video-intel:0]
-package.use/x11-drivers_xf86-video-intel_0 : x11-drivers/xf86-video-intel:0 -debug -uxa dri sna udev xvmc
-+package.env : x11-drivers/xf86-video-intel:0 x11-drivers_xf86-video-intel_0
-env/x11-drivers_xf86-video-intel_0 : CPPFLAGS=-D_GNU_SOURCE
+package.use : x11-drivers/xf86-video-intel:0 -debug -uxa dri sna udev xvmc
+package.env : x11-drivers/xf86-video-intel:0 x11-drivers_xf86-video-intel_0
+env : CPPFLAGS=-D_GNU_SOURCE
 
 [x11-drivers/xf86-video-mach64:0]
-package.use/x11-drivers_xf86-video-mach64_0 : x11-drivers/xf86-video-mach64:0 dri
+package.use : x11-drivers/xf86-video-mach64:0 dri
 
 [x11-drivers/xf86-video-mga:0]
-package.use/x11-drivers_xf86-video-mga_0 : x11-drivers/xf86-video-mga:0 dri
+package.use : x11-drivers/xf86-video-mga:0 dri
 
 [x11-drivers/xf86-video-nouveau:0]
-package.use/x11-drivers_xf86-video-nouveau_0 : x11-drivers/xf86-video-nouveau:0 -glamor
+package.use : x11-drivers/xf86-video-nouveau:0 -glamor
 
 [x11-drivers/xf86-video-openchrome:0]
-package.use/x11-drivers_xf86-video-openchrome_0 : x11-drivers/xf86-video-openchrome:0 -debug -viaregtool
+package.use : x11-drivers/xf86-video-openchrome:0 -debug -viaregtool
 
 [x11-drivers/xf86-video-qxl:0]
-package.use/x11-drivers_xf86-video-qxl_0 : x11-drivers/xf86-video-qxl:0 -xspice
+package.use : x11-drivers/xf86-video-qxl:0 -xspice
 
 [x11-drivers/xf86-video-r128:0]
-package.use/x11-drivers_xf86-video-r128_0 : x11-drivers/xf86-video-r128:0 dri
+package.use : x11-drivers/xf86-video-r128:0 dri
 
 [x11-drivers/xf86-video-savage:0]
-package.use/x11-drivers_xf86-video-savage_0 : x11-drivers/xf86-video-savage:0 dri
+package.use : x11-drivers/xf86-video-savage:0 dri
 
 [x11-drivers/xf86-video-tdfx:0]
-package.use/x11-drivers_xf86-video-tdfx_0 : x11-drivers/xf86-video-tdfx:0 dri
+package.use : x11-drivers/xf86-video-tdfx:0 dri
 
 [x11-drivers/xf86-video-v4l:0]
-package.use/x11-drivers_xf86-video-v4l_0 : x11-drivers/xf86-video-v4l:0 -debug
+package.use : x11-drivers/xf86-video-v4l:0 -debug
 
 [x11-libs/c++-gtk-utils:3]
-package.use/x11-libs_c++-gtk-utils_3 : x11-libs/c++-gtk-utils:3 -nls gtk static-libs
+package.use : x11-libs/c++-gtk-utils:3 -nls gtk static-libs
 
 [x11-libs/cairo:0]
-package.use/x11-libs_cairo_0 : x11-libs/cairo:0 -aqua -debug -directfb -gles2 -valgrind -xlib-xcb X glib opengl static-libs svg xcb
+package.use : x11-libs/cairo:0 -aqua -debug -directfb -gles2 -valgrind -xlib-xcb X glib opengl static-libs svg xcb
 
 [x11-libs/fltk:1]
-package.use/x11-libs_fltk_1 : x11-libs/fltk:1 -debug -doc -examples -games -xft cairo opengl pdf static-libs threads xinerama
+package.use : x11-libs/fltk:1 -debug -doc -examples -games -xft cairo opengl pdf static-libs threads xinerama
 
 [x11-libs/fox:1.6]
-package.use/x11-libs_fox_1.6 : x11-libs/fox:1.6 -debug -doc -profile bzip2 jpeg opengl png tiff truetype zlib
+package.use : x11-libs/fox:1.6 -debug -doc -profile bzip2 jpeg opengl png tiff truetype zlib
 
 [x11-libs/fox:1.7]
-package.use/x11-libs_fox_1.7 : x11-libs/fox:1.7 -debug -doc -profile bzip2 jpeg opengl png tiff truetype zlib
+package.use : x11-libs/fox:1.7 -debug -doc -profile bzip2 jpeg opengl png tiff truetype zlib
 
 [x11-libs/gdk-pixbuf:2]
-package.use/x11-libs_gdk-pixbuf_2 : x11-libs/gdk-pixbuf:2 -debug -test X introspection jpeg jpeg2k tiff
-+package.env : x11-libs/gdk-pixbuf:2 x11-libs_gdk-pixbuf_2
-env/x11-libs_gdk-pixbuf_2 : MAKEOPTS="-j1"
+package.use : x11-libs/gdk-pixbuf:2 -debug -test X introspection jpeg jpeg2k tiff
+package.env : x11-libs/gdk-pixbuf:2 x11-libs_gdk-pixbuf_2
+env : MAKEOPTS="-j1"
 
 [x11-libs/gksu:0]
-package.use/x11-libs_gksu_0 : x11-libs/gksu:0 -doc -gnome
+package.use : x11-libs/gksu:0 -doc -gnome
 
 [x11-libs/gl2ps:0]
-package.use/x11-libs_gl2ps_0 : x11-libs/gl2ps:0 -doc png zlib
+package.use : x11-libs/gl2ps:0 -doc png zlib
 
 [x11-libs/glamor:0]
-package.use/x11-libs_glamor_0 : x11-libs/glamor:0 -gles static-libs xv
-+package.env : x11-libs/glamor:0 x11-libs_glamor_0
-env/x11-libs_glamor_0 : CPPFLAGS="-D_GNU_SOURCE"
+package.use : x11-libs/glamor:0 -gles static-libs xv
+package.env : x11-libs/glamor:0 x11-libs_glamor_0
+env : CPPFLAGS="-D_GNU_SOURCE"
 
 [x11-libs/gnome-pty-helper:0]
-package.use/x11-libs_gnome-pty-helper_0 : x11-libs/gnome-pty-helper:0 hardened
+package.use : x11-libs/gnome-pty-helper:0 hardened
 
 [x11-libs/goffice:0.10]
-package.use/x11-libs_goffice_0.10 : x11-libs/goffice:0.10 introspection
+package.use : x11-libs/goffice:0.10 introspection
 
 [x11-libs/goocanvas:0]
-package.use/x11-libs_goocanvas_0 : x11-libs/goocanvas:0 -examples
+package.use : x11-libs/goocanvas:0 -examples
 
 [x11-libs/gtk+:2]
-package.use/x11-libs_gtk+_2 : x11-libs/gtk+:2 -aqua -debug -examples -test cups introspection vim-syntax xinerama
+package.use : x11-libs/gtk+:2 -aqua -debug -examples -test cups introspection vim-syntax xinerama
 
 [x11-libs/gtk+:3]
-package.use/x11-libs_gtk+_3 : x11-libs/gtk+:3 -aqua -broadway -cloudprint -colord -debug -examples -test -wayland X cups introspection vim-syntax xinerama
+package.use : x11-libs/gtk+:3 -aqua -broadway -cloudprint -colord -debug -examples -test -wayland X cups introspection vim-syntax xinerama
 
 [x11-libs/gtk+extra:0]
-package.use/x11-libs_gtk+extra_0 : x11-libs/gtk+extra:0 -test introspection static-libs
+package.use : x11-libs/gtk+extra:0 -test introspection static-libs
 
 [x11-libs/gtkdatabox:0]
-package.use/x11-libs_gtkdatabox_0 : x11-libs/gtkdatabox:0 -doc -examples -test glade static-libs
+package.use : x11-libs/gtkdatabox:0 -doc -examples -test glade static-libs
 
 [x11-libs/gtkglext:0]
-package.use/x11-libs_gtkglext_0 : x11-libs/gtkglext:0 -debug
+package.use : x11-libs/gtkglext:0 -debug
 
 [x11-libs/gtkmathview:0]
-package.use/x11-libs_gtkmathview_0 : x11-libs/gtkmathview:0 -mathml -t1lib gtk svg
+package.use : x11-libs/gtkmathview:0 -mathml -t1lib gtk svg
 
 [x11-libs/gtksourceview:2.0]
-package.use/x11-libs_gtksourceview_2.0 : x11-libs/gtksourceview:2.0 -test
+package.use : x11-libs/gtksourceview:2.0 -test
 
 [x11-libs/gtksourceview:3.0]
-package.use/x11-libs_gtksourceview_3.0 : x11-libs/gtksourceview:3.0 -glade -test introspection vala
+package.use : x11-libs/gtksourceview:3.0 -glade -test introspection vala
 
 [x11-libs/hippo-canvas:0]
-package.use/x11-libs_hippo-canvas_0 : x11-libs/hippo-canvas:0 python
+package.use : x11-libs/hippo-canvas:0 python
 
 [x11-libs/libFS:0]
-package.use/x11-libs_libfs_0 : x11-libs/libFS:0 ipv6 static-libs
+package.use : x11-libs/libFS:0 ipv6 static-libs
 
 [x11-libs/libGLw:0]
-package.use/x11-libs_libglw_0 : x11-libs/libGLw:0 motif static-libs
+package.use : x11-libs/libGLw:0 motif static-libs
 
 [x11-libs/libICE:0]
-package.use/x11-libs_libice_0 : x11-libs/libICE:0 -doc ipv6 static-libs
+package.use : x11-libs/libICE:0 -doc ipv6 static-libs
 
 [x11-libs/libSM:0]
-package.use/x11-libs_libsm_0 : x11-libs/libSM:0 -doc ipv6 static-libs uuid
+package.use : x11-libs/libSM:0 -doc ipv6 static-libs uuid
 
 [x11-libs/libX11:0]
-package.use/x11-libs_libx11_0 : x11-libs/libX11:0 -doc -test ipv6 static-libs
+package.use : x11-libs/libX11:0 -doc -test ipv6 static-libs
 
 [x11-libs/libXScrnSaver:0]
-package.use/x11-libs_libxscrnsaver_0 : x11-libs/libXScrnSaver:0 static-libs
+package.use : x11-libs/libXScrnSaver:0 static-libs
 
 [x11-libs/libXTrap:0]
-package.use/x11-libs_libxtrap_0 : x11-libs/libXTrap:0 static-libs
+package.use : x11-libs/libXTrap:0 static-libs
 
 [x11-libs/libXau:0]
-package.use/x11-libs_libxau_0 : x11-libs/libXau:0 static-libs
+package.use : x11-libs/libXau:0 static-libs
 
 [x11-libs/libXaw3d:0]
-package.use/x11-libs_libxaw3d_0 : x11-libs/libXaw3d:0 static-libs unicode
+package.use : x11-libs/libXaw3d:0 static-libs unicode
 
 [x11-libs/libXaw3dXft:0]
-package.use/x11-libs_libxaw3dxft_0 : x11-libs/libXaw3dXft:0 static-libs unicode xpm
+package.use : x11-libs/libXaw3dXft:0 static-libs unicode xpm
 
 [x11-libs/libXaw:0]
-package.use/x11-libs_libxaw_0 : x11-libs/libXaw:0 -deprecated -doc static-libs
+package.use : x11-libs/libXaw:0 -deprecated -doc static-libs
 
 [x11-libs/libXcomposite:0]
-package.use/x11-libs_libxcomposite_0 : x11-libs/libXcomposite:0 -doc static-libs
+package.use : x11-libs/libXcomposite:0 -doc static-libs
 
 [x11-libs/libXcursor:0]
-package.use/x11-libs_libxcursor_0 : x11-libs/libXcursor:0 static-libs
+package.use : x11-libs/libXcursor:0 static-libs
 
 [x11-libs/libXdamage:0]
-package.use/x11-libs_libxdamage_0 : x11-libs/libXdamage:0 static-libs
+package.use : x11-libs/libXdamage:0 static-libs
 
 [x11-libs/libXdmcp:0]
-package.use/x11-libs_libxdmcp_0 : x11-libs/libXdmcp:0 -doc static-libs
+package.use : x11-libs/libXdmcp:0 -doc static-libs
 
 [x11-libs/libXevie:0]
-package.use/x11-libs_libxevie_0 : x11-libs/libXevie:0 static-libs
+package.use : x11-libs/libXevie:0 static-libs
 
 [x11-libs/libXext:0]
-package.use/x11-libs_libxext_0 : x11-libs/libXext:0 -doc static-libs
+package.use : x11-libs/libXext:0 -doc static-libs
 
 [x11-libs/libXfixes:0]
-package.use/x11-libs_libxfixes_0 : x11-libs/libXfixes:0 static-libs
+package.use : x11-libs/libXfixes:0 static-libs
 
 [x11-libs/libXfont:0]
-package.use/x11-libs_libxfont_0 : x11-libs/libXfont:0 -doc -truetype bzip2 ipv6 static-libs
+package.use : x11-libs/libXfont:0 -doc -truetype bzip2 ipv6 static-libs
 
 [x11-libs/libXfontcache:0]
-package.use/x11-libs_libxfontcache_0 : x11-libs/libXfontcache:0 static-libs
+package.use : x11-libs/libXfontcache:0 static-libs
 
 [x11-libs/libXft:0]
-package.use/x11-libs_libxft_0 : x11-libs/libXft:0 static-libs
+package.use : x11-libs/libXft:0 static-libs
 
 [x11-libs/libXi:0]
-package.use/x11-libs_libxi_0 : x11-libs/libXi:0 -doc static-libs
+package.use : x11-libs/libXi:0 -doc static-libs
 
 [x11-libs/libXinerama:0]
-package.use/x11-libs_libxinerama_0 : x11-libs/libXinerama:0 static-libs
+package.use : x11-libs/libXinerama:0 static-libs
 
 [x11-libs/libXmu:0]
-package.use/x11-libs_libxmu_0 : x11-libs/libXmu:0 -doc ipv6 static-libs
+package.use : x11-libs/libXmu:0 -doc ipv6 static-libs
 
 [x11-libs/libXp:0]
-package.use/x11-libs_libxp_0 : x11-libs/libXp:0 static-libs
+package.use : x11-libs/libXp:0 static-libs
 
 [x11-libs/libXpm:0]
-package.use/x11-libs_libxpm_0 : x11-libs/libXpm:0 static-libs
+package.use : x11-libs/libXpm:0 static-libs
 
 [x11-libs/libXrandr:0]
-package.use/x11-libs_libxrandr_0 : x11-libs/libXrandr:0 static-libs
+package.use : x11-libs/libXrandr:0 static-libs
 
 [x11-libs/libXrender:0]
-package.use/x11-libs_libxrender_0 : x11-libs/libXrender:0 static-libs
+package.use : x11-libs/libXrender:0 static-libs
 
 [x11-libs/libXres:0]
-package.use/x11-libs_libxres_0 : x11-libs/libXres:0 static-libs
+package.use : x11-libs/libXres:0 static-libs
 
 [x11-libs/libXt:0]
-package.use/x11-libs_libxt_0 : x11-libs/libXt:0 static-libs
+package.use : x11-libs/libXt:0 static-libs
 
 [x11-libs/libXtst:0]
-package.use/x11-libs_libxtst_0 : x11-libs/libXtst:0 -doc static-libs
+package.use : x11-libs/libXtst:0 -doc static-libs
 
 [x11-libs/libXv:0]
-package.use/x11-libs_libxv_0 : x11-libs/libXv:0 static-libs
+package.use : x11-libs/libXv:0 static-libs
 
 [x11-libs/libXvMC:0]
-package.use/x11-libs_libxvmc_0 : x11-libs/libXvMC:0 static-libs
+package.use : x11-libs/libXvMC:0 static-libs
 
 [x11-libs/libXxf86dga:0]
-package.use/x11-libs_libxxf86dga_0 : x11-libs/libXxf86dga:0 static-libs
+package.use : x11-libs/libXxf86dga:0 static-libs
 
 [x11-libs/libXxf86misc:0]
-package.use/x11-libs_libxxf86misc_0 : x11-libs/libXxf86misc:0 static-libs
+package.use : x11-libs/libXxf86misc:0 static-libs
 
 [x11-libs/libXxf86vm:0]
-package.use/x11-libs_libxxf86vm_0 : x11-libs/libXxf86vm:0 static-libs
+package.use : x11-libs/libXxf86vm:0 static-libs
 
 [x11-libs/libast:0]
-package.use/x11-libs_libast_0 : x11-libs/libast:0 cpu_flags_x86_mmx imlib pcre
+package.use : x11-libs/libast:0 cpu_flags_x86_mmx imlib pcre
 
 [x11-libs/libdesktop-agnostic:0]
-package.use/x11-libs_libdesktop-agnostic_0 : x11-libs/libdesktop-agnostic:0 -debug -glade -gnome gconf introspection
+package.use : x11-libs/libdesktop-agnostic:0 -debug -glade -gnome gconf introspection
 
 [x11-libs/libdrm:0]
-package.use/x11-libs_libdrm_0 : x11-libs/libdrm:0 -libkms -video_cards_exynos -video_cards_freedreno -video_cards_omap -video_cards_tegra -video_cards_vmware static-libs video_cards_intel video_cards_nouveau video_cards_radeon
+package.use : x11-libs/libdrm:0 -libkms -video_cards_exynos -video_cards_freedreno -video_cards_omap -video_cards_tegra -video_cards_vmware static-libs video_cards_intel video_cards_nouveau video_cards_radeon
 
 [x11-libs/libfontenc:0]
-package.use/x11-libs_libfontenc_0 : x11-libs/libfontenc:0 static-libs
+package.use : x11-libs/libfontenc:0 static-libs
 
 [x11-libs/libgksu:2]
-package.use/x11-libs_libgksu_2 : x11-libs/libgksu:2 -nls static-libs
+package.use : x11-libs/libgksu:2 -nls static-libs
 
 [x11-libs/libnotify:0]
-package.use/x11-libs_libnotify_0 : x11-libs/libnotify:0 -test introspection
+package.use : x11-libs/libnotify:0 -test introspection
 
 [x11-libs/libpciaccess:0]
-package.use/x11-libs_libpciaccess_0 : x11-libs/libpciaccess:0 -minimal static-libs zlib
+package.use : x11-libs/libpciaccess:0 -minimal static-libs zlib
 
 [x11-libs/libsexy:0]
-package.use/x11-libs_libsexy_0 : x11-libs/libsexy:0 -doc static-libs
+package.use : x11-libs/libsexy:0 -doc static-libs
 
 [x11-libs/libva-intel-driver:0]
-package.use/x11-libs_libva-intel-driver_0 : x11-libs/libva-intel-driver:0 -wayland X drm
+package.use : x11-libs/libva-intel-driver:0 -wayland X drm
 
 [x11-libs/libva-vdpau-driver:0]
-package.use/x11-libs_libva-vdpau-driver_0 : x11-libs/libva-vdpau-driver:0 -debug opengl
+package.use : x11-libs/libva-vdpau-driver:0 -debug opengl
 
 [x11-libs/libva:0]
-package.use/x11-libs_libva_0 : x11-libs/libva:0 -egl -vdpau -video_cards_dummy -video_cards_fglrx -video_cards_nvidia -wayland X drm opengl video_cards_intel
+package.use : x11-libs/libva:0 -egl -vdpau -video_cards_dummy -video_cards_fglrx -video_cards_nvidia -wayland X drm opengl video_cards_intel
 
 [x11-libs/libvdpau:0]
-package.use/x11-libs_libvdpau_0 : x11-libs/libvdpau:0 -doc -test dri
+package.use : x11-libs/libvdpau:0 -doc -test dri
 
 [x11-libs/libview:0]
-package.use/x11-libs_libview_0 : x11-libs/libview:0 static-libs
+package.use : x11-libs/libview:0 static-libs
 
 [x11-libs/libwnck:1]
-package.use/x11-libs_libwnck_1 : x11-libs/libwnck:1 introspection startup-notification
+package.use : x11-libs/libwnck:1 introspection startup-notification
 
 [x11-libs/libwnck:3]
-package.use/x11-libs_libwnck_3 : x11-libs/libwnck:3 -tools introspection startup-notification
+package.use : x11-libs/libwnck:3 -tools introspection startup-notification
 
 [x11-libs/libxcb:0]
-package.use/x11-libs_libxcb_0 : x11-libs/libxcb:0 -doc -selinux -test -xkb static-libs
+package.use : x11-libs/libxcb:0 -doc -selinux -test -xkb static-libs
 
 [x11-libs/libxkbfile:0]
-package.use/x11-libs_libxkbfile_0 : x11-libs/libxkbfile:0 static-libs
+package.use : x11-libs/libxkbfile:0 static-libs
 
 [x11-libs/libxkbui:0]
-package.use/x11-libs_libxkbui_0 : x11-libs/libxkbui:0 static-libs
+package.use : x11-libs/libxkbui:0 static-libs
 
 [x11-libs/libxklavier:0]
-package.use/x11-libs_libxklavier_0 : x11-libs/libxklavier:0 -doc introspection
+package.use : x11-libs/libxklavier:0 -doc introspection
 
 [x11-libs/libxshmfence:0]
-package.use/x11-libs_libxshmfence_0 : x11-libs/libxshmfence:0 static-libs
+package.use : x11-libs/libxshmfence:0 static-libs
 
 [x11-libs/motif:0]
-package.use/x11-libs_motif_0 : x11-libs/motif:0 -examples -xft jpeg motif22-compatibility png static-libs unicode
+package.use : x11-libs/motif:0 -examples -xft jpeg motif22-compatibility png static-libs unicode
 
 [x11-libs/pango:0]
-package.use/x11-libs_pango_0 : x11-libs/pango:0 -debug X introspection
+package.use : x11-libs/pango:0 -debug X introspection
 
 [x11-libs/pixman:0]
-package.use/x11-libs_pixman_0 : x11-libs/pixman:0 -altivec -cpu_flags_x86_ssse3 -iwmmxt -loongson2f -neon cpu_flags_x86_mmxext cpu_flags_x86_sse2 static-libs
+package.use : x11-libs/pixman:0 -altivec -cpu_flags_x86_ssse3 -iwmmxt -loongson2f -neon cpu_flags_x86_mmxext cpu_flags_x86_sse2 static-libs
 
 [x11-libs/qscintilla:0]
-package.use/x11-libs_qscintilla_0 : x11-libs/qscintilla:0 -designer -doc
+package.use : x11-libs/qscintilla:0 -designer -doc
 
 [x11-libs/qwt:5]
-package.use/x11-libs_qwt_5 : x11-libs/qwt:5 -doc -examples static-libs svg
+package.use : x11-libs/qwt:5 -doc -examples static-libs svg
 
 [x11-libs/qwt:6]
-package.use/x11-libs_qwt_6 : x11-libs/qwt:6 -doc -examples -mathml static-libs svg
+package.use : x11-libs/qwt:6 -doc -examples -mathml static-libs svg
 
 [x11-libs/qwtplot3d:0]
-package.use/x11-libs_qwtplot3d_0 : x11-libs/qwtplot3d:0 -doc -examples
+package.use : x11-libs/qwtplot3d:0 -doc -examples
 
 [x11-libs/startup-notification:0]
-package.use/x11-libs_startup-notification_0 : x11-libs/startup-notification:0 static-libs
+package.use : x11-libs/startup-notification:0 static-libs
 
 [x11-libs/vte:0]
-package.use/x11-libs_vte_0 : x11-libs/vte:0 -debug introspection python
+package.use : x11-libs/vte:0 -debug introspection python
 
 [x11-libs/vte:2.90]
-package.use/x11-libs_vte_2.90 : x11-libs/vte:2.90 -debug -glade introspection
+package.use : x11-libs/vte:2.90 -debug -glade introspection
 
 [x11-libs/vte:2.91]
-package.use/x11-libs_vte_2.91 : x11-libs/vte:2.91 -debug -glade introspection vala
+package.use : x11-libs/vte:2.91 -debug -glade introspection vala
 
 [x11-libs/wxGTK:2.8]
-package.use/x11-libs_wxgtk_2.8 : x11-libs/wxGTK:2.8 -aqua -debug -doc -gnome -gstreamer -pch X odbc opengl sdl tiff
+package.use : x11-libs/wxGTK:2.8 -aqua -debug -doc -gnome -gstreamer -pch X odbc opengl sdl tiff
 
 [x11-libs/wxGTK:3.0]
-package.use/x11-libs_wxgtk_3.0 : x11-libs/wxGTK:3.0 -aqua -debug -doc -gstreamer -libnotify -opengl -sdl -tiff -webkit X
+package.use : x11-libs/wxGTK:3.0 -aqua -debug -doc -gstreamer -libnotify -opengl -sdl -tiff -webkit X
 
 [x11-libs/xcb-util-cursor:0]
-package.use/x11-libs_xcb-util-cursor_0 : x11-libs/xcb-util-cursor:0 -doc -test static-libs
+package.use : x11-libs/xcb-util-cursor:0 -doc -test static-libs
 
 [x11-libs/xcb-util-image:0]
-package.use/x11-libs_xcb-util-image_0 : x11-libs/xcb-util-image:0 -doc -test static-libs
+package.use : x11-libs/xcb-util-image:0 -doc -test static-libs
 
 [x11-libs/xcb-util-keysyms:0]
-package.use/x11-libs_xcb-util-keysyms_0 : x11-libs/xcb-util-keysyms:0 -doc -test static-libs
+package.use : x11-libs/xcb-util-keysyms:0 -doc -test static-libs
 
 [x11-libs/xcb-util-renderutil:0]
-package.use/x11-libs_xcb-util-renderutil_0 : x11-libs/xcb-util-renderutil:0 -doc -test static-libs
+package.use : x11-libs/xcb-util-renderutil:0 -doc -test static-libs
 
 [x11-libs/xcb-util-wm:0]
-package.use/x11-libs_xcb-util-wm_0 : x11-libs/xcb-util-wm:0 -doc -test static-libs
+package.use : x11-libs/xcb-util-wm:0 -doc -test static-libs
 
 [x11-libs/xcb-util:0]
-package.use/x11-libs_xcb-util_0 : x11-libs/xcb-util:0 -doc -test static-libs
+package.use : x11-libs/xcb-util:0 -doc -test static-libs
 
 [x11-libs/xforms:0]
-package.use/x11-libs_xforms_0 : x11-libs/xforms:0 -doc opengl static-libs
+package.use : x11-libs/xforms:0 -doc opengl static-libs
 
 [x11-libs/xosd:0]
-package.use/x11-libs_xosd_0 : x11-libs/xosd:0 xinerama
+package.use : x11-libs/xosd:0 xinerama
 
 [x11-libs/xpyb:0]
-package.use/x11-libs_xpyb_0 : x11-libs/xpyb:0 -selinux static-libs
+package.use : x11-libs/xpyb:0 -selinux static-libs
 
 [x11-libs/xtrans:0]
-package.use/x11-libs_xtrans_0 : x11-libs/xtrans:0 -doc
+package.use : x11-libs/xtrans:0 -doc
 
 [x11-misc/bmpanel:0]
-package.use/x11-misc_bmpanel_0 : x11-misc/bmpanel:0 -debug -libev -libevent
+package.use : x11-misc/bmpanel:0 -debug -libev -libevent
 
 [x11-misc/compton:0]
-package.use/x11-misc_compton_0 : x11-misc/compton:0 dbus drm opengl pcre xinerama
+package.use : x11-misc/compton:0 dbus drm opengl pcre xinerama
 
 [x11-misc/devilspie2:0]
-package.use/x11-misc_devilspie2_0 : x11-misc/devilspie2:0 -debug
+package.use : x11-misc/devilspie2:0 -debug
 
 [x11-misc/dmenu:0]
-package.use/x11-misc_dmenu_0 : x11-misc/dmenu:0 -xft xinerama
+package.use : x11-misc/dmenu:0 -xft xinerama
 
 [x11-misc/dockmanager:0]
-package.use/x11-misc_dockmanager_0 : x11-misc/dockmanager:0 -debug
+package.use : x11-misc/dockmanager:0 -debug
 
 [x11-misc/dzen:2]
-package.use/x11-misc_dzen_2 : x11-misc/dzen:2 -minimal -xft xinerama xpm
+package.use : x11-misc/dzen:2 -minimal -xft xinerama xpm
 
 [x11-misc/e16menuedit2:0]
-package.use/x11-misc_e16menuedit2_0 : x11-misc/e16menuedit2:0 -debug
+package.use : x11-misc/e16menuedit2:0 -debug
 
 [x11-misc/efax-gtk:0]
-package.use/x11-misc_efax-gtk_0 : x11-misc/efax-gtk:0 -nls
+package.use : x11-misc/efax-gtk:0 -nls
 
 [x11-misc/fbpager:0]
-package.use/x11-misc_fbpager_0 : x11-misc/fbpager:0 xrender
+package.use : x11-misc/fbpager:0 xrender
 
 [x11-misc/gccmakedep:0]
-package.use/x11-misc_gccmakedep_0 : x11-misc/gccmakedep:0 static-libs
+package.use : x11-misc/gccmakedep:0 static-libs
 
 [x11-misc/grsync:0]
-package.use/x11-misc_grsync_0 : x11-misc/grsync:0 -debug
+package.use : x11-misc/grsync:0 -debug
 
 [x11-misc/grun:0]
-package.use/x11-misc_grun_0 : x11-misc/grun:0 -nls
+package.use : x11-misc/grun:0 -nls
 
 [x11-misc/lineak-defaultplugin:0]
-package.use/x11-misc_lineak-defaultplugin_0 : x11-misc/lineak-defaultplugin:0 -debug
+package.use : x11-misc/lineak-defaultplugin:0 -debug
 
 [x11-misc/lineak-xosdplugin:0]
-package.use/x11-misc_lineak-xosdplugin_0 : x11-misc/lineak-xosdplugin:0 -debug
+package.use : x11-misc/lineak-xosdplugin:0 -debug
 
 [x11-misc/lineakd:0]
-package.use/x11-misc_lineakd_0 : x11-misc/lineakd:0 -debug
+package.use : x11-misc/lineakd:0 -debug
 
 [x11-misc/menumaker:0]
-package.use/x11-misc_menumaker_0 : x11-misc/menumaker:0 -doc
+package.use : x11-misc/menumaker:0 -doc
 
 [x11-misc/nitrogen:0]
-package.use/x11-misc_nitrogen_0 : x11-misc/nitrogen:0 -nls xinerama
+package.use : x11-misc/nitrogen:0 -nls xinerama
 
 [x11-misc/openbox-menu:0]
-package.use/x11-misc_openbox-menu_0 : x11-misc/openbox-menu:0 icons svg
+package.use : x11-misc/openbox-menu:0 icons svg
 
 [x11-misc/parcellite:0]
-package.use/x11-misc_parcellite_0 : x11-misc/parcellite:0 -nls
+package.use : x11-misc/parcellite:0 -nls
 
 [x11-misc/pathfinder:0]
-package.use/x11-misc_pathfinder_0 : x11-misc/pathfinder:0 -debug -doc -profile jpeg png tiff
+package.use : x11-misc/pathfinder:0 -debug -doc -profile jpeg png tiff
 
 [x11-misc/qcomicbook:0]
-package.use/x11-misc_qcomicbook_0 : x11-misc/qcomicbook:0 -debug
+package.use : x11-misc/qcomicbook:0 -debug
 
 [x11-misc/rednotebook:0]
-package.use/x11-misc_rednotebook_0 : x11-misc/rednotebook:0 -libyaml spell
+package.use : x11-misc/rednotebook:0 -libyaml spell
 
 [x11-misc/redshift:0]
-package.use/x11-misc_redshift_0 : x11-misc/redshift:0 -appindicator -geoclue -nls gtk
+package.use : x11-misc/redshift:0 -appindicator -geoclue -nls gtk
 
 [x11-misc/rodent:0]
-package.use/x11-misc_rodent_0 : x11-misc/rodent:0 -experimental
+package.use : x11-misc/rodent:0 -experimental
 
 [x11-misc/shared-mime-info:0]
-package.use/x11-misc_shared-mime-info_0 : x11-misc/shared-mime-info:0 -test
+package.use : x11-misc/shared-mime-info:0 -test
 
 [x11-misc/slim:0]
-package.use/x11-misc_slim_0 : x11-misc/slim:0 -branding -consolekit -pam
-+package.env : x11-misc/slim:0 x11-misc_slim_0
-env/x11-misc_slim_0 : LDFLAGS="-lpthread"
+package.use : x11-misc/slim:0 -branding -consolekit -pam
+package.env : x11-misc/slim:0 x11-misc_slim_0
+env : LDFLAGS="-lpthread"
 
 [x11-misc/spacefm:0]
-package.use/x11-misc_spacefm_0 : x11-misc/spacefm:0 startup-notification
+package.use : x11-misc/spacefm:0 startup-notification
 
 [x11-misc/synergy:0]
-package.use/x11-misc_synergy_0 : x11-misc/synergy:0 -test qt4
+package.use : x11-misc/synergy:0 -test qt4
 
 [x11-misc/touchfreeze:0]
-package.use/x11-misc_touchfreeze_0 : x11-misc/touchfreeze:0 -debug
+package.use : x11-misc/touchfreeze:0 -debug
 
 [x11-misc/wbar:0]
-package.use/x11-misc_wbar_0 : x11-misc/wbar:0 gtk
+package.use : x11-misc/wbar:0 gtk
 
 [x11-misc/x2vnc:0]
-package.use/x11-misc_x2vnc_0 : x11-misc/x2vnc:0 tk
+package.use : x11-misc/x2vnc:0 tk
 
 [x11-misc/xcalendar:0]
-package.use/x11-misc_xcalendar_0 : x11-misc/xcalendar:0 -motif
+package.use : x11-misc/xcalendar:0 -motif
 
 [x11-misc/xcb:0]
-package.use/x11-misc_xcb_0 : x11-misc/xcb:0 -motif
+package.use : x11-misc/xcb:0 -motif
 
 [x11-misc/xdg-user-dirs:0]
-package.use/x11-misc_xdg-user-dirs_0 : x11-misc/xdg-user-dirs:0 gtk
-+package.env : x11-misc/xdg-user-dirs:0 x11-misc_xdg-user-dirs_0
-env/x11-misc_xdg-user-dirs_0 : LDFLAGS="-liconv -lpthread"
+package.use : x11-misc/xdg-user-dirs:0 gtk
+package.env : x11-misc/xdg-user-dirs:0 x11-misc_xdg-user-dirs_0
+env : LDFLAGS="-liconv -lpthread"
 
 [x11-misc/xdg-utils:0]
-package.use/x11-misc_xdg-utils_0 : x11-misc/xdg-utils:0 -doc perl
+package.use : x11-misc/xdg-utils:0 -doc perl
 
 [x11-misc/xdialog:0]
-package.use/x11-misc_xdialog_0 : x11-misc/xdialog:0 -doc -examples -nls
+package.use : x11-misc/xdialog:0 -doc -examples -nls
 
 [x11-misc/xdotool:0]
-package.use/x11-misc_xdotool_0 : x11-misc/xdotool:0 -examples
+package.use : x11-misc/xdotool:0 -examples
 
 [x11-misc/xkbd:0]
-package.use/x11-misc_xkbd_0 : x11-misc/xkbd:0 -debug -doc
+package.use : x11-misc/xkbd:0 -debug -doc
 
 [x11-misc/xnee:0]
-package.use/x11-misc_xnee_0 : x11-misc/xnee:0 -gnome -xosd static-libs
+package.use : x11-misc/xnee:0 -gnome -xosd static-libs
 
 [x11-misc/xnots:0]
-package.use/x11-misc_xnots_0 : x11-misc/xnots:0 vim-syntax
+package.use : x11-misc/xnots:0 vim-syntax
 
 [x11-misc/xosview:0]
-package.use/x11-misc_xosview_0 : x11-misc/xosview:0 suid
+package.use : x11-misc/xosview:0 suid
 
 [x11-misc/xscreensaver:0]
-package.use/x11-misc_xscreensaver_0 : x11-misc/xscreensaver:0 -gdm -new-login -pam -selinux jpeg opengl perl suid xinerama
+package.use : x11-misc/xscreensaver:0 -gdm -new-login -pam -selinux jpeg opengl perl suid xinerama
 
 [x11-misc/xxkb:0]
-package.use/x11-misc_xxkb_0 : x11-misc/xxkb:0 svg
+package.use : x11-misc/xxkb:0 svg
 
 [x11-plugins/ascpu:0]
-package.use/x11-plugins_ascpu_0 : x11-plugins/ascpu:0 jpeg
+package.use : x11-plugins/ascpu:0 jpeg
 
 [x11-plugins/asmem:0]
-package.use/x11-plugins_asmem_0 : x11-plugins/asmem:0 jpeg
+package.use : x11-plugins/asmem:0 jpeg
 
 [x11-plugins/astime:0]
-package.use/x11-plugins_astime_0 : x11-plugins/astime:0 jpeg
+package.use : x11-plugins/astime:0 jpeg
 
 [x11-plugins/bfm:0]
-package.use/x11-plugins_bfm_0 : x11-plugins/bfm:0 -gkrellm
+package.use : x11-plugins/bfm:0 -gkrellm
 
 [x11-plugins/gkrellm-volume:2]
-package.use/x11-plugins_gkrellm-volume_2 : x11-plugins/gkrellm-volume:2 alsa
+package.use : x11-plugins/gkrellm-volume:2 alsa
 
 [x11-plugins/gkrellmss:0]
-package.use/x11-plugins_gkrellmss_0 : x11-plugins/gkrellmss:0 -nls
+package.use : x11-plugins/gkrellmss:0 -nls
 
 [x11-plugins/gkrellsun:1]
-package.use/x11-plugins_gkrellsun_1 : x11-plugins/gkrellsun:1 -nls
+package.use : x11-plugins/gkrellsun:1 -nls
 
 [x11-plugins/gkrelltop:0]
-package.use/x11-plugins_gkrelltop_0 : x11-plugins/gkrelltop:0 X
+package.use : x11-plugins/gkrelltop:0 X
 
 [x11-plugins/guifications:0]
-package.use/x11-plugins_guifications_0 : x11-plugins/guifications:0 -debug -nls
+package.use : x11-plugins/guifications:0 -debug -nls
 
 [x11-plugins/hexchat-javascript:0]
-package.use/x11-plugins_hexchat-javascript_0 : x11-plugins/hexchat-javascript:0 -examples
+package.use : x11-plugins/hexchat-javascript:0 -examples
 
 [x11-plugins/pidgin-birthday-reminder:0]
-package.use/x11-plugins_pidgin-birthday-reminder_0 : x11-plugins/pidgin-birthday-reminder:0 static-libs
+package.use : x11-plugins/pidgin-birthday-reminder:0 static-libs
 
 [x11-plugins/pidgin-encryption:0]
-package.use/x11-plugins_pidgin-encryption_0 : x11-plugins/pidgin-encryption:0 -nls
+package.use : x11-plugins/pidgin-encryption:0 -nls
 
 [x11-plugins/pidgin-libnotify:0]
-package.use/x11-plugins_pidgin-libnotify_0 : x11-plugins/pidgin-libnotify:0 -debug -nls
+package.use : x11-plugins/pidgin-libnotify:0 -debug -nls
 
 [x11-plugins/pidgin-mbpurple:0]
-package.use/x11-plugins_pidgin-mbpurple_0 : x11-plugins/pidgin-mbpurple:0 twitgin
+package.use : x11-plugins/pidgin-mbpurple:0 twitgin
 
 [x11-plugins/pidgin-musictracker:0]
-package.use/x11-plugins_pidgin-musictracker_0 : x11-plugins/pidgin-musictracker:0 -debug
+package.use : x11-plugins/pidgin-musictracker:0 -debug
 
 [x11-plugins/purple-plugin_pack:0]
-package.use/x11-plugins_purple-plugin_pack_0 : x11-plugins/purple-plugin_pack:0 -debug -talkfilters gtk ncurses spell
+package.use : x11-plugins/purple-plugin_pack:0 -debug -talkfilters gtk ncurses spell
 
 [x11-plugins/wmbattery:0]
-package.use/x11-plugins_wmbattery_0 : x11-plugins/wmbattery:0 -upower
+package.use : x11-plugins/wmbattery:0 -upower
 
 [x11-plugins/wmbutton:0]
-package.use/x11-plugins_wmbutton_0 : x11-plugins/wmbutton:0 -branding
+package.use : x11-plugins/wmbutton:0 -branding
 
 [x11-plugins/wmfire:0]
-package.use/x11-plugins_wmfire_0 : x11-plugins/wmfire:0 session
+package.use : x11-plugins/wmfire:0 session
 
 [x11-plugins/wmnd:0]
-package.use/x11-plugins_wmnd_0 : x11-plugins/wmnd:0 -snmp
+package.use : x11-plugins/wmnd:0 -snmp
 
 [x11-plugins/wmsysmon:0]
-package.use/x11-plugins_wmsysmon_0 : x11-plugins/wmsysmon:0 -high-ints
+package.use : x11-plugins/wmsysmon:0 -high-ints
 
 [x11-proto/bigreqsproto:0]
-package.use/x11-proto_bigreqsproto_0 : x11-proto/bigreqsproto:0 -doc
+package.use : x11-proto/bigreqsproto:0 -doc
 
 [x11-proto/fontsproto:0]
-package.use/x11-proto_fontsproto_0 : x11-proto/fontsproto:0 -doc
+package.use : x11-proto/fontsproto:0 -doc
 
 [x11-proto/recordproto:0]
-package.use/x11-proto_recordproto_0 : x11-proto/recordproto:0 -doc
+package.use : x11-proto/recordproto:0 -doc
 
 [x11-proto/scrnsaverproto:0]
-package.use/x11-proto_scrnsaverproto_0 : x11-proto/scrnsaverproto:0 -doc
+package.use : x11-proto/scrnsaverproto:0 -doc
 
 [x11-proto/xcmiscproto:0]
-package.use/x11-proto_xcmiscproto_0 : x11-proto/xcmiscproto:0 -doc
+package.use : x11-proto/xcmiscproto:0 -doc
 
 [x11-proto/xextproto:0]
-package.use/x11-proto_xextproto_0 : x11-proto/xextproto:0 -doc
+package.use : x11-proto/xextproto:0 -doc
 
 [x11-proto/xproto:0]
-package.use/x11-proto_xproto_0 : x11-proto/xproto:0 -doc
+package.use : x11-proto/xproto:0 -doc
 
 [x11-terms/aterm:0]
-package.use/x11-terms_aterm_0 : x11-terms/aterm:0 -background -cjk -xgetdefault
+package.use : x11-terms/aterm:0 -background -cjk -xgetdefault
 
 [x11-terms/eterm:0]
-package.use/x11-terms_eterm_0 : x11-terms/eterm:0 -escreen -minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode
+package.use : x11-terms/eterm:0 -escreen -minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode
 
 [x11-terms/evilvte:0]
-package.use/x11-terms_evilvte_0 : x11-terms/evilvte:0 -savedconfig
+package.use : x11-terms/evilvte:0 -savedconfig
 
 [x11-terms/mlterm:0]
-package.use/x11-terms_mlterm_0 : x11-terms/mlterm:0 -debug -ibus -libssh2 -m17n-lib -nls -scim -uim -xft bidi gtk static-libs
+package.use : x11-terms/mlterm:0 -debug -ibus -libssh2 -m17n-lib -nls -scim -uim -xft bidi gtk static-libs
 
 [x11-terms/mrxvt:0]
-package.use/x11-terms_mrxvt_0 : x11-terms/mrxvt:0 -debug -menubar -truetype -utempter jpeg png session xpm
+package.use : x11-terms/mrxvt:0 -debug -menubar -truetype -utempter jpeg png session xpm
 
 [x11-terms/root-tail:0]
-package.use/x11-terms_root-tail_0 : x11-terms/root-tail:0 -debug -kde
+package.use : x11-terms/root-tail:0 -debug -kde
 
 [x11-terms/rxvt-unicode:0]
-package.use/x11-terms_rxvt-unicode_0 : x11-terms/rxvt-unicode:0 -256-color -alt-font-width -blink -buffer-on-clear -fading-colors -iso14755 -pixbuf -secondary-wheel -unicode3 -wcwidth -xft focused-urgency font-styles mousewheel perl startup-notification vanilla
+package.use : x11-terms/rxvt-unicode:0 -256-color -alt-font-width -blink -buffer-on-clear -fading-colors -iso14755 -pixbuf -secondary-wheel -unicode3 -wcwidth -xft focused-urgency font-styles mousewheel perl startup-notification vanilla
 
 [x11-terms/rxvt:0]
-package.use/x11-terms_rxvt_0 : x11-terms/rxvt:0 -cjk -linuxkeys -motif -xgetdefault
+package.use : x11-terms/rxvt:0 -cjk -linuxkeys -motif -xgetdefault
 
 [x11-terms/valaterm:0]
-package.use/x11-terms_valaterm_0 : x11-terms/valaterm:0 -nls
+package.use : x11-terms/valaterm:0 -nls
 
 [x11-terms/xfce4-terminal:0]
-package.use/x11-terms_xfce4-terminal_0 : x11-terms/xfce4-terminal:0 -debug
+package.use : x11-terms/xfce4-terminal:0 -debug
 
 [x11-terms/xterm:0]
-package.use/x11-terms_xterm_0 : x11-terms/xterm:0 -toolbar -truetype Xaw3d openpty unicode
+package.use : x11-terms/xterm:0 -toolbar -truetype Xaw3d openpty unicode
 
 [x11-themes/adwaita-icon-theme:0]
-package.use/x11-themes_adwaita-icon-theme_0 : x11-themes/adwaita-icon-theme:0 -branding
+package.use : x11-themes/adwaita-icon-theme:0 -branding
 
 [x11-themes/comix-xcursors:0]
-package.use/x11-themes_comix-xcursors_0 : x11-themes/comix-xcursors:0 -lefthanded -opaque
+package.use : x11-themes/comix-xcursors:0 -lefthanded -opaque
 
 [x11-themes/fvwm-themes:0]
-package.use/x11-themes_fvwm-themes_0 : x11-themes/fvwm-themes:0 -gnome
+package.use : x11-themes/fvwm-themes:0 -gnome
 
 [x11-themes/gentoo-artwork:0]
-package.use/x11-themes_gentoo-artwork_0 : x11-themes/gentoo-artwork:0 -kde -lilo -offensive grub icons pixmaps
+package.use : x11-themes/gentoo-artwork:0 -kde -lilo -offensive grub icons pixmaps
 
 [x11-themes/gnome-colors-common:0]
-package.use/x11-themes_gnome-colors-common_0 : x11-themes/gnome-colors-common:0 branding
+package.use : x11-themes/gnome-colors-common:0 branding
 
 [x11-themes/gnome-icon-theme:0]
-package.use/x11-themes_gnome-icon-theme_0 : x11-themes/gnome-icon-theme:0 -branding
+package.use : x11-themes/gnome-icon-theme:0 -branding
 
 [x11-themes/greybird:0]
-package.use/x11-themes_greybird_0 : x11-themes/greybird:0 -ayatana -gnome
+package.use : x11-themes/greybird:0 -ayatana -gnome
 
 [x11-themes/gtk-engines-murrine:0]
-package.use/x11-themes_gtk-engines-murrine_0 : x11-themes/gtk-engines-murrine:0 -animation-rtl themes
+package.use : x11-themes/gtk-engines-murrine:0 -animation-rtl themes
 
 [x11-themes/gtk-engines-xfce:0]
-package.use/x11-themes_gtk-engines-xfce_0 : x11-themes/gtk-engines-xfce:0 -debug
+package.use : x11-themes/gtk-engines-xfce:0 -debug
 
 [x11-themes/gtk-engines:2]
-package.use/x11-themes_gtk-engines_2 : x11-themes/gtk-engines:2 -accessibility lua
+package.use : x11-themes/gtk-engines:2 -accessibility lua
 
 [x11-themes/light-themes:0]
-package.use/x11-themes_light-themes_0 : x11-themes/light-themes:0 gtk3
+package.use : x11-themes/light-themes:0 gtk3
 
 [x11-themes/mate-icon-theme-faenza:0]
-package.use/x11-themes_mate-icon-theme-faenza_0 : x11-themes/mate-icon-theme-faenza:0 -debug -minimal
+package.use : x11-themes/mate-icon-theme-faenza:0 -debug -minimal
 
 [x11-themes/nimbus:0]
-package.use/x11-themes_nimbus_0 : x11-themes/nimbus:0 -minimal gtk
+package.use : x11-themes/nimbus:0 -minimal gtk
 
 [x11-themes/redhat-artwork:0]
-package.use/x11-themes_redhat-artwork_0 : x11-themes/redhat-artwork:0 -audacious -cursors -gdm -icons -kdm -nautilus
+package.use : x11-themes/redhat-artwork:0 -audacious -cursors -gdm -icons -kdm -nautilus
 
 [x11-themes/tangerine-icon-theme:0]
-package.use/x11-themes_tangerine-icon-theme_0 : x11-themes/tangerine-icon-theme:0 -minimal
+package.use : x11-themes/tangerine-icon-theme:0 -minimal
 
 [x11-themes/windowmaker-themes:0]
-package.use/x11-themes_windowmaker-themes_0 : x11-themes/windowmaker-themes:0 -offensive
+package.use : x11-themes/windowmaker-themes:0 -offensive
 
 [x11-themes/xcursor-neutral:0]
-package.use/x11-themes_xcursor-neutral_0 : x11-themes/xcursor-neutral:0 -examples
+package.use : x11-themes/xcursor-neutral:0 -examples
 
 [x11-wm/blackbox:0]
-package.use/x11-wm_blackbox_0 : x11-wm/blackbox:0 -debug -nls -truetype
+package.use : x11-wm/blackbox:0 -debug -nls -truetype
 
 [x11-wm/dwm:0]
-package.use/x11-wm_dwm_0 : x11-wm/dwm:0 -savedconfig xinerama
+package.use : x11-wm/dwm:0 -savedconfig xinerama
 
 [x11-wm/enlightenment:0]
-package.use/x11-wm_enlightenment_0 : x11-wm/enlightenment:0 -doc -nls -pango -pulseaudio -xcomposite -xrandr dbus xinerama
+package.use : x11-wm/enlightenment:0 -doc -nls -pango -pulseaudio -xcomposite -xrandr dbus xinerama
 
 [x11-wm/fvwm:0]
-package.use/x11-wm_fvwm_0 : x11-wm/fvwm:0 -debug -doc -gtk2-perl -lock -netpbm -nls -rplay -stroke -truetype bidi perl png readline svg tk vanilla xinerama
+package.use : x11-wm/fvwm:0 -debug -doc -gtk2-perl -lock -netpbm -nls -rplay -stroke -truetype bidi perl png readline svg tk vanilla xinerama
 
 [x11-wm/icewm:0]
-package.use/x11-wm_icewm_0 : x11-wm/icewm:0 -debug -gnome -minimal -nls -truetype bidi uclibc xinerama
+package.use : x11-wm/icewm:0 -debug -gnome -minimal -nls -truetype bidi uclibc xinerama
 
 [x11-wm/jwm:0]
-package.use/x11-wm_jwm_0 : x11-wm/jwm:0 -debug -truetype bidi jpeg png xinerama xpm
+package.use : x11-wm/jwm:0 -debug -truetype bidi jpeg png xinerama xpm
 
 [x11-wm/musca:0]
-package.use/x11-wm_musca_0 : x11-wm/musca:0 -apis -savedconfig -xlisten
+package.use : x11-wm/musca:0 -apis -savedconfig -xlisten
 
 [x11-wm/openbox:3]
-package.use/x11-wm_openbox_3 : x11-wm/openbox:3 -branding -debug -nls -xdg imlib session startup-notification static-libs svg
+package.use : x11-wm/openbox:3 -branding -debug -nls -xdg imlib session startup-notification static-libs svg
 
 [x11-wm/oroborus:0]
-package.use/x11-wm_oroborus_0 : x11-wm/oroborus:0 -gnome
+package.use : x11-wm/oroborus:0 -gnome
 
 [x11-wm/pekwm:0]
-package.use/x11-wm_pekwm_0 : x11-wm/pekwm:0 -contrib -debug -themes -truetype xinerama
+package.use : x11-wm/pekwm:0 -contrib -debug -themes -truetype xinerama
 
 [x11-wm/ratpoison:0]
-package.use/x11-wm_ratpoison_0 : x11-wm/ratpoison:0 -debug -emacs -sloppy history xft
+package.use : x11-wm/ratpoison:0 -debug -emacs -sloppy history xft
 
 [x11-wm/sawfish:0]
-package.use/x11-wm_sawfish_0 : x11-wm/sawfish:0 -emacs -nls xinerama
+package.use : x11-wm/sawfish:0 -emacs -nls xinerama
 
 [x11-wm/selectwm:2]
-package.use/x11-wm_selectwm_2 : x11-wm/selectwm:2 -nls
+package.use : x11-wm/selectwm:2 -nls
 
 [x11-wm/windowlab:0]
-package.use/x11-wm_windowlab_0 : x11-wm/windowlab:0 -truetype
+package.use : x11-wm/windowlab:0 -truetype
 
 [x11-wm/windowmaker:0]
-package.use/x11-wm_windowmaker_0 : x11-wm/windowmaker:0 -modelock -nls -xrandr gif jpeg png tiff xinerama
+package.use : x11-wm/windowmaker:0 -modelock -nls -xrandr gif jpeg png tiff xinerama
 
 [x11-wm/xpra:0]
-package.use/x11-wm_xpra_0 : x11-wm/xpra:0 -csc -dec_av -dec_av2 -pulseaudio -server -sound -x264 client clipboard opengl rencode vpx webp
+package.use : x11-wm/xpra:0 -csc -dec_av -dec_av2 -pulseaudio -server -sound -x264 client clipboard opengl rencode vpx webp
 
 [xfce-base/exo:0]
-package.use/xfce-base_exo_0 : xfce-base/exo:0 -debug
+package.use : xfce-base/exo:0 -debug
 
 [xfce-base/garcon:0]
-package.use/xfce-base_garcon_0 : xfce-base/garcon:0 -debug
+package.use : xfce-base/garcon:0 -debug
 
 [xfce-base/libxfce4ui:0]
-package.use/xfce-base_libxfce4ui_0 : xfce-base/libxfce4ui:0 -debug gtk3 startup-notification
+package.use : xfce-base/libxfce4ui:0 -debug gtk3 startup-notification
 
 [xfce-base/libxfce4util:0]
-package.use/xfce-base_libxfce4util_0 : xfce-base/libxfce4util:0 -debug
+package.use : xfce-base/libxfce4util:0 -debug
 
 [xfce-base/libxfcegui4:0]
-package.use/xfce-base_libxfcegui4_0 : xfce-base/libxfcegui4:0 -glade startup-notification
+package.use : xfce-base/libxfcegui4:0 -glade startup-notification
 
 [xfce-base/thunar:0]
-package.use/xfce-base_thunar_0 : xfce-base/thunar:0 -debug -test -udisks dbus exif libnotify pcre xfce_plugins_trash
+package.use : xfce-base/thunar:0 -debug -test -udisks dbus exif libnotify pcre xfce_plugins_trash
 
 [xfce-base/xfce4-appfinder:0]
-package.use/xfce-base_xfce4-appfinder_0 : xfce-base/xfce4-appfinder:0 -debug
+package.use : xfce-base/xfce4-appfinder:0 -debug
 
 [xfce-base/xfce4-meta:0]
-package.use/xfce-base_xfce4-meta_0 : xfce-base/xfce4-meta:0 -minimal svg
+package.use : xfce-base/xfce4-meta:0 -minimal svg
 
 [xfce-base/xfce4-panel:0]
-package.use/xfce-base_xfce4-panel_0 : xfce-base/xfce4-panel:0 -debug
+package.use : xfce-base/xfce4-panel:0 -debug
 
 [xfce-base/xfce4-session:0]
-package.use/xfce-base_xfce4-session_0 : xfce-base/xfce4-session:0 -debug -nls -policykit -systemd -upower xscreensaver
+package.use : xfce-base/xfce4-session:0 -debug -nls -policykit -systemd -upower xscreensaver
 
 [xfce-base/xfce4-settings:0]
-package.use/xfce-base_xfce4-settings_0 : xfce-base/xfce4-settings:0 -debug -libcanberra -libinput -upower libnotify xklavier
+package.use : xfce-base/xfce4-settings:0 -debug -libcanberra -libinput -upower libnotify xklavier
 
 [xfce-base/xfconf:0]
-package.use/xfce-base_xfconf_0 : xfce-base/xfconf:0 -debug perl
+package.use : xfce-base/xfconf:0 -debug perl
 
 [xfce-base/xfdesktop:0]
-package.use/xfce-base_xfdesktop_0 : xfce-base/xfdesktop:0 -debug libnotify thunar
+package.use : xfce-base/xfdesktop:0 -debug libnotify thunar
 
 [xfce-base/xfwm4:0]
-package.use/xfce-base_xfwm4_0 : xfce-base/xfwm4:0 -debug dri startup-notification xcomposite
+package.use : xfce-base/xfwm4:0 -debug dri startup-notification xcomposite
 
 [xfce-extra/thunar-archive-plugin:0]
-package.use/xfce-extra_thunar-archive-plugin_0 : xfce-extra/thunar-archive-plugin:0 -debug
+package.use : xfce-extra/thunar-archive-plugin:0 -debug
 
 [xfce-extra/thunar-media-tags-plugin:0]
-package.use/xfce-extra_thunar-media-tags-plugin_0 : xfce-extra/thunar-media-tags-plugin:0 -debug
+package.use : xfce-extra/thunar-media-tags-plugin:0 -debug
 
 [xfce-extra/thunar-shares-plugin:0]
-package.use/xfce-extra_thunar-shares-plugin_0 : xfce-extra/thunar-shares-plugin:0 -debug
+package.use : xfce-extra/thunar-shares-plugin:0 -debug
 
 [xfce-extra/thunar-vcs-plugin:0]
-package.use/xfce-extra_thunar-vcs-plugin_0 : xfce-extra/thunar-vcs-plugin:0 -debug git subversion
+package.use : xfce-extra/thunar-vcs-plugin:0 -debug git subversion
 
 [xfce-extra/tumbler:0]
-package.use/xfce-extra_tumbler_0 : xfce-extra/tumbler:0 -debug -gstreamer -odf curl ffmpeg jpeg pdf raw
+package.use : xfce-extra/tumbler:0 -debug -gstreamer -odf curl ffmpeg jpeg pdf raw
 
 [xfce-extra/xfce4-battery-plugin:0]
-package.use/xfce-extra_xfce4-battery-plugin_0 : xfce-extra/xfce4-battery-plugin:0 -debug
+package.use : xfce-extra/xfce4-battery-plugin:0 -debug
 
 [xfce-extra/xfce4-cellmodem-plugin:0]
-package.use/xfce-extra_xfce4-cellmodem-plugin_0 : xfce-extra/xfce4-cellmodem-plugin:0 -debug
+package.use : xfce-extra/xfce4-cellmodem-plugin:0 -debug
 
 [xfce-extra/xfce4-clipman-plugin:0]
-package.use/xfce-extra_xfce4-clipman-plugin_0 : xfce-extra/xfce4-clipman-plugin:0 -debug -qrcode
+package.use : xfce-extra/xfce4-clipman-plugin:0 -debug -qrcode
 
 [xfce-extra/xfce4-cpufreq-plugin:0]
-package.use/xfce-extra_xfce4-cpufreq-plugin_0 : xfce-extra/xfce4-cpufreq-plugin:0 -debug
+package.use : xfce-extra/xfce4-cpufreq-plugin:0 -debug
 
 [xfce-extra/xfce4-cpugraph-plugin:0]
-package.use/xfce-extra_xfce4-cpugraph-plugin_0 : xfce-extra/xfce4-cpugraph-plugin:0 -debug
+package.use : xfce-extra/xfce4-cpugraph-plugin:0 -debug
 
 [xfce-extra/xfce4-datetime-plugin:0]
-package.use/xfce-extra_xfce4-datetime-plugin_0 : xfce-extra/xfce4-datetime-plugin:0 -debug
+package.use : xfce-extra/xfce4-datetime-plugin:0 -debug
 
 [xfce-extra/xfce4-diskperf-plugin:0]
-package.use/xfce-extra_xfce4-diskperf-plugin_0 : xfce-extra/xfce4-diskperf-plugin:0 -debug
+package.use : xfce-extra/xfce4-diskperf-plugin:0 -debug
 
 [xfce-extra/xfce4-embed-plugin:0]
-package.use/xfce-extra_xfce4-embed-plugin_0 : xfce-extra/xfce4-embed-plugin:0 -debug
+package.use : xfce-extra/xfce4-embed-plugin:0 -debug
 
 [xfce-extra/xfce4-equake-plugin:0]
-package.use/xfce-extra_xfce4-equake-plugin_0 : xfce-extra/xfce4-equake-plugin:0 -debug
+package.use : xfce-extra/xfce4-equake-plugin:0 -debug
 
 [xfce-extra/xfce4-eyes-plugin:0]
-package.use/xfce-extra_xfce4-eyes-plugin_0 : xfce-extra/xfce4-eyes-plugin:0 -debug
+package.use : xfce-extra/xfce4-eyes-plugin:0 -debug
 
 [xfce-extra/xfce4-fsguard-plugin:0]
-package.use/xfce-extra_xfce4-fsguard-plugin_0 : xfce-extra/xfce4-fsguard-plugin:0 -debug
+package.use : xfce-extra/xfce4-fsguard-plugin:0 -debug
 
 [xfce-extra/xfce4-genmon-plugin:0]
-package.use/xfce-extra_xfce4-genmon-plugin_0 : xfce-extra/xfce4-genmon-plugin:0 -debug
+package.use : xfce-extra/xfce4-genmon-plugin:0 -debug
 
 [xfce-extra/xfce4-kbdleds-plugin:0]
-package.use/xfce-extra_xfce4-kbdleds-plugin_0 : xfce-extra/xfce4-kbdleds-plugin:0 -debug
+package.use : xfce-extra/xfce4-kbdleds-plugin:0 -debug
 
 [xfce-extra/xfce4-mailwatch-plugin:0]
-package.use/xfce-extra_xfce4-mailwatch-plugin_0 : xfce-extra/xfce4-mailwatch-plugin:0 -debug ipv6 ssl
+package.use : xfce-extra/xfce4-mailwatch-plugin:0 -debug ipv6 ssl
 
 [xfce-extra/xfce4-mixer:0]
-package.use/xfce-extra_xfce4-mixer_0 : xfce-extra/xfce4-mixer:0 -debug alsa keybinder oss
+package.use : xfce-extra/xfce4-mixer:0 -debug alsa keybinder oss
 
 [xfce-extra/xfce4-modemlights-plugin:0]
-package.use/xfce-extra_xfce4-modemlights-plugin_0 : xfce-extra/xfce4-modemlights-plugin:0 -debug
+package.use : xfce-extra/xfce4-modemlights-plugin:0 -debug
 
 [xfce-extra/xfce4-mpc-plugin:0]
-package.use/xfce-extra_xfce4-mpc-plugin_0 : xfce-extra/xfce4-mpc-plugin:0 -debug -libmpd
+package.use : xfce-extra/xfce4-mpc-plugin:0 -debug -libmpd
 
 [xfce-extra/xfce4-netload-plugin:0]
-package.use/xfce-extra_xfce4-netload-plugin_0 : xfce-extra/xfce4-netload-plugin:0 -debug
+package.use : xfce-extra/xfce4-netload-plugin:0 -debug
 
 [xfce-extra/xfce4-places-plugin:0]
-package.use/xfce-extra_xfce4-places-plugin_0 : xfce-extra/xfce4-places-plugin:0 -debug libnotify
+package.use : xfce-extra/xfce4-places-plugin:0 -debug libnotify
 
 [xfce-extra/xfce4-playercontrol-plugin:0]
-package.use/xfce-extra_xfce4-playercontrol-plugin_0 : xfce-extra/xfce4-playercontrol-plugin:0 -audacious -mpd
+package.use : xfce-extra/xfce4-playercontrol-plugin:0 -audacious -mpd
 
 [xfce-extra/xfce4-quicklauncher-plugin:0]
-package.use/xfce-extra_xfce4-quicklauncher-plugin_0 : xfce-extra/xfce4-quicklauncher-plugin:0 -debug
+package.use : xfce-extra/xfce4-quicklauncher-plugin:0 -debug
 
 [xfce-extra/xfce4-screenshooter:0]
-package.use/xfce-extra_xfce4-screenshooter_0 : xfce-extra/xfce4-screenshooter:0 -debug
+package.use : xfce-extra/xfce4-screenshooter:0 -debug
 
 [xfce-extra/xfce4-sensors-plugin:0]
-package.use/xfce-extra_xfce4-sensors-plugin_0 : xfce-extra/xfce4-sensors-plugin:0 -debug -hddtemp -lm_sensors -video_cards_nvidia acpi libnotify
+package.use : xfce-extra/xfce4-sensors-plugin:0 -debug -hddtemp -lm_sensors -video_cards_nvidia acpi libnotify
 
 [xfce-extra/xfce4-smartbookmark-plugin:0]
-package.use/xfce-extra_xfce4-smartbookmark-plugin_0 : xfce-extra/xfce4-smartbookmark-plugin:0 -debug
+package.use : xfce-extra/xfce4-smartbookmark-plugin:0 -debug
 
 [xfce-extra/xfce4-soundmenu-plugin:0]
-package.use/xfce-extra_xfce4-soundmenu-plugin_0 : xfce-extra/xfce4-soundmenu-plugin:0 -debug -lastfm glyr keybinder
+package.use : xfce-extra/xfce4-soundmenu-plugin:0 -debug -lastfm glyr keybinder
 
 [xfce-extra/xfce4-systemload-plugin:0]
-package.use/xfce-extra_xfce4-systemload-plugin_0 : xfce-extra/xfce4-systemload-plugin:0 -debug -upower
+package.use : xfce-extra/xfce4-systemload-plugin:0 -debug -upower
 
 [xfce-extra/xfce4-taskmanager:0]
-package.use/xfce-extra_xfce4-taskmanager_0 : xfce-extra/xfce4-taskmanager:0 -debug -gksu -gtk3
+package.use : xfce-extra/xfce4-taskmanager:0 -debug -gksu -gtk3
 
 [xfce-extra/xfce4-time-out-plugin:0]
-package.use/xfce-extra_xfce4-time-out-plugin_0 : xfce-extra/xfce4-time-out-plugin:0 -debug
+package.use : xfce-extra/xfce4-time-out-plugin:0 -debug
 
 [xfce-extra/xfce4-verve-plugin:0]
-package.use/xfce-extra_xfce4-verve-plugin_0 : xfce-extra/xfce4-verve-plugin:0 dbus
+package.use : xfce-extra/xfce4-verve-plugin:0 dbus
 
 [xfce-extra/xfce4-volumed:0]
-package.use/xfce-extra_xfce4-volumed_0 : xfce-extra/xfce4-volumed:0 -debug alsa libnotify oss
+package.use : xfce-extra/xfce4-volumed:0 -debug alsa libnotify oss
 
 [xfce-extra/xfce4-wavelan-plugin:0]
-package.use/xfce-extra_xfce4-wavelan-plugin_0 : xfce-extra/xfce4-wavelan-plugin:0 -debug
+package.use : xfce-extra/xfce4-wavelan-plugin:0 -debug
 
 [xfce-extra/xfce4-weather-plugin:0]
-package.use/xfce-extra_xfce4-weather-plugin_0 : xfce-extra/xfce4-weather-plugin:0 -debug -upower
+package.use : xfce-extra/xfce4-weather-plugin:0 -debug -upower
 
 [xfce-extra/xfce4-windowck-plugin:0]
-package.use/xfce-extra_xfce4-windowck-plugin_0 : xfce-extra/xfce4-windowck-plugin:0 -debug
+package.use : xfce-extra/xfce4-windowck-plugin:0 -debug
 
 [xfce-extra/xfce4-wmdock-plugin:0]
-package.use/xfce-extra_xfce4-wmdock-plugin_0 : xfce-extra/xfce4-wmdock-plugin:0 -debug
+package.use : xfce-extra/xfce4-wmdock-plugin:0 -debug
 
 [xfce-extra/xfce4-xkb-plugin:0]
-package.use/xfce-extra_xfce4-xkb-plugin_0 : xfce-extra/xfce4-xkb-plugin:0 -debug
+package.use : xfce-extra/xfce4-xkb-plugin:0 -debug
 
 [xfce-extra/xfdashboard:0]
-package.use/xfce-extra_xfdashboard_0 : xfce-extra/xfdashboard:0 -debug
+package.use : xfce-extra/xfdashboard:0 -debug