fix tests

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 53 insertions, 14 deletions

diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
index 88ed063c845e..b8280fa9c8c7 100644
--- a/media-libs/mediastreamer/ChangeLog
+++ b/media-libs/mediastreamer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mediastreamer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.70 2013/10/09 18:52:30 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.71 2013/10/09 19:36:13 hasufell Exp $
+
+  09 Oct 2013; Julian Ospald <hasufell@gentoo.org> mediastreamer-2.9.0.ebuild,
+  +files/mediastreamer-2.9.0-tests.patch:
+  fix tests
 
 *mediastreamer-2.9.0 (09 Oct 2013)
 
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index 63f98530d26e..a4cc863beca9 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -10,6 +10,7 @@ AUX mediastreamer-2.8.2-ffmpeg-1.0.patch 1603 SHA256 c76fea152b1c6d968b753464e2e
 AUX mediastreamer-2.8.2-libav9.patch 4464 SHA256 5677af43cf8224a7a129dabe7dcf7db331a5e07119d0e28b1e117ec8c4b55685 SHA512 8df2c02bd2066b00bf5ce1e841d3fcf3ac51d8b7401a26e9b1f894b31cfa58026619874ce1e02393e41948bff3e89499f7be022abef5d4f9b6442033632d01bd WHIRLPOOL ad6238c7183df176934f5b7a8d16f6879a12b7e66e25453e42a5728cc56e626c36e2609e560ed26c84bafa8fd9142a993526e486383a404ca69c4d6ebb301acd
 AUX mediastreamer-2.8.2-v4l-automagic.patch 1675 SHA256 c804e26d980648478cf10acb95ecca3e24c1f63acbefc80c6fced623a36a72f0 SHA512 9b091a1edbe82e7b633d64ff1d6a5c702ddacfac289bb47c632aae6063961ea6a9c5260f863b0e902f6f77b004abca47cb3d7088b284fdf5953ac21deddd5b4a WHIRLPOOL 2687b2cda2d97037f0661a654de0d8e16979558a13aee253f54dacb999ce50972334a58a0d669bf0fe73f6290fbdb2b4d96ab8a3448c92ed50d545fc473179b9
 AUX mediastreamer-2.9.0-libav9.patch 4535 SHA256 dc42bcd66c81dec0ab38058c640f575b75a6c0688db2bd7dc4a8e45fafaa196a SHA512 1fe44aeac23c0f97a2cba2e7312ed57833b0d7a2bf382de7727000c833159ae3123cc2c4b22b00a9977c9481a633efaad8c0d4615f0e6118baf3c326ccdb5fde WHIRLPOOL eddab46d033521e95b8dbdc4602a2441fb28a3e086ee2b21cf60113127738cf1ab868e24f65dd0f0ab0e52f2bf8a33a86747f316bc5cf0ee716bcd118c21ef08
+AUX mediastreamer-2.9.0-tests.patch 587 SHA256 80fc8b229e41adde9d00fd38a0ad44ab028db9e4acbf5c7c5e612e581e7541c3 SHA512 9298a6b2979c7f0f7a119a0bf5c943f9e03d860d4ea82de23a224b288e9e953da22bde5c1d01aa6b357dd897d5cda7fd9ca91ff05d6e1d54100f48f82e6b0011 WHIRLPOOL 7e55e8b284c58a3ab36899bc078600da205cacf5e947a954f289d3a898f1940083ff43e35222d4bb566b260055950f314b4c70169bd796b4f8ed205dfbcf65e2
 AUX mediastreamer-2.9.0-underlinking.patch 1969 SHA256 03cdca023eaf4e787a179c1e373b5d6c3728a69ba761c8e89a508cce7e2db27c SHA512 35103d8fc617d8202031cb9157e757d9a4822ad90595b2842a0715420c69b60bc4c99bedf0d4b6aee419c3a663104e8d0f05c743c7a374c3ae3bc5d7630a761e WHIRLPOOL 3201cd07595865a3dd42efd53b2a13f3ec2d2a87c53c2313776e0ee1e0b3e155153bad0a0789b74aab2d57ef8c59ff5a9d44fc79a99effb0ec90f6e3a02a2f53
 AUX mediastreamer-2.9.0-v4l-automagic.patch 1563 SHA256 e5dcb6b61e3536a60d38ed96ac0ff9d9c9044042bb8356bedd3ef2594ff7b64d SHA512 0de2d426e0b9594695fea4c3cfe5fb832d351380c53ed671ede2c4c7d0142205af22c3fc9048812bbcd2e20c6b3f7fb8828baa4704466e2da1906112193d7dcf WHIRLPOOL 9e7864f87e3976963198632c45756a15015f45aa6b11f327026b9c3a1e0e5d8af9e4a9d9bf312b8255fabbbc7b71df9d38990cfbb07e3a41f164296005548e4f
 DIST mediastreamer-2.7.3.tar.gz 758146 SHA256 c3cbea285f1e85259b2ac06d3f1730b4258e280011598b91f5b90b8432bf1dc0 SHA512 f9ebfa12b1c760b5c24b5496466d92148a170ee2d522d9085db3fb72cc93f8e3e71ba1ae14f57d94a33b752450555c7d3ebf59267447203861247a8685e18259 WHIRLPOOL c1528bcca27c979ac29d6ccb6e32eac53ddd9e69d3f034056ad579d5ff6cd295c9224db6b841d6aa708e2c60251b192e85d6843342c14f8ead75d9f137c8d818
