gentoo Easter resync : 12.04.2020

4 files changed, 125 insertions, 2 deletions

diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 597aa70487fb..86f79b9594a9 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,10 +1,13 @@
 AUX config.gentoo-r1 499 BLAKE2B 8a4f1261f09e613c2bd666b070c4f5848a5b30ed48cf5668623274a4aaaeb525ded1ac83f8b5e0d6a7ec7c149c1959651e15ca3223a29e7a9487ce206c972b95 SHA512 4fab673258f340f00a79ced3106b6f32b74eaa7c691447422890ef66ae5ac82f703b3ad08178d656823d9cd51510521ff92c41866e629657a6e67c53279c0752
 AUX config.gentoo-so-r2 524 BLAKE2B b540de1163b9eb6014bd421c62d582bb6b4341866e6fb8212bc0c38c7fc3c9bf4f5cf6e1bd95a9e30879384dfad3232361985b10a093b900b52bb6ca01216577 SHA512 03d6a8712c0c2c4b7b7ebcdcada9ab6ece6fd19ffafc61c864821d19671001efb7c91b77fcf35ed38275c46d305ade3a7a655922fdec3ab6e7e00785242ee5fd
+AUX config.gentoo-so-r3 539 BLAKE2B e80c461f69a991641100d3966d1d100dc7fe8c15e3edc358bcd8ebd17a3f8c4d00a5557c9983f51a251a4602dcc378138df736f13665f5d5140081e047df0f5b SHA512 3f7d4a860b45ff6769fe1f29e694dfb897ab5b7c50f3d0d896425d300be6277df850cdb67cf311a0671ba747339b32f65d44a95b020940b3d1ac5764d873f20f
 AUX live-recursive3.patch 557 BLAKE2B f18a8152345006272b2b7385053ffd012e6dabc5754ae7712def7e90c55040c9e1c80dafc0d30555751e183c2b9d92de4410d8cb95d8707414cb17f641acbb6f SHA512 98992859d1f8149e337adbf42c13276e6bf40d5497399ab4f82351cd5caf78ecd60e28df24d36b34cfd02e83365cb37ae1b264afcb52334f304695b400bce622
 DIST live.2017.10.28.tar.gz 629858 BLAKE2B a1d862ae1356b46fcd4e5ef7e27c47d3fb3abac35add6feb7955f60ddbd93e9242a84102393de67dda0d39c09632a0cc9a5f54d30c9f91d005696d3a566258bd SHA512 eea5bdb8d89e76c8b6aeb6ec04b77af3048cb41f228d230ba4da6045e9bc691a456023d44d8650fe690b08143567ed5af5b633f5b6522debff79344a813dc7d0
 DIST live.2018.01.29.tar.gz 630144 BLAKE2B dd58865636a44ccabd0e3b02e1679393f17fb09d82455188d49d4fcb321b21e136a168c0f4c407c1dba3afcb5b541192cd2c5181d7a7710d39d4727526fc39cf SHA512 dfdfcac67acd28f651807de423c6aed00190cfc38ecd361b76d37d8cc27ee2fa91a42a5b8835045680fd7f65c847e41747b948c2c71e6530a3c7e89421c60227
 DIST live.2018.07.07.tar.gz 630625 BLAKE2B 8545d4d8ed60328ccc782b6c2a8c4a0dc9ce3c1245fbc78fed4d3eb6f42de39c3c341456dc00cdc416fdcb2e518f5fe387273f5b4d2c3e2d32bfa22a21df2a90 SHA512 e7d4ddf51e9666c6ebe9a46976035b68fea94be54825535ffb04006cd242b9d3ad08250305206442bed3500d1e8d628ccf44302c485f63a9e244b3f8b1e27fe4
