Switch amd64 to multilib since hulu no longer works with 64bit flash.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 83 insertions, 4 deletions

diff --git a/media-tv/huludesktop/ChangeLog b/media-tv/huludesktop/ChangeLog
index fe4baebc2e72..80594fc1d1a3 100644
--- a/media-tv/huludesktop/ChangeLog
+++ b/media-tv/huludesktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/huludesktop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/huludesktop/ChangeLog,v 1.3 2010/06/20 23:30:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/huludesktop/ChangeLog,v 1.4 2010/08/11 05:28:09 vapier Exp $
+
+*huludesktop-0.9.7-r2 (11 Aug 2010)
+
+  11 Aug 2010; Mike Frysinger <vapier@gentoo.org> +huludesktop-0.9.7-r2.ebuild,
+  files/huludesktop:
+  Switch amd64 to multilib since hulu no longer works with 64bit flash.
 
 *huludesktop-0.9.7-r1 (20 Jun 2010)
 
diff --git a/media-tv/huludesktop/files/huludesktop b/media-tv/huludesktop/files/huludesktop
index b36fbaa143ad..fbfefed23be1 100755
--- a/media-tv/huludesktop/files/huludesktop
+++ b/media-tv/huludesktop/files/huludesktop
@@ -1,8 +1,32 @@
 #!/bin/sh
-if [ ! -e ~/.huludesktop ] ; then
-	cat <<-EOF > ~/.huludesktop
+
+config_file=$(echo ~/.huludesktop)
+
+# 64bit support is dead ;(
+find_flash()
+{
+	for d in \
+		/usr/lib32/nsbrowser/plugins \
+		/usr/lib/nsbrowser/plugins \
+	; do
+		f="${d}/libflashplayer.so"
+		[ -e "${f}" ] && echo ${f} && return 0
+	done
+	echo ${f}
+}
+
+if [ ! -e ${config_file} ] ; then
+	# Create a stub file for people
+	cat <<-EOF > ${config_file}
 	[flash]
-	flash_location = /opt/netscape/plugins/libflashplayer.so
+	flash_location = $(find_flash)
 	EOF
+else
+	# Update the config file on the fly
+	curr_flash=$(awk '$1 == "flash_location" { print $NF }' ${config_file})
+	if [ ! -e "${curr_flash}" ] ; then
+		sed -i "/^flash_location/s:=.*:= $(find_flash):" ${config_file}
+	fi
 fi
+
 exec /opt/bin/huludesktop.bin "$@"
diff --git a/media-tv/huludesktop/huludesktop-0.9.7-r2.ebuild b/media-tv/huludesktop/huludesktop-0.9.7-r2.ebuild
new file mode 100644
index 000000000000..2143bd4777d8
--- /dev/null
+++ b/media-tv/huludesktop/huludesktop-0.9.7-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/huludesktop/huludesktop-0.9.7-r2.ebuild,v 1.1 2010/08/11 05:28:09 vapier Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Hulu desktop"
+HOMEPAGE="http://www.hulu.com/labs/hulu-desktop-linux"
+SRC_URI="http://download.hulu.com/${PN}_i386.deb -> ${P}_i386.deb"
+
+LICENSE="Hulu-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lirc"
+RESTRICT="mirror strip"
+
+RDEPEND="sys-libs/glibc
+	www-plugins/adobe-flash
+	!amd64? (
+		sys-libs/zlib
+		x11-libs/gtk+:2
+		dev-libs/glib:2
+		lirc? ( app-misc/lirc )
+	)
+	amd64? (
+		app-emulation/emul-linux-x86-baselibs
+		app-emulation/emul-linux-x86-gtklibs
+	)"
+
+QA_EXECSTACK="opt/bin/huludesktop.bin"
+
+src_unpack() {
+	unpack ${A} ./data.tar.gz
+}
+
+src_install() {
+	insinto /etc/${PN}
+	doins etc/${PN}/hd_keymap.ini || die
+
+	into /opt
+	dobin "${FILESDIR}"/${PN} || die
+	newbin usr/bin/${PN} ${PN}.bin || die
+
+	domenu usr/share/applications/${PN}.desktop || die
+	doicon usr/share/pixmaps/${PN}.png || die
+	dodoc usr/share/doc/${PN}/README
+}