version bump

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 57 insertions, 320 deletions

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index c4e74aed5218..a01bb0dcb214 100644
--- a/app-emulation/open-vm-tools/ChangeLog
+++ b/app-emulation/open-vm-tools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/open-vm-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.34 2010/03/16 16:23:03 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.35 2010/03/24 17:04:34 vadimk Exp $
+
+*open-vm-tools-0.0.20100320.243334 (24 Mar 2010)
+
+  24 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  -open-vm-tools-0.0.20090618.172495-r2.ebuild,
+  -open-vm-tools-0.0.20090722.179896.ebuild,
+  -open-vm-tools-0.0.20090824.187411.ebuild,
+  +open-vm-tools-0.0.20100320.243334.ebuild:
+  version bump
 
 *open-vm-tools-0.0.20100223.236320-r1 (16 Mar 2010)
 *open-vm-tools-0.0.20091216.217847-r2 (16 Mar 2010)
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090618.172495-r2.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20090618.172495-r2.ebuild
deleted file mode 100644
index e3eb4f0f5afe..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090618.172495-r2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20090618.172495-r2.ebuild,v 1.1 2009/07/10 19:51:51 vadimk Exp $
-
-EAPI="2"
-
-inherit 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}"
-
-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="~amd64 ~x86"
-IUSE="X doc fuse icu unity xinerama"
-
-RDEPEND=">=dev-libs/glib-2
-		dev-libs/libdnet
-		sys-apps/ethtool
-		sys-process/procps
-		virtual/pam
-		X? (
-			dev-cpp/gtkmm
-			x11-base/xorg-server
-			x11-drivers/xf86-input-vmmouse
-			x11-drivers/xf86-video-vmware
-			x11-libs/gtk+
-			x11-libs/libnotify
-			x11-libs/libX11
-		)
-		fuse? ( sys-fs/fuse )
-		icu? ( dev-libs/icu )
-		unity? (
-			dev-libs/uriparser
-			x11-libs/libXScrnSaver
-		)
-		xinerama? ( x11-libs/libXinerama )
-		!app-emulation/vmware-esx-tools
-		!app-emulation/vmware-server-tools
-		!app-emulation/vmware-workstation-tools
-		"
-
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		virtual/linux-sources
-		doc? ( app-doc/doxygen )
-		"
-
-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'
-
-	linux-mod_pkg_setup
-	MODULE_NAMES=""
-	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}"
-
-	for mod in ${VMWARE_MODULE_LIST};
-	do
-		if [ "${mod}" == "vmxnet" -o "${mod}" == "vmxnet3" ];
-		then
-			MODTARGET="net"
-		else
-			MODTARGET="openvmtools"
-		fi
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
-	done
-
-	enewgroup vmware
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/default-scripts.patch"
-	sed -i -e 's:VMTOOLSD_PLUGIN_ROOT=\\"\$(pkglibdir)\\":VMTOOLSD_PLUGIN_ROOT=\\"\$(pkglibdir)/plugins\\":g' \
-		services/vmtoolsd/Makefile.in || die "sed plugin path failed"
-	sed -i -e 's/proc-3.2.7/proc/g' configure || die "sed configure failed"
-	sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
-}
-
-src_configure() {
-	econf \
-		--with-procps \
-		--with-dnet \
-		--without-kernel-modules \
-		$(use_with X x) \
-		$(use_with X gtk2) \
-		$(use_with X gtkmm) \
-		$(use_with icu) \
-		$(use_enable unity) \
-		$(use_enable xinerama multimon)
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	emake || die "failed to compile"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	emake DESTDIR="${D}" install || die "failed to install"
-
-	rm "${D}"/etc/pam.d/vmtoolsd
-	pamd_mimic_system vmtoolsd auth account
-
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools || die "failed to newinitd"
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools || die "failed to newconfd"
-
-	if use X;
-	then
-		insinto /etc/xdg/autostart
-		doins "${FILESDIR}/open-vm-tools.desktop" || die "failed to install .desktop"
-
-		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 the users which should have access to this function"
-		elog "	to the group 'vmware'."
-	fi
-}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090722.179896.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20090722.179896.ebuild
deleted file mode 100644
index 5c3091d79d3d..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090722.179896.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20090722.179896.ebuild,v 1.1 2009/07/24 23:12:56 vadimk Exp $
-
-EAPI="2"
-
-inherit 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}"
-
-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="~amd64 ~x86"
-IUSE="X doc fuse icu unity xinerama"
-
-RDEPEND=">=dev-libs/glib-2
-		dev-libs/libdnet
-		sys-apps/ethtool
-		sys-process/procps
-		virtual/pam
-		X? (
-			dev-cpp/gtkmm
-			x11-base/xorg-server
-			x11-drivers/xf86-input-vmmouse
-			x11-drivers/xf86-video-vmware
-			x11-libs/gtk+
-			x11-libs/libnotify
-			x11-libs/libX11
-		)
-		fuse? ( sys-fs/fuse )
-		icu? ( dev-libs/icu )
-		unity? (
-			dev-libs/uriparser
-			x11-libs/libXScrnSaver
-		)
-		xinerama? ( x11-libs/libXinerama )
-		!app-emulation/vmware-esx-tools
-		!app-emulation/vmware-server-tools
-		!app-emulation/vmware-workstation-tools
-		"
-
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		virtual/linux-sources
-		doc? ( app-doc/doxygen )
-		"
-
-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'
-
-	linux-mod_pkg_setup
-	MODULE_NAMES=""
-	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}"
-
-	for mod in ${VMWARE_MODULE_LIST};
-	do
-		if [ "${mod}" == "vmxnet" -o "${mod}" == "vmxnet3" ];
-		then
-			MODTARGET="net"
-		else
-			MODTARGET="openvmtools"
-		fi
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
-	done
-
-	enewgroup vmware
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/default-scripts.patch"
-	#sed -i -e 's:VMTOOLSD_PLUGIN_ROOT=\\"\$(pkglibdir)\\":VMTOOLSD_PLUGIN_ROOT=\\"\$(pkglibdir)/plugins\\":g' \
-	#	services/vmtoolsd/Makefile.in || die "sed plugin path failed"
-	sed -i -e 's/proc-3.2.7/proc/g' configure || die "sed configure failed"
-	sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
-}
-
-src_configure() {
-	econf \
-		--with-procps \
-		--with-dnet \
-		--without-kernel-modules \
-		$(use_with X x) \
-		$(use_with X gtk2) \
-		$(use_with X gtkmm) \
-		$(use_with icu) \
-		$(use_enable unity) \
-		$(use_enable xinerama multimon)
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	emake || die "failed to compile"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	emake DESTDIR="${D}" install || die "failed to install"
-
-	rm "${D}"/etc/pam.d/vmtoolsd
-	pamd_mimic_system vmtoolsd auth account
-
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools || die "failed to newinitd"
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools || die "failed to newconfd"
-
-	if use X;
-	then
-		insinto /etc/xdg/autostart
-		doins "${FILESDIR}/open-vm-tools.desktop" || die "failed to install .desktop"
-
-		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 the users which should have access to this function"
-		elog "	to the group 'vmware'."
-	fi
-}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090824.187411.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20100320.243334.ebuild
index 594903ede2a9..fad006bb8a57 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090824.187411.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20100320.243334.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20090824.187411.ebuild,v 1.1 2009/08/27 19:03:47 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20100320.243334.ebuild,v 1.1 2010/03/24 17:04:34 vadimk Exp $
 
 EAPI="2"
 
