net-libs/ekiga: try to patch kde support

svn path=/trunk/; revision=835

3 files changed, 301 insertions, 8 deletions

diff --git a/net-im/ekiga/Manifest b/net-im/ekiga/Manifest
index 547764b..d210373 100644
--- a/net-im/ekiga/Manifest
+++ b/net-im/ekiga/Manifest
@@ -1,10 +1,10 @@
 AUX ekiga-3.0.2-ptracing.patch 5708 RMD160 1031c2a8fa5b2ade6ceb513a56e9b5ae95a60809 SHA1 419c06ac2058943bea9fa21f96b231cc11b9fdba SHA256 1a83b04db2ab039c616ccf1b4f1071290b08d64a4929643d5147da53d353d3fe
-AUX ekiga-3.2.0-configure.patch 974 RMD160 ba76cc8f23f4c2888ff301428dc6d713e82c3bca SHA1 20677405316db6941cdf2439f7676c752654b8ae SHA256 c6d7ff3051ffa55bc19a41076c4e79addd54717e38447deab2f80be5ebd29f22
+AUX ekiga-3.2.0-configure.patch 11573 RMD160 dcc2752d1335f7040917d7ab18e4d4b59887dfc0 SHA1 59a9ac729dbc8f286cf0c42e04cf14cb3dece8a7 SHA256 e561e35fd4f79bf5b6b713b6ab0f8afd80a7259e003b70c42aecd2677f9bb94b
 AUX ekiga-3.2.0-ptracing.patch 5073 RMD160 bad220709a9238347f2ed219a4ffe0ee9f5e1d0a SHA1 3050a2c4c2dc04b2ade582652df9fe8ea0c6e5e3 SHA256 78070f8e94c457d872979da177f612b1609e533ecbe943e2f13e863c67d8ffe8
 AUX ekiga-3.2.0-xcap.patch 2640 RMD160 c112e0a93c5dd121f83368ccf3dcf6f78bdd7eb6 SHA1 761ca9e87085e9cae194e47267ee4ed4b48cfd5b SHA256 e5284d49e703e43256f2a136159598c2f088d4e12698e158ae1b27ef357a26f2
 DIST ekiga-3.0.2.tar.bz2 7142789 RMD160 997b890f5a18ae89020f7511db977f5ae0561ba2 SHA1 a89e2b493a1fcc518ffa2af36f6ffb2955bc2090 SHA256 df17dea4e6eb4c67ba3949e03fdc665840d9848c124126e765a510146f1e638e
 DIST ekiga-3.2.0.tar.bz2 7679645 RMD160 f31e94dbe03038e39fb5b50bd71372992c13ae8b SHA1 6a8d6f203cd982cbfb37822b2a96f176176cd763 SHA256 998b50e3920546cb43cd281d519394a2db23f5bf10223cac49120296407b3c6d
 EBUILD ekiga-3.0.2.ebuild 4700 RMD160 de289cb1ea6f334be16c435ee0e534d2078febf4 SHA1 2245015dddd99a3461c43cba12fac58cc92a9226 SHA256 23ae2dbc5186a110089301f6bc51c51f2197ba7c3c2a499356da2b55bd9cfacd
-EBUILD ekiga-3.2.0-r1.ebuild 6340 RMD160 3258cb1aad954539189a3bdd84085855e614f955 SHA1 d71193ca6a1f7c8554ed0ef78011d856829d8d5d SHA256 c39ba746c4a8f1f6b0bdb7a85c79fc1bb2a851310f314917763af6457a6c6ea5
+EBUILD ekiga-3.2.0-r1.ebuild 6340 RMD160 197661c679051354d06a8f5cf0f58c0341b249e6 SHA1 0860a9a26ee358c5c963d40b2aa49e50f84f0f4d SHA256 39aad71661d92789ca25083aad08689a8301d1a8b838a010104ef3c68c07e28b
 MISC ChangeLog 856 RMD160 bbd7073a78530729fa8435c805459d1eb4cf46ae SHA1 9882d4d9eeeed7cfebe1b5609d5ba87e0edd8705 SHA256 843a7d0d0e24189cbcd29750c71ab0d324ebd418f6ab7372609cc7e661d98c95
 MISC metadata.xml 528 RMD160 e925e497011180300d392e98206ff24e4b06911b SHA1 cf734d7d2b7c55c01e5ce3779e4bd3c89ffcad35 SHA256 b9895d5d6170742d1d26a135bab40a97c3aa1f4941c96d6018a3daead65bf12a
