summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Kuznetsov <vadimk@gentoo.org>2009-08-27 19:03:47 +0000
committerVadim Kuznetsov <vadimk@gentoo.org>2009-08-27 19:03:47 +0000
commit80dc31dafff01e8808ca72a42d7cb609224b97e0 (patch)
tree0f1352149ea0c44e0030e9746a87be56da21a76c /app-emulation/open-vm-tools
parentSet SUPPORT_PYTHON_ABIS (bug #282857). (diff)
downloadgentoo-2-80dc31dafff01e8808ca72a42d7cb609224b97e0.tar.gz
gentoo-2-80dc31dafff01e8808ca72a42d7cb609224b97e0.tar.bz2
gentoo-2-80dc31dafff01e8808ca72a42d7cb609224b97e0.zip
version bump.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/open-vm-tools')
-rw-r--r--app-emulation/open-vm-tools/ChangeLog11
-rw-r--r--app-emulation/open-vm-tools/files/10-vmware-tools5
-rw-r--r--app-emulation/open-vm-tools/files/2.6.28.1-api-break.patch20
-rw-r--r--app-emulation/open-vm-tools/metadata.xml1
-rw-r--r--app-emulation/open-vm-tools/open-vm-tools-0.0.20090121.142982.ebuild125
-rw-r--r--app-emulation/open-vm-tools/open-vm-tools-0.0.20090824.187411.ebuild (renamed from app-emulation/open-vm-tools/open-vm-tools-0.0.20090318.154848.ebuild)114
6 files changed, 66 insertions, 210 deletions
diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index 85593ae9cacb..1b777fe9059a 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.24 2009/08/23 23:22:05 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.25 2009/08/27 19:03:47 vadimk Exp $
+
+*open-vm-tools-0.0.20090824.187411 (27 Aug 2009)
+
+ 27 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org -files/10-vmware-tools,
+ -open-vm-tools-0.0.20090121.142982.ebuild,
+ +open-vm-tools-0.0.20090824.187411.ebuild,
+ -files/2.6.28.1-api-break.patch,
+ -open-vm-tools-0.0.20090318.154848.ebuild:
+ version bump. clean old ebuilds
23 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org
-open-vm-tools-0.0.20080515.93241.ebuild,
diff --git a/app-emulation/open-vm-tools/files/10-vmware-tools b/app-emulation/open-vm-tools/files/10-vmware-tools
deleted file mode 100644
index 3e1d2649d88a..000000000000
--- a/app-emulation/open-vm-tools/files/10-vmware-tools
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# launches the open-vm-tool user daemon
-
-/etc/init.d/vmware-tools --quiet status && \
- vmware-user &
diff --git a/app-emulation/open-vm-tools/files/2.6.28.1-api-break.patch b/app-emulation/open-vm-tools/files/2.6.28.1-api-break.patch
deleted file mode 100644
index 9eb6463c4b66..000000000000
--- a/app-emulation/open-vm-tools/files/2.6.28.1-api-break.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/modules/linux/vmhgfs/page.c b/modules/linux/vmhgfs/page.c
-index 4fc9b53..d4a5d26 100644
---- a/modules/linux/vmhgfs/page.c
-+++ b/modules/linux/vmhgfs/page.c
-@@ -864,7 +864,15 @@ HgfsWriteBegin(struct file *file, // IN: File to be written
- unsigned pageTo = pos + len;
- struct page *page;
-
-+ /*
-+ * AOP_FLAG_NOFS was defined in the same changeset that
-+ * grab_cach_page_write_bring() was introduced.
-+ */
-+#ifdef AOP_FLAG_NOFS
-+ page = grab_cache_page_write_begin(mapping, index, flags);
-+#else
- page = __grab_cache_page(mapping, index);
-+#endif
- if (page == NULL) {
- return -ENOMEM;
- }
diff --git a/app-emulation/open-vm-tools/metadata.xml b/app-emulation/open-vm-tools/metadata.xml
index e9f203bf9bdb..54f82e796658 100644
--- a/app-emulation/open-vm-tools/metadata.xml
+++ b/app-emulation/open-vm-tools/metadata.xml
@@ -15,7 +15,6 @@
<flag name='doc'>Generate API documantation</flag>
<flag name='fuse'>Build vmblock-fuse in favor of FUSE based blocking
mechanism for DnD</flag>
- <flag name='gtkmm'>Enable gtkmm support</flag>
<flag name='unity'>Enable host unity support</flag>
</use>
</pkgmetadata>
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090121.142982.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20090121.142982.ebuild
deleted file mode 100644
index 6eee7666b92b..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090121.142982.ebuild
+++ /dev/null
@@ -1,125 +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.20090121.142982.ebuild,v 1.1 2009/02/08 20:28:08 ikelos Exp $
-
-inherit pam eutils linux-mod 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"
-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="
- virtual/linux-sources
- sys-apps/ethtool
- X? (
- x11-libs/libX11
- x11-libs/gtk+
- )
- unity? (
- x11-libs/libXScrnSaver
- dev-libs/uriparser
- )
- xinerama? (
- x11-libs/libXinerama
- )
- !app-emulation/vmware-workstation-tools
- !app-emulation/vmware-server-tools
- !app-emulation/vmware-esx-tools
- sys-process/procps
- dev-libs/libdnet
- icu? ( dev-libs/icu )
- "
-
-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
- )
-"
-
-VMWARE_MOD_DIR="modules/linux"
-VMWARE_MODULE_LIST="vmblock vmhgfs vmsync vmmemctl vmxnet"
-
-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}"
-
- for mod in ${VMWARE_MODULE_LIST};
- do
- if [[ "${mod}" == "vmxnet" ]];
- then
- MODTARGET="net"
- else
- MODTARGET="openvmtools"
- fi
- MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
- done
-
- enewgroup vmware
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/2.6.28.1-api-break.patch"
- epatch "${FILESDIR}/default-scripts.patch"
-}
-
-src_compile() {
- econf \
- --without-kernel-modules \
- $(use_with icu) \
- $(use_with X x) \
- $(use_enable unity) \
- $(use_enable xinerama multimon) \
- || die "Error: econf failed!"
-
- linux-mod_src_compile
-
- emake || die
-}
-
-src_install() {
-
- linux-mod_src_install
-
- pamd_mimic_system vmware-guestd auth account
-
- emake install DESTDIR="${D}" || die "Failed to install"
-
- newinitd "${FILESDIR}/open-vm.initd" vmware-tools
- newconfd "${FILESDIR}/open-vm.confd" vmware-tools
-
- if use X;
- then
- insinto /etc/xdg/autostart
- doins "${FILESDIR}/open-vm-tools.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.20090318.154848.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20090824.187411.ebuild
index ae828da0d7e6..594903ede2a9 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090318.154848.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20090824.187411.ebuild
@@ -1,64 +1,58 @@
# 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.20090318.154848.ebuild,v 1.1 2009/06/04 13:20:34 vadimk Exp $
+# $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 $
-inherit pam eutils linux-mod versionator
+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}"
-S="${WORKDIR}/${MY_P}"
-
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 gtkmm"
-DEPEND="
- virtual/linux-sources
+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? (
- x11-libs/libX11
+ 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? (
- x11-libs/libXScrnSaver
dev-libs/uriparser
+ x11-libs/libXScrnSaver
)
- xinerama? (
- x11-libs/libXinerama
- )
- gtkmm? (
- dev-cpp/gtkmm
- )
- !app-emulation/vmware-workstation-tools
- !app-emulation/vmware-server-tools
- !app-emulation/vmware-esx-tools
- sys-process/procps
- dev-libs/libdnet
- icu? ( dev-libs/icu )
+ xinerama? ( x11-libs/libXinerama )
"
-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
- )
-"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ virtual/linux-sources
+ doc? ( app-doc/doxygen )
+ "
+
+S="${WORKDIR}/${MY_P}"
VMWARE_MOD_DIR="modules/linux"
-VMWARE_MODULE_LIST="vmblock vmhgfs vmsync vmmemctl vmxnet"
+VMWARE_MODULE_LIST="pvscsi vmblock vmci vmhgfs vmsync vmmemctl vmxnet vmxnet3 vsock"
pkg_setup() {
use unity && ! use xinerama && \
@@ -66,11 +60,11 @@ pkg_setup() {
linux-mod_pkg_setup
MODULE_NAMES=""
- BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR}"
+ 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" ]];
+ if [ "${mod}" == "vmxnet" -o "${mod}" == "vmxnet3" ];
then
MODTARGET="net"
else
@@ -82,47 +76,51 @@ pkg_setup() {
enewgroup vmware
}
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
epatch "${FILESDIR}/default-scripts.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"
}
-src_compile() {
+src_configure() {
econf \
- --without-kernel-modules \
- $(use_with icu) \
- $(use_with X x) \
- $(use_with gtkmm) \
- $(use_enable unity) \
- $(use_enable xinerama multimon) \
- || die "Error: econf failed!"
+ --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
+ emake || die "failed to compile"
}
src_install() {
-
linux-mod_src_install
- pamd_mimic_system vmware-guestd auth account
+ emake DESTDIR="${D}" install || die "failed to install"
- emake install DESTDIR="${D}" || die "Failed to install"
+ rm "${D}"/etc/pam.d/vmtoolsd
+ pamd_mimic_system vmtoolsd auth account
- newinitd "${FILESDIR}/open-vm.initd" vmware-tools
- newconfd "${FILESDIR}/open-vm.confd" vmware-tools
+ 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"
+ 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 '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
}