[gentoo-commits] repo/gentoo:master commit in: media-sound/mp32ogg/, media-sound/mp32ogg/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/mp32ogg/, media-sound/mp32ogg/files/

[Aaron Bauman]

commit:     35178d5ceee311f46117a41cb92da8ddc02cb188
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 21:22:43 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed May 30 00:27:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35178d5c

media-sound/mp32ogg: bump EAPI and drop eutils

Upstream is dead, but the package is still mirrored by Gentoo. Unable to
rename the source file.

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8641

 .../mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch     |  4 ++--
 .../mp32ogg/files/mp32ogg-0.11-r4-quality.patch    |  4 ++--
 .../files/mp32ogg-0.11-r5-german_umlaut.patch      |  4 ++--
 ...gg-0.11-r6-force-filename-stringification.patch |  4 ++--
 media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild         | 23 +++++++++++-----------
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch
index b617584f94d..f71f13163e2 100644
--- a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch
@@ -1,5 +1,5 @@
---- mp32ogg.orig	2004-02-03 01:09:20.000000000 -0800
-+++ mp32ogg	2004-02-03 01:25:01.000000000 -0800
+--- a/mp32ogg
++++ b/mp32ogg
 @@ -6,6 +6,9 @@
  # <http://www.opensource.org/licenses/artistic-license.html>
  

diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
index 38fad9bc9ab..0bf9b05a5ca 100644
--- a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
@@ -1,5 +1,5 @@
---- mp32ogg.orig	2005-01-01 15:32:32.138906448 +0000
-+++ mp32ogg	2005-01-01 15:52:33.061338488 +0000
+--- a/mp32ogg
++++ b/mp32ogg
 @@ -9,6 +9,8 @@
  # 0.11-gentoo
  #     * Jeremy Huddleston <eradicator@gentoo.org>:

diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
index 20361f1b983..10588d87e1d 100644
--- a/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
@@ -1,5 +1,5 @@
---- mp32ogg_old	2008-01-29 10:45:06.000000000 +0100
-+++ mp32ogg	2008-01-29 10:44:34.000000000 +0100
+--- a/mp32ogg
++++ b/mp32ogg
 @@ -6,6 +6,10 @@
  # <http://www.opensource.org/licenses/artistic-license.html>
  

diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
index 65f7a83454f..1b08f545335 100644
--- a/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
@@ -1,8 +1,8 @@
 http://bugs.gentoo.org/328953
 http://qa.mandriva.com/53477
 
---- mp32ogg
-+++ mp32ogg
+--- a/mp32ogg
++++ b/mp32ogg
 @@ -167,7 +167,9 @@
  }
  

diff --git a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
index 72c5e39e14a..92d9ea2f2c7 100644
--- a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="A perl script to convert MP3 files to Ogg Vorbis files"
 HOMEPAGE="http://faceprint.com/code/"
@@ -21,17 +20,17 @@ DEPEND=""
 
 S=${WORKDIR}
 
-src_unpack() {
-	cp -f "${DISTDIR}"/${PN} "${WORKDIR}" || die
-}
+PATCHES=(
+	"${FILESDIR}/${P}-r4-mpg321.patch"
+	"${FILESDIR}/${P}-r4-quality.patch"\
+	"${FILESDIR}/${P}-r5-german_umlaut.patch"
+	"${FILESDIR}/${P}-r6-force-filename-stringification.patch"
+)
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-r4-mpg321.patch \
-		"${FILESDIR}"/${P}-r4-quality.patch \
-		"${FILESDIR}"/${P}-r5-german_umlaut.patch \
-		"${FILESDIR}"/${P}-r6-force-filename-stringification.patch
+src_unpack() {
+	cp -f "${DISTDIR}"/${PN} "${WORKDIR}" || die "Copying sources failed"
 }
 
 src_install() {
-	dobin mp32ogg || die
+	dobin mp32ogg
 }