-inherit eutils linux-mod pam versionator
+inherit eutils pam versionator
 
 MY_DATE="$(get_version_component_range 3)"
 MY_BUILD="$(get_version_component_range 4)"
@@ -18,68 +18,56 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X doc fuse icu unity xinerama"
-
-RDEPEND=">=dev-libs/glib-2
-		dev-libs/libdnet
-		sys-apps/ethtool
-		sys-process/procps
-		virtual/pam
-		X? (
-			dev-cpp/gtkmm
-			x11-base/xorg-server
-			x11-drivers/xf86-input-vmmouse
-			x11-drivers/xf86-video-vmware
-			x11-libs/gtk+
-			x11-libs/libnotify
-			x11-libs/libX11
-		)
-		fuse? ( sys-fs/fuse )
-		icu? ( dev-libs/icu )
-		unity? (
-			dev-libs/uriparser
-			x11-libs/libXScrnSaver
-		)
-		xinerama? ( x11-libs/libXinerama )
-		"
+IUSE="X doc fuse icu +pic unity xinerama"
+
+RDEPEND="app-emulation/open-vm-tools-kmod
+	>=dev-libs/glib-2
+	dev-libs/libdnet
+	sys-apps/ethtool
+	sys-process/procps
+	virtual/pam
+	X? (
+		dev-cpp/gtkmm
+		x11-base/xorg-server
+		x11-drivers/xf86-input-vmmouse
+		x11-drivers/xf86-video-vmware
+		x11-libs/gtk+
+		x11-libs/libnotify
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+	fuse? ( sys-fs/fuse )
+	icu? ( dev-libs/icu )
+	unity? (
+		dev-libs/uriparser
+		x11-libs/libXScrnSaver
+	)
+	xinerama? ( x11-libs/libXinerama )
+	"
 
 DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		virtual/linux-sources
-		doc? ( app-doc/doxygen )
-		"
+	dev-util/pkgconfig
+	virtual/linux-sources
+	doc? ( app-doc/doxygen )
+	"
 
 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'
-
-	linux-mod_pkg_setup
-	MODULE_NAMES=""
-	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}"
-
-	for mod in ${VMWARE_MODULE_LIST};
-	do
-		if [ "${mod}" == "vmxnet" -o "${mod}" == "vmxnet3" ];
-		then
-			MODTARGET="net"
-		else
-			MODTARGET="openvmtools"
-		fi
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
-	done
+	use unity && ! use xinerama && die 'The Unity USE flag requires USE="xinerama" as well'
 
 	enewgroup vmware
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/default-scripts.patch"
+	epatch "${FILESDIR}/default-scripts1.patch"
+	epatch "${FILESDIR}/checkvm-pie-safety.patch"
+	epatch "${FILESDIR}/vmguestlib-pkg-config.patch"
 	sed -i -e 's/proc-3.2.7/proc/g' configure || die "sed configure failed"
