Version bump.

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

4 files changed, 12 insertions, 179 deletions

diff --git a/net-misc/youtube-dl/ChangeLog b/net-misc/youtube-dl/ChangeLog
index d1b5636b13c6..48b918a9b417 100644
--- a/net-misc/youtube-dl/ChangeLog
+++ b/net-misc/youtube-dl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/youtube-dl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.490 2015/07/05 04:05:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.491 2015/07/08 04:45:04 jer Exp $
+
+*youtube-dl-2015.07.07 (08 Jul 2015)
+
+  08 Jul 2015; Jeroen Roovers <jer@gentoo.org>
+  -youtube-dl-2015.06.15-r1.ebuild, -youtube-dl-2015.06.25-r1.ebuild,
+  -youtube-dl-2015.07.04.ebuild, +youtube-dl-2015.07.07.ebuild:
+  Version bump.
 
 *youtube-dl-2015.07.04 (05 Jul 2015)
 
diff --git a/net-misc/youtube-dl/youtube-dl-2015.06.15-r1.ebuild b/net-misc/youtube-dl/youtube-dl-2015.06.15-r1.ebuild
deleted file mode 100644
index 63b6391cd62b..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2015.06.15-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.06.15-r1.ebuild,v 1.1 2015/06/23 17:25:29 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and more 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
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink drtuber empflix eporner eroprofile
-			extremetube fourtube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies mofosex motherless porn91 pornhd pornotube
-			pornovoisines pornoxo redtube sexykarma sexu sunporno slutload
-			spankbang spankwire thisav tnaflix trutube tube8 vporn xbef
-			xhamster xnxx xtube xvideos xxxymovies youjizz youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			pornhub
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/__init__.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/__init__.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			youtube_dl/extractor/tumblr.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	epatch_user
-}
-
-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-2015.06.25-r1.ebuild b/net-misc/youtube-dl/youtube-dl-2015.06.25-r1.ebuild
deleted file mode 100644
index 04ad216e2ba1..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2015.06.25-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.06.25-r1.ebuild,v 1.2 2015/07/05 04:05:06 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and more 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
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink drtuber empflix eporner eroprofile
-			extremetube fourtube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies mofosex motherless porn91 pornhd pornotube
-			pornovoisines pornoxo redtube sexykarma sexu sunporno slutload
-			spankbang spankwire thisav tnaflix trutube tube8 vporn xbef xnxx
-			xtube xvideos xxxymovies youjizz youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			pornhub xhamster
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/__init__.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/__init__.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			youtube_dl/extractor/tumblr.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	epatch_user
-}
-
-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-2015.07.04.ebuild b/net-misc/youtube-dl/youtube-dl-2015.07.07.ebuild
index 02fab5f9bc42..70111ef8e9bf 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.07.04.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.07.07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.07.04.ebuild,v 1.1 2015/07/05 04:05:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.07.07.ebuild,v 1.1 2015/07/08 04:45:04 jer Exp $
 
 EAPI=5
 
@@ -34,12 +34,12 @@ src_prepare() {
 			fourtube foxgay goshgay hellporno hentaistigma hornbunny keezmovies
 			mofosex motherless porn91 pornhd pornotube pornovoisines pornoxo
 			redtube sexykarma sexu sunporno slutload spankbang spankwire thisav
-			tnaflix trutube tube8 vporn xbef xnxx xtube xvideos xxxymovies
-			youjizz youporn
+			trutube tube8 vporn xbef xnxx xtube xvideos xxxymovies youjizz
+			youporn
 		)
 		# these have multi-line import statements
 		local mxxx=(
-			pornhub xhamster
+			pornhub xhamster tnaflix
 		)
 		# do single line imports
 		sed -i \