Keep all /etc/portage/* basically the same, and make the changes I did below.  I'm not finished compiling yet, but I'm fixing things as I go.  ie, that particular 'gle' package has to be masked.

/etc/portage/package.keywords
# added by Trent
net-www/apache -ldap

/etc/portage/package.mask
# removed by Trent
#=x11-libs/libdrm-2.2.0
#>=x11-libs/libdrm-2.0.2_p20061028

# added by Trent
>=sys-apps/dbus-1.0
>=x11-libs/qt-4.2.2
>=x11-drivers/xf86-video-intel-1.6.0_alpha20060720
>media-tv/ivtv-0.8.1
=media-libs/gle-3.1.0-r1


/etc/portage/package.unmask
# added by Trent
=net-misc/dhcdbd-1.14-r1