Fix creation of desktop item, and GCC version issue.

Package-Manager: portage-2.1.5_rc6

6 files changed, 22 insertions, 101 deletions

diff --git a/app-emulation/vmware-server-console/ChangeLog b/app-emulation/vmware-server-console/ChangeLog
index acd13b6dad2c..2859e26bc540 100644
--- a/app-emulation/vmware-server-console/ChangeLog
+++ b/app-emulation/vmware-server-console/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/vmware-server-console
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server-console/ChangeLog,v 1.28 2008/04/04 06:45:07 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server-console/ChangeLog,v 1.29 2008/04/26 15:40:42 ikelos Exp $
+
+  26 Apr 2008; Mike Auty <ikelos@gentoo.org>
+  -vmware-server-console-1.0.3.44356.ebuild,
+  vmware-server-console-1.0.4.56528.ebuild,
+  vmware-server-console-1.0.5.80187.ebuild:
+  Fix creation of desktop item, and GCC version issue.
 
   04 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
   vmware-server-console-1.0.5.80187.ebuild:
diff --git a/app-emulation/vmware-server-console/Manifest b/app-emulation/vmware-server-console/Manifest
index c90ff6f8fced..13ef1743297c 100644
--- a/app-emulation/vmware-server-console/Manifest
+++ b/app-emulation/vmware-server-console/Manifest
@@ -3,20 +3,18 @@ Hash: SHA1
 
 AUX 90vmware-server-console 76 RMD160 22fed127d20bfb758163443dcbd2879bf1d49be6 SHA1 105e3194c134b752a8d5cef1a23ae621cd835d80 SHA256 ff3abe9d58fd673d8f3d2f7e967aa6db426e3e15b4d868dc1483682357a928b8
 AUX vmware-server-console.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
-DIST VMware-server-linux-client-1.0.3-44356.zip 23355388 RMD160 fed5884dc14c565ad9fb5bd089c951ea9adea79d SHA1 86703bfef17058a360bda0dc4c478d1bcb0fbad2 SHA256 613912cea96209654dfd588ec4369c882de3510036cd0a20ac2467d54593ef83
 DIST VMware-server-linux-client-1.0.4-56528.zip 23337450 RMD160 7183ba1d88c06bf9bbad74b01515f59598e64394 SHA1 f079a037c9291e0537146aad8330d34a1d6533fe SHA256 259b19ea3b5d30d8d5700ca1ba2ff38e4b07ef82685b6dd711ca33f192ce8102
 DIST VMware-server-linux-client-1.0.5-80187.zip 23571694 RMD160 47b60c8ca583687aac3c4ddc4ead0bdb24b8e888 SHA1 46c2d981194617cbf029506147e2802ed52c599e SHA256 141b76eab5c455ace15b7aecffa30ed65a3312457e21d5a8250e8d7dba9519b7
 DIST vmware-libcrypto.so.0.9.7l.tar.bz2 412159 RMD160 89282ae9fc6e8921a47704bc9cd23cf70a6870e8 SHA1 f86c4cb076fe1764975e9243dc0fae763f2b589a SHA256 fae52acf61415959cca763a715a2b61ec49f161a416d418d6a1faffce531db12
 DIST vmware-libssl.so.0.9.7l.tar.bz2 78244 RMD160 195dd4808e60f81621e6ed12b843ded49c0fa747 SHA1 5fe729a1e49e77afd83b408845833174e1296e39 SHA256 3e1e13196066dc5b77d3ef6b5df55a29156eba1f39661e40cd617b538220d089
