gentoo resync : 03.11.2019

5 files changed, 51 insertions, 32 deletions

diff --git a/media-sound/poc/Manifest b/media-sound/poc/Manifest
index 04be1c604293..e7d5fda02a12 100644
--- a/media-sound/poc/Manifest
+++ b/media-sound/poc/Manifest
@@ -1,5 +1,6 @@
-AUX poc-0.4.1-fec-pkt-prototype.patch 214 BLAKE2B d97d4a1a105c475635a662f5ce17cef249dacd00a23dde77870a80bfa326b98f6f5fdefa75f58c65d04727880750505dd656fca278aa5c658fe99be1a9420a12 SHA512 d98b35b746f5bc92c017e2c3f3bf3f19b2ed28970a955dd0ca6010f338889cacf0c3e527f2eb8a57bbdfc67499fd2eb24b93662dbb2b24c43ed790e79e249e99
-AUX poc-0.4.1-file-perms.patch 269 BLAKE2B f09586fd78447263d21c4685144931c59029c0db94967bf0670754601b1c16ceb247327846379aa384eb82d847d1a6608749bb1b5dd9b65cbda70e114ff54b0c SHA512 a86671efabc9438876132f92a9d59ec2a125010796f645c63b67ec29d26040bfd158852580881576564961e2efd0ee86eaf8b29577ad5bbd94d974ed1e4d811b
+AUX poc-0.4.1-fec-pkt-prototype.patch 218 BLAKE2B 48a3f1938094bf997187dc9451d8d13d09be12f290154e75d116ca82e0dc2ec311e243357fc02d7889e2af514abeb88f005183f85338050d18b2f5c7b6df5791 SHA512 bae56e17cbc735a805b58e63f579254e42487f84b761675e40cb055f82272dfdff6a1fe9b8907ac9562334962f28713d2a8185e3c73b77e9f5519e4837abf8ec
+AUX poc-0.4.1-file-perms.patch 273 BLAKE2B ba02074fafae5ee2ace5dd8e60d059da4725d6260115e739505a67f19fce0fcf126e4e1d4e434fbf2b6209ebda1fbb6b0af5a56d0546bfd9b4d81b04ff0f3846 SHA512 ebb4e43e57265c4b40d7e50e0bcb4f2defbcadf9eaa354393320ed90c2ee2120c0859c2533068331b31231353c32b6b0e021e9352a77e904e4224fc2ff74a299
+AUX poc-0.4.1-fix-build-system.patch 1014 BLAKE2B cdcb45bf5a461ad1c64751b8370571e7901f3cd65d1bce2d365c59528b8a6e00c02cedd665ac780fcc11c3b363a425db40f1e611c2c86e6d2b4dd7645a31db39 SHA512 a831eb4ab7c344299bf7ef432a4114bfcbc54f650b36a63de2677da8cb90c986e3e616fda658c13377afaf66ed389ae2d83971943a22a43571807835ecd0a2fd
 DIST poc-0.4.1.tar.gz 114875 BLAKE2B 50731ca679bd24e799ecef193d40dc6ef38954fb96c418b426d9fcd30f776ac1e8239c6e3a756f0e333ae6ef2a623561c19fe216442241d6d06373e757e3e0ca SHA512 84cbe5421006a9b81310925c22d4b25888c036c83ee1c59ee63415fb5656b9c04d5c417817d026f8ad85240f401b3d5cdeb2c4f480b13bf7a295d147ef2246b7
-EBUILD poc-0.4.1.ebuild 841 BLAKE2B 90f26eb17967f437661bde67e30282510c24030b528e5f8c9a89b4125e44fcfb1affe3754a1fb1e98c250c2527fb0d39f362155ba3a0dd3eef0b465a309f94fe SHA512 980aedab8dbbbe7740804978df2c063f6d7cb99d940e016c674d5c120cca819f6a391ee174a6085c5a2cb75f17e5d11f2692565c71e976584b75d802b343d8ef
+EBUILD poc-0.4.1.ebuild 573 BLAKE2B cbd74d82389ea46f22eb451fde99db132bb2aa6f1f748c8ef106239a812dd6634ed1e96e0719c73f67f4d0d769dff7abc7c20e99871b4b50fe36c8ae89762c34 SHA512 795f25f35fe6cfb0ea5217c420a0f96012254260689abb277cca2f556503fb42b1fba9ffbd9a5ac256091dc4c5c7155f1b5128645c75d56f6ea29352fbf065cd
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/poc/files/poc-0.4.1-fec-pkt-prototype.patch b/media-sound/poc/files/poc-0.4.1-fec-pkt-prototype.patch
index f0957a1ca292..757a85faddb6 100644
--- a/media-sound/poc/files/poc-0.4.1-fec-pkt-prototype.patch
+++ b/media-sound/poc/files/poc-0.4.1-fec-pkt-prototype.patch
@@ -1,7 +1,7 @@
 sync prototypes between the header and source
 