diff --git a/net-im/ekiga/ekiga-3.2.0-r1.ebuild b/net-im/ekiga/ekiga-3.2.0-r1.ebuild
index dda8d53..9461c10 100644
--- a/net-im/ekiga/ekiga-3.2.0-r1.ebuild
+++ b/net-im/ekiga/ekiga-3.2.0-r1.ebuild
@@ -9,8 +9,8 @@ inherit eutils gnome2
 DESCRIPTION="H.323 and SIP VoIP softphone"
 HOMEPAGE="http://www.ekiga.org/"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE="avahi dbus debug doc eds gconf gnome gstreamer +h323 kde kontact ldap libnotify mmx nls +shm +sip static v4l xcap xv"
 
diff --git a/net-im/ekiga/files/ekiga-3.2.0-configure.patch b/net-im/ekiga/files/ekiga-3.2.0-configure.patch
index 1687839..5df19b7 100644
--- a/net-im/ekiga/files/ekiga-3.2.0-configure.patch
+++ b/net-im/ekiga/files/ekiga-3.2.0-configure.patch
@@ -1,6 +1,191 @@
 --- configure.old	2009-03-29 14:53:29.000000000 -0400
-+++ configure	2009-03-28 11:20:41.000000000 -0400
-@@ -25071,7 +25071,9 @@
++++ configure	2009-04-17 18:25:16.000000000 -0400
+@@ -1129,6 +1129,8 @@
+ AVAHI_LIBS
+ GSTREAMER_CFLAGS
+ GSTREAMER_LIBS
++KDE_CFLAGS
++KDE_LIBS
+ SOUP_CFLAGS
+ SOUP_LIBS
+ PTLIB_CFLAGS
+@@ -1863,6 +1865,8 @@
+               C compiler flags for GSTREAMER, overriding pkg-config
+   GSTREAMER_LIBS
+               linker flags for GSTREAMER, overriding pkg-config
++  KDE_CFLAGS  C compiler flags for KDE, overriding pkg-config
++  KDE_LIBS    linker flags for KDE, overriding pkg-config
+   SOUP_CFLAGS C compiler flags for SOUP, overriding pkg-config
+   SOUP_LIBS   linker flags for SOUP, overriding pkg-config
+   PTLIB_CFLAGS
+@@ -5399,7 +5403,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 5402 "configure"' > conftest.$ac_ext
++  echo '#line 5406 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -8003,11 +8007,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8006: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8010: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8010: \$? = $ac_status" >&5
++   echo "$as_me:8014: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -8293,11 +8297,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8296: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8300: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8300: \$? = $ac_status" >&5
++   echo "$as_me:8304: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -8397,11 +8401,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8400: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8404: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:8404: \$? = $ac_status" >&5
++   echo "$as_me:8408: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -10810,7 +10814,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 10813 "configure"
++#line 10817 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -10910,7 +10914,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 10913 "configure"
++#line 10917 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -13319,11 +13323,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:13322: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13326: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:13326: \$? = $ac_status" >&5
++   echo "$as_me:13330: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -13423,11 +13427,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:13426: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13430: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:13430: \$? = $ac_status" >&5
++   echo "$as_me:13434: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -15021,11 +15025,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15024: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15028: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:15028: \$? = $ac_status" >&5
++   echo "$as_me:15032: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -15125,11 +15129,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15128: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15132: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:15132: \$? = $ac_status" >&5
++   echo "$as_me:15136: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -17353,11 +17357,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17356: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17360: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:17360: \$? = $ac_status" >&5
++   echo "$as_me:17364: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -17643,11 +17647,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17646: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17650: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:17650: \$? = $ac_status" >&5
++   echo "$as_me:17654: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -17747,11 +17751,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17750: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17754: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:17754: \$? = $ac_status" >&5
++   echo "$as_me:17758: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -25071,7 +25075,9 @@
  
  # Check whether --enable-gstreamer was given.
  if test "${enable_gstreamer+set}" = set; then