-	sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
+	# Do not filter out Werror
+	# Upstream Bug  http://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708
+	# sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
+	sed -i -e 's:\(TEST_PLUGIN_INSTALLDIR=\).*:\1\$libdir/open-vm-tools/plugins/tests:g' configure || die "sed test_plugin_installdir failed"
 }
 
 src_configure() {
@@ -87,28 +75,30 @@ src_configure() {
 		--with-procps \
 		--with-dnet \
 		--without-kernel-modules \
+		$(use_enable doc docs) \
+		--docdir=/usr/share/doc/${PF} \
 		$(use_with X x) \
 		$(use_with X gtk2) \
 		$(use_with X gtkmm) \
 		$(use_with icu) \
+		$(use_with pic) \
 		$(use_enable unity) \
 		$(use_enable xinerama multimon)
 }
 
 src_compile() {
-	linux-mod_src_compile
-
 	emake || die "failed to compile"
 }
 
 src_install() {
-	linux-mod_src_install
-
 	emake DESTDIR="${D}" install || die "failed to install"
 
 	rm "${D}"/etc/pam.d/vmtoolsd
 	pamd_mimic_system vmtoolsd auth account
 
+	rm "${D}"/usr/$(get_libdir)/*.la
+	rm "${D}"/usr/$(get_libdir)/open-vm-tools/plugins/common/*.la
+
 	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools || die "failed to newinitd"
 	newconfd "${FILESDIR}/open-vm.confd" vmware-tools || die "failed to newconfd"