Restore native 64bit support and make it easier to switch between multilib & non-multilib versions.

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

3 files changed, 97 insertions, 5 deletions

diff --git a/media-tv/huludesktop/ChangeLog b/media-tv/huludesktop/ChangeLog
index 3cb7cbefc2f6..0379d856e37e 100644
--- a/media-tv/huludesktop/ChangeLog
+++ b/media-tv/huludesktop/ChangeLog
@@ -1,6 +1,13 @@
 # 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.5 2010/08/14 04:15:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/huludesktop/ChangeLog,v 1.6 2010/09/18 09:44:46 vapier Exp $
+
+*huludesktop-0.9.8-r1 (18 Sep 2010)
+
+  18 Sep 2010; Mike Frysinger <vapier@gentoo.org> +huludesktop-0.9.8-r1.ebuild,
+  files/huludesktop:
+  Restore native 64bit support and make it easier to switch between multilib &
+  non-multilib versions.
 
 *huludesktop-0.9.8 (14 Aug 2010)
 
diff --git a/media-tv/huludesktop/files/huludesktop b/media-tv/huludesktop/files/huludesktop
index fbfefed23be1..114262473891 100755
--- a/media-tv/huludesktop/files/huludesktop
+++ b/media-tv/huludesktop/files/huludesktop
@@ -1,20 +1,37 @@
 #!/bin/sh
 
+hulu="/opt/bin/huludesktop.bin"
 config_file=$(echo ~/.huludesktop)
 
-# 64bit support is dead ;(
+is_64bit()
+{
+	case $(file -L "$1") in
+		*32-bit*) ;; # fall through
+		*64-bit*) echo 64; return 0 ;;
+		*) echo "unable to detect bitsize of $1" 1>&2 ;;
+	esac
+	echo 32
+	return 1
+}
+
 find_flash()
 {
 	for d in \
 		/usr/lib32/nsbrowser/plugins \
 		/usr/lib/nsbrowser/plugins \
+		/usr/lib64/nsbrowser/plugins \
 	; do
 		f="${d}/libflashplayer.so"
-		[ -e "${f}" ] && echo ${f} && return 0
+		if [ -e "${f}" ] && [ ${bit_hulu} = $(is_64bit "${f}") ] ; then
+			echo ${f}
+			return 0
+		fi
 	done
 	echo ${f}
 }
 
+bit_hulu=$(is_64bit ${hulu})
+
 if [ ! -e ${config_file} ] ; then
 	# Create a stub file for people
 	cat <<-EOF > ${config_file}
@@ -24,8 +41,12 @@ if [ ! -e ${config_file} ] ; then
 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}
+	if [ ! -e "${curr_flash}" ] || [ ${bit_hulu} != $(is_64bit "${curr_flash}") ] ; then
+		new_flash=$(find_flash)
+		echo "Updating flash path:"
+		echo "  old: ${curr_flash}"
+		echo "  new: ${new_flash}"
+		sed -i "/^flash_location/s:=.*:= ${new_flash}:" ${config_file}
 	fi
 fi
 
diff --git a/media-tv/huludesktop/huludesktop-0.9.8-r1.ebuild b/media-tv/huludesktop/huludesktop-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..5b53d9c31766
--- /dev/null
+++ b/media-tv/huludesktop/huludesktop-0.9.8-r1.ebuild
@@ -0,0 +1,64 @@
+# 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.8-r1.ebuild,v 1.1 2010/09/18 09:44:46 vapier Exp $
+
+# since 64bit flash availability is up in the air, make it easy
+# to switch to/from multilib in the ebuild
+NATIVE64="y"
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Hulu desktop"
+HOMEPAGE="http://www.hulu.com/labs/hulu-desktop-linux"
+SRC_URI="${NATIVE64:+amd64? ( http://download.hulu.com/${PN}_amd64.deb -> ${P}_amd64.deb )}
+	x86? ( http://download.hulu.com/${PN}_i386.deb -> ${P}_i386.deb )"
+
+LICENSE="Hulu-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lirc"
+RESTRICT="mirror strip"
+
+NATIVE_DEPEND="sys-libs/zlib
+	x11-libs/gtk+:2
+	dev-libs/glib:2
+	lirc? ( app-misc/lirc )"
+RDEPEND="sys-libs/glibc
+	www-plugins/adobe-flash"
+if [[ ${NATIVE64} == "y" ]] ; then
+	RDEPEND+="
+		!amd64? ( ${NATIVE_DEPEND} )
+		amd64? (
+			app-emulation/emul-linux-x86-baselibs
+			app-emulation/emul-linux-x86-gtklibs
+		)"
+else
+	RDEPEND+="
+		${NATIVE_DEPEND}
+		amd64? (
+			=www-plugins/adobe-flash-10.2*
+			=www-plugins/adobe-flash-10.0*
+		)"
+fi
+DEPEND=""
+
+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
+}