Version bump.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

8 files changed, 11 insertions, 338 deletions

diff --git a/net-misc/youtube-dl/ChangeLog b/net-misc/youtube-dl/ChangeLog
index 42192de0adc9..ef918ce0ea71 100644
--- a/net-misc/youtube-dl/ChangeLog
+++ b/net-misc/youtube-dl/ChangeLog
@@ -1,6 +1,15 @@
 # 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.336 2014/05/05 16:11:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.337 2014/05/12 16:46:41 jer Exp $
+
+*youtube-dl-2014.05.12 (12 May 2014)
+
+  12 May 2014; Jeroen Roovers <jer@gentoo.org> -youtube-dl-2014.04.01.3.ebuild,
+  -youtube-dl-2014.04.03.2.ebuild, -youtube-dl-2014.04.07.1.ebuild,
+  -youtube-dl-2014.04.11.2.ebuild, -youtube-dl-2014.04.19.ebuild,
+  -youtube-dl-2014.04.21.6.ebuild, -youtube-dl-2014.04.30.1.ebuild,
+  +youtube-dl-2014.05.12.ebuild:
+  Version bump.
 
 *youtube-dl-2014.05.05 (05 May 2014)
 
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.01.3.ebuild b/net-misc/youtube-dl/youtube-dl-2014.04.01.3.ebuild
deleted file mode 100644
index 0672d44698a3..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.04.01.3.ebuild
+++ /dev/null
@@ -1,56 +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.04.01.3.ebuild,v 1.1 2014/04/01 18:56:33 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3})
-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 mofosex pornhd pornhub pornotube redtube
-			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 CHANGELOG README.txt
-	doman ${PN}.1
-	newbashcomp ${PN}.bash-completion ${PN}
-	python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.03.2.ebuild b/net-misc/youtube-dl/youtube-dl-2014.04.03.2.ebuild
deleted file mode 100644
index b6aa6081c316..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.04.03.2.ebuild
+++ /dev/null
@@ -1,56 +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.04.03.2.ebuild,v 1.1 2014/04/03 14:22:13 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3})
-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 mofosex pornhd pornhub pornotube redtube
-			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 CHANGELOG README.txt
-	doman ${PN}.1
-	newbashcomp ${PN}.bash-completion ${PN}
-	python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.07.1.ebuild b/net-misc/youtube-dl/youtube-dl-2014.04.07.1.ebuild
deleted file mode 100644
index 75fb64c16615..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.04.07.1.ebuild
+++ /dev/null
@@ -1,56 +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.04.07.1.ebuild,v 1.1 2014/04/07 13:58:16 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3})
-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 mofosex pornhd pornhub pornotube redtube
-			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 CHANGELOG README.txt
-	doman ${PN}.1
-	newbashcomp ${PN}.bash-completion ${PN}
-	python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.11.2.ebuild b/net-misc/youtube-dl/youtube-dl-2014.04.11.2.ebuild
deleted file mode 100644
index afb60e1677a8..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.04.11.2.ebuild
+++ /dev/null
@@ -1,56 +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.04.11.2.ebuild,v 1.1 2014/04/11 14:52:35 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3})
-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 mofosex pornhd pornhub pornotube redtube
-			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 CHANGELOG README.txt
-	doman ${PN}.1
-	newbashcomp ${PN}.bash-completion ${PN}
-	python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.19.ebuild b/net-misc/youtube-dl/youtube-dl-2014.04.19.ebuild
deleted file mode 100644
index 696608cf5b8e..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.04.19.ebuild
+++ /dev/null
@@ -1,56 +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.04.19.ebuild,v 1.1 2014/04/19 13:52:03 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3})
-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 mofosex pornhd pornhub pornotube redtube
-			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 CHANGELOG README.txt
-	doman ${PN}.1
-	newbashcomp ${PN}.bash-completion ${PN}
-	python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.21.6.ebuild b/net-misc/youtube-dl/youtube-dl-2014.04.21.6.ebuild
deleted file mode 100644
index 7c68b94528ad..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.04.21.6.ebuild
+++ /dev/null
@@ -1,56 +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.04.21.6.ebuild,v 1.2 2014/04/27 21:05:34 floppym 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 mofosex pornhd pornhub pornotube redtube
-			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 CHANGELOG README.txt
-	doman ${PN}.1
-	newbashcomp ${PN}.bash-completion ${PN}
-	python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.30.1.ebuild b/net-misc/youtube-dl/youtube-dl-2014.05.12.ebuild
index 45ba7ecd5ead..31f745eb9687 100644
--- a/net-misc/youtube-dl/youtube-dl-2014.04.30.1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2014.05.12.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.04.30.1.ebuild,v 1.1 2014/04/30 14:58:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.05.12.ebuild,v 1.1 2014/05/12 16:46:41 jer Exp $
 
 EAPI=5