sync with 10.3

3 files changed, 128 insertions, 120 deletions

diff --git a/profiles/default-macos-10.4/packages.build b/profiles/default-macos-10.4/packages.build
index 5fa0f95658b4..8397a5c1a26c 100644
--- a/profiles/default-macos-10.4/packages.build
+++ b/profiles/default-macos-10.4/packages.build
@@ -14,7 +14,7 @@ app-text/enscript-1.6.3
 app-text/rcs-5.7
 app-text/texi2html-1.57
 dev-db/mysql-4.0.18
-dev-java/JavaScriptCore-96
+dev-java/javascriptcore-96
 dev-lang/objc4-235
 dev-lang/perl-5.8.1
 dev-lang/python-2.3
@@ -37,6 +37,7 @@ mail-client/squirrelmail-1.4.1
 mail-filter/procmail-3.21
 mail-mta/postfix-2.0.8
 media-gfx/gimp_print-4.2.5
+media-libs/freetype-2.1.4
 net-analyzer/net_snmp-5.0.8
 net-analyzer/netcat-110
 net-analyzer/netinfo-324
@@ -44,7 +45,7 @@ net-analyzer/network_cmds-176
 net-analyzer/tcpdump-3.8
 net-dialup/ppp-142
 net-dns/bind-9.2.2
-net-firewall/IPFirewall-17
+net-firewall/ipfirewall-17
 net-fs/samba-3.0.2
 net-ftp/lukemftp-3
 net-ftp/lukemftpd-8
@@ -58,7 +59,7 @@ net-mail/mailman-2.1.4
 net-misc/curl-7.10.2
 net-misc/efax-0.9a
 net-misc/gsasl-2.1.1
-net-misc/mDNSResponder-58
+net-misc/mdnsresponder-58
 net-misc/openssh-3.6.1_p1
 net-misc/openssl-0.9.7b
 net-misc/rsync-2.5.7
@@ -85,117 +86,117 @@ sys-apps/tcp_wrappers-7.6
 sys-apps/texinfo-4.6
 sys-apps/vixie-cron-3.0.1
 sys-apps/xinetd-2.0.0
