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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

2 files changed, 42 insertions, 8 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/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