Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

6 files changed, 25 insertions, 24 deletions

diff --git a/media-sound/mp32ogg/Manifest b/media-sound/mp32ogg/Manifest
index f71d3ad4444b..3a6abe363549 100644
--- a/media-sound/mp32ogg/Manifest
+++ b/media-sound/mp32ogg/Manifest
@@ -1,7 +1,7 @@
-AUX mp32ogg-0.11-r4-mpg321.patch 708 BLAKE2B d0c5eef64ea12442fd1db61a710840db76a0b203b4a544a9c287ece42d5a2d90abf8c9abbce54b06f0b75607f7e35aef3f11f70daceea492b4e873b21b8e4345 SHA512 b54e2bfb21aae229b1703719b1bc5a231ddeac90e3f40b15ecd36c4a4a6015701358f47170b2aa5e7869bd5cef5ccf24405076835e82e08279f1accd204b27a0
-AUX mp32ogg-0.11-r4-quality.patch 2676 BLAKE2B 7d3b5f6b3fe9e3f8f99031b0cc30a1fc30bea30f3e2f21ef23e1ec161b2d6a319518ba9ae1a6e5c661b6621859c8eb398334c6734990b14815d1593785b92800 SHA512 e66238a8f512013ad9a86acb50d16ed178c291f6f30da96d16f9de779f8c37e023832e6d2adee1d8778d884e1085b6a2821560b7e8cc34422b2e90b83a1bb801
-AUX mp32ogg-0.11-r5-german_umlaut.patch 1786 BLAKE2B b25e35b6a231f4138c137a413c60a9420e63bb453da7df5f53868124c0f581c9d1c4b4350dbad1322470c297d39e9cabdb2fa0372e7aa50417ebf62340ce94c1 SHA512 9e95d4de4bb4656dd9600282a169ed1c47e50dc4b47219375138e0e81d3b5e9ed14f2f8411422a7cb68a0bc458ce34af20bdf9d4f606200118a2a70451e33aeb
-AUX mp32ogg-0.11-r6-force-filename-stringification.patch 374 BLAKE2B 76a3c37e46a94cdf2712bc74bb1d981344ce6a47831d8c63b49137e66e0724df304f7fbe5696cb0a08605b56ef7c9c9b24e992e503e89687c7433acbd07fdb89 SHA512 0179d71462fb6d88f5378d5a82622544eed9869b1bd533c1fccc73337a8b3820030dfa4abe6e04f6a887da92696882d303a6e94f955166b95c7df31a437a9494
+AUX mp32ogg-0.11-r4-mpg321.patch 781 BLAKE2B 9d0e0293bbaf53542621b678fd89a6562b95409298ec1ed32838eaed05b58ab44366b95193537a3349e77f607bfe610d6057f221e856e3a774ce2c6869aacd66 SHA512 d4c93206c424358859dfd0e5474e8b9990458c239ab2f4b3fdf873c5808bdd278fb05355bd7e6c50b8ae40be26ff65b90efa83e19a18df8e84c0de7181fbb8fd
+AUX mp32ogg-0.11-r4-quality.patch 2749 BLAKE2B 8a1d1a4f4f7c0c5d0be5eeb8f796e727054f4da528a228278f7ca6887b07756ac671bf12a50cc84fa5ba4190bf6c4a9dd52a92f76e6cd4e7fd72147e3308be90 SHA512 70ff58791c8704eb78016364f86669576c7101c4d4d34cd0a46e2c3abfaadffc817ae40f1192cc1b295a131d72da72cb1eedfff4032798b033b3e0ad656b0c44
+AUX mp32ogg-0.11-r5-german_umlaut.patch 1858 BLAKE2B e0b1c2ee7ef95b42584208a212a99753a94f1b40f70776f4fbca094c8a0c2bbd2e08a09d64df2f231d5b02f701caecc9370de5a8a931aeaabc826195e92b285b SHA512 aef750075b8af19c1a88c0c78bf55653f91af815aa3ff723a6bb3a2961996f1ff65f29cc5d2f7027371a2b91e5dce6088a6c8582f5dafd8b6346ba129e770b8d
+AUX mp32ogg-0.11-r6-force-filename-stringification.patch 370 BLAKE2B 36dd2daf9ea585878f5e8fdbf96ccc0060117fa9256244fb6f811dcab1a2cd02d8745543787c8df0479fb606066b9ac5bcf4b74064cd4b3effc00910a3ffeb0f SHA512 494d44a6265422270cad2cb81f99809760f1816584b6657e4e9c0d3a500ad6ee9d989277815ecaab613ee03a9d6571b7db06bca6430dcad208015ebbc27f6303
 DIST mp32ogg 9216 BLAKE2B b73b17b7005ae53487a78b5e4ae118b1c18b713609ec9d7fb83b9f1295ae21b0cf5a3178445042562cea992c078b432353a40c46cbfa5a5e49c45e8cbae95002 SHA512 342c3e0430d203fed8f793fb14fa532210cac616a0f48d243c9a14477d048bf9da3dbab5712cdf24cff2d98c6a5bc1edb43080f4ee05672fcf8f3e07fa667bd1
