net-libs/ortp: fix bug 226247 and add optional ssl support

svn path=/trunk/; revision=831

3 files changed, 41 insertions, 15 deletions

diff --git a/net-libs/ortp/ChangeLog b/net-libs/ortp/ChangeLog
index 2694946..2730c3e 100644
--- a/net-libs/ortp/ChangeLog
+++ b/net-libs/ortp/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ChangeLog,v 1.29 2008/02/12 21:39:09 vapier Exp $
 
+  14 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
+	ortp-0.15.0.ebuild:
+  Fix bug 226247 and add optional ssl support
+
   23 Feb 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
 	+ortp-0.15.0.ebuild:
   Version bump to 0.15.0, see bug #257798
diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
index 6900dde..5bc2ee0 100644
--- a/net-libs/ortp/Manifest
+++ b/net-libs/ortp/Manifest
@@ -2,6 +2,6 @@ AUX ortp-0.13.1-linphone-2.1.1.patch 2671 RMD160 66671680f8cd51d029e4253f03c8712
 DIST ortp-0.13.1.tar.gz 455112 RMD160 f87c886526878d636012dbf2b8ae36c6161afb82 SHA1 27928c973b1bfbe4da999675a26d12e870e35e60 SHA256 2ba471a2a4f1d7f10fb70de5b68dbb7d32b43494efcecb88b3bd8445f630494c
 DIST ortp-0.15.0.tar.gz 491669 RMD160 bca44ac18d228bc419f4507973ef4806fd71ea24 SHA1 273c6fea84a1d66e4650fe1a5f02102e7bedd41f SHA256 742860d9165ec291be981bd6f33415c83aadc6f8b2ea287acb561bd76c9e0baa
 EBUILD ortp-0.13.1-r2.ebuild 1254 RMD160 5df6dd862be7db4f335e521c060a7e2d50c486ae SHA1 0100f15da5366e07df0dccd264301a4395adc49f SHA256 4fc9662b539c3abc846a85e3564e13d132c882ea544983948700a481e5a08984
-EBUILD ortp-0.15.0.ebuild 1751 RMD160 c0b7530c3ea9e0376a14d62285ffdd00320a0272 SHA1 b097b1825fd204ba71128df3b515322acc7dbcaf SHA256 4beaae585fc00e07b36ce53c6b189d24f34f56ff7547699359683e6de6626886
-MISC ChangeLog 4136 RMD160 d9ffe10469c8f32e11b35439dfeb7aab3bd3a728 SHA1 9acd1c665013af839c8716f2783f51dabb4493f5 SHA256 63f468d9ea4c0b379d05957c5d590df8ba9f22c0e7c2f770ec6c58e534782c06
+EBUILD ortp-0.15.0.ebuild 2409 RMD160 720003198bc7ccfbb60a4ac466af8df3df4e24f6 SHA1 371184d70f8161928080174a60fa753b33b8c064 SHA256 e83d4f2edfdf1bc5b4c5191e8228bba2e0109aeb7554c4cc23380551a5bdf7bc
+MISC ChangeLog 4255 RMD160 3ebed4a3b9b96fbd85edcbde62d350c58829bab7 SHA1 eb54a16d7924a6216d32ebc73eaf0294a3fe1d31 SHA256 3f8fb3549f70b041b1245d701d9ef36e0237e4b9412ddf11190e697692363956
 MISC metadata.xml 240 RMD160 b0a9703f2df3e17c34506b1d856b645edfbab979 SHA1 ae1dfce2eb3c10a2d983d76acb8ccc1550cbcba4 SHA256 9d39779efdb1b3680a7ac999ac65226b297edb93777124d8b18b9f87e92372f0
diff --git a/net-libs/ortp/ortp-0.15.0.ebuild b/net-libs/ortp/ortp-0.15.0.ebuild
index 177f121..66c07d9 100644
--- a/net-libs/ortp/ortp-0.15.0.ebuild
+++ b/net-libs/ortp/ortp-0.15.0.ebuild
@@ -2,9 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-# TODO: with +srtp, ortp throws a QA notice about TEXTREL
-# TODO: srtp USE flag should be masked on unKEYWORDED archs
-
 EAPI="2"
 
 DESCRIPTION="Open Real-time Transport Protocol (RTP, RFC3550) stack"
@@ -14,15 +11,21 @@ SRC_URI="http://download.savannah.nongnu.org/releases/linphone/${PN}/sources/${P
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc ipv6 minimal srtp"
+IUSE="debug doc examples ipv6 minimal srtp ssl"
 
-RDEPEND="dev-libs/openssl
-	srtp? ( net-libs/libsrtp )"
+RDEPEND="srtp? ( net-libs/libsrtp )
+	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
+# TODO: sandbox violation with +doc
+# TODO: test USE="srtp -ssl"
+
+# TODO: with +srtp, ortp throws a QA notice about TEXTREL
+# TODO: srtp USE flag should be masked on unKEYWORDED archs
+
 src_prepare() {
-	# to be sure doc is not compiled nor installed with -doc and doxygen inst
+	# to be sure doc is not builded nor installed w/ -doc and doxygen installed
 	if ! use doc; then
 		sed -i -e 's/test $DOXYGEN != //' configure \
 			|| die "patching configure failed"
@@ -34,6 +37,17 @@ src_prepare() {
 			|| die "patching configure failed"
 	fi
 
+	# to authorize -ssl even with openssl installed
+	if ! use ssl; then
+		sed -i -e 's/SSL_LIBS=".*"/SSL_LIBS=""/' \
+			-e 's/openssl\/.*.h/poll.h/' configure \
+			|| die "patching configure failed"
+	fi
+
+	# do not build examples programs, see bug 226247
+	sed -i -e 's/SUBDIRS = . tests/SUBDIRS = ./' src/Makefile.in \
+		|| die "patching src/Makefile.in failed"
+
 	# new Makefile.in add /${P} to docdir
 	if use doc; then
 		sed -i -e 's/$(docdir)\/$(PACKAGE)-$(VERSION)/$(docdir)/' Makefile.in \
@@ -46,17 +60,25 @@ src_configure() {
 	# mode64bit adds +DA2.0W +DS2.0 CFLAGS wich are needed for HP-UX
 	# strict adds -Werror, don't want it
 	econf \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable minimal perf) \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--enable-fast-install \
+		--enable-libtool-lock \
 		--disable-memcheck \
 		--disable-mode64bit \
 		--disable-strict \
-		--with-pic \
-		--docdir=/usr/share/doc/${PF}
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable minimal perf)
 }
 
 src_install() {
-	einstall || die "einstall failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
+
 	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins src/tests/*.c || die "doins failed"
+	fi
 }