@@ -17,17 +18,17 @@ DIST mediastreamer-2.8.2.tar.gz 882966 SHA256 a62ebb008913db6e03e27bd1ec30bb560a
 DIST mediastreamer-2.9.0.tar.gz 3578877 SHA256 c245b9444c2abb4c84433606e01f0b3ce29ce78de0afe1e191f4f3c62656acd5 SHA512 8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0 WHIRLPOOL 9e425ff2e461ceb6dae3890e6bd8035de65f5b3fd0590e01b75259c0d27dd54cfd37cb88d43752c2903c954ac44e353e4ed63588d3f08ec690da77293a31ba68
 EBUILD mediastreamer-2.7.3-r3.ebuild 4025 SHA256 fa7ad39d38d81008afdc5ca9525276a04b617e706cb42e2826bc019d61dfc6e3 SHA512 f5d60e1f710524c8313129a5d2297ac156988e65bb2eb18123a7b5c30a5db0e969d7004c848891b579290f5227e7ace156d0f2d9d3224e4f4484d1eed7b5470e WHIRLPOOL 9d8ce54f8ae4b02aee70b21b09fafae9e9d55e8298ffc6fd96bffcc574b6830e3ba3dbca8b29c140ea80268b7db739f6ef3983d93481376803aea0edb579c373
 EBUILD mediastreamer-2.8.2.ebuild 3948 SHA256 7c9c6fd227d2c4926cfc328d96eb0868cbbd3a3c003de11209c284f2360a4f15 SHA512 3a52a03882e891032ee33a546e9e24efc7800bd41e1766d1319775e3adbff8a476415c128cd4a56e0a0020a8c172b03ae9e55ed104d67ed6b316e0f4377f403e WHIRLPOOL b46b4ada0ab8f6f99d374aabbdb90c96f93711350773527b9dc421b9d71d6fc255251ee5d789914583a9ff5545163af62eef87ac028c0bf94c07d1ac14476655
