Revbump to fix problems with recent youtube changes

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

4 files changed, 141 insertions, 36 deletions

diff --git a/media-video/xvideoservicethief/ChangeLog b/media-video/xvideoservicethief/ChangeLog
index 669e50e456a1..20874a0eaf83 100644
--- a/media-video/xvideoservicethief/ChangeLog
+++ b/media-video/xvideoservicethief/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/xvideoservicethief
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/ChangeLog,v 1.27 2011/08/26 14:26:51 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/ChangeLog,v 1.28 2012/07/11 19:51:16 hwoarang Exp $
+
+*xvideoservicethief-2.4.1-r2 (11 Jul 2012)
+
+  11 Jul 2012; Markos Chandras <hwoarang@gentoo.org>
+  +xvideoservicethief-2.4.1-r2.ebuild,
+  files/xvideoservicethief-2.4.1-youtube-api.patch:
+  Revbump to fix problems with recent youtube changes
 
   26 Aug 2011; Markos Chandras <hwoarang@gentoo.org>
   -xvideoservicethief-2.4.1.ebuild:
@@ -131,4 +138,3 @@
   14 Mar 2009; Ben de Groot <yngwin@gentoo.org> +files/gcc-4.3.patch,
   +metadata.xml, +xvideoservicethief-1.8.2.ebuild:
   Initial import from qting-edge overlay. See also bug 210894.