-EBUILD vmware-server-console-1.0.3.44356.ebuild 2336 RMD160 d70a2591762d91133e0ae56d7b8c64335ab598a2 SHA1 0d606b455be9e705db2ca45c28112286258bd0be SHA256 72774bf1b07211dda792766b642de2ad93f35fd3a10fe38f3fb4c3a1a0b40bb0
-EBUILD vmware-server-console-1.0.4.56528.ebuild 2398 RMD160 6d6ae0b64f6a71fbe8989a0ef8455e096fa0238a SHA1 0bdab94eeae842848a51d95c4d712edaf8f3ce29 SHA256 75e2cf4d9e98206f9b4e48ce13b6ca3f7fc5f239a23c428896bb85cf17d65efb
-EBUILD vmware-server-console-1.0.5.80187.ebuild 2044 RMD160 acec9f0a3fc65ae4818c2f2bd29608eeb11bdda8 SHA1 0f9cf36582caa07a5ec33478d92291d768bdbe55 SHA256 ec0e0955a802e394bf12f267ba72ebf48a053fa9996e20678d4a3aa651088365
-MISC ChangeLog 4965 RMD160 a9b8eaa020bf706ddd5ca80be0dd866288064dd9 SHA1 2d1118b578d53cccde0cf50831895df720808226 SHA256 aa3cdfa5953902b756d9292f6d25cc03dce202976ae085963bc7a69fcb8f0ffa
+EBUILD vmware-server-console-1.0.4.56528.ebuild 2403 RMD160 337645188a731175deb2a93633aac331a8a20e1c SHA1 65ecb87ae1b691d76105ddbba4a50700fc0aff66 SHA256 a333f5a4e83f104d4a74174def0444fac915b96ccf26c0c0f03326907bd782dc
+EBUILD vmware-server-console-1.0.5.80187.ebuild 2150 RMD160 563bc6c4bdef1a0383c45a4bdca9729521ee358f SHA1 6d21cb6f1c0cb5fae1a986730ff4e5ceec612db9 SHA256 036898bfca727eeb99f5c74cf8b730b6c808dfbc4bae309deaf6dc1aa5c2022f
+MISC ChangeLog 5200 RMD160 faeb542e534f79d419505c2da08edc0b43abb83b SHA1 be48afd2790191c97dc215d954704454cd7c5d08 SHA256 28fb046f5554080d678fefcf10a98a01d1d136017d0609901ff4d7a754c2e835
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH9c57NQqtfCuFneMRAiZ3AJ99Qpzbi6kyKHGAYWUUb+NA4V9vSACcD5tr
-/ekwtXOAw8QSZh/3LEqnGfc=
-=1ymQ
+iEYEARECAAYFAkgTTRYACgkQu7rWomwgFXoIEwCZAamsV2+3GJDZ6Q47a3AuUbgL
+qjEAn0UpfOc42xHBty+FYZ2AhPVu+MSY
+=v1fc
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-server-console/vmware-server-console-1.0.3.44356.ebuild b/app-emulation/vmware-server-console/vmware-server-console-1.0.3.44356.ebuild
deleted file mode 100644
index 5929cbc2a521..000000000000
--- a/app-emulation/vmware-server-console/vmware-server-console-1.0.3.44356.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server-console/vmware-server-console-1.0.3.44356.ebuild,v 1.6 2008/02/29 17:43:25 carlo Exp $
-
-# Unlike many other binary packages the user doesn't need to agree to a licence
-# to download VMWare. The agreeing to a licence is part of the configure step
-# which the user must run manually.
-
-inherit eutils versionator vmware
-
-MY_PN=${PN/vm/VM}
-MY_PV=$(replace_version_separator 3 '-')
-MY_P="${MY_PN}-${MY_PV}"
-FN="VMware-server-linux-client-${MY_PV}"
-S="${WORKDIR}/${PN}-distrib"
-
-DESCRIPTION="VMware Remote Console for Linux"
-HOMEPAGE="http://www.vmware.com/"
-SRC_URI="http://download3.vmware.com/software/vmserver/${FN}.zip
-		http://dev.gentoo.org/~wolf31o2/sources/dump/vmware-libssl.so.0.9.7l.tar.bz2
-		mirror://gentoo/vmware-libssl.so.0.9.7l.tar.bz2
-		http://dev.gentoo.org/~wolf31o2/sources/dump/vmware-libcrypto.so.0.9.7l.tar.bz2
-		mirror://gentoo/vmware-libcrypto.so.0.9.7l.tar.bz2"
-
-LICENSE="vmware"
-IUSE=""
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip"
-
-DEPEND=">=sys-libs/glibc-2.3.5
-	virtual/os-headers
-	>=dev-lang/perl-5
-	>=sys-apps/portage-2.0.54
-	app-arch/unzip"
-
-# vmware-server-console should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND=">=sys-libs/glibc-2.3.5
-	amd64? ( app-emulation/emul-linux-x86-gtklibs )
-	!amd64? ( x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXcursor
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst )
-	>=dev-lang/perl-5
-	!<sys-apps/dbus-0.62"
-
-etcdir="/etc/${PN}"
-ANY_ANY=""
-
-src_unpack() {
-	cd "${WORKDIR}"
-	unpack ${A}
-	unpack ./${MY_P}.tar.gz
-	cd "${S}"
-	unpack vmware-libssl.so.0.9.7l.tar.bz2
-	unpack vmware-libcrypto.so.0.9.7l.tar.bz2
-}
-
-src_install() {
-	echo 'libdir = "'${VMWARE_INSTALL_DIR}'/lib"' > etc/config
-	vmware_src_install
-
-	make_desktop_entry ${PN} "VMWare Remote Console" ${PN} System
-
-	dodir /usr/bin
-	dosym ${VMWARE_INSTALL_DIR}/bin/${PN} /usr/bin/${PN}
-}
-
-pkg_config() {
-	einfo "Running ${ROOT}${dir}/bin/vmware-config-server-console.pl"
-	"${ROOT}${dir}/bin/vmware-config-server-console.pl"
-}
diff --git a/app-emulation/vmware-server-console/vmware-server-console-1.0.4.56528.ebuild b/app-emulation/vmware-server-console/vmware-server-console-1.0.4.56528.ebuild
index c1736b7a0121..0609e1766cae 100644
--- a/app-emulation/vmware-server-console/vmware-server-console-1.0.4.56528.ebuild
+++ b/app-emulation/vmware-server-console/vmware-server-console-1.0.4.56528.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server-console/vmware-server-console-1.0.4.56528.ebuild,v 1.6 2008/03/01 12:32:22 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server-console/vmware-server-console-1.0.4.56528.ebuild,v 1.7 2008/04/26 15:40:42 ikelos Exp $
 
 # Unlike many other binary packages the user doesn't need to agree to a licence
 # to download VMWare. The agreeing to a licence is part of the configure step
