gentoo resync : 21.07.2018

8 files changed, 5 insertions, 561 deletions

diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index b27b24c997cb..1d9171377436 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,20 +1,10 @@
-AUX config.gentoo 480 BLAKE2B 45d6f1f4af54d643cbb6d5d5d5687a8386014dce8b4cb8d821362739408e246ca2250ef6cfeef42abbc6033aeb16bb2f134c605a7bbc80abe633b46b6b544cec SHA512 3a2ead41b8005f2c5fb03e3911143ea1540855bf2f81058adc782dbe6d2d7a426582f923593479388ac55ff5022bcd6642de01e5e08355e3fed9162c06f3b9e1
 AUX config.gentoo-r1 499 BLAKE2B 8a4f1261f09e613c2bd666b070c4f5848a5b30ed48cf5668623274a4aaaeb525ded1ac83f8b5e0d6a7ec7c149c1959651e15ca3223a29e7a9487ce206c972b95 SHA512 4fab673258f340f00a79ced3106b6f32b74eaa7c691447422890ef66ae5ac82f703b3ad08178d656823d9cd51510521ff92c41866e629657a6e67c53279c0752
-AUX config.gentoo-so-r1 505 BLAKE2B a51e2ae4b288dcd296977c06232bafe7e8b3f34d770ba6a07f282d72db1dc1b38cebfefce7ceb4c2f8ffddc28d1c1523f950a4dc336e2e337cbb94c98d524aad SHA512 f9375c226eb74a1dbb79cbe98e0945f3729703fc11f6f8a1865bcd1ce6dca6024c650e6354e8ccd146c91d73f89d8db64dc239fca730d525e8679429284d38d7
 AUX config.gentoo-so-r2 524 BLAKE2B b540de1163b9eb6014bd421c62d582bb6b4341866e6fb8212bc0c38c7fc3c9bf4f5cf6e1bd95a9e30879384dfad3232361985b10a093b900b52bb6ca01216577 SHA512 03d6a8712c0c2c4b7b7ebcdcada9ab6ece6fd19ffafc61c864821d19671001efb7c91b77fcf35ed38275c46d305ade3a7a655922fdec3ab6e7e00785242ee5fd
 AUX live-recursive3.patch 557 BLAKE2B f18a8152345006272b2b7385053ffd012e6dabc5754ae7712def7e90c55040c9e1c80dafc0d30555751e183c2b9d92de4410d8cb95d8707414cb17f641acbb6f SHA512 98992859d1f8149e337adbf42c13276e6bf40d5497399ab4f82351cd5caf78ecd60e28df24d36b34cfd02e83365cb37ae1b264afcb52334f304695b400bce622
