removing old ebuilds and patches

(Portage version: 13823-svn/cvs/Linux ppc)

12 files changed, 12 insertions, 835 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index 6a3994f60975..2ac999f8d3f8 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-voip/linphone
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.37 2009/07/08 20:55:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.38 2009/07/19 14:45:26 volkmar Exp $
+
+  19 Jul 2009; Mounir Lamouri <volkmar@gentoo.org>
+  -files/linphone-1.6.0-call.patch,
+  -files/linphone-2.0.1-configure-gsm.patch,
+  -files/linphone-2.0.1-mediastreamer-deps.patch,
+  -files/linphone-2.0.1-speexdsp.patch,
+  -files/linphone-2.1.1-ortp-deps.patch, -linphone-3.0.0.ebuild,
+  -files/linphone-3.0.0-pkg-config.patch, -linphone-3.1.0.ebuild,
+  -files/linphone-3.1.0-external-mstreamer.patch,
+  -files/linphone-3.1.0-novideo-preferences.patch, metadata.xml:
+  Removing old ebuilds and patches
 
   08 Jul 2009; Markus Meier <maekke@gentoo.org> linphone-3.1.1.ebuild:
   amd64 stable, bug #259172
diff --git a/net-voip/linphone/files/linphone-1.6.0-call.patch b/net-voip/linphone/files/linphone-1.6.0-call.patch
deleted file mode 100644
index 27fe669f8c1c..000000000000
--- a/net-voip/linphone/files/linphone-1.6.0-call.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- linphone-1.6.0.old/console/commands.c	2007-02-02 13:57:55.000000000 +0100
-+++ linphone-1.6.0/console/commands.c	2007-02-02 14:25:51.000000000 +0100
-@@ -287,6 +287,7 @@
- static int
- lpc_cmd_call(LinphoneCore *lc, char *args)
- {
-+	if ( ! args || ! *args ) return 0;
- 	if ( lc->call != NULL )
- 	{
- 		printf("Terminate current call first.\n");
diff --git a/net-voip/linphone/files/linphone-2.0.1-configure-gsm.patch b/net-voip/linphone/files/linphone-2.0.1-configure-gsm.patch
deleted file mode 100644
index fe343f2efd30..000000000000
--- a/net-voip/linphone/files/linphone-2.0.1-configure-gsm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mediastreamer2/configure
-+++ b/mediastreamer2/configure
-@@ -22174,7 +22174,7 @@
- 
- 
- 
--if test "$GSM_found" = "yes" ; then
-+if test "$GSM_found" = "yes" && test "$enable_gsm" != "no" ; then
- 	build_gsm=yes
- fi
- 
diff --git a/net-voip/linphone/files/linphone-2.0.1-mediastreamer-deps.patch b/net-voip/linphone/files/linphone-2.0.1-mediastreamer-deps.patch
deleted file mode 100644
index c7aae1725570..000000000000
--- a/net-voip/linphone/files/linphone-2.0.1-mediastreamer-deps.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-liblinphone.la does not seem to properly add -L paths to libmediastreamer.la,
-so force the issue to work around the link failure caused by the -rpath added
-to /usr/lib/linphone/ and having an already installed older version of linphone
-
---- console/Makefile.in
-+++ console/Makefile.in
-@@ -287,12 +287,12 @@
- @BUILD_CONSOLE_TRUE@	-I$(osip_prefix)/include 
- 
- @BUILD_CONSOLE_TRUE@linphonec_SOURCES = linphonec.c linphonec.h commands.c
--@BUILD_CONSOLE_TRUE@linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS) $(OSIP_LIBS)
-+@BUILD_CONSOLE_TRUE@linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la $(READLINE_LIBS) $(OSIP_LIBS)
- @BUILD_CONSOLE_TRUE@sipomatic_SOURCES = \
- @BUILD_CONSOLE_TRUE@	sipomatic.c sipomatic.h
- 
- @BUILD_CONSOLE_TRUE@sipomatic_LDADD = $(INTLLIBS)  \
--@BUILD_CONSOLE_TRUE@					$(top_builddir)/coreapi/liblinphone.la \
-+@BUILD_CONSOLE_TRUE@					$(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
- @BUILD_CONSOLE_TRUE@			$(OSIP_LIBS)
- 
- AM_CFLAGS = $(STRICT_OPTIONS)  -DENABLE_TRACE -D_ORTP_SOURCE $(VIDEO_CFLAGS) $(READLINE_CFLAGS) $(OSIP_CFLAGS)
---- gtk/Makefile.in
-+++ gtk/Makefile.in
-@@ -335,7 +335,7 @@
- @BUILD_GTK_TRUE@	$(linphone_common_sources)
- 
- @BUILD_GTK_TRUE@linphone_LDADD = $(LIBGTK_LIBS) $(INTLLIBS) \
--@BUILD_GTK_TRUE@				$(top_builddir)/coreapi/liblinphone.la
-+@BUILD_GTK_TRUE@				$(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la
- 
- AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
- 		$(ORTP_CFLAGS) $(OSIP_CFLAGS)
-@@ -348,7 +348,7 @@
- @BUILD_GNOME_APPLET_TRUE@linphone_applet_CFLAGS = $(AM_CFLAGS) $(GNOME_APPLETS_CFLAGS) -DLINPHONE_APPLET
- @BUILD_GNOME_APPLET_TRUE@linphone_applet_LDADD = \
- @BUILD_GNOME_APPLET_TRUE@				$(GNOME_APPLETS_LIBS) \
--@BUILD_GNOME_APPLET_TRUE@				$(top_builddir)/coreapi/liblinphone.la \
-+@BUILD_GNOME_APPLET_TRUE@				$(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
- @BUILD_GNOME_APPLET_TRUE@				$(OSIP_LIBS)
- 
- @BUILD_GNOME_APPLET_TRUE@serverdir = $(libdir)/bonobo/servers
diff --git a/net-voip/linphone/files/linphone-2.0.1-speexdsp.patch b/net-voip/linphone/files/linphone-2.0.1-speexdsp.patch
deleted file mode 100644
index c0bd4156c1fa..000000000000
--- a/net-voip/linphone/files/linphone-2.0.1-speexdsp.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-http://bugs.gentoo.org/205893
-
---- linphone-2.0.1/mediastreamer2/configure
-+++ linphone-2.0.1/mediastreamer2/configure
-@@ -21907,6 +21915,117 @@
- 	build_speex=yes
- fi
- 
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for SPEEXDSP" >&5
-+echo $ECHO_N "checking for SPEEXDSP... $ECHO_C" >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$SPEEXDSP_CFLAGS"; then
-+        pkg_cv_SPEEXDSP_CFLAGS="$SPEEXDSP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speexdsp >= 1.2beta3\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "speexdsp >= 1.2beta3") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_SPEEXDSP_CFLAGS=`$PKG_CONFIG --cflags "speexdsp >= 1.2beta3" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+    fi
-+else
-+	pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$SPEEXDSP_LIBS"; then
-+        pkg_cv_SPEEXDSP_LIBS="$SPEEXDSP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speexdsp >= 1.2beta3\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "speexdsp >= 1.2beta3") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_SPEEXDSP_LIBS=`$PKG_CONFIG --libs "speexdsp >= 1.2beta3" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+    fi
-+else
-+	pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        SPEEXDSP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "speexdsp >= 1.2beta3"`
-+        else
-+	        SPEEXDSP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "speexdsp >= 1.2beta3"`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$SPEEXDSP_PKG_ERRORS" >&5
-+
-+	{ { echo "$as_me:$LINENO: error: Package requirements (speexdsp >= 1.2beta3) were not met:
-+
-+$SPEEXDSP_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables SPEEXDSP_CFLAGS
-+and SPEEXDSP_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (speexdsp >= 1.2beta3) were not met:
-+
-+$SPEEXDSP_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables SPEEXDSP_CFLAGS
-+and SPEEXDSP_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
-+   { (exit 1); exit 1; }; }
-+elif test $pkg_failed = untried; then
-+	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables SPEEXDSP_CFLAGS
-+and SPEEXDSP_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables SPEEXDSP_CFLAGS
-+and SPEEXDSP_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+else
-+	SPEEXDSP_CFLAGS=$pkg_cv_SPEEXDSP_CFLAGS
-+	SPEEXDSP_LIBS=$pkg_cv_SPEEXDSP_LIBS
-+        { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+	SPEEX_LIBS="$SPEEX_LIBS $SPEEXDSP_LIBS"
-+fi
-+
- 
- 
- 
diff --git a/net-voip/linphone/files/linphone-2.1.1-ortp-deps.patch b/net-voip/linphone/files/linphone-2.1.1-ortp-deps.patch
deleted file mode 100644
index 426e6e90b1a9..000000000000
--- a/net-voip/linphone/files/linphone-2.1.1-ortp-deps.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- console/Makefile.in
-+++ console/Makefile.in
-@@ -282,13 +282,13 @@
- @BUILD_CONSOLE_TRUE@	-I$(top_srcdir)/mediastreamer2/include
- 
- @BUILD_CONSOLE_TRUE@linphonec_SOURCES = linphonec.c linphonec.h commands.c
--@BUILD_CONSOLE_TRUE@linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la $(READLINE_LIBS) $(OSIP_LIBS)
-+@BUILD_CONSOLE_TRUE@linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la $(READLINE_LIBS) $(OSIP_LIBS) $(ORTP_LIBS)
- @BUILD_CONSOLE_TRUE@sipomatic_SOURCES = \
- @BUILD_CONSOLE_TRUE@	sipomatic.c sipomatic.h
- 
- @BUILD_CONSOLE_TRUE@sipomatic_LDADD = $(INTLLIBS)  \
- @BUILD_CONSOLE_TRUE@					$(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
--@BUILD_CONSOLE_TRUE@			$(OSIP_LIBS)
-+@BUILD_CONSOLE_TRUE@			$(OSIP_LIBS) $(ORTP_LIBS)
- 
- AM_CFLAGS = $(STRICT_OPTIONS)  -DENABLE_TRACE -D_ORTP_SOURCE $(VIDEO_CFLAGS) $(READLINE_CFLAGS) $(OSIP_CFLAGS)
- 
---- gtk/Makefile.in
-+++ gtk/Makefile.in
-@@ -330,7 +330,7 @@
- @BUILD_GTK_TRUE@	$(linphone_common_sources)
- 
- @BUILD_GTK_TRUE@linphone_LDADD = $(LIBGTK_LIBS) $(INTLLIBS) \
--@BUILD_GTK_TRUE@				$(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la
-+@BUILD_GTK_TRUE@				$(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la $(ORTP_LIBS)
- 
- AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
- 		$(ORTP_CFLAGS) $(OSIP_CFLAGS)
-@@ -344,7 +344,7 @@
- @BUILD_GNOME_APPLET_TRUE@linphone_applet_LDADD = \
- @BUILD_GNOME_APPLET_TRUE@				$(GNOME_APPLETS_LIBS) \
- @BUILD_GNOME_APPLET_TRUE@				$(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
--@BUILD_GNOME_APPLET_TRUE@				$(OSIP_LIBS)
-+@BUILD_GNOME_APPLET_TRUE@				$(OSIP_LIBS) $(ORTP_LIBS)
- 
- @BUILD_GNOME_APPLET_TRUE@serverdir = $(libdir)/bonobo/servers
- @BUILD_GNOME_APPLET_TRUE@server_in_files = GNOME_LinphoneApplet.server.in
diff --git a/net-voip/linphone/files/linphone-3.0.0-pkg-config.patch b/net-voip/linphone/files/linphone-3.0.0-pkg-config.patch
deleted file mode 100644
index 7c84216a0c5a..000000000000
--- a/net-voip/linphone/files/linphone-3.0.0-pkg-config.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-explicitly run PKG_PROG_PKG_CONFIG
-
---- mediastreamer2/configure
-+++ mediastreamer2/configure
-@@ -875,6 +875,7 @@ F77
- FFLAGS
- ac_ct_F77
- LIBTOOL
-+PKG_CONFIG
- BUILD_MACOSX_TRUE
- BUILD_MACOSX_FALSE
- MSPLUGINS_CFLAGS
-@@ -884,7 +885,6 @@ BUILD_OSS_FALSE
- ALSA_LIBS
- BUILD_ALSA_TRUE
- BUILD_ALSA_FALSE
--PKG_CONFIG
- ARTS_CFLAGS
- ARTS_LIBS
- BUILD_ARTS_TRUE
-@@ -20809,6 +20809,127 @@ if test $GCC = yes && test $wall_werror = yes;  then
- 	CFLAGS="$CFLAGS -Werror "
- fi
- 
-+
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+	if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+  ac_pt_PKG_CONFIG=$PKG_CONFIG
-+  # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $ac_pt_PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+  if test "x$ac_pt_PKG_CONFIG" = x; then
-+    PKG_CONFIG=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    PKG_CONFIG=$ac_pt_PKG_CONFIG
-+  fi
-+else
-+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+fi
-+
-+fi
-+if test -n "$PKG_CONFIG"; then
-+	_pkg_min_version=0.9.0
-+	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
-+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+		{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+	else
-+		{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+		PKG_CONFIG=""
-+	fi
-+
-+fi
-+
- macosx_found=no
- 
- case $OS in
-@@ -21332,126 +21453,6 @@ arts_enabled=false
- if test "$artsc" = "true" ; then
- 
- 
--
--if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
--	if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
--set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--  ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
--  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6; }
--else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--fi
--if test -z "$ac_cv_path_PKG_CONFIG"; then
--  ac_pt_PKG_CONFIG=$PKG_CONFIG
--  # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $ac_pt_PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--  ;;
--esac
--fi
--ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
--if test -n "$ac_pt_PKG_CONFIG"; then
--  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
--echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
--else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--  if test "x$ac_pt_PKG_CONFIG" = x; then
--    PKG_CONFIG=""
--  else
--    case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
--    PKG_CONFIG=$ac_pt_PKG_CONFIG
--  fi
--else
--  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
--fi
--
--fi
--if test -n "$PKG_CONFIG"; then
--	_pkg_min_version=0.9.0
--	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
--echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
--	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
--		{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--	else
--		{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--		PKG_CONFIG=""
--	fi
--
--fi
--
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for ARTS" >&5
- echo $ECHO_N "checking for ARTS... $ECHO_C" >&6; }
-@@ -26209,6 +26210,7 @@ F77!$F77$ac_delim
- FFLAGS!$FFLAGS$ac_delim
- ac_ct_F77!$ac_ct_F77$ac_delim
- LIBTOOL!$LIBTOOL$ac_delim
-+PKG_CONFIG!$PKG_CONFIG$ac_delim
- BUILD_MACOSX_TRUE!$BUILD_MACOSX_TRUE$ac_delim
- BUILD_MACOSX_FALSE!$BUILD_MACOSX_FALSE$ac_delim
- MSPLUGINS_CFLAGS!$MSPLUGINS_CFLAGS$ac_delim
-@@ -26218,7 +26220,6 @@ BUILD_OSS_FALSE!$BUILD_OSS_FALSE$ac_delim
- ALSA_LIBS!$ALSA_LIBS$ac_delim
- BUILD_ALSA_TRUE!$BUILD_ALSA_TRUE$ac_delim
- BUILD_ALSA_FALSE!$BUILD_ALSA_FALSE$ac_delim
--PKG_CONFIG!$PKG_CONFIG$ac_delim
- ARTS_CFLAGS!$ARTS_CFLAGS$ac_delim
- ARTS_LIBS!$ARTS_LIBS$ac_delim
- BUILD_ARTS_TRUE!$BUILD_ARTS_TRUE$ac_delim
diff --git a/net-voip/linphone/files/linphone-3.1.0-external-mstreamer.patch b/net-voip/linphone/files/linphone-3.1.0-external-mstreamer.patch
deleted file mode 100644
index 4c4092209086..000000000000
--- a/net-voip/linphone/files/linphone-3.1.0-external-mstreamer.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- configure.in.old	2009-04-23 18:32:59.000000000 -0400
-+++ configure.in	2009-04-23 18:49:01.000000000 -0400
-@@ -258,7 +258,26 @@
- 
- AC_SUBST(STRICT_OPTIONS)
- 
--AC_CONFIG_SUBDIRS( mediastreamer2 )
-+AC_ARG_ENABLE(external-mediastreamer,
-+      [  --enable-external-mediastreamer Use external mediastreamer library],
-+      [case "${enableval}" in
-+        yes) external_mediastreamer=true ;;
-+        no)  external_mediastreamer=false ;;
-+        *) AC_MSG_ERROR(bad value ${enableval} for --enable-external-mediastreamer) ;;
-+      esac],[external_mediastreamer=false])
-+
-+if test "$external_mediastreamer" = 'true'; then
-+	LP_CHECK_MSTREAMER
-+else
-+	AC_CONFIG_SUBDIRS( mediastreamer2 )
-+	MSTREAMER_CFLAGS="-I\$(top_srcdir)/mediastreamer2/include"
-+	MSTREAMER_LIBS="\$(top_builddir)/mediastreamer2/src/libmediastreamer.la"
-+fi
-+
-+AC_SUBST(MSTREAMER_CFLAGS)
-+AC_SUBST(MSTREAMER_LIBS)
-+
-+AM_CONDITIONAL(EXTERNAL_MSTREAMER, [test "$external_mediastreamer" = 'true'])
- 
- dnl check for db2html (docbook) to generate html user manual
- AC_CHECK_PROG(have_sgmltools,sgmltools, yes, no)
---- console/Makefile.am.old	2009-04-23 18:38:26.000000000 -0400
-+++ console/Makefile.am	2009-04-23 18:38:56.000000000 -0400
-@@ -7,7 +7,7 @@
- 	-I$(top_srcdir)/coreapi\
- 	$(ORTP_CFLAGS) \
- 	-I$(top_srcdir)/exosip \
--	-I$(top_srcdir)/mediastreamer2/include
-+	$(MSTREAMER_CFLAGS)
- 
- 
- 
-@@ -16,7 +16,7 @@
- linphonec_SOURCES = linphonec.c linphonec.h commands.c
- 
- linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS)  \
--		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-+		$(MSTREAMER_LIBS) \
- 		$(ORTP_LIBS) \
- 		$(SPEEX_LIBS) \
- 		$(OSIP_LIBS)
-@@ -26,7 +26,7 @@
- 
- sipomatic_LDADD= 	$(INTLLIBS)  \
- 			$(top_builddir)/coreapi/liblinphone.la \
--			$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-+			$(MSTREAMER_LIBS) \
- 			$(ORTP_LIBS) \
- 			$(SPEEX_LIBS) \
- 			$(OSIP_LIBS)
---- coreapi/Makefile.am.old	2009-04-23 18:41:10.000000000 -0400
-+++ coreapi/Makefile.am	2009-04-23 18:41:32.000000000 -0400
-@@ -7,7 +7,7 @@
- 
- INCLUDES = \
- 	-I$(top_srcdir)\
--	-I$(top_srcdir)/mediastreamer2/include
-+	$(MSTREAMER_CFLAGS)
- 
- 
- lib_LTLIBRARIES=liblinphone.la
-@@ -32,7 +32,7 @@
- 
- liblinphone_la_LIBADD= \
- 		$(EXOSIP_LIBS) \
--		$(top_builddir)/mediastreamer2/src/libmediastreamer.la 
-+		$(MSTREAMER_LIBS)
- 
- 
- AM_CFLAGS=$(STRICT_OPTIONS)  -DIN_LINPHONE \
---- gtk-glade/Makefile.am.old	2009-04-23 18:39:42.000000000 -0400
-+++ gtk-glade/Makefile.am	2009-04-23 20:19:38.000000000 -0400
-@@ -34,8 +34,8 @@
- 			buddylookup.c \
- 			linphone.h
- 
--linphone_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \
--		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-+linphone_3_LDADD=$(ORTP_LIBS) \
-+		$(MSTREAMER_LIBS) \
- 		$(top_builddir)/coreapi/liblinphone.la \
- 			$(LIBGTK_LIBS) $(INTLLIBS) \
- 			$(LIBGLADE_LIBS)
-@@ -54,7 +54,7 @@
- 
- 
- AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
--		-I$(top_srcdir)/mediastreamer2/include/ \
-+		$(MSTREAMER_CFLAGS) \
- 		$(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
- 		$(ORTP_CFLAGS) $(OSIP_CFLAGS) 
- 
---- m4/mstreamer.m4.old	1969-12-31 19:00:00.000000000 -0500
-+++ m4/mstreamer.m4	2009-04-23 19:36:12.000000000 -0400
-@@ -0,0 +1,11 @@
-+AC_DEFUN([LP_CHECK_MSTREAMER],[
-+
-+PKG_CHECK_MODULES([MSTREAMER], [mediastreamer >= 2.2.3], , [ms_failed=true])
-+
-+if test "$ms_failed" = "true"; then
-+	AC_MSG_ERROR("External mediastreamer library not found")
-+fi
-+
-+AC_SUBST([MSTREAMER_LIBS])
-+AC_SUBST([MSTREAMER_CFLAGS])
-+])
diff --git a/net-voip/linphone/files/linphone-3.1.0-novideo-preferences.patch b/net-voip/linphone/files/linphone-3.1.0-novideo-preferences.patch
deleted file mode 100644
index 671241c1d694..000000000000
--- a/net-voip/linphone/files/linphone-3.1.0-novideo-preferences.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-fix crash when compiled with --disable-video
-
---- coreapi/linphonecore.c.old	2009-04-24 19:20:24.000000000 -0400
-+++ coreapi/linphonecore.c	2009-04-24 19:21:10.000000000 -0400
-@@ -2108,7 +2108,7 @@
- 	if (olddev!=NULL && olddev!=lc->video_conf.device){
- 		toggle_video_preview(lc,FALSE);/*restart the video local preview*/
- 	}
--	if (lc->ready){
-+	if (lc->ready && lc->video_conf.device){
- 		vd=ms_web_cam_get_string_id(lc->video_conf.device);
- 		if (vd && strstr(vd,"Static picture")!=NULL){
- 			vd=NULL;
diff --git a/net-voip/linphone/linphone-3.0.0.ebuild b/net-voip/linphone/linphone-3.0.0.ebuild
deleted file mode 100644
index 37fcc1c0bbb2..000000000000
--- a/net-voip/linphone/linphone-3.0.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.0.0.ebuild,v 1.6 2009/04/28 12:14:35 volkmar Exp $
-
-inherit eutils
-
-DESCRIPTION="Voice Over IP phone (internet phone which uses SIP)"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/stable/sources/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="alsa arts console gsm gtk ipv6 video xv"
-
-RDEPEND="dev-libs/glib
-	dev-perl/XML-Parser
-	net-dns/bind-tools
-	>=net-libs/libosip-3.0.3
-	>=net-libs/libeXosip-3.0.3
-	>=media-libs/speex-1.1.12
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	gtk? (
-		>=x11-libs/gtk+-2
-		gnome-base/libglade
-	)
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	video? (
-		>=media-libs/libsdl-1.2.9
-		media-video/ffmpeg
-		>=media-libs/libtheora-1.0_alpha7
-	)"
-DEPEND="${RDEPEND}
-	x86? ( xv? ( dev-lang/nasm ) )
-	dev-util/pkgconfig"
-# use the bundled ortp until newer versions leave package.mask
-#	>=net-libs/ortp-0.13.0
-#	portaudio? ( >=media-libs/portaudio-19_pre )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-pkg-config.patch
-}
-
-src_compile() {
-	export ac_cv_path_DOXYGEN=false
-	export ac_cv_path_INTLTOOL_UPDATE=true #252704
-	export ac_cv_path_INTLTOOL_MERGE=true
-	export ac_cv_path_INTLTOOL_EXTRACT=true
-	econf \
-		--disable-manual \
-		--disable-strict \
-		--libdir=/usr/$(get_libdir)/linphone \
-		--libexecdir=/usr/$(get_libdir)/linphone/exec \
-		$(use_enable console console_ui) \
-		$(use_enable gtk gtk_ui) \
-		$(use_enable ipv6) \
-		$(use_enable alsa) \
-		$(use_enable arts artsc) \
-		$(use_with gsm) \
-		$(use_enable video) \
-		--disable-portaudio \
-		$(use_enable x86 truespeech) \
-		|| die "Unable to configure"
-		#--enable-external-ortp \
-		#$(use_enable portaudio)
-	emake || die "Unable to make"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "Failed to install"
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README README.arm TODO
-
-	# don't install mediastreamer/ortp includes, docs and pkgconfig files
-	# to avoid conflicts with net-libs/ortp
-	rm -r "${D}"/usr/include/{mediastreamer2,ortp} || die
-	rm -r "${D}"/usr/$(get_libdir)/linphone/pkgconfig/{mediastreamer,ortp}.pc || die
-	mv "${D}"/usr/$(get_libdir)/{linphone/,}pkgconfig || die
-}
diff --git a/net-voip/linphone/linphone-3.1.0.ebuild b/net-voip/linphone/linphone-3.1.0.ebuild
deleted file mode 100644
index 244e2b38e386..000000000000
--- a/net-voip/linphone/linphone-3.1.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.1.0.ebuild,v 1.4 2009/05/15 20:39:35 maekke Exp $
-
-EAPI="2"
-
-inherit eutils autotools multilib
-
-DESCRIPTION="Video softphone based on the SIP protocol"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/stable/sources/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gtk ipv6 ncurses nls video"
-
-RDEPEND=">=media-libs/mediastreamer-2.2.3[video?]
-	>=net-libs/libeXosip-3.0.2
-	>=net-libs/libosip-3.0.0
-	>=net-libs/ortp-0.15.0_p1
-	gtk? ( dev-libs/glib:2
-		>=gnome-base/libglade-2.4.0:2.0
-		>=x11-libs/gtk+-2.4.0:2 )
-	ncurses? ( sys-libs/readline
-		sys-libs/ncurses )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	doc? ( app-text/sgmltools-lite )
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-IUSE_LINGUAS="fr it de ja es pl cs nl sv pt_BR hu ru"
-
-for l in ${IUSE_LINGUAS}; do
-	IUSE="${IUSE} linguas_${l}"
-done
-
-# TODO:
-# run-time test for ipv6 : does it need mediastreamer[ipv6] ?
-
-pkg_setup() {
-	if ! use gtk && ! use ncurses; then
-		ewarn "gtk and ncurses are disabled."
-		ewarn "At least one of these use flags are needed to get a front-end."
-		ewarn "Only liblinphone is going to be installed."
-	fi
-
-	strip-linguas ${IUSE_LINGUAS}
-
-	if [[ -z "${LINGUAS}" ]]; then
-		# no linguas set, using the default one
-		LINGUAS=" "
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-external-mstreamer.patch
-
-	# this patch removes need to gettext and intltool
-	# but intltool was needed for eautoreconf so I add m4_pattern_allow
-	# which is probably not the best way but it's working
-	epatch "${FILESDIR}"/${P}-nls.patch
-
-	# remove speex check, avoid bug when mediastreamer[-speex]
-	sed -i -e '/SPEEX/d' configure.in || die "patching configure.in failed"
-
-	# fix path to use lib64
-	sed -i -e "s:lib\(/liblinphone\):$(get_libdir)\1:" configure.in \
-		|| die "patching configure.in failed"
-
-	# removing bundled libs dir prevent them to be reconf
-	rm -rf mediastreamer2 oRTP || die "should not die"
-	# and references in Makefile.am
-	sed -i -e "s:oRTP::" -e "s:mediastreamer2::" Makefile.am \
-		|| die "patching Makefile.am failed"
-
-	eautoreconf
-
-	# fix crash
-	epatch "${FILESDIR}"/${P}-novideo-preferences.patch
-}
-
-src_configure() {
-	# strict: we don't want -Werror
-	# external-ortp,external-mediastreamer: prefer external libs
-	# truespeech: seems not used, TODO: ask in ml
-	# rsvp: breaking the build (not maintained anymore) --disable = --enable
-	# alsa, artsc and portaudio are used for bundled mediastreamer
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--disable-strict \
-		--enable-external-ortp \
-		--enable-external-mediastreamer \
-		--disable-truespeech \
-		--disable-dependency-tracking \
-		$(use_enable doc manual) \
-		$(use_enable gtk gtk_ui) \
-		$(use_enable ipv6) \
-		$(use_enable ncurses console_ui) \
-		$(use_enable nls) \
-		$(use_enable video)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BUGS ChangeLog NEWS README README.arm TODO \
-		|| die "dodoc failed"
-}
diff --git a/net-voip/linphone/metadata.xml b/net-voip/linphone/metadata.xml
index 0e21901a88c2..0c0be6aebb20 100644
--- a/net-voip/linphone/metadata.xml
+++ b/net-voip/linphone/metadata.xml
@@ -7,7 +7,6 @@
 		<name>Mounir Lamouri</name>
 	</maintainer>
 	<use>
-		<flag name='console'>Build console interface</flag>
 		<flag name='video'>Enable video support (display/capture)</flag>
 	</use>
 </pkgmetadata>