From b43527e9820d7a4d151d1862caf025e7847d91bb Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 16 Oct 2016 22:44:48 +0200 Subject: [PATCH] youtube-dl: rebuild for Python 3.5 Switch to python3-* pkgs. Convert python3.4-* pkg into dummy pkg. --- srcpkgs/python3-youtube-dl | 1 + srcpkgs/youtube-dl/template | 31 ++++++++++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) create mode 120000 srcpkgs/python3-youtube-dl diff --git a/srcpkgs/python3-youtube-dl b/srcpkgs/python3-youtube-dl new file mode 120000 index 0000000000..067dc06bf4 --- /dev/null +++ b/srcpkgs/python3-youtube-dl @@ -0,0 +1 @@ +youtube-dl \ No newline at end of file diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index 3267676133..d4f4eeccd2 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,21 +1,20 @@ # Template file for 'youtube-dl' pkgname=youtube-dl version=2016.10.16 -revision=1 +revision=2 noarch=yes -build_style=python-module wrksrc="${pkgname}" -hostmakedepends="python python3.4" -depends="python" -python_versions="2.7 3.4" +build_style=python-module pycompile_module="youtube_dl" +hostmakedepends="python python3" +depends="python" 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=0ff39cbc17b4a73957238ab94ff5f05de2b7d833b0af3e2caf1df51eeeeacc60 -alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2.7" +alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { rm -rf ${DESTDIR}/usr/etc @@ -24,15 +23,21 @@ post_install() { vinstall ${pkgname}.fish 644 usr/share/fish/completions ${pkgname} } -python3.4-youtube-dl_package() { +python3-youtube-dl_package() { noarch=yes - depends="python3.4" - pycompile_version="3.4" + depends="python3" pycompile_module="youtube_dl" - alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl3.4" - short_desc="${short_desc/2/3.4}" + replaces="python3.4-youtube-dl>=0" + alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl3" + short_desc="${short_desc/2/3}" pkg_install() { - vmove usr/bin/youtube-dl3.4 - vmove usr/lib/python3.4 + vmove usr/bin/youtube-dl3 + vmove usr/lib/python3* } } +python3.4-youtube-dl_package() { + noarch=yes + build_style=meta + short_desc="${short_desc/2/3.4} (transitional dummy package)" + depends="python3-youtube-dl>=${version}_${revision}" +}