-DIST live.2017.01.26.tar.gz 629183 BLAKE2B 43cdbfff53990c128620cb3fcd1e55bc5571dd331ff5359b0c971b82cfdc65623aeb453410d8cc5cbe44517dce2b4dd6a846b295387c92d7c22895f9f611ef06 SHA512 2123d78c18cb2a0f522450aa426beceefe7f70b659ec9c9f04045cbde8e53a927b7909172a42da3967be73989b16f444f02e0b70dab671d4c75e567d8939ad23
-DIST live.2017.05.24.tar.gz 629181 BLAKE2B 2cf6218777991fe68b10f130f04691cc98a4e7c11dcfe7f79144bbae62716afba1f3b504fbeadadee7af8d64e2715fd62a7be8b38637a52c71b0cff511747304 SHA512 d00d87d4e011f1c100331e517f2939fe85e25d0920b9418d66c4f9254b2441c569ef7c3ece05123132f3dc44da595a62f57f0840ca33e40c48c2b193bc44b01b
-DIST live.2017.06.04.tar.gz 629288 BLAKE2B df2e99ab348b92de1b3ac60b53e9f80a41a8307160f78b5bc8f97385210a4b45f0b4bb9359a3b1574880b6d15a09506aa654100ca5360041c3ac31e9c9698687 SHA512 89eb3854c2ef7d0a1f443b4ca46c66040dfcc586ffd1e3e08c1b9e831eae6ade1c16e628c0ed0e7804c4e7430993f662e3fe8df2f09903024153d188276c3088
-DIST live.2017.07.18.tar.gz 629395 BLAKE2B 79a7a31b65d6a116ab36f6f9c590df0957ce84810cb4ac6ae101ae6185bbe80cbbea68a45a0119cb2acb75f7f7647b4f4006449e82b5f02b597f3048bf322d58 SHA512 49e164203a73a94629e66fcf48fde5f937b2c4724a0d4026b1970a8118039ce5cec393b777dea7439c09d3b0789f9f9d7f6f8a5328c4a3dd78a95e05b6525586
-DIST live.2017.09.12.tar.gz 629538 BLAKE2B 6f2b08d6b73a287663ec2c40faa7ff8b955aea7ca261d3eec69d85ea77f26ee951d14c3aedac48d84be0bdaafccc7a721d83974ce0fc8693aecc63984f377fbe SHA512 09b18b5f5dce28519b6c7cd8d52eb3448711939df051f84c8d6dce0b88d05c982711059f2ce13efccd326b2dbfeb93b88c4e03fe4a88bbd8fcefcb25e51d107d
 DIST live.2017.10.28.tar.gz 629858 BLAKE2B a1d862ae1356b46fcd4e5ef7e27c47d3fb3abac35add6feb7955f60ddbd93e9242a84102393de67dda0d39c09632a0cc9a5f54d30c9f91d005696d3a566258bd SHA512 eea5bdb8d89e76c8b6aeb6ec04b77af3048cb41f228d230ba4da6045e9bc691a456023d44d8650fe690b08143567ed5af5b633f5b6522debff79344a813dc7d0
 DIST live.2018.01.29.tar.gz 630144 BLAKE2B dd58865636a44ccabd0e3b02e1679393f17fb09d82455188d49d4fcb321b21e136a168c0f4c407c1dba3afcb5b541192cd2c5181d7a7710d39d4727526fc39cf SHA512 dfdfcac67acd28f651807de423c6aed00190cfc38ecd361b76d37d8cc27ee2fa91a42a5b8835045680fd7f65c847e41747b948c2c71e6530a3c7e89421c60227
-EBUILD live-2017.01.26.ebuild 4074 BLAKE2B 0ed602e82d042ccb992c5d246760ae3b0d1203e8e25ef6eae8261402e23691858fe4ac56227d5976728a41a999deed3a2921e027253b56ab6e8ccacc0c951fb8 SHA512 7e64a5112cb951c2521d852950a3f59381058dc3383aa44166f3e61ffd70cc80e5cb7a6146837c987e243d05dcab00c1ae42e1f4fb47c73bac39bf33a4a10628
-EBUILD live-2017.05.24.ebuild 4083 BLAKE2B ad6936bdf6531802afd6bb4760a9f697adc0bbd0da17f17f06a7f356d44820df696910f0142e1b962e56c808332af6bab3229e6d24125354075be6094472b5bd SHA512 b691cab7073fdcead420d65e6d19648fc366960906a9459a9db07318aad208bd1894695db9d1d241bebdc781784bed70527575d5443d026a402c1013515a52d7
-EBUILD live-2017.06.04.ebuild 4090 BLAKE2B 50e8ea7a3d60bbaff107d0835eea0f501d43b1cfe579b1b64486e2f0761f6dd5d2c81ed43ad05788effd256cffb81e496855647a217bc353ac122626173d2552 SHA512 05afb93c11e0739f8106c637c63e544ec1344d6de6b77c0da113b70821ea38a2e4a1da1eaef6e1f44b8f8dfc15894f288a19c17696f92ac63fd46f488ecdbaf6
-EBUILD live-2017.07.18.ebuild 4090 BLAKE2B 50e8ea7a3d60bbaff107d0835eea0f501d43b1cfe579b1b64486e2f0761f6dd5d2c81ed43ad05788effd256cffb81e496855647a217bc353ac122626173d2552 SHA512 05afb93c11e0739f8106c637c63e544ec1344d6de6b77c0da113b70821ea38a2e4a1da1eaef6e1f44b8f8dfc15894f288a19c17696f92ac63fd46f488ecdbaf6
-EBUILD live-2017.09.12.ebuild 4090 BLAKE2B 50e8ea7a3d60bbaff107d0835eea0f501d43b1cfe579b1b64486e2f0761f6dd5d2c81ed43ad05788effd256cffb81e496855647a217bc353ac122626173d2552 SHA512 05afb93c11e0739f8106c637c63e544ec1344d6de6b77c0da113b70821ea38a2e4a1da1eaef6e1f44b8f8dfc15894f288a19c17696f92ac63fd46f488ecdbaf6
+DIST live.2018.07.07.tar.gz 630625 BLAKE2B 8545d4d8ed60328ccc782b6c2a8c4a0dc9ce3c1245fbc78fed4d3eb6f42de39c3c341456dc00cdc416fdcb2e518f5fe387273f5b4d2c3e2d32bfa22a21df2a90 SHA512 e7d4ddf51e9666c6ebe9a46976035b68fea94be54825535ffb04006cd242b9d3ad08250305206442bed3500d1e8d628ccf44302c485f63a9e244b3f8b1e27fe4
 EBUILD live-2017.10.28.ebuild 4119 BLAKE2B e659bc41f6a6957369cb65e60ac6002ce822a9535fb5bb01e96ba097dc29c3e7db7b88df070d73132c10b65a13fcf963fd257a9b5b6a1270ea1bf3dcdbf25adc SHA512 c5909db1feeb8fc5bb2ae8ba67b685498db4ccd657563f42adb2e79b96f2ac851f8acee2f847808987cdabd8d10dcd4e2ec6e7e3f02f4aa38f408acca425cf93
 EBUILD live-2018.01.29.ebuild 4127 BLAKE2B ec6c5912a3bb8f9ef9c4324ee4d6a854f466ce6cd7ea70a35e787315b0a868626e6669da07e41d188c50bd9b19b3e8289e88c749eea31fdc977687ee98d92bfc SHA512 37d4c1ee272c5b15f2b18a70b245d73c3d4cef288b428d21fa905d38bc9acd43cba28723c70a6708a40d01aa62891796a1cb2ef85015e6567dc5c356d693ba1e
