WIP

svn path=/; revision=121

7 files changed, 352 insertions, 3 deletions

diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.17.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.17.ebuild
new file mode 100644
index 0000000..e9a9a69
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.17.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.15-r1.ebuild,v 1.1 2006/10/17 09:21:11 ikelos Exp $
+
+KEYWORDS="~x86 ~amd64"
+VMWARE_VER="VME_S1B1"
+
+inherit vmware-mod
+
+VMWARE_MODULE_LIST="vmmon vmnet vmblock"
+SRC_URI="mirror://vmware/software/wkst/VMware-workstation-6.0.0-45731.i386.tar.gz
+	http://download.softpedia.ro/linux/VMware-workstation-6.0.0-45731.i386.tar.gz"
+VMWARE_MOD_DIR="vmware-distrib/lib/modules/source/"
+
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
new file mode 100644
index 0000000..544d319
--- /dev/null
+++ b/app-emulation/vmware-workstation/Manifest
@@ -0,0 +1,2 @@
+DIST VMware-workstation-6.0.0-45731.i386.tar.gz 190053947 RMD160 cb20bebe843ef7ae6b0fe3155b61bd8d29fbdaa2 SHA1 2daa71872b1e03f01843a918c7301c7b577585a7 SHA256 6781820f88c2321ecd9fe12f1a228703717b92447565cef40648789dde06e698
+EBUILD vmware-workstation-6.0.0.45731.ebuild 3212 RMD160 5720638a842d5fd99518360df2e5ad82ca57c844 SHA1 fad30b72489e1863724e5136cbd1c1efd27dc83b SHA256 d5f57c66cb8d165d740f293fc8cbb86aa562931aac096a687e9ad7af959bb1c7
diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.0.0.45731.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.0.0.45731.ebuild
new file mode 100644
index 0000000..700a6c8
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-6.0.0.45731.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.3.34685.ebuild,v 1.4 2006/12/14 18:35:44 wolf31o2 Exp $
+
+inherit vmware eutils versionator
+
+MY_PN="VMware-workstation-$(replace_version_separator 3 - $PV)"
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
+SRC_URI="
+	x86? ( 
+		mirror://vmware/software/wkst/${MY_PN}.i386.tar.gz
+		http://download.softpedia.ro/linux/${MY_PN}.i386.tar.gz
+	)"
+#	amd64? (
+#		mirror://vmware/software/wkst/${MY_PN}.x86_64.tar.gz
+#		http://download.softpedia.ro/linux/${MY_PN}.x86_64.tar.gz
+#	)"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+RESTRICT="strip"
+
+# No any-any update needed for vmware-workstation 6
+ANY_ANY=""
+
+# vmware-workstation should not use virtual/libc as this is a 
+# precompiled binary package thats linked to glibc.
+RDEPEND="sys-libs/glibc
+	amd64? (
+		x11-libs/libXrandr
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXi
+		x11-libs/libview
+		dev-cpp/libsexymm
+		dev-cpp/cairomm
+		dev-cpp/libgnomecanvasmm
+		virtual/xft )
+	x86? (
+		x11-libs/libXrandr
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXi
+		x11-libs/libview
+		dev-cpp/libsexymm
+		virtual/xft )
+	!app-emulation/vmware-player
+	!app-emulation/vmware-server
+	~app-emulation/vmware-modules-1.0.0.17
+	!<app-emulation/vmware-modules-1.0.0.17
+	!>=app-emulation/vmware-modules-1.0.0.18
+	>=dev-lang/perl-5
+	sys-apps/pciutils"
+
+S="${WORKDIR}"/vmware-distrib
+
+RUN_UPDATE="no"
+
+dir=/opt/vmware/workstation
+Ddir=${D}/${dir}
+
+QA_TEXTRELS_x86="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0"
+QA_EXECSTACK_x86="${dir:1}/bin/vmnet-bridge
+	${dir:1}/bin/vmnet-dhcpd
+	${dir:1}/bin/vmnet-natd
+	${dir:1}/bin/vmnet-netifup
+	${dir:1}/bin/vmnet-sniffer
+	${dir:1}/bin/vmware-loop
+	${dir:1}/bin/vmware-ping
+	${dir:1}/bin/vmware-vdiskmanager
+	${dir:1}/lib/bin/vmware
+	${dir:1}/lib/bin/vmware-vmx
+	${dir:1}/lib/bin/vmrun
+	${dir:1}/lib/bin/vmplayer
+	${dir:1}/lib/bin-debug/vmware-vmx
+	${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1"
+
+QA_TEXTRELS_amd64="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0"
+QA_EXECSTACK_amd64="${dir:1}/bin/vmnet-bridge
+	${dir:1}/bin/vmnet-dhcpd
+	${dir:1}/bin/vmnet-natd
+	${dir:1}/bin/vmnet-netifup
+	${dir:1}/bin/vmnet-sniffer
+	${dir:1}/bin/vmware-loop
+	${dir:1}/bin/vmware-ping
+	${dir:1}/bin/vmware-vdiskmanager
+	${dir:1}/lib/bin/vmware
+	${dir:1}/lib/bin/vmware-vmx
+	${dir:1}/lib/bin/vmrun
+	${dir:1}/lib/bin/vmplayer
+	${dir:1}/lib/bin-debug/vmware-vmx
+	${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1"
+
+pkg_setup() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+	vmware_pkg_setup
+}
+
+src_install() {
+	vmware_src_install
+
+	doicon lib/share/pixmaps/vmware-player.png
+	make_desktop_entry vmware "VMWare Workstation" ${PN}.png System
+	make_desktop_entry vmplayer "VMWare Player" vmware-player.png System
+
+	# Nasty hack to ensure the EULA is included
+	insinto /opt/vmware/workstation/lib/share
+	newins doc/EULA EULA.txt
+}
diff --git a/games-rpg/secondlife-bin/files/digest-secondlife-bin-1.13.3.2 b/games-rpg/secondlife-bin/files/digest-secondlife-bin-1.13.3.2
deleted file mode 100644
index f3da53b..0000000
--- a/games-rpg/secondlife-bin/files/digest-secondlife-bin-1.13.3.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9800068b0a06ae5370633fafa57eae10 SecondLife_i686_1_13_3_2.tar.bz2 40863936
-RMD160 6b2ec9dcd94b2fafa923b606e46eec74bbab4538 SecondLife_i686_1_13_3_2.tar.bz2 40863936
-SHA256 db181dc52b31e91982bfed2e19678dfca21434a795fefd3dba06bdcf9fdc30a8 SecondLife_i686_1_13_3_2.tar.bz2 40863936
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
new file mode 100644
index 0000000..05ba009
--- /dev/null
+++ b/x11-libs/wxGTK/Manifest
@@ -0,0 +1,4 @@
+AUX socketfix.patch 1034 RMD160 d04b4d76a5ea104b27eda6b88f5932c7dacc459a SHA1 9388f32a91366149d826f9c97766aacb7d8d75bf SHA256 0e7ddd814b9dc6ebf59a310c222602df29cfad2b1659bd97b30caf55887fa6ef
+DIST wxPython-src-2.8.3.0.tar.bz2 25004220 RMD160 f958cc7a3523b66c46d61c77c20b39280f008e68 SHA1 bcb931d00f3f5a218b8806bba8ba7424cbd08605 SHA256 086f8efa6ca7378463293226c39bd3ce17a7534e42651abbc2d9f8a00a260acb
+DIST wxWidgets-2.8.3-HTML.tar.gz 1754449 RMD160 f9f39ee33d3ccd4b200ee853777349ae2c505117 SHA1 046bc7ab5b5e881cf8d5120238aaa3f4d5d8948d SHA256 e4828c0a4f86681c152486b6f47d13e87052ea94a8a6b0e55526d699e21fe7fb
+EBUILD wxGTK-2.8.3.0.ebuild 5229 RMD160 3a53e29708e6da970a76ee3aea23c2257b962f12 SHA1 a01982ada3888e9b292a2db14c0671786722b8a2 SHA256 ca7c34603ab80a8f3cae16de82b48ac2c2170025349922b5e340692036b42fdb
diff --git a/x11-libs/wxGTK/files/socketfix.patch b/x11-libs/wxGTK/files/socketfix.patch
new file mode 100644
index 0000000..bf694da
--- /dev/null
+++ b/x11-libs/wxGTK/files/socketfix.patch
@@ -0,0 +1,29 @@
+Index: src/unix/gsocket.cpp
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/unix/gsocket.cpp,v
+retrieving revision 1.67.2.2
+diff -u -r1.67.2.2 gsocket.cpp
+--- src/unix/gsocket.cpp	2007/03/17 02:15:29	1.67.2.2
++++ src/unix/gsocket.cpp	2007/03/25 19:28:24
+@@ -1168,17 +1168,16 @@
+     else
+       ret = Recv_Dgram(buffer, size);
+ 
+-    /* If recv returned zero, then the connection is lost, and errno is not set.
++    /* If recv returned zero, then the connection has been gracefully closed.
+      * Otherwise, recv has returned an error (-1), in which case we have lost the
+      * socket only if errno does _not_ indicate that there may be more data to read.
+      */
+     if (ret == 0)
+     {
+-      m_error = GSOCK_IOERR;
++      /* Make sure wxSOCKET_LOST event gets sent */
+       m_detected = GSOCK_LOST_FLAG;
+-      Close();
+-      // Signal an error for return
+-      return -1;
++      Detected_Read();
++      return 0;
+     }
+     else if (ret == -1)
+     {
diff --git a/x11-libs/wxGTK/wxGTK-2.8.3.0.ebuild b/x11-libs/wxGTK/wxGTK-2.8.3.0.ebuild
new file mode 100644
index 0000000..c5afd02
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.8.3.0.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils flag-o-matic multilib toolchain-funcs versionator
+
+HTML_PV="$(get_version_component_range 1-3)"
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and wxbase non-gui library"
+
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+		doc? ( mirror://sourceforge/wxwindows/wxWidgets-${HTML_PV}-HTML.tar.gz )"
+
+SLOT="2.8"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc gnome joystick odbc opengl sdl stl unicode X gif"
+LICENSE="wxWinLL-3"
+HOMEPAGE="http://www.wxwidgets.org"
+
+# Note 1: Gettext is not runtime dependency even if nls? because wxWidgets
+#         has its own implementation of it
+# Note 2: PCX support is enabled if the correct libraries are detected.
+#         There is no USE flag for this.
+
+RDEPEND="X? ( opengl? ( virtual/opengl )
+		>=x11-libs/gtk+-2.0
+		>=dev-libs/glib-2.0
+		media-libs/tiff
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		gnome? ( >=gnome-base/libgnomeprintui-2.8 ) )
+	odbc? ( dev-db/unixODBC )
+	x86? ( sdl? ( >=media-libs/libsdl-1.2 ) )
+	amd64? ( sdl? ( >=media-libs/libsdl-1.2 ) )
+	ppc? ( sdl? ( >=media-libs/libsdl-1.2 ) )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	X? (
+		x11-proto/xproto
+		x11-proto/xineramaproto
+		x11-proto/xf86vidmodeproto
+	   )"
+
+S=${WORKDIR}/wxPython-src-${PV}
+HTML_S=${WORKDIR}/wxWidgets-${HTML_PV}
+
+# Configure a build.
+# It takes three parameters;
+# $1: prefix for the build directory (used for wxGTK which has two
+#     builds needed.
+# $2: "unicode" if it must be build with else ""
+# $3: all the extra parameters to pass to configure script
+configure_build() {
+	export LANG='C'
+
+	mkdir ${S}/$1_build
+	cd ${S}/$1_build
+	# odbc works with ansi only:
+	subconfigure $3 $(use_with odbc)
+	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake failed"
+	#wxbase has no contrib:
+	if [[ -e contrib/src ]]; then
+		cd contrib/src
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake contrib failed"
+	fi
+
+	if [[ "$2" == "unicode" ]] && use unicode; then
+		mkdir ${S}/$1_build_unicode
+		cd ${S}/$1_build_unicode
+		subconfigure $3 --enable-unicode
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "Unicode emake failed"
+		if [[ -e contrib/src ]]; then
+			cd contrib/src
+			emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "Unicode emake contrib failed"
+		fi
+	fi
+}
+
+# This is a commodity function which calls configure script
+# with the default parameters plus extra parameters. It's used
+# as building the unicode version required redoing it.
+# It takes all the params and passes them to the script
+subconfigure() {
+	ECONF_SOURCE="${S}" \
+		econf \
+			--with-zlib \
+			$(use_enable debug) $(use_enable debug debug_gdb) \
+			$* || die "./configure failed"
+}
+
+# Installs a build
+# It takes only a parameter: the prefix for the build directory
+# see configure_build function
+install_build() {
+	cd ${S}/$1_build
+	einstall libdir="${D}/usr/$(get_libdir)" || die "Install failed"
+	if [[ -e contrib ]]; then
+		cd contrib/src
+		einstall libdir="${D}/usr/$(get_libdir)" || die "Install contrib failed"
+	fi
+	if [[ -e ${S}/$1_build_unicode ]]; then
+		cd ${S}/$1_build_unicode
+		einstall libdir="${D}/usr/$(get_libdir)" || die "Unicode install failed"
+		cd contrib/src
+		einstall libdir="${D}/usr/$(get_libdir)" || die "Unicode install contrib failed"
+	fi
+}
+
+pkg_setup() {
+	if use X; then
+		elog "To install only wxbase (non-gui libs) use USE=-X"
+	else
+		elog "To install GUI libraries, in addition to wxbase, use USE=X"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/socketfix.patch"
+#	epatch "${FILESDIR}/${P}-wxrc_build_fix.patch"
+#	epatch "${FILESDIR}/${P}-dialog_focus.patch"
+#	epatch "${FILESDIR}/${P}-slider_linesize.patch"
+#
+#	# Reverse apply patch in wxPython tarball that breaks ABI
+#	EPATCH_OPTS="-R" epatch "${S}/patches/listctrl-ongetitemcolumnimage.patch"
+}
+
+src_compile() {
+	gnuconfig_update
+	append-flags -fno-strict-aliasing
+	myconf="${myconf}
+		$(use_with sdl)
+		$(use_enable joystick)"
+
+	if use X; then
+		myconf="${myconf}
+			$(use_enable opengl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)"
+	fi
+	if use stl; then 
+		myconf="${myconf}
+		$(use_enable stl)"
+	fi
+
+	if use gif; then 
+		myconf="${myconf}
+			$(use_enable gif)"
+	else
+		myconf="${myconf}
+		$(use_disable gif)"
+	fi
+
+
+	use X && configure_build gtk2 unicode "${myconf} --with-gtk=2"
+	use X || configure_build base unicode "${myconf} --disable-gui"
+}
+
+src_install() {
+	use X && install_build gtk2
+	use X || install_build base
+
+	cp ${D}/usr/bin/wx-config ${D}/usr/bin/wx-config-2.8 || die "Failed to cp wx-config"
+
+	# In 2.6 all wx-config*'s go in/usr/lib/wx/config
+	# Only install wx-config if 2.4 is not installed:
+	if [ -e "/usr/bin/wx-config" ]; then
+		if [ "$(/usr/bin/wx-config --release)" = "2.4" ]; then
+			rm ${D}/usr/bin/wx-config
+		fi
+	fi
+
+	dodoc ${S}/docs/changes.txt
+	dodoc ${S}/docs/gtk/readme.txt
+
+	if use doc; then
+		dohtml -r ${HTML_S}/docs/html/*
+	fi
+}
+
+pkg_postinst() {
+	elog "dev-libs/wxbase has been removed from portage."
+	elog "wxBase is installed with wxGTK, as one of many libraries."
+	elog "If only wxBase is wanted, -X USE flag may be specified."
+}