added vmguestlib pkg-config patch. Bug 309749

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 30 insertions, 111 deletions

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index f0f1d7a70f36..c4e74aed5218 100644
--- a/app-emulation/open-vm-tools/ChangeLog
+++ b/app-emulation/open-vm-tools/ChangeLog
@@ -1,6 +1,18 @@
 # 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.33 2010/03/11 20:31:21 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.34 2010/03/16 16:23:03 vadimk Exp $
+
+*open-vm-tools-0.0.20100223.236320-r1 (16 Mar 2010)
+*open-vm-tools-0.0.20091216.217847-r2 (16 Mar 2010)
+
+  16 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  -open-vm-tools-0.0.20091015.201664.ebuild,
+  -open-vm-tools-0.0.20091216.217847-r1.ebuild,
+  +open-vm-tools-0.0.20091216.217847-r2.ebuild,
+  -open-vm-tools-0.0.20100223.236320.ebuild,
+  +open-vm-tools-0.0.20100223.236320-r1.ebuild,
+  +files/vmguestlib-pkg-config.patch:
+  added vmguestlib pkg-config patch. Bug 309749
 
   11 Mar 2010; Tristan Heaven <nyhm@gentoo.org>
   open-vm-tools-0.0.20100223.236320.ebuild:
diff --git a/app-emulation/open-vm-tools/files/vmguestlib-pkg-config.patch b/app-emulation/open-vm-tools/files/vmguestlib-pkg-config.patch
new file mode 100644
index 000000000000..6b125a1c91c7
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/vmguestlib-pkg-config.patch
@@ -0,0 +1,12 @@
+diff --git a/libguestlib/vmguestlib.pc.in b/libguestlib/vmguestlib.pc.in
+index 815d897..9fae5fd 100644
+--- a/libguestlib/vmguestlib.pc.in
++++ b/libguestlib/vmguestlib.pc.in
+@@ -1,5 +1,7 @@
+ # VMware GuestLib pkgconfig data.
+ 
++prefix=@prefix@
++exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20091015.201664.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20091015.201664.ebuild
deleted file mode 100644
index 65676d06d16c..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20091015.201664.ebuild
+++ /dev/null
@@ -1,107 +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.20091015.201664.ebuild,v 1.3 2009/11/10 16:51:16 vadimk Exp $
-
-EAPI="2"
-
-inherit eutils 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 +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 )
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use unity && ! use xinerama && die 'The Unity USE flag requires USE="xinerama" as well'
-
-	enewgroup vmware
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/default-scripts1.patch"
-	epatch "${FILESDIR}/checkvm-pie-safety.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_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_with pic) \
-		$(use_enable unity) \
-		$(use_enable xinerama multimon)
-}
-
-src_compile() {
-	emake || die "failed to compile"
-}
-
-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.20091216.217847-r1.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20091216.217847-r2.ebuild
index f67119cd2530..87eb327f73fb 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20091216.217847-r1.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20091216.217847-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.20091216.217847-r1.ebuild,v 1.1 2010/01/02 15:03:02 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20091216.217847-r2.ebuild,v 1.1 2010/03/16 16:23:03 vadimk Exp $
 
 EAPI="2"
 
@@ -62,6 +62,7 @@ pkg_setup() {
 src_prepare() {
 	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"
 	sed -i -e 's:\(TEST_PLUGIN_INSTALLDIR=\).*:\1\$libdir/open-vm-tools/plugins/tests:g' configure || die "sed test_plugin_installdir failed"
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20100223.236320.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20100223.236320-r1.ebuild
index d30777f96e6a..f5e9d6fe805f 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20100223.236320.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20100223.236320-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.20100223.236320.ebuild,v 1.2 2010/03/11 20:31:21 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20100223.236320-r1.ebuild,v 1.1 2010/03/16 16:23:03 vadimk Exp $
 
 EAPI="2"
 
-inherit eutils multilib pam versionator
+inherit eutils pam versionator
 
 MY_DATE="$(get_version_component_range 3)"
 MY_BUILD="$(get_version_component_range 4)"
@@ -62,6 +62,7 @@ pkg_setup() {
 src_prepare() {
 	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"
 	# Do not filter out Werror
 	# Upstream Bug  http://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708