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

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

4 files changed, 89 insertions, 12 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/Manifest b/media-tv/huludesktop/Manifest
index 007d17bbedaf..482441bb17bd 100644
--- a/media-tv/huludesktop/Manifest
+++ b/media-tv/huludesktop/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX huludesktop 183 RMD160 26db7daa0bba1711014be9dbcb6445ebe921f043 SHA1 e3a44c211c0e262f5950291f1799d444c4fa2f50 SHA256 4b2875f2414c65e33c062fb21c35d5d4f584fe881972d035ae1a7a941a270589
-DIST huludesktop-0.9.7_amd64.deb 674808 RMD160 1df6490fc4495922eccd9ffca7a9dee3f960a74d SHA1 e2a10618ea368facd4973942d5a30e9bd74d7e36 SHA256 39ba1dbb67459da36a8c77f3c9f35786714aa50ac540bdd4a7213e22ed0e2112
+AUX huludesktop 663 RMD160 c419c88a08cf0b2e8bfed1ef61e87cb1d9e0fbe5 SHA1 34824ee15b6f0865be3ef6feb9218db62723b697 SHA256 d785a73811f9ed5ce20068baeff92815f6eb2eb6cf108ac84142ee454d0364e0
 DIST huludesktop-0.9.7_i386.deb 612388 RMD160 8f57338062176202297e940e6b93e528e6a1d3b0 SHA1 81ef1ec11100b71c68cec787e4cbf9652c8b57cc SHA256 b62113030b0b7387e90d0aeb52c8e367d53f99957c3fdca07c4c2e745a073ae0
-EBUILD huludesktop-0.9.7-r1.ebuild 1120 RMD160 10fb9898157fa04b76149f1c879eb185f48d90a0 SHA1 d10b245b432daa6a6efc2bcea6ed004748c842b3 SHA256 16174c83383365f895b7e26a6cd5b419d793050b652fa9604ae43289060b1af8
-EBUILD huludesktop-0.9.7.ebuild 1081 RMD160 370c0732c236771110f1a9d18305569f355f34d6 SHA1 735e02f472976e7688e368ba5f81d234f8b49e96 SHA256 c7d46ef5c93913e13b97f584f8fc4f0f326c7ba5e689c0eb325e271dd229feb6
-MISC ChangeLog 721 RMD160 c09ac791d856acb858c5559c2eb2221068acb081 SHA1 412256443189a744d010333957edb8e2708d9456 SHA256 6767d0dbd4f81a577f19aa63e5581ff761200b87f380bc6e286befadd605dd3f
+EBUILD huludesktop-0.9.7-r2.ebuild 1107 RMD160 f35d657d1f924844ea587831ae57d26d7a2f6cc8 SHA1 54e9260082125777853960b2d08db725545fd07b SHA256 2c81973a18adbd7065dd531fbdaeb19949e1291e8a7052275313196a7a9c0dc2
+MISC ChangeLog 932 RMD160 e2c99d0f7caac64701cfe06393a8f7f8dde6f046 SHA1 0bdc86bfb872c97c612babdaf648d03c00877ef7 SHA256 2cdace6d27728fa5b3e2f94de1d42a951279532366ec2fd3c42908f9ad6c55c5
 MISC metadata.xml 221 RMD160 2699c0059639536eb7befa077a27e437569a26ba SHA1 4bef3741184af2e2d984fec094cd0ab39ae2e624 SHA256 1d72b91d3ef79fdff0049c23a645d8595a5fb72ea7e5d5b6fa43cfc18e9a4627
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwepKkACgkQTwhj9JtAlp6FuAD+K+5rAurSWtfRTbHJuoO1k8Bd
-VxIvHplx29t6RVqFoHQBAKgkJ0eET5Wa63vW7VyQMtlRg5VvILJltQUTR3yuhARx
-=kTmP
+iF4EAREIAAYFAkxiNVIACgkQTwhj9JtAlp60ewD+IKYlSHshG7hwlF0KBUz8xMHE
+8Rjch+it87/VkEnmlXUA/jdTUWnZw5uf51a1a3KVaEJ/yv+gaAPUILjHgrNJRo57
+=nukk
 -----END PGP SIGNATURE-----
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
+}