3 files changed, 5 insertions, 101 deletions
diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index d4e2cda4b460..c056dfcbd702 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/cdparanoia
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.122 2014/01/28 14:01:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.123 2014/01/28 15:53:54 ssuominen Exp $
+
+  28 Jan 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -cdparanoia-3.10.2-r4.ebuild, -cdparanoia-3.10.2-r5.ebuild:
+  old
 
   28 Jan 2014; Agostino Sarubbo <ago@gentoo.org> cdparanoia-3.10.2-r6.ebuild:
   Stable for ppc64, wrt bug #497246
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r4.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r4.ebuild
deleted file mode 100644
index cad9037a5afd..000000000000
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r4.ebuild
+++ /dev/null
@@ -1,42 +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/cdparanoia/cdparanoia-3.10.2-r4.ebuild,v 1.3 2013/03/03 09:24:39 vapier Exp $
-
-EAPI=4
-inherit autotools eutils flag-o-matic libtool toolchain-funcs versionator
-
-MY_P=${PN}-III-$(get_version_component_range 2-3)
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="http://www.xiph.org/paranoia"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
-	http://dev.gentoo.org/~ssuominen/${MY_P}-patches-2.tbz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
-
-	mv configure.guess config.guess
-	mv configure.sub config.sub
-
-	sed -i -e '/configure.\(guess\|sub\)/d' configure.in || die
-
-	eautoconf
-	elibtoolize
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-	append-flags -I"${S}/interface"
-	econf
-}
-
-src_compile() {
-	emake OPT="${CFLAGS}"
-	use static-libs && emake lib OPT="${CFLAGS}"
-}
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r5.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r5.ebuild
deleted file mode 100644
index 3eee86c3a049..000000000000
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r5.ebuild
+++ /dev/null
@@ -1,58 +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/cdparanoia/cdparanoia-3.10.2-r5.ebuild,v 1.3 2013/03/03 09:24:39 vapier Exp $
-
-EAPI=5
-inherit autotools eutils flag-o-matic libtool toolchain-funcs versionator
-
-MY_P=${PN}-III-$(get_version_component_range 2-3)
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="http://www.xiph.org/paranoia"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
-	http://dev.gentoo.org/~ssuominen/${MY_P}-patches-2.tbz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="app-admin/eselect-cdparanoia"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
-
-	mv configure.guess config.guess
-	mv configure.sub config.sub
-
-	sed -i -e '/configure.\(guess\|sub\)/d' configure.in || die
-
-	eautoconf
-	elibtoolize
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-	append-flags -I"${S}/interface"
-	econf
-}
-
-src_compile() {
-	emake OPT="${CFLAGS}"
-	use static-libs && emake lib OPT="${CFLAGS}"
-}
-
-src_install() {
-	default
-	mv "${ED}"/usr/bin/${PN}{,-paranoia}
-}
-
-pkg_postinst() {
-	eselect ${PN} update ifunset
-}
-
-pkg_postrm() {
-	eselect ${PN} update ifunset
-}