added vmguestlib pkg-config patch. Bug 309749

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index f0f1d7a70f361a2e98caff77a98838873d65e470..c4e74aed521831b689304ba13bfe181940b375b3 100644 (file)
--- 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/Manifest b/app-emulation/open-vm-tools/Manifest
index a55c65de6bc2bc39d0a81cafb779ea08a59bcee8..0015d11a6950583f4a65824f6682c22f838cab02 100644 (file)
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX checkvm-pie-safety.patch 2043 RMD160 c73a1e3afe0085d26d7814410bc26fb8ea5062e7 SHA1 1b86588a3447b09924751ef38b914912d671f4b5 SHA256 e3e27f36c8ffad08b3ca038d9ebb13c5d1b36e003fb9a7d8eaa265fde802b1e0
 AUX default-scripts.patch 3525 RMD160 7c3dfd342be245531493a9cf7a8be2be4c67dc4b SHA1 56ba6ca91262f73732a7d806a9c812aea683c2d2 SHA256 99ad1a202335736c50bbb92432371e522934d1a3347e992158b881cf9f810da6
 AUX default-scripts1.patch 4787 RMD160 3186d91d1f6f840bb7fb2e757b802ba05675894b SHA1 5843708e342b8c57f600a6cbd7d0b12f7f14a35b SHA256 3190fe24e2b03e99fa0b7b9f93d413c7b886138c1e964ca7917a45099f29609e
@@ -9,25 +6,17 @@ AUX open-vm-tools.initd 1879 RMD160 bfccf434f969272b5c910b7c8e5b90de223ff410 SHA
 AUX open-vm.confd 88 RMD160 5e398024e72a871f258d73e09f02e37a815443b0 SHA1 56133c21c6d29243ac81a9c1ada61616778f3ce2 SHA256 180a2b6d9d18af319b79b2ca6ebf1020b63e5ebf2f601a63c1a9f9f7d2e0b95c
 AUX open-vm.initd 1875 RMD160 9d2cc36fd93e70ae20eecd49b10c4da0e09aad69 SHA1 1702f267d32ca138e0e99d9ed86b4abc32cc3997 SHA256 1799b78836441b389de0b3d92aad80fcf020fe8b57da4f6d6999f86ee87f51bf
 AUX tools.conf 21 RMD160 88b5b8c8e088333e9c00b2e1c3f3572553342e7b SHA1 42a670b887751dbe9317624dd11068390d1780b0 SHA256 05dcb62e54991ca5546066e4d04b50be98fb0cc229168d4d73df8cf8a94c068c
+AUX vmguestlib-pkg-config.patch 314 RMD160 67aebad0f0fe06c68d1e816c00b5499c6758134e SHA1 1df5e5c116333cf25eb7614316e1d92d4ea8a325 SHA256 69a40f99d85604492595ce3501641dbf8077a7ea96e2516f49b8f798685a04b3
 AUX xautostart.conf 59 RMD160 ca1ea3f1b82caa6e97d94835d88a39a6f153ff7a SHA1 92ba86e426fdaa3de1a8aad56db2d2ac358949a1 SHA256 13398e0ffcd7005bc8c92f3cd62865d2601e52fc980a4702fa252bef5c1efcc7
 DIST open-vm-tools-2009.06.18-172495.tar.gz 3424675 RMD160 7fceacdc3e2e1857a85fd348625ed906383bb52f SHA1 3f2273e2366dc8bca60a3f84e0933580aa4c066d SHA256 27d529553c9a62172876a9a88289102d77bc6307b6fc10b7a2bc17cbbb54251e
 DIST open-vm-tools-2009.07.22-179896.tar.gz 3455624 RMD160 5d6b7bc27cf93061d6fb250db8271c8891699721 SHA1 66aae7773445dc3589420278b0b55bc8a107cb5b SHA256 50eff9fc275b2ceb73cac64cd671ddbd0602337c7190cfda85103c290805a556
 DIST open-vm-tools-2009.08.24-187411.tar.gz 3516336 RMD160 7fde99197565895617ce03677a5803f4b3835462 SHA1 8749f71ea02767e2ea04ac0f66762b5cdc1398dc SHA256 703544111a7c01adfc7c4d81f0d9c783a5d56edff40c0eb5f32410390357f6f5