@@ -11,7 +196,7 @@
  fi
  
  
-@@ -25220,7 +25222,9 @@
+@@ -25220,14 +25226,85 @@
  
  # Check whether --enable-kde was given.
  if test "${enable_kde+set}" = set; then
@@ -22,7 +207,104 @@
  fi
  
  
-@@ -25401,7 +25405,9 @@
+ if test "x$enable_kde" = "xyes"; then
+-  found_kde=yes
+-  KDE_CFLAGS="-I/usr/include/qt4"
+-  KDE_LIBS="-lQtCore"
++
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for KDE" >&5
++$as_echo_n "checking for KDE... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++    if test -n "$KDE_CFLAGS"; then
++        pkg_cv_KDE_CFLAGS="$KDE_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtCore\"") >&5
++  ($PKG_CONFIG --exists --print-errors "QtCore") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_KDE_CFLAGS=`$PKG_CONFIG --cflags "QtCore" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++    if test -n "$KDE_LIBS"; then
++        pkg_cv_KDE_LIBS="$KDE_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtCore\"") >&5
++  ($PKG_CONFIG --exists --print-errors "QtCore") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_KDE_LIBS=`$PKG_CONFIG --libs "QtCore" 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
++	        KDE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtCore"`
++        else
++	        KDE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtCore"`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$KDE_PKG_ERRORS" >&5
++
++	{ $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++                found_kde=no
++elif test $pkg_failed = untried; then
++	found_kde=no
++else
++	KDE_CFLAGS=$pkg_cv_KDE_CFLAGS
++	KDE_LIBS=$pkg_cv_KDE_LIBS
++        { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++	found_kde=yes
++fi
++
+   CPPFLAGS_save="$CPPFLAGS"
+   LIBS_save="$LIBS"
+   CPPFLAGS="$CPPFLAGS $KDE_CFLAGS"
+@@ -25373,13 +25450,15 @@
+ 
+   CPPFLAGS="$CPPFLAGS_save"
+   LIBS="$LIBS_save"
++
+   if test "x$found_kde" = "xno"; then
+-    { { $as_echo "$as_me:$LINENO: error: We need this header!" >&5
+-$as_echo "$as_me: error: We need this header!" >&2;}
++    { { $as_echo "$as_me:$LINENO: error: You need QtCore and kapplication.h to enable KDE support" >&5
++$as_echo "$as_me: error: You need QtCore and kapplication.h to enable KDE support" >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+ 
+ 
++
+   KDE="enabled"
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -25401,7 +25480,9 @@
  
  # Check whether --enable-kab was given.
  if test "${enable_kab+set}" = set; then
@@ -33,7 +315,18 @@
  fi
  
  
-@@ -25588,7 +25594,9 @@
+@@ -25413,8 +25494,8 @@
+    { (exit 1); exit 1; }; }
+   fi
+   found_kab=yes
+-  KAB_CFLAGS="-I/usr/include/qt4"
+-  KAB_LIBS="-lQtCore -lkabc"
++  KAB_CFLAGS=""
++  KAB_LIBS="-lkabc"
+   CPPFLAGS_save="$CPPFLAGS"
+   LIBS_save="$LIBS"
+   CPPFLAGS="$CPPFLAGS $KAB_CFLAGS"
+@@ -25588,7 +25669,9 @@
  
  # Check whether --enable-xcap was given.
  if test "${enable_xcap+set}" = set; then