From 666dafcec61edd17e90afe580be3989f3b60dddf Mon Sep 17 00:00:00 2001
From: netpositive36 <netpositive36@users.noreply.github.com>
Date: Wed, 22 Nov 2017 22:02:54 +0000
Subject: [PATCH] youtube-dl: version bump. Old recipes removed. (#1796)

---
 .../youtube_dl/youtube_dl-2017.10.29.recipe   | 55 -------------------
 ...28.recipe => youtube_dl-2017.11.15.recipe} | 20 ++-----
 2 files changed, 4 insertions(+), 71 deletions(-)
 delete mode 100644 net-misc/youtube_dl/youtube_dl-2017.10.29.recipe
 rename net-misc/youtube_dl/{youtube_dl-2017.04.28.recipe => youtube_dl-2017.11.15.recipe} (64%)

diff --git a/net-misc/youtube_dl/youtube_dl-2017.10.29.recipe b/net-misc/youtube_dl/youtube_dl-2017.10.29.recipe
deleted file mode 100644
index 953a9d58e..000000000
--- a/net-misc/youtube_dl/youtube_dl-2017.10.29.recipe
+++ /dev/null
@@ -1,55 +0,0 @@
-SUMMARY="A command-line program to download videos from various sites"
-DESCRIPTION="The program is usually invoked as youtube-dl followed by \
-options and the video URL. Run 'youtube-dl --help' and get a summary \
-of all options.
-Some YouTube videos are served using Adobe's proprietary RTMP protocol, which \
-imposes DRM restrictions and encrypts the connection. youtube-dl is not able \
-to download these videos by itself."
-HOMEPAGE="http://rg3.github.io/youtube-dl/"
-COPYRIGHT="2006-2017 Ricardo Garcia Gonzalez"
-LICENSE="Public Domain"
-REVISION="1"
-SOURCE_URI="https://github.com/rg3/youtube-dl/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="e66441b2b852d6b46f16e47ffa236c6e77d9070fb82e5c125ee489030a5fde6e"
-SOURCE_DIR="youtube-dl-$portVersion"
-
-ARCHITECTURES="any"
-
-PROVIDES="
-	youtube_dl = $portVersion
-	cmd:youtube_dl = $portVersion
-	"
-REQUIRES="
-	haiku
-	cmd:python
-	cmd:ffmpeg
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	cmd:python
-	"
-BUILD_PREREQUIRES="
-	cmd:zip
-	"
-
-BUILD()
-{
-	zip -q youtube-dl youtube_dl/*.py youtube_dl/*/*.py
-	zip -q -j youtube-dl youtube_dl/__main__.py
-	echo '#!/bin/python' > youtube-dl
-	cat youtube-dl.zip >> youtube-dl
-	rm youtube-dl.zip
-	chmod a+x youtube-dl
-}
-
-INSTALL()
-{
-	mkdir -p $binDir
-	cp -a youtube-dl $binDir
-}
-
-TEST()
-{
-	youtube-dl --version
-}
diff --git a/net-misc/youtube_dl/youtube_dl-2017.04.28.recipe b/net-misc/youtube_dl/youtube_dl-2017.11.15.recipe
similarity index 64%
rename from net-misc/youtube_dl/youtube_dl-2017.04.28.recipe
rename to net-misc/youtube_dl/youtube_dl-2017.11.15.recipe
index 4353e9ead..400684478 100644
--- a/net-misc/youtube_dl/youtube_dl-2017.04.28.recipe
+++ b/net-misc/youtube_dl/youtube_dl-2017.11.15.recipe
@@ -9,9 +9,8 @@ HOMEPAGE="http://rg3.github.io/youtube-dl/"
 COPYRIGHT="2006-2017 Ricardo Garcia Gonzalez"
 LICENSE="Public Domain"
 REVISION="1"
-SOURCE_URI="https://github.com/rg3/youtube-dl/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="be227d241a5abdf3ad1ba4fd5a14d850e1f1204a609dc5a3703124897565942e"
-SOURCE_DIR="youtube-dl-$portVersion"
+SOURCE_URI="https://github.com/rg3/youtube-dl/releases/download/$portVersion/youtube-dl#noarchive"
+CHECKSUM_SHA256="c9afd970df5cda9325f9460744ad67334f899df8c24085bf7555eb6e849cfe75"
 
 ARCHITECTURES="any"
 
@@ -26,20 +25,14 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	cmd:python
 	"
+
 BUILD_PREREQUIRES="
-	cmd:zip
 	"
 
 BUILD()
 {
-	zip -q youtube-dl youtube_dl/*.py youtube_dl/*/*.py
-	zip -q -j youtube-dl youtube_dl/__main__.py
-	echo '#!/bin/python' > youtube-dl
-	cat youtube-dl.zip >> youtube-dl
-	rm youtube-dl.zip
+	sed -i 's/\/usr//' youtube-dl
 	chmod a+x youtube-dl
 }
 
@@ -48,8 +41,3 @@ INSTALL()
 	mkdir -p $binDir
 	cp -a youtube-dl $binDir
 }
-
-TEST()
-{
-	youtube-dl --version
-}