--- open-vm-tools-0.0.20090618.172495.ebuild	2009-07-09 14:17:13.952760075 +0200
+++ open-vm-tools-0.0.20090618.172495-r1.ebuild	2009-07-09 14:22:30.526061695 +0200
@@ -4,66 +4,61 @@
 
 EAPI="2"
 
-inherit eutils linux-mod pam versionator
+inherit autotools eutils linux-mod pam versionator
 
 MY_DATE="$(get_version_component_range 3)"
 MY_BUILD="$(get_version_component_range 4)"
 MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
 MY_P="${PN}-${MY_PV}"
 
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Opensourced tools for VMware guests"
+DESCRIPTION="Opensourced tools for VMware guests."
 HOMEPAGE="http://open-vm-tools.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="X xinerama icu unity"
-DEPEND="
-		!app-emulation/vmware-workstation-tools
-		!app-emulation/vmware-server-tools
-		!app-emulation/vmware-esx-tools
-		virtual/linux-sources
-		sys-apps/ethtool
-		X? (
-			x11-libs/libX11
-			x11-libs/gtk+
-			dev-cpp/gtkmm
-		)
-		unity? (
-			x11-libs/libXScrnSaver
-			dev-libs/uriparser
-		)
-		xinerama? (
-			x11-libs/libXinerama
-		)
-		sys-process/procps
-		dev-libs/libdnet
-		>=dev-libs/glib-2
-		icu? ( dev-libs/icu )
-		"
+KEYWORDS="~amd64 ~x86"
+IUSE="X icu unity xinerama"
+
+DEPEND=">=dev-libs/glib-2
+	dev-libs/libdnet
+	dev-util/pkgconfig
+	sys-apps/ethtool
+	sys-process/procps
+	virtual/linux-sources
+	X? (
+		dev-cpp/gtkmm
+		x11-libs/libnotify
+		x11-libs/libX11
+		x11-libs/gtk+
+	)
+	icu? ( dev-libs/icu )
+	unity? (
+		dev-libs/uriparser
+		x11-libs/libXScrnSaver
+	)
+	xinerama? ( x11-libs/libXinerama )
+	!app-emulation/vmware-workstation-tools
+	!app-emulation/vmware-server-tools
+	!app-emulation/vmware-esx-tools"
 
 RDEPEND="${DEPEND/virtual\/linux\-sources/}
-		 virtual/pam
-		 X? (
-			x11-base/xorg-server
-			x11-drivers/xf86-video-vmware
-			x11-drivers/xf86-input-vmmouse
-		 )
-		 unity? (
-			x11-libs/libXScrnSaver
-			dev-libs/uriparser
-		 )
-	"
+	virtual/pam
+	X? (
+		x11-base/xorg-server
+		x11-drivers/xf86-input-vmmouse
+		x11-drivers/xf86-video-vmware
+	)"
+
+# TODO: Fuse, libnotify and doxygen automagic
+
+S="${WORKDIR}/${MY_P}"
 
 VMWARE_MOD_DIR="modules/linux"
 VMWARE_MODULE_LIST="pvscsi vmblock vmci vmhgfs vmsync vmmemctl vmxnet vmxnet3 vsock"
 
 pkg_setup() {
-	use unity && ! use xinerama && \
-	  die 'The Unity USE flag requires USE="xinerama" as well'
+	use unity && ! use xinerama && die "The Unity USE flag requires USE=\"xinerama\" as well."
 
 	linux-mod_pkg_setup
 	MODULE_NAMES=""
@@ -85,14 +80,22 @@
 
 src_prepare() {
 	epatch "${FILESDIR}/default-scripts.patch"
-	sed -e 's:VMTOOLSD_PLUGIN_ROOT=\\"\$(pkglibdir)\\":VMTOOLSD_PLUGIN_ROOT=\\"\$(pkglibdir)/plugins\\":g' -i services/vmtoolsd/Makefile.in
+	sed -i -e 's:VMTOOLSD_PLUGIN_ROOT=\\"\$(pkglibdir)\\":VMTOOLSD_PLUGIN_ROOT=\\"\$(pkglibdir)/plugins\\":g' \
+		"${S}"/services/vmtoolsd/Makefile.in || die "sed plugin path failed"
+
+	# fix configure for >=sys-process/procps-3.2.8
+	sed -i -e 's/proc-3.2.7/proc/g' "${S}"/configure{,.ac} || die "sed configure failed"
+	eautoreconf
 }
 
 src_configure() {
 	econf \
+		--with-procps \
+		--with-dnet \
 		--without-kernel-modules \
 		$(use_with icu) \
 		$(use_with X x) \
+		$(use_with X gtk2) \
 		$(use_with X gtkmm) \
 		$(use_enable unity) \
 		$(use_enable xinerama multimon)
@@ -101,29 +104,28 @@
 src_compile() {
 	linux-mod_src_compile
 
-	emake || die
+	emake || die "failed to compile"
 }
 
 src_install() {
 	linux-mod_src_install
 
-	emake DESTDIR="${D}" install || die "Failed to install"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	rm "${D}"/etc/pam.d/vmtoolsd
 	pamd_mimic_system vmtoolsd auth account
 
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools
+	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools || die "newinit.d vmware-tools failed"
+	newconfd "${FILESDIR}/open-vm.confd" vmware-tools || die "newconfd vmware-tools failed"
 
-	if use X;
-	then
+	if use X ; then
 		insinto /etc/xdg/autostart
-		doins "${FILESDIR}/open-vm-tools.desktop"
+		doins "${FILESDIR}/open-vm-tools.desktop" || die "doins .desktop file failed"
 
 		elog "To be able to use the drag'n'drop feature of VMware for file"
 		elog "exchange, you need to do this:"
-		elog "	Add 'vmware-tools' to your default runlevel"
+		elog "	Add 'vmware-tools' to your default runlevel."
 		elog "	Add the users which should have access to this function"
-		elog "	to the group 'vmware'"
+		elog "	to the group 'vmware'."
 	fi
 }