gentoo resync : 21.06.2020

3 files changed, 125 insertions, 6 deletions

diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 9dd8c328fa60..b6e9d73b52fd 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,4 +1,6 @@
 AUX config.gentoo-so-r3 539 BLAKE2B e80c461f69a991641100d3966d1d100dc7fe8c15e3edc358bcd8ebd17a3f8c4d00a5557c9983f51a251a4602dcc378138df736f13665f5d5140081e047df0f5b SHA512 3f7d4a860b45ff6769fe1f29e694dfb897ab5b7c50f3d0d896425d300be6277df850cdb67cf311a0671ba747339b32f65d44a95b020940b3d1ac5764d873f20f
 DIST live.2020.03.06.tar.gz 7231080 BLAKE2B 95a1d3cc394eba473296973a1e44160dd1ca8e2efbc322a2e0bfbdb183244cda28b219ea14a51c8d146807d829b566a9c3782b291d5abfbd306a92e030e108e4 SHA512 7da439fbdeab0da6687dee56d9a27bf7b8f8a9c84b420d72f2e2a7ff7a73d18756d1fdb920f29b36917d93efcecc9230877637322d5041eeba114882b4bf7a06
-EBUILD live-2020.03.06.ebuild 3052 BLAKE2B fefa656dca0f1ebde2bb5ecccee03c0e5ca2abb1efed3a0921bfefd975cc4cb5eb59197fef1fa8086a03614e024465d64567f0a39909a4c83d6d3c76449c688e SHA512 0d306cb3123b1ee15828c3ae77f782c74a1b408989a80d5a7b16dfe869cff67d8cb3dc4a7ded87aa86d56d173c34ff3474732bb3e4dbc2ac24c127e8c828581e
+DIST live.2020.05.15.tar.gz 7229400 BLAKE2B 74532c178aa1044750110eb52561b99cd70874574ee84992201a145b18091d4f8475e2a299a83f0fe42c7e64483d46175fb76465a22509db3ba2633aff1327f6 SHA512 d53fb7e8c586f50e561aa361567ccd45babdbbcbe96a06d95e42a04a54b23ac3f474fefcacf94a49b604008623acf06789b92238364713853babbe356eeac4aa
+EBUILD live-2020.03.06.ebuild 3309 BLAKE2B 300acf8483430163c136dd4a6fb06ad83c942cc90d89cf30a9dac61415ed2ed40e3fffb8b891befb8272b440643f8ad7027763618571c2ec03ccc7a2cead659a SHA512 a4304a0c5e311373098ebef2e67c4b3143e619ff704c145def45a9349bf852d8a01352800f60b7f1a29372b67fa19eabdf5c2c20f906692db63ad81dbe493c14
+EBUILD live-2020.05.15.ebuild 3171 BLAKE2B 3db86728b930caaffc62266072acead0e9da871925d07ae6b2c47a144ac5c121f2052ad1ed113d9ed38869b0853fc13ca773ebcf1f0a8da17ec4fb78c571d38f SHA512 242b1570d863957225f9da0d0324667e79ada49a337dcf7e2895a01525c4431d602e85b1604d1b47bf60820a5e2899beebc80eab7206cb4ddb975df4ce6ea5e3
 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
index c1ab7d6f306a..1faafb5ccd34 100644
--- a/media-plugins/live/live-2020.03.06.ebuild
+++ b/media-plugins/live/live-2020.03.06.ebuild
@@ -3,14 +3,19 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
 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"
+# 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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="libressl ssl"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
@@ -52,7 +57,7 @@ src_prepare() {
 				-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 shared
+				|| die
 		;;
 	esac
 }
@@ -61,17 +66,20 @@ 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
+	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 '-lssl' '') -L. ${LDFLAGS}"
+	local link_opts="$(usex ssl "$(pkg-config --libs libssl libcrypto)" '') -L. ${LDFLAGS}"
 	local lib_suffix="${suffix#.}"
 
 	einfo "Beginning shared library build"
@@ -90,7 +98,7 @@ src_compile() {
 }
 
 src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
+	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"
 
diff --git a/media-plugins/live/live-2020.05.15.ebuild b/media-plugins/live/live-2020.05.15.ebuild
new file mode 100644
index 000000000000..cce1f38eef20
--- /dev/null
+++ b/media-plugins/live/live-2020.05.15.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 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/"
+SRC_URI="http://www.live555.com/liveMedia/public/${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 ~x86-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@cmpct.info>
+# 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=9
+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
+}