-EBUILD mp32ogg-0.11-r6.ebuild 784 BLAKE2B 8f70106f59b2427cfc3a968b18109383352c3ea06b61909f781c5922d7d301e3906a735ca45290de41a0c5c00807a50a702144c47194e0f64323bf41ab4667fa SHA512 ced29fa6a3e071c0016f83882893501034a7859f1f43c4840f815761f3c5d31a2de678333bc52604dd26a31bb469dac0882eaa03a03c0db1a099a82cc9824169
+EBUILD mp32ogg-0.11-r6.ebuild 802 BLAKE2B 486204cb7ed6fcc452da144bba607833b3de73307c647e84e1ca9977d390075ead08f35427debe2f6b72ec88cacbe2664ce4920e3b8a8dc234089ef54a5290da SHA512 2c88ab384fd4ebc4d6b4f625c4f80fe3876953d859dd748f23eb2da0d3503974ce757a866f5c13cc056b745730a8590edd2733e693e256d505d2fb25d4e0d749
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
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 f71f13163e25..b617584f94de 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 @@
---- a/mp32ogg
-+++ b/mp32ogg
+--- mp32ogg.orig	2004-02-03 01:09:20.000000000 -0800
++++ mp32ogg	2004-02-03 01:25:01.000000000 -0800
 @@ -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 0bf9b05a5ca4..38fad9bc9abc 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 @@
---- a/mp32ogg
-+++ b/mp32ogg
+--- mp32ogg.orig	2005-01-01 15:32:32.138906448 +0000
++++ mp32ogg	2005-01-01 15:52:33.061338488 +0000
 @@ -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 10588d87e1d9..20361f1b9835 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 @@
---- a/mp32ogg
-+++ b/mp32ogg
+--- mp32ogg_old	2008-01-29 10:45:06.000000000 +0100
++++ mp32ogg	2008-01-29 10:44:34.000000000 +0100
 @@ -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 1b08f5453350..65f7a83454fa 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
 
---- a/mp32ogg
-+++ b/mp32ogg
+--- mp32ogg
++++ 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 92d9ea2f2c79..72c5e39e14aa 100644
--- a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=2
+inherit eutils
 
 DESCRIPTION="A perl script to convert MP3 files to Ogg Vorbis files"
 HOMEPAGE="http://faceprint.com/code/"
@@ -20,17 +21,17 @@ DEPEND=""
 
 S=${WORKDIR}
 
-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_unpack() {
-	cp -f "${DISTDIR}"/${PN} "${WORKDIR}" || die "Copying sources failed"
+	cp -f "${DISTDIR}"/${PN} "${WORKDIR}" || die
+}
+
+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_install() {
-	dobin mp32ogg
+	dobin mp32ogg || die
 }