---- fec-pkt.c
-+++ fec-pkt.c
+--- a/fec-pkt.c
++++ b/fec-pkt.c
 @@ -68,3 +68,3 @@
  **/
 -int fec_pkt_read(fec_pkt_t *pkt, int fd) {
diff --git a/media-sound/poc/files/poc-0.4.1-file-perms.patch b/media-sound/poc/files/poc-0.4.1-file-perms.patch
index ee23d90ab82b..71360341f0cf 100644
--- a/media-sound/poc/files/poc-0.4.1-file-perms.patch
+++ b/media-sound/poc/files/poc-0.4.1-file-perms.patch
@@ -1,7 +1,7 @@
 Creating mp3 files with u+x attributes is just silly
 
---- file.c
-+++ file.c
+--- a/file.c
++++ b/file.c
 @@ -136,3 +136,3 @@
      file->fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC,
 -                    S_IRWXU | S_IRGRP | S_IROTH);
diff --git a/media-sound/poc/files/poc-0.4.1-fix-build-system.patch b/media-sound/poc/files/poc-0.4.1-fix-build-system.patch
new file mode 100644
index 000000000000..01a58084633c
--- /dev/null
+++ b/media-sound/poc/files/poc-0.4.1-fix-build-system.patch
@@ -0,0 +1,30 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@
+ #
+ # 2005 bl0rg.net
+ 
+-CFLAGS += -Wall -O2
++CFLAGS += -Wall
+ 
+ # Uncomment these flags to add id3 support to mp3cue and mp3cut
+ #CFLAGS += -DWITH_ID3TAG
+@@ -352,8 +352,9 @@
+ 
+ USER  ?= root
+ GROUP ?= root
+-PREFIX:= /usr/local
++PREFIX:= /usr
+ install: install-man
++	install -d -g root -o root $(DESTDIR)/$(PREFIX)/bin
+ 	install -g root -o root -m 0755 mp3cue    $(DESTDIR)/$(PREFIX)/bin
+ 	install -g root -o root -m 0755 mp3cut    $(DESTDIR)/$(PREFIX)/bin
+ 	install -g root -o root -m 0755 mp3length $(DESTDIR)/$(PREFIX)/bin
+@@ -367,6 +368,7 @@
+ 	install -g root -o root -m 0755 pogg-http $(DESTDIR)/$(PREFIX)/bin
+ 
+ install-man:
++	install -d -g root -o root $(DESTDIR)/$(PREFIX)/share/man/man1
+ 	install -g root -o root -m 0644 man/man1/mp3cue.1    $(DESTDIR)/$(PREFIX)/share/man/man1
+ 	install -g root -o root -m 0644 man/man1/mp3cut.1    $(DESTDIR)/$(PREFIX)/share/man/man1
+ 	install -g root -o root -m 0644 man/man1/mp3length.1 $(DESTDIR)/$(PREFIX)/share/man/man1
diff --git a/media-sound/poc/poc-0.4.1.ebuild b/media-sound/poc/poc-0.4.1.ebuild
index f91c5fc7dd44..a187a005a8fe 100644
--- a/media-sound/poc/poc-0.4.1.ebuild
+++ b/media-sound/poc/poc-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="mp3 and ogg streamer (include mp3cue and mp3cut)"
 HOMEPAGE="http://www.bl0rg.net/software/poc"
@@ -12,29 +12,17 @@ SRC_URI="http://www.bl0rg.net/software/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="sys-devel/flex
-	sys-devel/bison"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/^CFLAGS/s:-O2::' \
-		-e '/^PREFIX/s:/local::' \
-		Makefile
-	epatch "${FILESDIR}"/${P}-fec-pkt-prototype.patch
-	epatch "${FILESDIR}"/${P}-file-perms.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed."
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-fec-pkt-prototype.patch
+	"${FILESDIR}"/${P}-file-perms.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
 
-src_install() {
-	dodir /usr/bin /usr/share/man/man1
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc README TODO
+src_configure() {
+	tc-export CC
 }