gentoo resync : 30.06.2019

3 files changed, 2 insertions, 51 deletions

diff --git a/media-sound/erec/Manifest b/media-sound/erec/Manifest
index 346f4aa22066..7c1cc6ff69a3 100644
--- a/media-sound/erec/Manifest
+++ b/media-sound/erec/Manifest
@@ -1,5 +1,4 @@
 AUX erec-2.2.0.1-gcc43.patch 340 BLAKE2B d3fc0c0d4bb509e7ce3839b8e83732a12602036502a010d1752139c66da6fcc8993bfcc98d74fb226ee67a0af9d2f73c5da97586a2fa61932c6469310411f5d0 SHA512 12f94249223911709ce46b3c5b1985019232f2d2ea906cfdebc30f6fd9e314e38ec40b734ea235d063f499e651a76fb05bcbfdd3be190b41e03625180b154cb0
 DIST erec-2.2.0.1.tar.bz2 25966 BLAKE2B 22e93e2185fc5eafab93a2558b3dd1261bcd7a96613fcc9b321baba13ca4dfaf024399aa298d36a6df7857ff0dd03c0bb15d3b3c26549b1845dba22061a94f6e SHA512 24832483ebca011294931a40be192fa1f6a0fbf69d2b515529bd6d9cbdb5bbd904f266bd824f816d044ed7ba63bc8cc6886868a0d594a0071e757c3e9ebfef28
-EBUILD erec-2.2.0.1-r1.ebuild 1000 BLAKE2B b0a97af4152309e4a9e106c8a9acbee69a7d107dc32862c6f082903db8137cce5434e5a2e48cb0e8f5d7fb7038ca3a87a1c6e4d82f86f0332766dd320e7976ec SHA512 2ba45949afad716291cb0e613e751f61928c5f5aab4981dc2622bf519a3ac16b290dd416da53030dbdad288379858784b4ed62df01c8d5797a3dd70fbfde991b
-EBUILD erec-2.2.0.1.ebuild 1015 BLAKE2B e6276645909bd996d5a03d3b8a94395a5e45f60848b911870caab8a559a4ed6ebce13d663088e5a5ca821b6f776e2ae1102dc44977eb0adb87ba10f3f9d4e0a5 SHA512 e3ff44ed3d359dd5176743241d7bc7d672da6bfa8044c54634b72e3bdcbc6ae9f3ea26a455ceae5cf8bc167e800013bee802eb07ebedd608c6074b25a4b43f95
+EBUILD erec-2.2.0.1-r1.ebuild 997 BLAKE2B 2841bafd4db18142468530877bd856ae03c3f424d173c2cf59c6742ac34c77c336c00097235da3edd4a49089260be17fa23daabd98ebd3a8c36448867597435a SHA512 7cb541e19f0a58a410a8799fa3087dedb294dcac260325d893f667335837eb8783197f1d02f71fdf48a833bea32622f90b97b610a86d36488cb6b2768b114765
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/erec/erec-2.2.0.1-r1.ebuild b/media-sound/erec/erec-2.2.0.1-r1.ebuild
index 527e1ace368b..1159778649aa 100644
--- a/media-sound/erec/erec-2.2.0.1-r1.ebuild
+++ b/media-sound/erec/erec-2.2.0.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Shared audio recording server"
 HOMEPAGE="https://bisqwit.iki.fi/source/erec.html"
 SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
diff --git a/media-sound/erec/erec-2.2.0.1.ebuild b/media-sound/erec/erec-2.2.0.1.ebuild
deleted file mode 100644
index 4d9f2c352052..000000000000
--- a/media-sound/erec/erec-2.2.0.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Shared audio recording server"
-HOMEPAGE="https://bisqwit.iki.fi/source/erec.html"
-SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
-
-KEYWORDS="amd64 ~ppc sparc x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="sys-apps/sed"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "s:BINDIR=/usr/local/bin:BINDIR=${D}usr/bin:" \
-		-e "s:^\\(ARGHLINK.*-L.*\\):#\\1:" \
-		-e "s:^#\\(ARGHLINK=.*a\\)$:\\1:" \
-		-e "s:\$(CXX):\$(CXX) \$(CXXFLAGS) -I\"${S}\"/argh:g" \
-		Makefile
-
-	sed -i \
-		 -e "s:CPPFLAGS=:CPPFLAGS=-I\"${S}\"/argh :" \
-		Makefile.sets
-
-	echo "" > .depend
-	echo "" > argh/.depend
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -j1 || die
-}
-
-src_install() {
-	dobin erec || die
-	dodoc README
-	dohtml README.html
-}