summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-08-23 09:43:03 +0000
committerJeroen Roovers <jer@gentoo.org>2014-08-23 09:43:03 +0000
commit12124ec23fe6103b2967c233f9384ca0602efe28 (patch)
tree89749ec12c9af7800a594da3d63256a1ff25bcfa /net-misc
parentConvert sed script to patch. Fix syslog calls without format (bug #520520). (diff)
downloadgentoo-2-12124ec23fe6103b2967c233f9384ca0602efe28.tar.gz
gentoo-2-12124ec23fe6103b2967c233f9384ca0602efe28.tar.bz2
gentoo-2-12124ec23fe6103b2967c233f9384ca0602efe28.zip
Version bump.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/youtube-dl/ChangeLog8
-rw-r--r--net-misc/youtube-dl/youtube-dl-2014.08.22.2.ebuild57
-rw-r--r--net-misc/youtube-dl/youtube-dl-2014.08.22.3.ebuild (renamed from net-misc/youtube-dl/youtube-dl-2014.08.21.3.ebuild)2
3 files changed, 8 insertions, 59 deletions
diff --git a/net-misc/youtube-dl/ChangeLog b/net-misc/youtube-dl/ChangeLog
index aa8f8af9e891..22b1e18ce054 100644
--- a/net-misc/youtube-dl/ChangeLog
+++ b/net-misc/youtube-dl/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/youtube-dl
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.373 2014/08/22 08:01:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.374 2014/08/23 09:43:03 jer Exp $
+
+*youtube-dl-2014.08.22.3 (23 Aug 2014)
+
+ 23 Aug 2014; Jeroen Roovers <jer@gentoo.org> -youtube-dl-2014.08.21.3.ebuild,
+ -youtube-dl-2014.08.22.2.ebuild, +youtube-dl-2014.08.22.3.ebuild:
+ Version bump.
*youtube-dl-2014.08.22.2 (22 Aug 2014)
diff --git a/net-misc/youtube-dl/youtube-dl-2014.08.22.2.ebuild b/net-misc/youtube-dl/youtube-dl-2014.08.22.2.ebuild
deleted file mode 100644
index a82bc151ada4..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.08.22.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.08.22.2.ebuild,v 1.1 2014/08/22 08:01:01 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3,3_4})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
-HOMEPAGE="http://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="offensive test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- if ! use offensive; then
- sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
- youtube_dl/version.py || die
- local xxx=(
- extremetube fourtube goshgay hentaistigma mofosex pornhd pornhub
- pornotube redtube slutload spankwire thisav trutube tube8 xbef
- xhamster xnxx xtube xvideos youjizz youporn
- )
- sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
- rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
- test/test_age_restriction.py || die
- fi
-}
-
-src_compile() {
- distutils-r1_src_compile
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- python_domodule youtube_dl
- dobin bin/${PN}
- dodoc README.txt
- doman ${PN}.1
- newbashcomp ${PN}.bash-completion ${PN}
- python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.08.21.3.ebuild b/net-misc/youtube-dl/youtube-dl-2014.08.22.3.ebuild
index a6a9073211f4..45abed02161b 100644
--- a/net-misc/youtube-dl/youtube-dl-2014.08.21.3.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2014.08.22.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.08.21.3.ebuild,v 1.1 2014/08/21 18:36:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.08.22.3.ebuild,v 1.1 2014/08/23 09:43:03 jer Exp $
EAPI=5