diff --git a/srcpkgs/python-youtube-dl b/srcpkgs/python-youtube-dl deleted file mode 120000 index 067dc06bf49..00000000000 --- a/srcpkgs/python-youtube-dl +++ /dev/null @@ -1 +0,0 @@ -youtube-dl \ No newline at end of file diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index 9e04e6ec7f9..5cca1510fb1 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,45 +1,38 @@ # Template file for 'youtube-dl' pkgname=youtube-dl version=2016.04.06 -revision=1 +revision=2 noarch=yes build_style=python-module wrksrc="${pkgname}" hostmakedepends="python python3.4" -depends="python python-youtube-dl" +depends="python" python_versions="2.7 3.4" pycompile_module="youtube_dl" -short_desc="Small CLI program to download videos from YouTube and other sites" +short_desc="CLI program to download videos from YouTube and other sites (Python2)" maintainer="Juan RP " homepage="http://rg3.github.com/youtube-dl/" license="Public Domain" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" checksum=115a7443162198f12d97c2c1d83e69d462f78410a26d6dd5ae3c74603397b9cd +replaces="python-youtube-dl<2016.04.06_2" post_install() { rm -rf ${DESTDIR}/usr/etc vinstall ${pkgname}.bash-completion 644 usr/share/bash-completion/completions ${pkgname} vinstall ${pkgname}.zsh 644 usr/share/zsh/site-functions _${pkgname} vinstall ${pkgname}.fish 644 usr/share/fish/completions ${pkgname} -} - -python-youtube-dl_package() { - short_desc+=" - Python2 module" - noarch=yes - pycompile_version="2.7" - pycompile_module="youtube_dl" - pkg_install() { - vmove usr/lib/python2.7 - } + vbin build-3.4/scripts-3.4/youtube-dl youtube-dl3.4 } python3.4-youtube-dl_package() { - short_desc+=" - Python3.4 module" noarch=yes + depends="python3.4" pycompile_version="3.4" pycompile_module="youtube_dl" + short_desc="${short_desc/2/3.4}" pkg_install() { + vmove usr/bin/youtube-dl3.4 vmove usr/lib/python3.4 } } -