@@ -76,7 +76,7 @@ src_install() {
 	echo 'libdir = "'${VMWARE_INSTALL_DIR}'/lib"' > etc/config
 	vmware_src_install
 
-	make_desktop_entry ${PN} "VMWare Remote Console" ${PN} System
+	make_desktop_entry ${PN} "VMWare Remote Console" ${PN}.png System
 
 	dodir /usr/bin
 	dosym ${VMWARE_INSTALL_DIR}/bin/${PN} /usr/bin/${PN}
diff --git a/app-emulation/vmware-server-console/vmware-server-console-1.0.5.80187.ebuild b/app-emulation/vmware-server-console/vmware-server-console-1.0.5.80187.ebuild
index c6549755dc62..973f959f221a 100644
--- a/app-emulation/vmware-server-console/vmware-server-console-1.0.5.80187.ebuild
+++ b/app-emulation/vmware-server-console/vmware-server-console-1.0.5.80187.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server-console/vmware-server-console-1.0.5.80187.ebuild,v 1.3 2008/04/04 06:45:07 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server-console/vmware-server-console-1.0.5.80187.ebuild,v 1.4 2008/04/26 15:40:42 ikelos Exp $
 
 # Unlike many other binary packages the user doesn't need to agree to a licence
 # to download VMWare. The agreeing to a licence is part of the configure step
@@ -69,6 +69,8 @@ src_install() {
 	echo 'libdir = "'${VMWARE_INSTALL_DIR}'/lib"' > etc/config
 	vmware_src_install
 
+	# Fix an ugly GCC error on start
+	rm -f "${D}${VMWARE_INSTALL_DIR}/lib/lib/libgcc_s.so.1/libgcc_s.so.1"
 	make_desktop_entry ${PN} "VMWare Remote Console" ${PN}.png System
 
 	dodir /usr/bin
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index 2ba0b7a935b6..e143dfe26b0e 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -13,13 +13,11 @@ AUX general/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5
 AUX vmware-authd 211 RMD160 1bd60030f6f7bb78c0fd3b6d156498121d4be5d4 SHA1 514538222dc4e665e1d450e1bf9bf1d8e03a2b61 SHA256 3eafe9ac10aeac852faa1fbbccb5c525560e358f69964995c5cfb86c53af6b54
 AUX vmware-server.rc 1529 RMD160 d6840024f8c7be0a673e5e29660cc75fea9520d8 SHA1 049cf33eb5bac09415f8e2a85f7ecfd0bbc5ab4a SHA256 ef551e4240eea88184c96e286354a53a4983ce80c3332a127767301b42586cb2
 AUX vmware-server.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
-DIST VMware-server-1.0.3-44356.tar.gz 106604355 RMD160 9a67334367e1f306d71d3fac95da102a75a5a4c3 SHA1 7da5fbdae8c1a77afc9c7693ae187b91cc2ac313 SHA256 b7bb207e61bed71de42b26e9e462ac4dfc168ea66fe93af8109d24fc2dc10abb
 DIST VMware-server-1.0.4-56528.tar.gz 106577920 RMD160 2922bd0e8f5381ce0ddaeec3d03a571f016c84b5 SHA1 c1dce05d64d98cbf0b3f37989e08a82b0b7f3664 SHA256 01335e4f0be83249b6bc72e7683c6dc85a6f127012e7fb5f18dd5c1ef5e62b31
 DIST VMware-server-1.0.5-80187.tar.gz 106920012 RMD160 3d89bdab484cd2c9875ddb777c375ab90a75d2f8 SHA1 459d7681a22a790d5b9495fd6d73a6854af6e01e SHA256 450a0fc8b0589d9baee86312909788f8888fe25ac5258350830f821c8b2e9efb
 DIST vmware-libcrypto.so.0.9.7l.tar.bz2 412159 RMD160 89282ae9fc6e8921a47704bc9cd23cf70a6870e8 SHA1 f86c4cb076fe1764975e9243dc0fae763f2b589a SHA256 fae52acf61415959cca763a715a2b61ec49f161a416d418d6a1faffce531db12
 DIST vmware-libssl.so.0.9.7l.tar.bz2 78244 RMD160 195dd4808e60f81621e6ed12b843ded49c0fa747 SHA1 5fe729a1e49e77afd83b408845833174e1296e39 SHA256 3e1e13196066dc5b77d3ef6b5df55a29156eba1f39661e40cd617b538220d089
 DIST vmware-server-perl-fixed-rpath-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 SHA1 9d696750ca3ec92b31ca8112fd80dcd832494044 SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b
-EBUILD vmware-server-1.0.3.44356.ebuild 3266 RMD160 31fd576a1ca2d9b6b9db02ef6a71a0348731cb89 SHA1 26dfb1177caadcb5a6aeea7f6fd210bdf9d148dc SHA256 580f7762380039624394df7437491b465319bc3e5f02e462e61eac22e858376b
 EBUILD vmware-server-1.0.4.56528.ebuild 3262 RMD160 d3616d549aba38df8b4a46a842811efa571a532c SHA1 e2fa8048a772371398dda1effbedf4169564a03a SHA256 a2f388b163e82b66ef130ea9632c817c967ae60fdc01cab2b2522b18276121f4
 EBUILD vmware-server-1.0.5.80187.ebuild 3004 RMD160 5c1c3ab03afae41541d94e861f073926d8267a3f SHA1 364c93e0820f4efd2327d6cbae02d0ef29657592 SHA256 f0c17110f565620884d4432dbfc1fe15bf355acb93f95aac6a07575d187c3232
 MISC ChangeLog 7333 RMD160 759dc9cfb7326714ba542c66fee9fa4babc46b0d SHA1 4b596a8d3d5d95831e5e543c5024d1277e861b78 SHA256 afacda7fe09d0322d258fb8abd88aa6d96737171ba19a4d05da59f472b06ec3f
@@ -27,7 +25,7 @@ MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgTSawACgkQu7rWomwgFXp1ygCfQ1it3cGw1CShyjhbd/xVC5gv
-hjkAn3hOFmtlfGOQiBFQFuC06h0/xCeE
-=/9R+
+iEYEARECAAYFAkgTTgkACgkQu7rWomwgFXrYBwCfc84bc1UgrbfuPzwCo2bU8pet
+6GAAn0YG5w68C+qKubXv2vcs6zNYaCJC
+=BKsO
 -----END PGP SIGNATURE-----