Adjust media-libs/opus dependency (bug #487888). Drop old.

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0x0F9C590B7FF324F6!)

5 files changed, 16 insertions, 162 deletions

diff --git a/media-sound/opus-tools/ChangeLog b/media-sound/opus-tools/ChangeLog
index 3425311a5b18..efff0bada0cb 100644
--- a/media-sound/opus-tools/ChangeLog
+++ b/media-sound/opus-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/opus-tools
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/opus-tools/ChangeLog,v 1.8 2013/12/13 16:08:59 polynomial-c Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/opus-tools/ChangeLog,v 1.9 2014/01/20 13:15:07 yngwin Exp $
+
+  20 Jan 2014; Ben de Groot <yngwin@gentoo.org> -opus-tools-0.1.2.ebuild,
+  -opus-tools-0.1.5.ebuild, -opus-tools-0.1.7.ebuild, opus-tools-0.1.8.ebuild:
+  Adjust media-libs/opus dependency (bug #487888). Drop old.
 
 *opus-tools-0.1.8 (13 Dec 2013)
 
diff --git a/media-sound/opus-tools/opus-tools-0.1.2.ebuild b/media-sound/opus-tools/opus-tools-0.1.2.ebuild
deleted file mode 100644
index 59c797cbbc11..000000000000
--- a/media-sound/opus-tools/opus-tools-0.1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/opus-tools/opus-tools-0.1.2.ebuild,v 1.1 2012/06/14 19:12:22 lu_zero Exp $
-
-EAPI=4
-
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://git.opus-codec.org/${PN}.git"
-fi
-
-inherit autotools ${SCM}
-
-DESCRIPTION="The Opus codec is designed for interactive speech and audio
-transmission over the Internet."
-HOMEPAGE="http://opus-codec.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="http://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
-else # Official release
-	SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=media-libs/libogg-1.3.0
-		 >=media-libs/opus-0.9.10"
-DEPEND="virtual/pkgconfig
-		${DEPEND}"
-
-src_prepare() {
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-sound/opus-tools/opus-tools-0.1.5.ebuild b/media-sound/opus-tools/opus-tools-0.1.5.ebuild
deleted file mode 100644
index fe0b34edc25e..000000000000
--- a/media-sound/opus-tools/opus-tools-0.1.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/opus-tools/opus-tools-0.1.5.ebuild,v 1.1 2012/09/09 10:01:40 lu_zero Exp $
-
-EAPI=4
-
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://git.opus-codec.org/${PN}.git"
-fi
-
-inherit autotools ${SCM}
-
-DESCRIPTION="The Opus codec is designed for interactive speech and audio
-transmission over the Internet."
-HOMEPAGE="http://opus-codec.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="http://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
-else # Official release
-	SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=media-libs/libogg-1.3.0
-		 >=media-libs/opus-0.9.10"
-DEPEND="virtual/pkgconfig
-		${DEPEND}"
-
-src_prepare() {
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-sound/opus-tools/opus-tools-0.1.7.ebuild b/media-sound/opus-tools/opus-tools-0.1.7.ebuild
deleted file mode 100644
index 3cef01f49ee3..000000000000
--- a/media-sound/opus-tools/opus-tools-0.1.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/opus-tools/opus-tools-0.1.7.ebuild,v 1.2 2013/10/12 16:22:10 aballier Exp $
-
-EAPI=4
-
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://git.opus-codec.org/${PN}.git"
-fi
-
-inherit autotools ${SCM}
-
-DESCRIPTION="The Opus codec is designed for interactive speech and audio
-transmission over the Internet."
-HOMEPAGE="http://opus-codec.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="http://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
-else # Official release
-	SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flac"
-
-RDEPEND=">=media-libs/libogg-1.3.0
-		 >=media-libs/opus-0.9.10
-		 flac? ( >=media-libs/flac-1.1.3 )
-		 "
-DEPEND="virtual/pkgconfig
-		${DEPEND}"
-
-src_prepare() {
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with flac)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-sound/opus-tools/opus-tools-0.1.8.ebuild b/media-sound/opus-tools/opus-tools-0.1.8.ebuild
index 0df03c8d8490..de1de64178df 100644
--- a/media-sound/opus-tools/opus-tools-0.1.8.ebuild
+++ b/media-sound/opus-tools/opus-tools-0.1.8.ebuild
@@ -1,20 +1,16 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/opus-tools/opus-tools-0.1.8.ebuild,v 1.1 2013/12/13 16:08:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/opus-tools/opus-tools-0.1.8.ebuild,v 1.2 2014/01/20 13:15:07 yngwin Exp $
 
 EAPI=5
+inherit autotools eutils
 
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://git.opus-codec.org/${PN}.git"
-fi
-
-inherit autotools eutils ${SCM}
-
-DESCRIPTION="The Opus codec is designed for interactive speech and audio
-transmission over the Internet."
+DESCRIPTION="Royalty-free, highly versatile audio codec"
 HOMEPAGE="http://opus-codec.org/"
+
 if [[ ${PV} == *9999 ]] ; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.opus-codec.org/${PN}.git"
 	SRC_URI=""
 elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
 	SRC_URI="http://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
@@ -28,11 +24,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="flac"
 
 RDEPEND=">=media-libs/libogg-1.3.0
-		 >=media-libs/opus-0.9.10
-		 flac? ( >=media-libs/flac-1.1.3 )
-		 "
+		 >=media-libs/opus-1.0.3
+		 flac? ( >=media-libs/flac-1.1.3 )"
 DEPEND="virtual/pkgconfig
-		${DEPEND}"
+		${RDEPEND}"
 
 src_prepare() {
 	[[ ${PV} == *9999 ]] && eautoreconf