-sys-darwin/Apple16X50Serial-13
-sys-darwin/Apple3Com3C90x-7
-sys-darwin/AppleADBButtons-250.0.1
-sys-darwin/AppleADBDisplay-103.0.1
-sys-darwin/AppleADBKeyboard-236.0.3
-sys-darwin/AppleADBMouse-209.0.3
-sys-darwin/AppleBMacEthernet-113.4.1
-sys-darwin/AppleCore99NVRAM-1.1
-sys-darwin/AppleCore99PE-121.0.2
-sys-darwin/AppleCuda-102.3.1
-sys-darwin/AppleDisplays-140.1.6
-sys-darwin/AppleGMACEthernet-131.2.1
-sys-darwin/AppleGenericPCATA-4
-sys-darwin/AppleGracklePCI-1.2
-sys-darwin/AppleHeathrow-121.0.1
-sys-darwin/AppleI2C-340.0.3
-sys-darwin/AppleI2S-100.0.2
-sys-darwin/AppleI386PCI-6
-sys-darwin/AppleIntel8255x-13
-sys-darwin/AppleIntelAC97Driver-6
-sys-darwin/AppleIntelPIIXATA-12
-sys-darwin/AppleK2SATA-100.3.3
-sys-darwin/AppleK2SATARoot-100.1.7
-sys-darwin/AppleKauaiATA-102.3.1
-sys-darwin/AppleKeyLargo-141.0.1
-sys-darwin/AppleKiwiATA-102.3.1
-sys-darwin/AppleKiwiRoot-102.3.1
-sys-darwin/AppleMESH-112.3.1
-sys-darwin/AppleMPIC-1.2.3
-sys-darwin/AppleMacRISC2PE-142.2.3
-sys-darwin/AppleMacRISC4PE-102.2.1
-sys-darwin/AppleMacRiscPCI-2.0.0
-sys-darwin/AppleMediaBay-1.0.1
-sys-darwin/AppleOnboardAudio-205.2.14
-sys-darwin/ApplePCCardATA-103.3.1
-sys-darwin/ApplePS2Controller-4
-sys-darwin/ApplePS2Keyboard-6.5
-sys-darwin/ApplePS2Mouse-7
-sys-darwin/ApplePS2Trackpad-3
-sys-darwin/AppleRAID-1.3.4
-sys-darwin/AppleRS232Serial-121.2.2
-sys-darwin/AppleSCCSerial-126.4.0
-sys-darwin/AppleSym8xx-120.0.2
-sys-darwin/AppleTalk-81
-sys-darwin/AppleUSBAudio-185.2.3
-sys-darwin/AppleUSBIrDA-131.2.2
-sys-darwin/AppleVIA-1.2
-sys-darwin/BootCache-16.1
-sys-darwin/BootX-59
-sys-darwin/CF-299
-sys-darwin/CMD646ATA-107.3.1
-sys-darwin/Chess-102.0.10
-sys-darwin/CoreOSMakefiles-22
-sys-darwin/Csu-46
-sys-darwin/DSAgent-32
-sys-darwin/DSNISPlugin-13
-sys-darwin/DSNSLPlugins-79
-sys-darwin/DSPasswordServerPlugin-68
-sys-darwin/DirectoryService-255
-sys-darwin/DiskArbitration-129
-sys-darwin/HeathrowATA-108.3.1
-sys-darwin/IOADBFamily-2
-sys-darwin/IOATABlockStorage-130.3.1
-sys-darwin/IOATAFamily-155.3.1
-sys-darwin/IOATAPIProtocolTransport-130.0.2
-sys-darwin/IOAudioFamily-140.2.9
-sys-darwin/IOCDStorageFamily-25
-sys-darwin/IODVDStorageFamily-14
-sys-darwin/IOFWDVComponents-153.4.1
-sys-darwin/IOFireWireAVC-152.4.1
-sys-darwin/IOFireWireFamily-170.4.0
-sys-darwin/IOFireWireIP-120.4.0
-sys-darwin/IOFireWireSBP2-151.4.0
-sys-darwin/IOFireWireSerialBusProtocolTransport-130.2.7
-sys-darwin/IOGraphics-123
-sys-darwin/IOHIDFamily-86
-sys-darwin/IOKitTools-38
-sys-darwin/IOKitUser-174
-sys-darwin/IONetworkingFamily-15
-sys-darwin/IOPCCardFamily-38
-sys-darwin/IOPCIFamily-21
-sys-darwin/IOSCSIArchitectureModelFamily-130.3.8
-sys-darwin/IOSCSIParallelFamily-130.3.1
-sys-darwin/IOSerialFamily-20
-sys-darwin/IOStorageFamily-44.1
-sys-darwin/IOUSBFamily-205.3.5
-sys-darwin/IOUSBMassStorageClass-130.2.1
-sys-darwin/KeyLargoATA-110.3.1
-sys-darwin/Libc-320
-sys-darwin/Libinfo-173
-sys-darwin/Libkvm-19
-sys-darwin/Libm-47
-sys-darwin/Libnotify-11
-sys-darwin/Librpcsvc-13
-sys-darwin/Libstreams-23
-sys-darwin/Libsystem-71
-sys-darwin/Libwrappers-9
-sys-darwin/Liby-10
-sys-darwin/NKEMgr-5.3
-sys-darwin/PowerManagement-49
-sys-darwin/QuickTimeStreamingServer-452
-sys-darwin/Security-163
-sys-darwin/SecurityNssAsn1-11
-sys-darwin/SecurityNssPkcs12-6
-sys-darwin/SecurityNssSmime-10
-sys-darwin/SecurityTool-7
-sys-darwin/SharedIP-42
-sys-darwin/SmartCardServices-15
-sys-darwin/Startup-177
-sys-darwin/UserNotification-15
-sys-darwin/WebCore-106
+sys-darwin/apple16x50serial-13
+sys-darwin/apple3com3c90x-7
+sys-darwin/appleadbbuttons-250.0.1
+sys-darwin/appleadbdisplay-103.0.1
+sys-darwin/appleadbkeyboard-236.0.3
+sys-darwin/appleadbmouse-209.0.3
+sys-darwin/applebmacethernet-113.4.1
+sys-darwin/applecore99nvram-1.1
+sys-darwin/applecore99pe-121.0.2
+sys-darwin/applecuda-102.3.1
+sys-darwin/appledisplays-140.1.6
+sys-darwin/applegmacethernet-131.2.1
+sys-darwin/applegenericpcata-4
+sys-darwin/applegracklepci-1.2
+sys-darwin/appleheathrow-121.0.1
+sys-darwin/applei2c-340.0.3
+sys-darwin/applei2s-100.0.2
+sys-darwin/applei386pci-6
+sys-darwin/appleintel8255x-13
+sys-darwin/appleintelac97driver-6
+sys-darwin/appleintelpiixata-12
+sys-darwin/applek2sata-100.3.3
+sys-darwin/appleK2sataroot-100.1.7
+sys-darwin/applekauaiata-102.3.1
+sys-darwin/applekeylargo-141.0.1
+sys-darwin/applekiwiata-102.3.1
+sys-darwin/applekiwiroot-102.3.1
+sys-darwin/applemesh-112.3.1
+sys-darwin/applempic-1.2.3
+sys-darwin/applemacrisc2pe-142.2.3
+sys-darwin/applemacrisc4pe-102.2.1
+sys-darwin/applemacriscpci-2.0.0
+sys-darwin/applemediabay-1.0.1
+sys-darwin/appleonboardaudio-205.2.14
+sys-darwin/applepccardata-103.3.1
+sys-darwin/appleps2controller-4
+sys-darwin/appleps2keyboard-6.5
+sys-darwin/appleps2Mouse-7
+sys-darwin/appleps2Trackpad-3
+sys-darwin/appleraid-1.3.4
+sys-darwin/applers232serial-121.2.2
+sys-darwin/applesccserial-126.4.0
+sys-darwin/applesym8xx-120.0.2
+sys-darwin/appletalk-81
+sys-darwin/appleusbaudio-185.2.3
+sys-darwin/appleusbirda-131.2.2
+sys-darwin/applevia-1.2
+sys-darwin/bootcache-16.1
+sys-darwin/bootx-59
+sys-darwin/cf-299
+sys-darwin/cmd646ata-107.3.1
+sys-darwin/chess-102.0.10
+sys-darwin/coreosmakefiles-22
+sys-darwin/csu-46
+sys-darwin/dsagent-32
+sys-darwin/dsnisplugin-13
+sys-darwin/dsnslplugins-79
+sys-darwin/dspasswordserverplugin-68
+sys-darwin/directoryservice-255
+sys-darwin/diskarbitration-129
+sys-darwin/heathrowata-108.3.1
+sys-darwin/ioadbfamily-2
+sys-darwin/ioatablockstorage-130.3.1
+sys-darwin/ioatafamily-155.3.1
+sys-darwin/ioataiprotocoltransport-130.0.2
+sys-darwin/ioaudiofamily-140.2.9
+sys-darwin/iocdstorageFamily-25
+sys-darwin/iodvdstorageFamily-14
+sys-darwin/iofwdvcomponents-153.4.1
+sys-darwin/iofirewireavc-152.4.1
+sys-darwin/iofirewirefamily-170.4.0
+sys-darwin/iofirewireip-120.4.0
+sys-darwin/iofirewiresbp2-151.4.0
+sys-darwin/iofirewireserialbusprotocoltransport-130.2.7
+sys-darwin/iographics-123
+sys-darwin/iohifamily-86
+sys-darwin/iokittools-38
+sys-darwin/iokitUser-174
+sys-darwin/ionetworkingfamily-15
+sys-darwin/iopccardfamily-38
+sys-darwin/iopciamily-21
+sys-darwin/ioscsiarchitecturemodelfamily-130.3.8
+sys-darwin/ioscsiparallelfamily-130.3.1
+sys-darwin/ioserialfamily-20
+sys-darwin/iostoragefamily-44.1
+sys-darwin/iousbfamily-205.3.5
+sys-darwin/iousbmassstorageclass-130.2.1
+sys-darwin/keylargoata-110.3.1
+sys-darwin/libc-320
+sys-darwin/libinfo-173
+sys-darwin/libkvm-19
+sys-darwin/libm-47
+sys-darwin/libnotify-11
+sys-darwin/librpcsvc-13
+sys-darwin/libstreams-23
+sys-darwin/libsystem-71
+sys-darwin/libwrappers-9
+sys-darwin/liby-10
+sys-darwin/nkemgr-5.3
+sys-darwin/powermanagement-49
+sys-darwin/quickTimestreamingserver-452
+sys-darwin/security-163
+sys-darwin/securitynssasn1-11
+sys-darwin/securitynsspkcs12-6
+sys-darwin/securitynsssmime-10
+sys-darwin/securitytool-7
+sys-darwin/sharedip-42
+sys-darwin/smartcardservices-15
+sys-darwin/startup-177
+sys-darwin/usernotification-15
+sys-darwin/webcore-106
 sys-darwin/adv_cmds-63
 sys-darwin/am_utils-8
 sys-darwin/apache-670
