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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 105 insertions, 14 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/Manifest b/media-tv/huludesktop/Manifest
index 8d5483b720f9..0a93f98e831d 100644
--- a/media-tv/huludesktop/Manifest
+++ b/media-tv/huludesktop/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX huludesktop 663 RMD160 c419c88a08cf0b2e8bfed1ef61e87cb1d9e0fbe5 SHA1 34824ee15b6f0865be3ef6feb9218db62723b697 SHA256 d785a73811f9ed5ce20068baeff92815f6eb2eb6cf108ac84142ee454d0364e0
-DIST huludesktop-0.9.7_i386.deb 612388 RMD160 8f57338062176202297e940e6b93e528e6a1d3b0 SHA1 81ef1ec11100b71c68cec787e4cbf9652c8b57cc SHA256 b62113030b0b7387e90d0aeb52c8e367d53f99957c3fdca07c4c2e745a073ae0
+AUX huludesktop 1130 RMD160 16ddcf44c4fa973cd496e1b095414e3bab4801b1 SHA1 0833a25ecbb7f0cbd524361ba9dd3e3b184a5538 SHA256 7b38b134b235d79d686f80ea357c6a56c0411de218fe4b529f8ffe413ae231da
+DIST huludesktop-0.9.8_amd64.deb 675020 RMD160 f21f354fc73601bf01c180e800e9b06de5a96584 SHA1 e12f0aeab8d419b9372d6ae71c7c309737c66217 SHA256 69a2976d47da3c51c1ddf926589648fdb658198e6328187999ab76d4976d438e
 DIST huludesktop-0.9.8_i386.deb 612520 RMD160 51610d987acfd7ae898572b90653e5323190ff6b SHA1 d3c5332697a1e388d1f4d23095644d9547d79360 SHA256 dab5004362f7f1c4f64db06c610496a33ca8743bf1a72d78e747d8878ac44f59
-EBUILD huludesktop-0.9.7-r2.ebuild 1107 RMD160 f35d657d1f924844ea587831ae57d26d7a2f6cc8 SHA1 54e9260082125777853960b2d08db725545fd07b SHA256 2c81973a18adbd7065dd531fbdaeb19949e1291e8a7052275313196a7a9c0dc2
-EBUILD huludesktop-0.9.8.ebuild 1104 RMD160 0bac0e9eefbea7f113bf615503729bb3ad9239b4 SHA1 59a19833267b5d0c1b1ec91e64ed84e93a0fdf45 SHA256 1ec3c4bf06b310ddec94b6355419886e0ff7962b7e5cdec5246f88452cb47903
-MISC ChangeLog 1060 RMD160 d21cf8dc2e40358be4a57d950a530545301a0274 SHA1 148ccfe98364da07f40e22d170d68f65d6efc1e3 SHA256 d1c4e6ae2a656a0e90c008b5873b7c6fe013a0edcd2c9b9c31c945d3de0573fc
+EBUILD huludesktop-0.9.8-r1.ebuild 1534 RMD160 9a2583fee793a09e78315e16ecba8acce7074bfa SHA1 606b67b42fb733a45054eda9c9b61b4eafe68dfd SHA256 e24df98e23df14b60b4225d794c210580db857f67937134e76767cda532971f9
+MISC ChangeLog 1303 RMD160 de5e3b0f81bfcf8a1359c27796d721582ed3901e SHA1 33a89b904fb7674deb637e288aa7509b00641a4d SHA256 acbf05238b1854cac095d1fadf9773d7e2aa642818bef3e0aba314350114b31c
 MISC metadata.xml 221 RMD160 2699c0059639536eb7befa077a27e437569a26ba SHA1 4bef3741184af2e2d984fec094cd0ab39ae2e624 SHA256 1d72b91d3ef79fdff0049c23a645d8595a5fb72ea7e5d5b6fa43cfc18e9a4627
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxmGNkACgkQTwhj9JtAlp5RqwD/UlPr1dm+1GHmvE0uwE/A4gww
-4ktL29LWQOG354Yh+doA/inzDZKHI3LP16Y7289ctq4UmlYA6jVYMNecY8wQViEp
-=QD/8
+iF4EAREIAAYFAkyUis0ACgkQTwhj9JtAlp7/cgEAoPPo2RqB9tVOzdiHoSe9dgD5
+i4s+RiQZCny5FBViCHoBAJCpPSfKB2/s/2pO0sIe3WiaO1TOzNfLlD4kgS095vx1
+=GTQN
 -----END PGP SIGNATURE-----
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
+}