-
diff --git a/media-video/xvideoservicethief/Manifest b/media-video/xvideoservicethief/Manifest
index afec7c3f742f..f86fab247e36 100644
--- a/media-video/xvideoservicethief/Manifest
+++ b/media-video/xvideoservicethief/Manifest
@@ -1,25 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX xvideoservicethief-2.4.1-youtube-api.patch 7972 RMD160 de47121936e5da80d6cd6fb7275bfe6b6b3fd4ba SHA1 7965602c033a90e06a0dfff7be27f2a8e3541aa3 SHA256 e0d22c518efb2c65ad01d4845c0445fd068f98c1ea4c2fc1f31bc569b9873956
-DIST xVST_2_4_1_src.zip 3817619 RMD160 66d17eff3c5334b585848a0defa7dfde03465aa3 SHA1 97bb364fc2cae2ca44eb3e9b19cc5f25b9818658 SHA256 cbd1f24156bdb6e3527b5b4d6823441881462442b9aeeb36098abcf16fbe7a29
-EBUILD xvideoservicethief-2.4.1-r1.ebuild 2435 RMD160 21e72a219de08d4092176df1f86bc0fb0fded62f SHA1 b967b1f1941b5a37b631e078e293bf50389ab93b SHA256 44db158ae8660eae61384f0210290412232d53bc0f9b8bf7b2987667479345c9
-MISC ChangeLog 4355 RMD160 b4f5ceadc9a43e034eb7361cf4fca50489ff645d SHA1 61ee942e543feea990fd841c25a435d866b1973b SHA256 4e01c52cb494ef87ccc5549a89c141f7229ad6d15408bd81475f27c104ae537d
-MISC metadata.xml 277 RMD160 d0901c2e5b1ad8ecc4e524e24397caa3f83224ca SHA1 2c00106871950270b41b7d669d36999d604907e4 SHA256 088b359fa836214a4429a6f7e7d7e3c82234a0c2e84da475c8b92f7f566f39cb
+AUX xvideoservicethief-2.4.1-youtube-api.patch 8567 SHA256 bdbdd01b30148ebf13e029b888ceca66006e17996c358bb524b1194fe0753a8c SHA512 a16a5b8ec9c9b10304e1bc2325949f33cdbc5a93c1f6759425ee942c28dd56b330b88f4b5afbd8d174df072855d89a7b784d7a2cccc4b4dccedd4f0c3e46bb20 WHIRLPOOL dc5b1f31aeb5a50cad23626ed05158e162c7c11c2e45708ae18de9d1ca1ffc1c62e8b8fcae78f3fc47e8c261878027e0772d209396c866a53dfdc1f5a6156ccc
+DIST xVST_2_4_1_src.zip 3817619 SHA256 cbd1f24156bdb6e3527b5b4d6823441881462442b9aeeb36098abcf16fbe7a29 SHA512 d0f23c3ac652326d3dd53ef66ba7db0c09ba28f8f7ad0bee864cab057b87d4b171f6076675abe443f738d7c715ec79d507e8d08fd595db3208fc4f9c5548eb2c WHIRLPOOL c19d6fac3a781435de6d4615a02ec00d21069387051ac0bdfda09d668ab70141a115ea1633d7290c3789f2353ddcf308f4372391a20a7689f94dc11df26561d8
+EBUILD xvideoservicethief-2.4.1-r1.ebuild 2435 SHA256 44db158ae8660eae61384f0210290412232d53bc0f9b8bf7b2987667479345c9 SHA512 915789b10be946857b1af7c33f079641a1c6ac43ab966b710770e87ff47f311467c48b9337ef1a517ed7361e399c630202f59e049cd7c1c3acede839ceab6940 WHIRLPOOL 58046df58c7b110388395d537961d4788695a1a017d6de921f4d3b920ef3db23ca96a189557b1ed576e2213b5127b1d11476e3c7ec08ff361a29f2563f21aa51
+EBUILD xvideoservicethief-2.4.1-r2.ebuild 2435 SHA256 1e45698ac557426aefbc171d5a248165c178b17eda8e61fa5d4cb99cc4572664 SHA512 9dd345994d95cc3f56e88b9eceaf9a9da2c6a90aec2a9eb00585380a01595cf0c180e463df1fb4a902eaedc9512515d4465818b56c03d3876cdce1e04e1dde44 WHIRLPOOL 0aa4d71cff519982c768a3c4b5d40fce92c993c1caa544d377d5177c06d6780f7189ae60ba01ebf82307086bedb223790ea23b0da3954faa29bb01768ea8c6ea
+MISC ChangeLog 4597 SHA256 a127384bb246b47a4defaadb61560f580aeb45ee4a2298df26ccf62634cdcb72 SHA512 e280688b890db35e17e0abfa454380e7bab1f30e5d6b3d6b3989756a17c27700c0bebc62c8f9e8f9f66728d5b947eb9f35bb3b65b6a2dde0cedc6bb4feda36be WHIRLPOOL 35e4a018ace2b87425178a688a142ac3fbfb13c13339bb6c258e3605d03bb1f9c94d6496ff063e1f955199314fe7e5aaa1d673179e54ab7ab2d2add9143e5950
+MISC metadata.xml 277 SHA256 088b359fa836214a4429a6f7e7d7e3c82234a0c2e84da475c8b92f7f566f39cb SHA512 48bc6043448b71311ad3d87831aa4cc283c6cbe9f460cebb42675360d280c6ed3400b6d1ddbbd3ff363d18907d81278d4800ffd74ca000378863ad76a775c8ac WHIRLPOOL 8d3e8168a08eb4b821fed71eb5c361c4cbb46ed59474892f5bcaa1afaa239816fda570f6c689afd49570fbedb716350c1405d328cc8364e7594f710ed076beaf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOV6zbAAoJEPqDWhW0r/LC3dUP/3oAELZWZwnkXpVi+FD3PGtQ
-D2ez0Eq7hkNm0qPfTrvWG+ipcKF1WcY4XgYLiuy3ryqJnK0cVmeaRIbzAATJC+OK
-hFWZjSaDY6dPiN/wR32VZxjNzXm4BiuewufPotuxInhKD8TAwz0VaHLoov5ANs7V
-u7McSttUhtGkxK7h3/JA/7VZy7xXTpynfKbmRYkbOMgY+jiedUMmYb7dDfLnifmK
-uwOebMYo+kPMXs1iRL8Ok8XEn0EuDAdOCx4L3Vhn97FqQt8K8dxrrRh18AY53LZe
-8b3lp7tOfvmWpPfm1EJMWG5hZ4xJyTcs/xrYXUuk1yS+gKp+D+6U+fqqumfTtQcW
-1AMV5ZB50fyWeuWr+/J4La9b3MsjygA9jU7jqtXd6OOhXKzkDMQjXS46G7zffThb
-/mc9hzGisKrtbE8waqCcP1qiTs5PKU+PkuiTk7IQCsf/7g4szWKWfRYMw4u0yAn4
-puvl/kMWSQyd1AckjTu1RWFeNNgwAesLHHpy7QBEMItZjQlGZ4O6x3PQo/TyPfoi
-iyWHLQMhrlp+ukuNZwsutgttcgN0GbJdy2jSooLshftWUguMpFhW+grqLJlEtj7d
-koOwkcm0uL9awX+q/jH3aHXXslJ1o7JWMfp1oZ5RDCN7U+gFkKpRB5dsgvUdE2/p
-bxfOPivuSKy0wSgBRGmM
-=//y6
+iQIcBAEBCgAGBQJP/dk6AAoJEPqDWhW0r/LCdjsP/1qcdmit2KZMdZgOgGEAGkp2
+NWXb0wywFfbnyh5PL/KkUMQyGHlgoIHJADPjemG5FIcFkU8jc1XzGiSzvzLzf1TW
+n8+PX/7Xq075b2NDUnKGhAABGb26F1FiRAJb30Z0oQ43MoJ1udCR8v2TyuS5FNM1
+ypUVvaEIsaAb1SyO0zJo4/iKoc90igum+3Q4HoaUScUlKF7lPELGiJ99qG/M1wp0
+dJMWUiDHZ0dO/tiiHxCnGaUfTMdFrn9SLNPP4r5zKqFgXA2qdkkxJdlJBzZLO18a
+Ve66L5DCfCrJNoLRyME7WlRMLjKBnInyY5tupr/4woJ/lLfmFdP6XdhwH+5OpeeC
+wGv/wRUiI/L8fTIUv1BqLwUbz1oP0m6a0inovP7ipNbftJOJHMYpkfUD1WBDEv/k
+oSWOCuAQ9PnIv0+0DmGqwftBvoQXVV9eHxtS9fhqFYezVt0g+DsMpNQneZWYqZYg
+5mJdYJiE1j9HGP/UNdcXZMJaRiVpdbjfl6PMthp5SJlvIMWPvQM3EnBRqFTTMQWQ
+UjfdbSMa5t/C2yI/GYH+Fmq623UiDa6mBh9pLnDjx3uDnEODeC/VgmU2gpswyl+V
+9+VxcOJnMxSOO5k/fHYsSN1inDI9rtW2XXvUzKSqI06Y4OMsLDhpvPAvEux3N/H1
+FSSf1KiuHCM9mdrLoHWr
+=GMma
 -----END PGP SIGNATURE-----
