gentoo resync : 28.04.2021

3 files changed, 2 insertions, 115 deletions

diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 985b4bcfa6d7..24e16d9e85ec 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,6 +1,4 @@
 AUX config.gentoo-so-r3 539 BLAKE2B e80c461f69a991641100d3966d1d100dc7fe8c15e3edc358bcd8ebd17a3f8c4d00a5557c9983f51a251a4602dcc378138df736f13665f5d5140081e047df0f5b SHA512 3f7d4a860b45ff6769fe1f29e694dfb897ab5b7c50f3d0d896425d300be6277df850cdb67cf311a0671ba747339b32f65d44a95b020940b3d1ac5764d873f20f
-DIST live.2020.03.06.tar.gz 7231080 BLAKE2B 95a1d3cc394eba473296973a1e44160dd1ca8e2efbc322a2e0bfbdb183244cda28b219ea14a51c8d146807d829b566a9c3782b291d5abfbd306a92e030e108e4 SHA512 7da439fbdeab0da6687dee56d9a27bf7b8f8a9c84b420d72f2e2a7ff7a73d18756d1fdb920f29b36917d93efcecc9230877637322d5041eeba114882b4bf7a06
 DIST live.2020.05.15.tar.gz 7229400 BLAKE2B 74532c178aa1044750110eb52561b99cd70874574ee84992201a145b18091d4f8475e2a299a83f0fe42c7e64483d46175fb76465a22509db3ba2633aff1327f6 SHA512 d53fb7e8c586f50e561aa361567ccd45babdbbcbe96a06d95e42a04a54b23ac3f474fefcacf94a49b604008623acf06789b92238364713853babbe356eeac4aa
-EBUILD live-2020.03.06.ebuild 3298 BLAKE2B 129514fe85a92a8d81a01ae26073b45a9ad76a505af10097f7aff1b61fe273fb3fb61c04c05146139ac8ca553d3c99e1ce8b13e59a88902e4468d1393f963251 SHA512 49c24dcfa8d5f24d1743e42ff4b49f18c31adac631c612c08eebb2d7f342b08cb51411fc96dbc914e44b730445f40d031cdc84f78111c8e920d3036cc2e7b792
-EBUILD live-2020.05.15.ebuild 3154 BLAKE2B 9c20b39704767d590025d46b8541c9bec6adab5410dd5284ff292cd821102c6e98bbc1d75b2df5399ab23172873b1a6dcdca69100a550cfe96dcaae6ea623c92 SHA512 4767b270ab195e7e2b780c6088ef454fba07acdf594cfb27e9b37096dbc8bbdc614695f49abe674db3ce61bd5c04fc29e9b2fa1a41aaf5a2aa56b89bad818ab5
+EBUILD live-2020.05.15.ebuild 3163 BLAKE2B 3f2a4ea97c868030ee08feb3b9601c8e897f0d4ecb81d6905d78ebd0436400e0163db84eb7db6cdd37448f748e55ecbd7b13b78ae20cd3b217af2794fb10850b SHA512 5f1975ad48ee3f2ec37467858b9980b38fd16044d59cdb116ae0663667086b99f9d44746bc7cc052a496a14b91d98e73482579d813ea1f3af9dde9a415068c8e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/live-2020.03.06.ebuild b/media-plugins/live/live-2020.03.06.ebuild
deleted file mode 100644
index ac9a6a590b9e..000000000000
--- a/media-plugins/live/live-2020.03.06.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
-HOMEPAGE="http://www.live555.com/"
-# Upstream aggressively remove old versions: bug #719336.
-#SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
-SRC_URI="https://cmpct.info/~sam/gentoo/distfiles/${CATEGORY}/${PN}/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="libressl ssl"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( "live-shared/README" )
-
-# Alexis Ballier <aballier@gentoo.org>, Sam James <sam@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-# You may wish to use a site like https://abi-laboratory.pro/index.php?view=timeline&l=live555
-LIVE_ABI_VERSION=8
-SLOT="0/${LIVE_ABI_VERSION}"
-
-S="${WORKDIR}/live"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/config.gentoo-so-r3" "${S}/config.gentoo-so-r1" || die
-
-	# This is all legacy stuff which needs to be cleaned up
-	case ${CHOST} in
-		*-solaris*)
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live/config.gentoo-so-r1 \
-				|| die
-		;;
-		*-darwin*)
-			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/config.gentoo-so-r1 \
-				|| die
-		;;
-	esac
-}
-
-src_configure() {
-	# This ebuild uses its own build system
-	# We don't want to call ./configure or anything here.
-	# The only thing we can do is honour the user's SSL preference.
-	if use ssl ; then
-		sed -i 's/-DNO_OPENSSL=1//' "${S}/config.gentoo-so-r1" || die
-	fi
-
-	# Bug 718912
-	tc-export CC CXX
-
-	# And defer to the scripts that upstream provide.
-	./genMakefiles gentoo-so-r1 || die
-}
-
-src_compile() {
-	export suffix="${LIVE_ABI_VERSION}.so"
-	local link_opts="$(usex ssl "$(pkg-config --libs libssl libcrypto)" '') -L. ${LDFLAGS}"
-	local lib_suffix="${suffix#.}"
-
-	einfo "Beginning shared library build"
-	emake LINK_OPTS="${link_opts}" LIB_SUFFIX="${lib_suffix}"
-
-	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
-		cd "${S}/${i}" || die
-		ln -s "lib${i}.${suffix}" "lib${i}.so" || die
-	done
-
-	einfo "Beginning programs build"
-	for i in proxyServer mediaServer ; do
-		cd "${S}/${i}" || die
-		emake LINK_OPTS="${link_opts}"
-	done
-}
-
-src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock ; do
-		dolib.so "${S}/${library}/lib${library}.${suffix}"
-		dosym "lib${library}.${suffix}" "/usr/$(get_libdir)/lib${library}.so"
-
-		insinto /usr/include/"${library}"
-		doins "${S}/${library}"/include/*h
-	done
-
-	dobin "${S}"/mediaServer/live555MediaServer
-	dobin "${S}"/proxyServer/live555ProxyServer
-}
diff --git a/media-plugins/live/live-2020.05.15.ebuild b/media-plugins/live/live-2020.05.15.ebuild
index 50d236a95c7a..431d011ee95e 100644
--- a/media-plugins/live/live-2020.05.15.ebuild
+++ b/media-plugins/live/live-2020.05.15.ebuild
@@ -77,7 +77,7 @@ src_configure() {
 
 src_compile() {
 	export suffix="${LIVE_ABI_VERSION}.so"
-	local link_opts="$(usex ssl "$(pkg-config --libs libssl libcrypto)" '') -L. ${LDFLAGS}"
+	local link_opts="$(usex ssl "$($(tc-getPKG_CONFIG) --libs libssl libcrypto)" '') -L. ${LDFLAGS}"
 	local lib_suffix="${suffix#.}"
 
 	einfo "Beginning shared library build"