-DIST open-vm-tools-2009.10.15-201664.tar.gz 3507956 RMD160 14a26a7423c97398afe007902ffd50b90328dd38 SHA1 f678d96dad4107c811f312a8bb1da97127b96ce3 SHA256 2a70d2ed605b898192def775958b596c7c4f26dc02de30165a3325af18e16ff5
 DIST open-vm-tools-2009.12.16-217847.tar.gz 3557356 RMD160 ed473e82672178acb2de4c9d8fcd95dd6655735f SHA1 6bf9dc1441415ccad6fcfb1cfccaf75c64d05424 SHA256 55554d22a9733532416e76eaa7ff1bad68f4b695fb75d03dfa3fb6bf32210ace
 DIST open-vm-tools-2010.02.23-236320.tar.gz 3504028 RMD160 b8ede0e98beab10aab1212835cb452566f026854 SHA1 f6825c62dbdb414a16b326fcdab5bdf7dd618d9e SHA256 e7f170636de4905fb0947f2cbc84289f690529551fb81860f240ef884f40d42c
 EBUILD open-vm-tools-0.0.20090618.172495-r2.ebuild 3466 RMD160 b33bc77efed16056d6b38ef02eaf155f93eb8b7d SHA1 7ef10f905fbabee15fbac540cccaf7bf6065b271 SHA256 1ad2cc59a03d9925b0049f72acbd3ed8436cdd911ab46c15b3a7c6839cec09a7
 EBUILD open-vm-tools-0.0.20090722.179896.ebuild 3465 RMD160 19a673371becafdbcf2852114a877194eb8421fc SHA1 9b4969677bdc5c131efa9d156ad3550a9322265f SHA256 dcce2a06acf2da73513a42b40d1e08283e303995e73d6e859120d88c767a787d
 EBUILD open-vm-tools-0.0.20090824.187411.ebuild 3177 RMD160 c8be53e80ede486579201fe0bc8b54cc73dc67b0 SHA1 239de3201de177505bd580e1ea5f55e3b5ab6830 SHA256 4769a6f8b250aa2e6029949a4d7454790bbd991fefd060f46e14d777adce3496
-EBUILD open-vm-tools-0.0.20091015.201664.ebuild 2703 RMD160 768b229f9e34b5c8ce444442e100804fa1eaa9de SHA1 20a180a625209c357de1474268a07e7896d3dfdb SHA256 09b9add390b04ff09b93b0a44499d4a116241d0e45edba72722272db7eb40d7e
-EBUILD open-vm-tools-0.0.20091216.217847-r1.ebuild 3004 RMD160 612b86e1254db279226e08cef012806d4ec1bf87 SHA1 a3de5a94a45c4f92aa731e562951564975a01625 SHA256 6879f99e5416433cd09f74e3544b27c0303de3454f20ac0a9ac11feddd8dbdbf
-EBUILD open-vm-tools-0.0.20100223.236320.ebuild 3139 RMD160 357c640b3867c3e3896ebd8c61fd81d09519bbe1 SHA1 59213c5cf07f7ca68d660012cc008ed1a920b2c4 SHA256 234a8de68f45df79ded8a7ef3ace4881c56526a8bc12876593a96de7d7be24a0
-MISC ChangeLog 7030 RMD160 ea2ad29fb88122bb4a2d53d3a61aa1e03c09fa36 SHA1 a7edf3651c30e707d8a3077ae898e90a44153f85 SHA256 3012a79481404307215a9e99d53212e0ecbcbfe2583817e415d85edc20ac9271
+EBUILD open-vm-tools-0.0.20091216.217847-r2.ebuild 3054 RMD160 b7fd4b0c94cc1591636769a6b497c363b95b5b63 SHA1 fb244c8c6b2441ad7e33e98eeab5a308ec7bfbfd SHA256 6d41a444a8e24bcd16e398449745b2b8b4b94a03b43f9967d133db890d035141
+EBUILD open-vm-tools-0.0.20100223.236320-r1.ebuild 3185 RMD160 2b023dbb503a257582f56c12b1e68309b7d3251b SHA1 2e1380e67a592ec5ee1b3cf8d67e8db1205fc4c3 SHA256 2be3c8f12dd7eb68d6461aef955e7b129bc38c5fe37256c8bbc86ad303d478f5
+MISC ChangeLog 7509 RMD160 09559a428d4cafec7f9214ee8c3473d0f8bac595 SHA1 a2b22c5ffcf18a644544d63224a4f40fc1ed765b SHA256 3946b23a1a3877a540b8929e0da677888197e6a86a0d3ecbc49db716d140202c
 MISC metadata.xml 791 RMD160 55a935bb194818c26471ad7e551dbffa1df2fc1c SHA1 cac933fef6a9eedc65a3d96f4edd117432bcbb2e SHA256 ac4e805eb85bb369b37f3381a6271a5bae8739b42465f64ee168cdc9683738d7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuZUx8ACgkQdz7hIScOURFKFwCgwAu5q3BPonQCPYCzFbnROdTm
-UyQAn0S6RtuQJ5d5jhVfIzc8heJvnQxg
-=V0nL
------END PGP SIGNATURE-----

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 (file)
index 0000000..6b125a1
--- /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 (file)
index 65676d0..0000000
--- 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
similarity index 95%
rename from app-emulation/open-vm-tools/open-vm-tools-0.0.20091216.217847-r1.ebuild
rename to app-emulation/open-vm-tools/open-vm-tools-0.0.20091216.217847-r2.ebuild
index f67119cd2530a7a2e72fca542d8c0cf9aff28113..87eb327f73fbf8269e61e722c0ecb0b05b2a3170 100644 (file)
--- 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
similarity index 94%
rename from app-emulation/open-vm-tools/open-vm-tools-0.0.20100223.236320.ebuild
rename to app-emulation/open-vm-tools/open-vm-tools-0.0.20100223.236320-r1.ebuild
index d30777f96e6a019203f3e0969331b58aaf740613..f5e9d6fe805f32e6564fe9c8299ecd69b665a44c 100644 (file)
--- 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