-EBUILD live-2017.10.28.ebuild 3971 BLAKE2B 7ddc62f8189524c80a3224a90887de3ceb85e1d71c624425231f9643db09a8fde313874e566e288d45a99923aed95fdc01e1634131a00d9dfd0b73ed50d9c6dd SHA512 9e2ce3b7761f175d44fbb84208937de46bb04574857fd7d249712506bc681d5b7b4a8513e4c2fb827fdc9d55aee757355b0f18ef27e90d7465def33bae3a755d
+DIST live.2020.03.06.tar.gz 7231080 BLAKE2B 95a1d3cc394eba473296973a1e44160dd1ca8e2efbc322a2e0bfbdb183244cda28b219ea14a51c8d146807d829b566a9c3782b291d5abfbd306a92e030e108e4 SHA512 7da439fbdeab0da6687dee56d9a27bf7b8f8a9c84b420d72f2e2a7ff7a73d18756d1fdb920f29b36917d93efcecc9230877637322d5041eeba114882b4bf7a06
+EBUILD live-2017.10.28.ebuild 3972 BLAKE2B aa1972772f5188f515ef1671de6f78761ff0e1c0c3b952e0e7681bdcf36278915e9632a99d75cfb8d9304eb9a20937342abcedad81dc52439e73e0552696e5a0 SHA512 963217c43a1bebe52209f1b2914cc402b533d388e119e794b384085083d8358a51e9939c7e608dedc25094d0c18f638355804ed4885a399099ee4e2286d4f642
 EBUILD live-2018.01.29.ebuild 3982 BLAKE2B e28c5b60c2be54e78cb80804b1e471ab32d32413f6bcd98a9e817cd83cccb087e3701db1500f805b3a3397dc0d29dda91ce38b6908511982957c303eb1f1ff8b SHA512 c6368ae4fe5fce9eb239782f163ac98d7d1124dc3620ef58629ea1877fc64603b1b4e752480973c43a19af25e4db8ae7eafbad5ced1203d5e501236a37d871a2
 EBUILD live-2018.07.07.ebuild 3982 BLAKE2B e28c5b60c2be54e78cb80804b1e471ab32d32413f6bcd98a9e817cd83cccb087e3701db1500f805b3a3397dc0d29dda91ce38b6908511982957c303eb1f1ff8b SHA512 c6368ae4fe5fce9eb239782f163ac98d7d1124dc3620ef58629ea1877fc64603b1b4e752480973c43a19af25e4db8ae7eafbad5ced1203d5e501236a37d871a2
+EBUILD live-2020.03.06.ebuild 3058 BLAKE2B 9b7c8405474858134d592e7de6356b25d802e8f30a3f3f5c30ac3ca0ec0d953b276f97e40a6ff2ea52f8107b6f3b2861898c2941b16eb49bc646fe8eab106498 SHA512 72683d7d6580cbaa9eedce6c94297ff8ee23050164bdb00bbc6b2b7bcff0e83711537bf7a9066f120751fd3bf205c52e6d209192098f387e5c13849f8bc74e6e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/files/config.gentoo-so-r3 b/media-plugins/live/files/config.gentoo-so-r3
new file mode 100644
index 000000000000..905e9e0b59a2
--- /dev/null
+++ b/media-plugins/live/files/config.gentoo-so-r3
@@ -0,0 +1,17 @@
+COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DXLOCALE_NOT_USED -DNO_OPENSSL=1
+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.10.28.ebuild b/media-plugins/live/live-2017.10.28.ebuild
index 5aae0ed7e752..608e5bd428c7 100644
--- a/media-plugins/live/live-2017.10.28.ebuild
+++ b/media-plugins/live/live-2017.10.28.ebuild
@@ -10,7 +10,7 @@ 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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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="examples static-libs"
 DOCS=( "live-shared/README" )
 
diff --git a/media-plugins/live/live-2020.03.06.ebuild b/media-plugins/live/live-2020.03.06.ebuild
new file mode 100644
index 000000000000..317ad30c5531
--- /dev/null
+++ b/media-plugins/live/live-2020.03.06.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+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=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 shared
+		;;
+	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
+
+	# 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 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
+}