-EBUILD mediastreamer-2.9.0.ebuild 4252 SHA256 83c98186205396817755dea8bb26bdcda3db8b0ad1d6f16264a70130429331b6 SHA512 34b3a2a4d99073c25367c6f693b23a47f81d8dd3cb47cb7876a4292ce313529cee6ce80437ed082e245ed78c1b0efdd0899953a7f1ac5caab760594f43d165de WHIRLPOOL aca3365a0a8a32ab30560d6c5d58c73d82e0de4c2f2fadabdf961f4a1567306e0bd02cb4d978a54f30300933821dfbd029a10265c283495b56699d313292eb3b
-MISC ChangeLog 10899 SHA256 d6749cfa04cdc01241b73aea54966da7edeb32d49c86185a00d0d36e89cd7995 SHA512 823b5c4f677d6542e3c16eb8bc81eaf732a8bdeb3348bb675669da5575ed29d7e2b4d9e6ba256bfd1dd3243ce6883b912099904ab150331ccdcebfcac628eada WHIRLPOOL 79ab6dcd75fc82fced49c2d6cc73939ce2eb12c1fb1fb777f49e7750fc5879d848e25e982a63f799766792248d56679be0f6693ad33dd5a2d4b718be77f37222
+EBUILD mediastreamer-2.9.0.ebuild 4410 SHA256 34b53305924044e393a55bf551dd0017b75244be2989d1f2db412d1f2988198a SHA512 4e713b437ff5c9370c8153aba8b56f26f5e4bcf161ebc87c59340a5a25025fdca109ae8f40a3f9452c5dbbeec7d2ec8d5388af18ab833acadaf21a466c7011f2 WHIRLPOOL 4358c0d28795ab22d0496e8f40e1465c19e605a829813f35c01efb1d3c7365a8aca5c96de29c230db6a87981cd9a73be511139836f4e6237788e14bad9494a44
+MISC ChangeLog 11033 SHA256 dfbb17d44a91988062e3988b5cb6e24b4d68ceea6a8e31b64c158f16d188089f SHA512 6a1f8600b2794c6e57990fb269067b800fd02897b434973765775b34c630f14389a93c42cc729f5128e21a1b76cd066d6b899f47f2d4ff55f11e74639aa7cbfb WHIRLPOOL 9e95455ff275dc2257cbae819609ec19c736996874f2cf0c2fd52c7b652adcb4d2d729955791c597304f96ff472bb842f885dd37dfc2bbdf91ade6b1b0a32511
 MISC metadata.xml 1037 SHA256 108a3e247cf1bbdb0c650b96f12ca1e8a57c6fa4117b2cb6ca805f942f2766f3 SHA512 e94f5284f668b943028d829164553258858a37da0cf5da1d49125cf790aba9c7dabd3f590dc9640cfeb8e8198a92392e8179d03d92e1a22ad7672706d2c36632 WHIRLPOOL 3a62c886fd7ad845d6da928d5e6bc1f61edcace4f774fb51b5d823bde40c76ab355447cf15a7fbef9f20728a16c32431c93a3a3fcad186b7f63f2aef3af75554
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSVaXyAAoJEFpvPKfnPDWzU4AH/iXYa1Ya35ETBRpI48h3y8ZQ
-mw/tAHLrCJDO77bpUSuOK1KyoawxDnI48sp/rVu2rIfy+n0URiKRzeD8M5fd9Ci8
-WoNCWgFlapLHIXkh+mKcVsoVOsXiKaYnMca6nb7dZM3s8BGXWEsxv6QfyAAO1Owr
-ga+GrzdmuNHnZcU7WslK8ndRhkAmeVZk81wzAGhgEvtANXUwMLjdn83fSC6TJAVk
-6v4i0vAs9U0Fi1q8k6khf61Qtw5OE8cgp/x0bKgAtt9HmQtvVF1VM0N/Fs82qkz9
-Q3QnVDqckL2segEH6BSMlmuAJdV2W4FpwOe5iFRHdWxcYQJkxASio3H6kYiD064=
-=NFXh
+iQEcBAEBCAAGBQJSVbAuAAoJEFpvPKfnPDWzER8H/RUQW39JwmNdWdQr26/tgSwC
+MvEUGoqEOjJVqkJ2vMmzUpIl8rd+1ucBjmh1A8Q/eYXHeAuye49lrQrhIYOFOp/1
+BiWLUpViJDETnUYMzwUJrV3hTUNA0lX0/nMj0vyCgysSCV0cxwdzfu4D1rBvlRoA
+hdarR2IOv4U6rDgo67SeAPoeyF6K1ouYVpgoc89BdnE6PEBx4M+fs8xPeJv5QqAQ
+Q4iRbZyebaX8x2zJWdCgLlNv/OyBAsSo9BXj9r/Ba3x8ebGFqv1GbJovWF7dyPJX
+GpssfYoAqhQY57kf2xQtzqG1K8nfZTXAoQTywVO7SgO+shQxwo3ytkB1PjWWYq8=
+=KGfz
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch
new file mode 100644
index 000000000000..3bcb8bd36618
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch
@@ -0,0 +1,26 @@
+From d9f448013bd5ea92ce42c99ef3338932ec694b62 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Wed, 9 Oct 2013 21:18:28 +0200
+Subject: [PATCH] fix tests
+
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 4b923a9..4aec221 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -873,6 +873,9 @@ case "$target_os" in
+ 		#hack for macport
+ 		CUNIT_LIBS+=" -lncurses"
+ 	;;
++	*linux*)
++		CUNIT_LIBS+=" -lncurses"
++	;;
+ 	*mingw*)
+ 		CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0501"
+ 		LIBS="$LIBS -lws2_32 -liphlpapi"
+-- 
+1.8.3.2
+
diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild
index 890dae0d575e..fcadebf3afc5 100644
--- a/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild,v 1.1 2013/10/09 18:52:30 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild,v 1.2 2013/10/09 19:36:13 hasufell Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 # TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
 IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc
 	ipv6 ntp-timestamp opus +ortp oss pcap portaudio pulseaudio sdl silk +speex
-	static-libs theora upnp v4l video x264 X"
+	static-libs test theora upnp v4l video x264 X"
 
 REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
 	video? ( || ( sdl X ) )
@@ -48,6 +48,7 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
+	test? ( >=dev-util/cunit-2.1_p2[ncurses] )
 	X? ( x11-proto/videoproto )"
 
 PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
@@ -90,7 +91,8 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${P}-v4l-automagic.patch" \
 		"${FILESDIR}/${P}-libav9.patch" \
-		"${FILESDIR}/${P}-underlinking.patch"
+		"${FILESDIR}/${P}-underlinking.patch" \
+		"${FILESDIR}/${P}-tests.patch"
 
 	eautoreconf
 }
@@ -111,7 +113,7 @@ src_configure() {
 		$(use_enable coreaudio macsnd)
 		$(use_enable debug)
 		$(use_enable filters)
-		$(use_enable g726 spandsp )
+		$(use_enable g726 spandsp)
 		$(use_enable gsm)
 		$(use_enable ipv6)
 		$(use_enable ntp-timestamp)
@@ -146,6 +148,12 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_test() {
+	default
+	cd tester || die
+	./mediastreamer2_tester || die
+}
+
 src_install() {
 	default
 	prune_libtool_files