+EBUILD live-2018.07.07.ebuild 4127 BLAKE2B ec6c5912a3bb8f9ef9c4324ee4d6a854f466ce6cd7ea70a35e787315b0a868626e6669da07e41d188c50bd9b19b3e8289e88c749eea31fdc977687ee98d92bfc SHA512 37d4c1ee272c5b15f2b18a70b245d73c3d4cef288b428d21fa905d38bc9acd43cba28723c70a6708a40d01aa62891796a1cb2ef85015e6567dc5c356d693ba1e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/files/config.gentoo b/media-plugins/live/files/config.gentoo
deleted file mode 100644
index b19d17552aac..000000000000
--- a/media-plugins/live/files/config.gentoo
+++ /dev/null
@@ -1,17 +0,0 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
-C =			c
-C_COMPILER =		$(CC)
-C_FLAGS =		$(COMPILE_OPTS) $(CFLAGS)
-CPP =			cpp
-CPLUSPLUS_COMPILER =	$(CXX)
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) $(CXXFLAGS)
-OBJ =			o
-LINK =			$(CXX) -o
-LINK_OPTS =		-L.
-CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		$(LD) -o
-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -r -Bstatic
-LIB_SUFFIX =			a
-LIBS_FOR_CONSOLE_APPLICATION =
-LIBS_FOR_GUI_APPLICATION =
-EXE =
diff --git a/media-plugins/live/files/config.gentoo-so-r1 b/media-plugins/live/files/config.gentoo-so-r1
deleted file mode 100644
index 76a603557344..000000000000
--- a/media-plugins/live/files/config.gentoo-so-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
-C =			c
-C_COMPILER =		$(CC)
-C_FLAGS =		$(COMPILE_OPTS) -fPIC $(CFLAGS)
-CPP =			cpp
-CPLUSPLUS_COMPILER =	$(CXX)
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -fPIC $(CXXFLAGS)
-OBJ =			o
-LINK =			$(CXX) -o
-LINK_OPTS =		-L.
-CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		$(CXX) -o
-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -shared -Wl,-soname,$@
-LIB_SUFFIX =			so
-LIBS_FOR_CONSOLE_APPLICATION =
-LIBS_FOR_GUI_APPLICATION =
-EXE =
diff --git a/media-plugins/live/live-2017.01.26.ebuild b/media-plugins/live/live-2017.01.26.ebuild
deleted file mode 100644
index d73d48a4abb8..000000000000
--- a/media-plugins/live/live-2017.01.26.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
-HOMEPAGE="http://www.live555.com/"
-SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
-	mirror://gentoo/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples static-libs"
-DOCS=( "live-shared/README" )
-
-# Alexis Ballier <aballier@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-LIVE_ABI_VERSION=7
-SLOT="0/${LIVE_ABI_VERSION}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}/live" "${S}/" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-recursive3.patch"
-
-	if use static-libs ; then
-		cp -pPR live live-shared
-		mv live live-static
-	else
-		mv live live-shared
-	fi
-
-	use static-libs && cp "${FILESDIR}/config.gentoo" live-static
-	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
-
-	case ${CHOST} in
-		*-solaris*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-static/config.gentoo \
-				|| die ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die
-		;;
-		*-darwin*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
-				live-static/config.gentoo \
-				|| die static ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
-				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
-				-e '/^LIB_SUFFIX /s/so/dylib/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die shared
-		;;
-	esac
-	multilib_copy_sources
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
-	tc-export CC CXX LD
-
-	if use static-libs ; then
-		cd "${BUILD_DIR}/live-static"
-
-		einfo "Beginning static library build"
-		./genMakefiles gentoo
-		emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
-	fi
-
-	cd "${BUILD_DIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	local suffix=$(get_libname ${LIVE_ABI_VERSION})
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
-
-	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
-		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
-		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
-		popd > /dev/null
-	done
-
-	if multilib_is_native_abi; then
-		einfo "Beginning programs build"
-		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
-			cd "${BUILD_DIR}/live-shared/${i}"
-			emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
-		done
-	fi
-}
-
-multilib_src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		use static-libs && dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
-		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
-
-		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
-	done
-
-	if multilib_is_native_abi; then
-		# Should we really install these?
-		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
-			xargs -0 dobin
-
-		dobin live-shared/mediaServer/live555MediaServer
-		dobin live-shared/proxyServer/live555ProxyServer
-	fi
-}
diff --git a/media-plugins/live/live-2017.05.24.ebuild b/media-plugins/live/live-2017.05.24.ebuild
deleted file mode 100644
index 22ccb8b6eb6d..000000000000
--- a/media-plugins/live/live-2017.05.24.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
-HOMEPAGE="http://www.live555.com/"
-SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
-	mirror://gentoo/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples static-libs"
-DOCS=( "live-shared/README" )
-
-# Alexis Ballier <aballier@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-LIVE_ABI_VERSION=7
-SLOT="0/${LIVE_ABI_VERSION}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}/live" "${S}/" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-recursive3.patch"
-
-	if use static-libs ; then
-		cp -pPR live live-shared
-		mv live live-static
-	else
-		mv live live-shared
-	fi
-
-	use static-libs && cp "${FILESDIR}/config.gentoo" live-static
-	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
-
-	case ${CHOST} in
-		*-solaris*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-static/config.gentoo \
-				|| die ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die
-		;;
-		*-darwin*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
-				live-static/config.gentoo \
-				|| die static ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
-				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
-				-e '/^LIB_SUFFIX /s/so/dylib/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die shared
-		;;
-	esac
-	multilib_copy_sources
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
-	tc-export CC CXX LD
-
-	if use static-libs ; then
-		cd "${BUILD_DIR}/live-static"
-
-		einfo "Beginning static library build"
-		./genMakefiles gentoo
-		emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
-	fi
-
-	cd "${BUILD_DIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	local suffix=$(get_libname ${LIVE_ABI_VERSION})
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
-
-	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
-		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
-		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
-		popd > /dev/null
-	done
-
-	if multilib_is_native_abi; then
-		einfo "Beginning programs build"
-		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
-			cd "${BUILD_DIR}/live-shared/${i}"
-			emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
-		done
-	fi
-}
-
-multilib_src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		use static-libs && dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
-		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
-
-		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
-	done
-
-	if multilib_is_native_abi; then
-		# Should we really install these?
-		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
-			xargs -0 dobin
-
-		dobin live-shared/mediaServer/live555MediaServer
-		dobin live-shared/proxyServer/live555ProxyServer
-	fi
-}
diff --git a/media-plugins/live/live-2017.07.18.ebuild b/media-plugins/live/live-2017.07.18.ebuild
deleted file mode 100644
index c7a493903e00..000000000000
--- a/media-plugins/live/live-2017.07.18.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
-HOMEPAGE="http://www.live555.com/"
-SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
-	mirror://gentoo/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples static-libs"
-DOCS=( "live-shared/README" )
-
-# Alexis Ballier <aballier@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-LIVE_ABI_VERSION=7
-SLOT="0/${LIVE_ABI_VERSION}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}/live" "${S}/" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-recursive3.patch"
-
-	if use static-libs ; then
-		cp -pPR live live-shared
-		mv live live-static
-	else
-		mv live live-shared
-	fi
-
-	use static-libs && cp "${FILESDIR}/config.gentoo" live-static
-	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
-
-	case ${CHOST} in
-		*-solaris*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-static/config.gentoo \
-				|| die ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die
-		;;
-		*-darwin*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
-				live-static/config.gentoo \
-				|| die static ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
-				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
-				-e '/^LIB_SUFFIX /s/so/dylib/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die shared
-		;;
-	esac
-	multilib_copy_sources
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
-	tc-export CC CXX LD
-
-	if use static-libs ; then
-		cd "${BUILD_DIR}/live-static"
-
-		einfo "Beginning static library build"
-		./genMakefiles gentoo
-		emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
-	fi
-
-	cd "${BUILD_DIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	local suffix=$(get_libname ${LIVE_ABI_VERSION})
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
-
-	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
-		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
-		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
-		popd > /dev/null
-	done
-
-	if multilib_is_native_abi; then
-		einfo "Beginning programs build"
-		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
-			cd "${BUILD_DIR}/live-shared/${i}"
-			emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
-		done
-	fi
-}
-
-multilib_src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		use static-libs && dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
-		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
-
-		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
-	done
-
-	if multilib_is_native_abi; then
-		# Should we really install these?
-		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
-			xargs -0 dobin
-
-		dobin live-shared/mediaServer/live555MediaServer
-		dobin live-shared/proxyServer/live555ProxyServer
-	fi
-}
diff --git a/media-plugins/live/live-2017.09.12.ebuild b/media-plugins/live/live-2017.09.12.ebuild
deleted file mode 100644
index c7a493903e00..000000000000
--- a/media-plugins/live/live-2017.09.12.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
-HOMEPAGE="http://www.live555.com/"
-SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
-	mirror://gentoo/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples static-libs"
-DOCS=( "live-shared/README" )
-
-# Alexis Ballier <aballier@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-LIVE_ABI_VERSION=7
-SLOT="0/${LIVE_ABI_VERSION}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}/live" "${S}/" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-recursive3.patch"
-
-	if use static-libs ; then
-		cp -pPR live live-shared
-		mv live live-static
-	else
-		mv live live-shared
-	fi
-
-	use static-libs && cp "${FILESDIR}/config.gentoo" live-static
-	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
-
-	case ${CHOST} in
-		*-solaris*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-static/config.gentoo \
-				|| die ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die
-		;;
-		*-darwin*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
-				live-static/config.gentoo \
-				|| die static ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
-				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
-				-e '/^LIB_SUFFIX /s/so/dylib/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die shared
-		;;
-	esac
-	multilib_copy_sources
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
-	tc-export CC CXX LD
-
-	if use static-libs ; then
-		cd "${BUILD_DIR}/live-static"
-
-		einfo "Beginning static library build"
-		./genMakefiles gentoo
-		emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
-	fi
-
-	cd "${BUILD_DIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	local suffix=$(get_libname ${LIVE_ABI_VERSION})
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
-
-	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
-		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
-		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
-		popd > /dev/null
-	done
-
-	if multilib_is_native_abi; then
-		einfo "Beginning programs build"
-		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
-			cd "${BUILD_DIR}/live-shared/${i}"
-			emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
-		done
-	fi
-}
-
-multilib_src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		use static-libs && dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
-		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
-
-		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
-	done
-
-	if multilib_is_native_abi; then
-		# Should we really install these?
-		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
-			xargs -0 dobin
-
-		dobin live-shared/mediaServer/live555MediaServer
-		dobin live-shared/proxyServer/live555ProxyServer
-	fi
-}
diff --git a/media-plugins/live/live-2017.06.04.ebuild b/media-plugins/live/live-2018.07.07.ebuild
index c7a493903e00..bc3998e3bd57 100644
--- a/media-plugins/live/live-2017.06.04.ebuild
+++ b/media-plugins/live/live-2018.07.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,8 @@ src_prepare() {
 		mv live live-shared
 	fi
 
-	use static-libs && cp "${FILESDIR}/config.gentoo" live-static
-	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+	use static-libs && cp "${FILESDIR}/config.gentoo-r1" live-static/config.gentoo
+	cp "${FILESDIR}/config.gentoo-so-r2" live-shared/config.gentoo-so-r1
 
 	case ${CHOST} in
 		*-solaris*)