diff --git a/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-youtube-api.patch b/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-youtube-api.patch
index 50f6bbe445d7..7bffe12f0d0d 100644
--- a/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-youtube-api.patch
+++ b/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-youtube-api.patch
@@ -1,11 +1,11 @@
---- resources/services/youtube/youtube.js	2010/09/02 11:52:07	911
-+++ resources/services/youtube/youtube.js	2011/08/06 23:30:28	961
+--- trunk/resources/services/youtube/youtube.js	2010/09/02 11:52:07	911
++++ trunk/resources/services/youtube/youtube.js	2012/05/08 17:34:53	975
 @@ -3,7 +3,7 @@
  * This file is part of xVideoServiceThief,
  * an open-source cross-platform Video service download
  *
 -* Copyright (C) 2007 - 2010 Xesc & Technology
-+* Copyright (C) 2007 - 2011 Xesc & Technology
++* Copyright (C) 2007 - 2012 Xesc & Technology
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,14 +14,31 @@
  function RegistVideoService()
  {
 -	this.version = "2.1.5";
-+	this.version = "3.0.1";
++	this.version = "3.0.6";
  	this.minVersion = "2.0.0a";
 -	this.author = "Xesc & Technology 2009";
-+	this.author = "Xesc & Technology 2011";
++	this.author = "Xesc & Technology 2012";
  	this.website = "http://www.youtube.com/";
  	this.ID = "youtube.com";
  	this.caption = "YouTube";
-@@ -55,32 +55,103 @@
+@@ -38,7 +38,6 @@
+ function getVideoInformation(url)
+ {
+ 	const URL_YOUTBE = "http://www.youtube.com/watch?v=%1";
+-	const HD_VIDEO_RES = "22";
+ 	// init result
+ 	var result = new VideoDefinition();
+ 	// default URL
+@@ -52,35 +51,112 @@
+ 		embededID = strRemove(embededID, 0, embededID.lastIndexOf("/v/") + 3);
+ 		youTubeURL = strFormat(URL_YOUTBE, embededID);
+ 	}
++	// cehck if is an embeded video (v2)
++	else if (youTubeURL.toString().indexOf("/embed/") != -1) 
++	{
++		var embededID = copyBetween(youTubeURL + "?", "/embed/", "?");
++		youTubeURL = strFormat(URL_YOUTBE, embededID);
++	}
  	// download webpage
  	var http = new Http();
  	var html = http.downloadWebpage(youTubeURL);
@@ -34,7 +51,7 @@
 +	result.title = strReplace(result.title, " - YouTube", "");
  	// check if this video need a login
 -	result.needLogin = result.title == "Broadcast Yourself.";
-+	result.needLogin = strIndexOf(html, "signing_in") != -1;
++	result.needLogin = strIndexOf(html, 'id="verify-details"') != -1;
  	// if we can continue (no loggin needed)
  	if (result.needLogin) return result;
 -	// get the video info block
@@ -65,9 +82,9 @@
 +	// init result
 +	var result = { url:null, extension:null };
 +	// get the flashVars value
-+	var flashVars = "?" + copyBetween(html, 'flashvars="', '"');
++	var flashVars = "?" + copyBetween(html, 'flashvars=\\"', '\\"');
 +	// convert each "&amp;" into "&"
-+	flashVars = strReplace(flashVars, "&amp;", "&");
++	flashVars = strReplace(flashVars, "\\u0026amp;", "&");
 +	// get an array with all fmt_stream_map values
 +	var fmt_stream_map_arr = splitString(getUrlParam(flashVars, "url_encoded_fmt_stream_map"), "url%3D", false);
 +	// default selected video quality
@@ -141,7 +158,7 @@
  /* 
  	This function "normalizeSpaces(str)" will be deprecated on next xVST version
  	and replaced with the new "simplifyString(str)" function (added in xVST 2.3.1)
-@@ -99,9 +170,11 @@
+@@ -99,9 +175,11 @@
  function searchVideos(keyWord, pageIndex)
  {
  	const URL_SEARCH = "http://www.youtube.com/results?search_query=%1&page=%2&hl=%3";
@@ -149,14 +166,14 @@
 -	const HTML_SEARCH_FINISH = "<!-- end search results -->";
 -	const HTML_SEARCH_SEPARATOR = '<div class="video-entry">';
 +	const HTML_SEARCH_START = '<div id="search-results">';
-+	const HTML_SEARCH_FINISH = '<span id="search-pva-content">';
-+	const HTML_SEARCH_SEPARATOR = '<div class="result-item *sr ">';
++	const HTML_SEARCH_FINISH = '<div id="search-pva-content">';
++	const HTML_SEARCH_SEPARATOR = '<div class="thumb-container">';
 +	const HTML_SEARCH_SUMMARY_START = '<p class="num-results">';
 +	const HTML_SEARCH_SUMMARY_END = '</p>';
  	// replace all spaces for "+"
  	keyWord = strReplace(keyWord, " ", "+");
  	// init search results object
-@@ -110,7 +183,7 @@
+@@ -110,7 +188,7 @@
  	var http = new Http();
  	var html = http.downloadWebpage(strFormat(URL_SEARCH, keyWord, pageIndex, searchResults.getUserLanguage()));
  	// get the search summary
@@ -165,7 +182,7 @@
  	searchResults.setSummary(cleanSummary(summary));
  	// get results html block
  	var htmlResults = copyBetween(html, HTML_SEARCH_START, HTML_SEARCH_FINISH);
-@@ -148,14 +221,17 @@
+@@ -148,14 +226,17 @@
  	var tmp, videoUrl, imageUrl, title, description, duration, rating;
  	// get video url
  	videoUrl = VIDEO_URL + copyBetween(html, 'href="', '"');
diff --git a/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild b/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild
new file mode 100644
index 000000000000..3d718361f71a
--- /dev/null
+++ b/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild,v 1.1 2012/07/11 19:51:16 hwoarang Exp $
+
+EAPI=2
+
+LANGS="br ca cs da de es fr gl hu it ja ko nl pl ro ru sv"
+
+inherit eutils qt4-r2 versionator
+
+MY_PV=$(replace_all_version_separators '_')
+MY_P="xVST_${MY_PV}_src"
+
+DESCRIPTION="Download (and convert) videos from various Web Video Services"
+HOMEPAGE="http://xviservicethief.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xviservicethief/${MY_P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+DEPEND="app-arch/unzip
+	>=x11-libs/qt-gui-4.5.3:4
+	>=x11-libs/qt-webkit-4.5.3:4
+	doc? ( app-doc/doxygen )"
+RDEPEND=">=x11-libs/qt-gui-4.5.3:4
+	virtual/ffmpeg
+	media-video/flvstreamer"
+
+RES_NAME="xVST"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	# fix translations
+	mv "${S}"/resources/translations/${RES_NAME}_cz.ts \
+		"${S}"/resources/translations/${RES_NAME}_cs.ts ||die
+	mv "${S}"/resources/translations/${RES_NAME}_jp.ts	\
+		"${S}"/resources/translations/${RES_NAME}_ja.ts || die
+	mv "${S}"/resources/translations/${RES_NAME}_du.ts	\
+		"${S}"/resources/translations/${RES_NAME}_nl.ts || die
+	mv "${S}"/resources/translations/${RES_NAME}_kr.ts	\
+		"${S}"/resources/translations/${RES_NAME}_ko.ts || die
+	# fix plugins, language path
+	sed -i -e "s/getApplicationPath()\ +\ \"/\"\/usr\/share\/${PN}/g" \
+		"${S}"/src/options.cpp || die "failed to fix paths"
+	epatch "${FILESDIR}"/${P}-youtube-api.patch
+}
+
+src_compile() {
+	local lang=
+	emake || die "emake failed"
+	for lang in "${S}"/resources/translations/*.ts; do
+		lrelease ${lang}
+	done
+}
+
+src_install() {
+	dobin bin/xvst || die "dobin failed"
+	local dest=/usr/share/${PN}/plugins
+	dodir ${dest}
+	find resources/services -name '*.js' -exec cp -dpR {} "${D}"${dest} \;
+	newicon resources/images/InformationLogo.png xvst.png
+	make_desktop_entry /usr/bin/xvst xVideoServiceThief xvst 'Qt;AudioVideo;Video'
+	if use doc; then
+		cd "${S}/documentation/source"
+		sed -i "/OUTPUT_DIRECTORY/s:G\:.*:docs:" Doxyfile
+		doxygen Doxyfile
+		dohtml -r docs/html/* || die "dohtml failed"
+	fi
+
+	#install translations
+	insinto /usr/share/${PN}/languages/
+	local lang= tlang=
+	for lang in ${LINGUAS}; do
+		for tlang in ${LANGS}; do
+			[[ ${lang} == ${tlang} ]] && doins "${S}"/resources/translations/xVST_${tlang}.qm
+		done
+	done
+}