@@ -217,8 +218,8 @@ sys-darwin/crontabs-12
 sys-darwin/developer_cmds-28
 sys-darwin/diskdev_cmds-277
 sys-darwin/doc_cmds-36
-sys-darwin/drvAppleCMD646Root-103.3.1
-sys-darwin/extenTools-17.3
+sys-darwin/drvapplecmd646root-103.3.1
+sys-darwin/extentools-17.3
 sys-darwin/file_cmds-82
 sys-darwin/files-436
 sys-darwin/gcc_legacy-938
@@ -266,4 +267,5 @@ sys-libs/pam-1.9
 sys-libs/pam-modules-13
 sys-libs/yacc-1.1.4
 sys-libs/zlib-1.1.4
-sys-darwin/X11-4.3.99
+sys-apps/diffutils-2.5.7 
+x11-base/apple-xfree-4.3
diff --git a/profiles/default-macos-10.4/use.mask b/profiles/default-macos-10.4/use.mask
index 0cd32fe163e5..4efa3da0ac0d 100644
--- a/profiles/default-macos-10.4/use.mask
+++ b/profiles/default-macos-10.4/use.mask
@@ -1 +1 @@
-# USE flags that don't work on Mac OS X
+# Add USE flags that don't work on Mac OS X here
diff --git a/profiles/default-macos-10.4/virtuals b/profiles/default-macos-10.4/virtuals
index 71f5fa3f714a..2ddce75248da 100644
--- a/profiles/default-macos-10.4/virtuals
+++ b/profiles/default-macos-10.4/virtuals
@@ -18,5 +18,11 @@ virtual/snmp		net-analyzer/net-snmp
 virtual/ssh		net-misc/openssh
 virtual/tetex		app-text/tetex
 virtual/textbrowser	net-www/links
-virtual/x11		sys-darwin/X11
-virtual/xft		sys-darwin/X11
+virtual/x11		sys-darwin/apple-xfree
+virtual/xft		sys-darwin/apple-xfree
+virtual/skkserv		app-i18n/skkserv
+virtual/flim		app-emacs/flim
+virtual/semi		app-emacs/semi
+virtual/w3m		net-www/w3m
+virtual/ruby		dev-lang/ruby
+virtual/blackbox	x11-wm/fluxbox