Migrate changes from Gentoo Prefix overlay. Keywords, EAPI3, build system tweaks for solaris/darwin, get_libname. Approved by team member

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 44 insertions, 20 deletions

diff --git a/media-plugins/live/ChangeLog b/media-plugins/live/ChangeLog
index 192a58b5aa6c..34394a140494 100644
--- a/media-plugins/live/ChangeLog
+++ b/media-plugins/live/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/live
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/ChangeLog,v 1.127 2010/04/24 17:23:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/ChangeLog,v 1.128 2010/08/06 19:53:38 darkside Exp $
+
+  06 Aug 2010; Jeremy Olexa <darkside@gentoo.org> live-2010.04.09.ebuild:
+  Migrate changes from Gentoo Prefix overlay. Keywords, EAPI3, build system
+  tweaks for solaris/darwin, get_libname. Approved by team member
 
 *live-2010.04.09 (24 Apr 2010)
 
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index ba5aa03d6f83..46ba0ff59ec4 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX config.gentoo 480 RMD160 7fe83cf6a587076b282c66f4e4d730e41b55fc27 SHA1 c26ee14495ac18d25aff20290b55181fa9245082 SHA256 f8dfcb44221ab3e1fbea958b0be5d817aaebe971129def44a96fe1cb0a7d4a00
 AUX config.gentoo-so 504 RMD160 60475939b963301f3a26416d87e53f8b08668d3e SHA1 9b829c9fe7c3a1f64a77deb5d484361c8ff8cd60 SHA256 48e623d25c0697e3274355670eae2d0d7f590502f63652bc3cf6cadbdd5429e2
 AUX config.gentoo-so-r1 505 RMD160 6bd37a2fa790eb116c477a6c77f61e88a3535348 SHA1 99961d3665c05375750c076e5f6bffc4044fdc42 SHA256 be1d556e414d128ee3998b4ad640dcd2fb829430c134997134e7054edac55eaf
@@ -14,13 +11,6 @@ EBUILD live-2008.09.02.ebuild 2689 RMD160 af10c27f30637a41ef15c6aafb7efd2789e61a
 EBUILD live-2009.06.02.ebuild 2688 RMD160 907541e56cae9099300647e741448aa51895c1ba SHA1 81899e914a1cbf97cdc0a205e8741184f0fae397 SHA256 2eb82ec8978f19a3b1ec68c66494a15c924dbad9700ce718e4407a006950b0ff
 EBUILD live-2009.09.28.ebuild 2675 RMD160 99bdca5624bda0a83cf1b75c4e322e673bcfcb7f SHA1 8e9f969c6c73a48645814d2c6a5e09224eccb64a SHA256 4467e23341bf8500af2b133e24bab748717fbdbd5cd67a7126c3a7accbcd66d1
 EBUILD live-2009.11.12.ebuild 2675 RMD160 e3daeca1bc6032591e2684efa1756e316a024174 SHA1 f00b56e94294cefa4eeae46a36d8b609a434831c SHA256 dfa24684732286dc625585e51865876aa3101d5718fb6ef0c2e9b9c1bc62a107
-EBUILD live-2010.04.09.ebuild 2675 RMD160 2a2d7a2e0e054beb629ace104b24967daddf0171 SHA1 c197fa6eee61bbdb07fd73e67fb1705e080ab5fa SHA256 b2611de6d57f50de7874c0541ef69f78ce77ba88692b7c4a5fd16d46f7f21dda
-MISC ChangeLog 15851 RMD160 8da4f6f6b9f9a15cee5b5cf68589a46f01b57eff SHA1 239e59ca0dd38245c5ef302e1d9169b1b8eb7409 SHA256 ca2386dfa0d6c1df3303aed82d116bace077a7791ad1bf36231ae0893d6384ba
+EBUILD live-2010.04.09.ebuild 3716 RMD160 6f53daeecf9029288efa39ac5b3c50c05eba84f8 SHA1 c94a4673c104dc9c3c13ce42a786aee0e1aef90d SHA256 55f56ab2371b2354c8fb618d619b0b9553c2d61655538944580d1c906a89b1da
+MISC ChangeLog 16068 RMD160 272a7168ddb087bde55f267eba4c2c12d2ffacf4 SHA1 f4bb347fc8cc30cb30ea7457791df6b71701e0a4 SHA256 7d1a379dcfaad7cdcd4555279c2eb4ad1985ca63803e0c41b30c8380cf532e3b
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkvTKPwACgkQvFcC4BYPU0qHiwCfRV6etKJOG6Knj8y7eLVat6/K
-fsEAoJtehbBpBM0m/aC28c2gYz9UuLQ2
-=Ne6+
------END PGP SIGNATURE-----
diff --git a/media-plugins/live/live-2010.04.09.ebuild b/media-plugins/live/live-2010.04.09.ebuild
index d27bf93011b1..f609e470da1a 100644
--- a/media-plugins/live/live-2010.04.09.ebuild
+++ b/media-plugins/live/live-2010.04.09.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2010.04.09.ebuild,v 1.1 2010/04/24 17:23:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2010.04.09.ebuild,v 1.2 2010/08/06 19:53:38 darkside Exp $
 
+EAPI=3
 inherit flag-o-matic eutils toolchain-funcs multilib
 
 DESCRIPTION="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming, suitable for embedded and/or low-cost streaming applications"
@@ -10,7 +11,7 @@ SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}"
@@ -20,8 +21,7 @@ S="${WORKDIR}"
 # If you don't know, ask someone.
 LIVE_ABI_VERSION=3
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	cd "${WORKDIR}"
 	epatch "${FILESDIR}/${PN}-recursive.patch"
 
@@ -30,8 +30,37 @@ src_unpack() {
 
 	cp "${FILESDIR}/config.gentoo" live-static
 	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+
+	case ${CHOST} in
+		*-solaris*)
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-static/config.gentoo \
+				live-shared/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/$/ /' \
+				-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)/"'$@:' \
+				live-shared/config.gentoo-so-r1 \
+				|| die shared
+		;;
+	esac
 }
 
+src_configure() { :; }
+
 src_compile() {
 	tc-export CC CXX LD
 
@@ -50,14 +79,15 @@ src_compile() {
 	cd "${WORKDIR}/live-shared"
 	einfo "Beginning shared library build"
 	./genMakefiles gentoo-so-r1
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="so.${LIVE_ABI_VERSION}" || die "failed to build shared libraries"
+	local suffix=$(get_libname ${LIVE_ABI_VERSION})
+	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
 }
 
 src_install() {
 	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
 		dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}.so.${LIVE_ABI_VERSION}
-		dosym lib${library}.so.${LIVE_ABI_VERSION} /usr/$(get_libdir)/lib${library}.so
+		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