Fix examples management for bug 226247. EAPI 2 bump and fix die messages.

Package-Manager: portage-2.1.6.7/cvs/Linux ppc

3 files changed, 29 insertions, 13 deletions

diff --git a/net-libs/ortp/ChangeLog b/net-libs/ortp/ChangeLog
index bdf2de33278b..35c1539f8a15 100644
--- a/net-libs/ortp/ChangeLog
+++ b/net-libs/ortp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/ortp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ChangeLog,v 1.31 2009/02/06 03:43:12 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ChangeLog,v 1.32 2009/04/15 02:22:43 volkmar Exp $
+
+  15 Apr 2009; Mounir Lamouri <volkmar@gentoo.org> ortp-0.7.1-r1.ebuild:
+  Fix examples management for bug 226247. EAPI 2 bump and fix die messages.
 
 *ortp-0.13.1-r1 (06 Feb 2009)
 
diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
index 742439f3a51d..cfcac704229c 100644
--- a/net-libs/ortp/Manifest
+++ b/net-libs/ortp/Manifest
@@ -1,6 +1,6 @@
 DIST ortp-0.13.1.tar.gz 455112 RMD160 f87c886526878d636012dbf2b8ae36c6161afb82 SHA1 27928c973b1bfbe4da999675a26d12e870e35e60 SHA256 2ba471a2a4f1d7f10fb70de5b68dbb7d32b43494efcecb88b3bd8445f630494c
 DIST ortp-0.7.1.tar.gz 426565 RMD160 142a9a851d8ef4dcdc53e4befcdd932bd1214c20 SHA1 a2b67ab75858ca0a059ab6eeb0cdaf4f3126e93d SHA256 2f2fc74a13df58f560c40385cd78683c66623d7a8271cb17941a9de7be07d43f
 EBUILD ortp-0.13.1-r1.ebuild 1288 RMD160 fc29885699bc22a96e671a248615472c2412a157 SHA1 55d7a2af9fd771f7690b5a795123a3e87ac71b81 SHA256 53ea2c222817c7a970ac1802092a20f55c7ad49a09a289f2c99ddd2d1c6882fe
-EBUILD ortp-0.7.1-r1.ebuild 927 RMD160 f0ea3c44815ce13749824e8202d6c92519b88c37 SHA1 a69e79033c7c3025e0ce2c5a87a78b97fdc25872 SHA256 33ebf473adc3e5dc7a10670645228faab07bca628712597427a2a0de05439ece
-MISC ChangeLog 3947 RMD160 7435c972796e9cd921532709ec81ca2321d145d1 SHA1 0d81d3f9a1b6dd12e62d6d1385c20f089a5b1fbd SHA256 6f9c9c26632656193e3715fd965bca69565cbccbf48de657612c2fdda6c4731d
+EBUILD ortp-0.7.1-r1.ebuild 1265 RMD160 01d277c47be20d7295d978da31532f5d7148deb1 SHA1 f8343e5512543517ff7f1c592c4043be99d64501 SHA256 249e47e791b7722ab9b55db93b4c6ec5744844c528ce0cf5846a16893e62ee4a
+MISC ChangeLog 4096 RMD160 f732879ed50bb76c0e82b173fccb1b56ea77684d SHA1 d8b850f9af0a54f1aab155b0624c78651e3a5e7a SHA256 8592f160e87a34c9b513df2262f6fd4384c9f41238198c5af41530ead81f8fe6
 MISC metadata.xml 159 RMD160 1cb780cd4240aaeb1b22a09a786b8ed4b0803823 SHA1 c96c65dcb37a559953bf3446b6719b0cac3585a8 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d
diff --git a/net-libs/ortp/ortp-0.7.1-r1.ebuild b/net-libs/ortp/ortp-0.7.1-r1.ebuild
index bdf938ff6894..c772e21b6ef0 100644
--- a/net-libs/ortp/ortp-0.7.1-r1.ebuild
+++ b/net-libs/ortp/ortp-0.7.1-r1.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ortp-0.7.1-r1.ebuild,v 1.18 2007/08/10 05:20:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ortp-0.7.1-r1.ebuild,v 1.19 2009/04/15 02:22:43 volkmar Exp $
+
+EAPI="2"
 
 DESCRIPTION="Open Real-time Transport Protocol (RTP) stack"
 HOMEPAGE="http://www.linphone.org/index.php/v2/code_review/ortp/"
 SRC_URI="http://www.linphone.org/ortp/sources/${P}.tar.gz"
 
-IUSE="ipv6"
+IUSE="examples ipv6"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
@@ -15,15 +17,26 @@ DEPEND="=dev-libs/glib-2*
 		>=dev-util/pkgconfig-0.9.0"
 RDEPEND="=dev-libs/glib-2*"
 
-src_compile() {
-	econf $(use_enable ipv6) || die 'configure failed'
-	emake || die 'make compile failed'
+src_prepare() {
+	# do not build examples programs, see bug 226247
+	sed -i -e 's/SUBDIRS = . tests/SUBDIRS = ./' src/Makefile.in \
+		|| die "patching src/Makefile.in failed"
+}
+
+src_configure() {
+	econf $(use_enable ipv6)
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "Make install failed"
-	sed -i -e "s:^\(#include <\)\(glib\.h>\)$:\1glib-2.0/\2:" ${D}/usr/include/ortp/rtpport.h
+	emake DESTDIR="${D}" install || die "Make install failed"
+	sed -i -e "s:^\(#include <\)\(glib\.h>\)$:\1glib-2.0/\2:" \
+		"${D}"/usr/include/ortp/rtpport.h || die "patching rtpport.h failed"
+
+	dodoc README ChangeLog AUTHORS TODO NEWS || die "dodoc failed"
+	dodoc docs/*.txt || die "dodoc failed"
 
-	dodoc README ChangeLog AUTHORS TODO NEWS
-	dodoc docs/*.txt
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins src/tests/*.c || die "doins failed"
+	fi
 }