net-voip/kphoneSI: drop ebuild which uses qt3.eclass

svn path=/trunk/; revision=883

12 files changed, 0 insertions, 703 deletions

diff --git a/net-voip/kphoneSI/ChangeLog b/net-voip/kphoneSI/ChangeLog
deleted file mode 100644
index cf871b4..0000000
--- a/net-voip/kphoneSI/ChangeLog
+++ /dev/null
@@ -1,22 +0,0 @@
-2006-06-17 18:50  stkn
-
-	* [r297] Manifest, files/kphoneSI_1.0-Makefile.in.diff,
-	  files/kphoneSI_1.0-SRTPWrapper.h.diff,
-	  files/kphoneSI_1.0-srtp-1.4.diff, kphoneSI-1.0.ebuild:
-	  Enable libsrtp-1.4 support in kphoneSI, small fixes in
-	  SRTPWrapper.h and .cpp, changes in Makefiles...
-
-2006-06-17 13:47  stkn
-
-	* [r292] ., Manifest, files, files/digest-kphoneSI-1.0,
-	  files/kphoneSI_1.0-Makefile.in.diff,
-	  files/kphoneSI_1.0-kphoneview.h.diff,
-	  files/kphoneSI_1.0-use-custom-cflags.patch, kphoneSI-1.0.ebuild:
-	  Add kphoneSI-1.0 (successor of kphone)
-
-  02 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
-  +kphoneSI-1.0.2.1.ebuild, +files/kphoneSI-1.0.2.1-Makefile.in.diff,
-  +files/kphoneSI-1.0.2.1-srtp-1.4.diff,
-  +files/kphoneSI-1.0.2.1-use-custom-cflags.patch:
-  version bump
-
diff --git a/net-voip/kphoneSI/Manifest b/net-voip/kphoneSI/Manifest
deleted file mode 100644
index fa2ef33..0000000
--- a/net-voip/kphoneSI/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX kphoneSI-1.0.2.1-Makefile.in.diff 4639 RMD160 1863dd48e57019602119b1d7258e1d960cffc1b5 SHA1 074c9e45e9b0b03179f1dddbd987148a9be0cb42 SHA256 5a38cd836153a5c5a012a5eb6a3f6a5bcc7453782e45126c1b8ef4fbdc6be2c6
-AUX kphoneSI-1.0.2.1-srtp-1.4.diff 2132 RMD160 941e93b3e3e226407c797a6e8b1467fe5874b35c SHA1 5621eee22e3d62ce3e85cd2a425acf34f68b97ca SHA256 ab3d07d7c8fe842c675ce9b6daaf78029866cfd1b90b1cd7b5b45f05d53aa4a6
-AUX kphoneSI-1.0.2.1-use-custom-cflags.patch 341 RMD160 65c0fde9ef9a8643e9162562d7604a149f183ed9 SHA1 82cf7f1f87aa4393b5a9955a2aa0f37c5954eb55 SHA256 6c3cbea6bea5081e11cdf5da196491c4dcec2b31a8dbd69b5690811cf3c37d5c
-AUX kphoneSI_1.0-Makefile.in.diff 3482 RMD160 9e8a485aeffde45eaa47264e2ce49499109338cf SHA1 a638b88436d20122ad2c2278c2ad67ce851b78dc SHA256 2c6d5ca6f7765f70dbbdeaac4d4d89c4fcefe293042d4d9a1d4c095b32e0de1f
-AUX kphoneSI_1.0-SRTPWrapper.h.diff 1438 RMD160 546b325cb732abb5bd83141dceb994f43aecc2ca SHA1 67dc94154a9eb02cb8817b9ecbb0713d18e5e4e1 SHA256 29391844c32b6b4a12e8e9b37992a239824d6866762e2af74445da5a3277744b
-AUX kphoneSI_1.0-kphoneview.h.diff 438 RMD160 cf9dc2443d2147b21e205ef5f9390eb679505ef4 SHA1 1d92061aea3f3fd66c93defe9e277d2776be0a60 SHA256 29133a37b9669d456c8b2f92b65f122ec148499a8713c82f8249e499f963fded
-AUX kphoneSI_1.0-srtp-1.4.diff 1849 RMD160 b3adbca59122e81583ed6c76dbaff8e9a86c0464 SHA1 5185e222a82b5bda6b05d5d77109a0126fc97e35 SHA256 5810af39e08f1a20c933d5679b3100e29455b965ccabf9bd3122dbb636c95b2f
-AUX kphoneSI_1.0-use-custom-cflags.patch 1616 RMD160 786ae673ddd486d829ab9560448856c7632e18a2 SHA1 6f4dcec26c08effc57931ee14d733b8ace5f230d SHA256 d495d122cb3b5325c33ec3a4bd0c9b20d868a724836f829b8483914296dafb80
-DIST kphoneSI_1.0.2.1.tar.gz 1409387 RMD160 841d548d8ccc95ec6c0039368195a29d5a774364 SHA1 76e30a03aad790ca4c7e4693e1fe67ce331fe544 SHA256 48c2ba8532fc607e10cb35b5b1cd56a7e5812d3af15aae7c370893e28cf81aaf
-DIST kphoneSI_1.0.tar.gz 1373391 RMD160 67df5139a481136d9b880839263cace7fcde3261 SHA1 b4fe3426275798c89149aba8cf5ae9a279c73bdb SHA256 b826e71acc25c53c0b323c019c60dbe40caf095cb47295fc95c25696aa8b003b
-EBUILD kphoneSI-1.0.2.1.ebuild 1815 RMD160 1ddf8245833a0f78fdc4864d8a07d6cdf0d70372 SHA1 9d7c870db78bd683dbe2c9c5143d167cd4aada37 SHA256 843ab7103e698d687be24bd59aab4461772c20eeb9e1d090b5fe88ea2c089a27
-EBUILD kphoneSI-1.0.ebuild 1857 RMD160 310874408a07bf13a0973c18d6f0d2f1ba4f3dad SHA1 a7ea09309e8b03274ee045c995e7a79ac710045e SHA256 d94769c486d826adb518e04585397b073285abe8dac45708637fe3cac6b4c031
-MISC ChangeLog 795 RMD160 0a57294d35cf8fa35f1e41605f1edafaf1010a11 SHA1 e1f17c059b4fa0c632ab7cb9110a2325cfa04f24 SHA256 c7a3c185dc4fa0242023e12403d0b5bc6b7f5cdf7b3d08c8bccaea25426d01f7
diff --git a/net-voip/kphoneSI/files/kphoneSI-1.0.2.1-Makefile.in.diff b/net-voip/kphoneSI/files/kphoneSI-1.0.2.1-Makefile.in.diff
deleted file mode 100644
index 392c20e..0000000
--- a/net-voip/kphoneSI/files/kphoneSI-1.0.2.1-Makefile.in.diff
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -Nur kphoneSI.orig/icons/Makefile.in kphoneSI/icons/Makefile.in
---- kphoneSI.orig/icons/Makefile.in	2006-10-02 16:55:47.000000000 +0200
-+++ kphoneSI/icons/Makefile.in	2006-10-02 16:55:54.000000000 +0200
-@@ -4,9 +4,9 @@
- ICON_DIR=$(SHAREDIR)/icons
- 
- install:
--	install --mode=0755 --directory $(ICON_DIR)
-+	install --mode=0755 --directory $(DESTDIR)$(ICON_DIR)
- 	for T in *.png; do \
--		install --mode=0644 $$T $(ICON_DIR); \
-+		install --mode=0644 $$T $(DESTDIR)$(ICON_DIR); \
- 	done
- 
- uninstall:
-diff -Nur kphoneSI.orig/kdial/Makefile.in kphoneSI/kdial/Makefile.in
---- kphoneSI.orig/kdial/Makefile.in	2006-10-02 16:55:47.000000000 +0200
-+++ kphoneSI/kdial/Makefile.in	2006-10-02 16:55:54.000000000 +0200
-@@ -16,11 +16,11 @@
- all:	kpsidial
- 
- install:	all
--	install --mode=0755 --directory $(BIN_DIR)
--	install --strip kpsidial $(BIN_DIR)
-+	install --mode=0755 --directory $(DESTDIR)$(BIN_DIR)
-+	install --strip kpsidial $(DESTDIR)$(BIN_DIR)
- 
- uninstall:
--	rm -f $(BIN_DIR)/kpsidial
-+	rm -f $(DESTDIR)$(BIN_DIR)/kpsidial
- 
- clean:
- 	rm -f kpsidial *.o  *~  *.bak core
-diff -Nur kphoneSI.orig/kphone/Makefile.in kphoneSI/kphone/Makefile.in
---- kphoneSI.orig/kphone/Makefile.in	2006-10-02 16:55:47.000000000 +0200
-+++ kphoneSI/kphone/Makefile.in	2006-10-02 16:56:09.000000000 +0200
-@@ -5,7 +5,7 @@
- exec_prefix=@exec_prefix@
- SHARE_DIR=@datadir@/KPhoneSI
- BIN_DIR=@bindir@
--MAN_DIR=${exec_prefix}/man/man1
-+MAN_DIR=@mandir@
- 
- MOREDEFS=-DSHARE_DIR=\"$(SHARE_DIR)\"
- 
-@@ -76,14 +76,14 @@
- all:	kpsi
- 
- install:	all
--	install --mode=0755 --directory $(BIN_DIR)
--	install --strip kpsi $(BIN_DIR)
--	install kphone.1 $(MAN_DIR)
--	install kpsi.1 $(MAN_DIR)
-+	install --mode=0755 --directory $(DESTDIR)$(BIN_DIR) $(DESTDIR)$(MAN_DIR)
-+	install --strip kpsi $(DESTDIR)$(BIN_DIR)
-+	install kphone.1 $(DESTDIR)$(MAN_DIR)
-+	install kpsi.1 $(DESTDIR)$(MAN_DIR)
- uninstall:
--	rm -f $(BIN_DIR)/kphone 
--	rm -f $(MAN_DIR)/kphone.1 
--	rm -f $(MAN_DIR)/kpsi.1
-+	rm -f $(DESTDIR)$(BIN_DIR)/kphone 
-+	rm -f $(DESTDIR)$(MAN_DIR)/kphone.1 
-+	rm -f $(DESTDIR)$(MAN_DIR)/kpsi.1
- 
- clean:
- 	rm -f kpsi *.o *.a *~ *.moc.cpp *.bak core
-diff -Nur kphoneSI.orig/po/Makefile.in kphoneSI/po/Makefile.in
---- kphoneSI.orig/po/Makefile.in	2006-10-02 16:55:47.000000000 +0200
-+++ kphoneSI/po/Makefile.in	2006-10-02 16:55:54.000000000 +0200
-@@ -18,9 +18,9 @@
- install: $(QM)
- 
- 
--	install --mode=0755 --directory $(PO_DIR)
-+	install --mode=0755 --directory $(DESTDIR)$(PO_DIR)
- 	for T in *.qm; do \
--		install --mode=0644 $$T $(PO_DIR); \
-+		install --mode=0644 $$T $(DESTDIR)$(PO_DIR); \
- 	done
- 
- uninstall:
-diff -Nur kphoneSI.orig/ringing/Makefile.in kphoneSI/ringing/Makefile.in
---- kphoneSI.orig/ringing/Makefile.in	2006-10-02 16:55:47.000000000 +0200
-+++ kphoneSI/ringing/Makefile.in	2006-10-02 16:55:54.000000000 +0200
-@@ -16,16 +16,16 @@
- all:	kphonering
- 
- install:	all
--	install --mode=0755 --directory $(BIN_DIR)
--	install --strip kphonering $(BIN_DIR)
--	install kphoneringsh $(BIN_DIR)
--	install --mode=0755 --directory $(SHARE_DIR)
--	install ring.wav $(SHARE_DIR)
-+	install --mode=0755 --directory $(DESTDIR)$(BIN_DIR)
-+	install --strip kphonering $(DESTDIR)$(BIN_DIR)
-+	install kphoneringsh $(DESTDIR)$(BIN_DIR)
-+	install --mode=0755 --directory $(DESTDIR)$(SHARE_DIR)
-+	install ring.wav $(DESTDIR)$(SHARE_DIR)
- 
- uninstall:
--	rm -f $(BIN_DIR)/kphonering
--	rm -f $(BIN_DIR)/kphoneringsh
--	rm -r $(SHARE_DIR)
-+	rm -f $(DESTDIR)$(BIN_DIR)/kphonering
-+	rm -f $(DESTDIR)$(BIN_DIR)/kphoneringsh
-+	rm -r $(DESTDIR)$(SHARE_DIR)
- 
- clean:
- 	rm -f kphonering *.o  *~  *.bak core
-diff -Nur kphoneSI.orig/srtp/Makefile.in kphoneSI/srtp/Makefile.in
---- kphoneSI.orig/srtp/Makefile.in	2006-10-02 16:55:47.000000000 +0200
-+++ kphoneSI/srtp/Makefile.in	2006-10-02 16:55:54.000000000 +0200
-@@ -1,8 +1,9 @@
- CXX=@CXX@
- #CC=@CC@
-+AR=ar
- 
- AFLAGS=-g
--CFLAGS=-I/usr/local/include/srtp -I- @CFLAGS@ -I. -I.. @DEFS@ @THREAD_FLAG@
-+CFLAGS=@CFLAGS@ -I. -I.. @DEFS@ @THREAD_FLAG@
- CXXFLAGS=$(CFLAGS)
- 
- LIBS=@LIBS@
-@@ -28,4 +29,4 @@
- 	makedepend -- $(CXXFLAGS) *.cpp
- 
- srtp.a: $(OBJS)
--	ar rcs $@ $(OBJS)
-+	$(AR) rcs $@ $(OBJS)
-diff -Nur kphoneSI.orig/srtp-1.4/Makefile.in kphoneSI/srtp-1.4/Makefile.in
---- kphoneSI.orig/srtp-1.4/Makefile.in	2006-10-02 16:55:47.000000000 +0200
-+++ kphoneSI/srtp-1.4/Makefile.in	2006-10-02 16:55:54.000000000 +0200
-@@ -1,8 +1,9 @@
- CXX=@CXX@
- #CC=@CC@
-+AR=ar
- 
- AFLAGS=-g
--CFLAGS=-I/usr/local/include/srtp -I- @CFLAGS@ -I. -I.. @DEFS@ @THREAD_FLAG@
-+CFLAGS=@CFLAGS@ -I. -I.. @DEFS@ @THREAD_FLAG@
- CXXFLAGS=$(CFLAGS)
- 
- LIBS=@LIBS@
-@@ -28,4 +29,4 @@
- 	makedepend -- $(CXXFLAGS) *.cpp
- 
- srtp.a: $(OBJS)
--	ar rcs $@ $(OBJS)
-+	$(AR) rcs $@ $(OBJS)
diff --git a/net-voip/kphoneSI/files/kphoneSI-1.0.2.1-srtp-1.4.diff b/net-voip/kphoneSI/files/kphoneSI-1.0.2.1-srtp-1.4.diff
deleted file mode 100644
index 30e853c..0000000
--- a/net-voip/kphoneSI/files/kphoneSI-1.0.2.1-srtp-1.4.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nur kphoneSI.orig/configure kphoneSI/configure
---- kphoneSI.orig/configure	2006-10-02 16:20:03.000000000 +0200
-+++ kphoneSI/configure	2006-10-02 16:20:16.000000000 +0200
-@@ -5079,7 +5079,7 @@
- fi
- 
- if test "$enable_srtp" = "yes"; then
--	srtp_make="srtp/Makefile"
-+	srtp_make="srtp-1.4/Makefile"
- else
- 	srtp_make=""
- fi
-diff -Nur kphoneSI.orig/configure.in kphoneSI/configure.in
---- kphoneSI.orig/configure.in	2006-10-02 16:20:03.000000000 +0200
-+++ kphoneSI/configure.in	2006-10-02 16:20:16.000000000 +0200
-@@ -208,7 +208,7 @@
- fi
- 
- if test "$enable_srtp" = "yes"; then
--	srtp_make="srtp/Makefile"
-+	srtp_make="srtp-1.4/Makefile"
- else
- 	srtp_make=""
- fi
-diff -Nur kphoneSI.orig/kphone/dspoutrtp.h kphoneSI/kphone/dspoutrtp.h
---- kphoneSI.orig/kphone/dspoutrtp.h	2006-10-02 16:20:03.000000000 +0200
-+++ kphoneSI/kphone/dspoutrtp.h	2006-10-02 16:20:16.000000000 +0200
-@@ -16,7 +16,7 @@
- #include "../Speex/speex_define.h"
- #endif
- #ifdef SRTPWRAPPER_HX
--#include "../srtp/SRTPWrapper.h"
-+#include "../srtp-1.4/SRTPWrapper.h"
- #endif
- #define GSM_ENC_BYTES		33
- #define GSM_DEC_SAMPLES		160
-diff -Nur kphoneSI.orig/kphone/Makefile.in kphoneSI/kphone/Makefile.in
---- kphoneSI.orig/kphone/Makefile.in	2006-10-02 16:20:03.000000000 +0200
-+++ kphoneSI/kphone/Makefile.in	2006-10-02 16:20:33.000000000 +0200
-@@ -13,7 +13,7 @@
- CXXFLAGS=$(CFLAGS)
- 
- ifeq (@ENABLE_SRTP@,yes)
--SR=srtp
-+SR=srtp-1.4
- LR=-lsrtp 
- endif
- 
-diff -Nur kphoneSI.orig/Makefile.in kphoneSI/Makefile.in
---- kphoneSI.orig/Makefile.in	2006-10-02 16:20:03.000000000 +0200
-+++ kphoneSI/Makefile.in	2006-10-02 16:20:16.000000000 +0200
-@@ -1,5 +1,5 @@
- ifeq (@ENABLE_SRTP@,yes)
--SR=srtp
-+SR=srtp-1.4
- endif
- 
- ifeq (@ENABLE_SPEEX@,yes)
-diff -Nur kphoneSI.orig/srtp-1.4/Makefile.in kphoneSI/srtp-1.4/Makefile.in
---- kphoneSI.orig/srtp-1.4/Makefile.in	2006-10-02 16:20:03.000000000 +0200
-+++ kphoneSI/srtp-1.4/Makefile.in	2006-10-02 16:20:16.000000000 +0200
-@@ -10,7 +10,7 @@
- 
- OBJS = SRTPWrapper.o
- 
--all:	srtp.a
-+all:	srtp-1.4.a
- 
- 
- %.o:	%.S
-@@ -28,5 +28,5 @@
- dep:
- 	makedepend -- $(CXXFLAGS) *.cpp
- 
--srtp.a: $(OBJS)
-+srtp-1.4.a: $(OBJS)
- 	$(AR) rcs $@ $(OBJS)
diff --git a/net-voip/kphoneSI/files/kphoneSI-1.0.2.1-use-custom-cflags.patch b/net-voip/kphoneSI/files/kphoneSI-1.0.2.1-use-custom-cflags.patch
deleted file mode 100644
index 4de4b2b..0000000
--- a/net-voip/kphoneSI/files/kphoneSI-1.0.2.1-use-custom-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur kphoneSI.orig/configure.in kphoneSI/configure.in
---- kphoneSI.orig/configure.in	2006-10-02 16:22:47.000000000 +0200
-+++ kphoneSI/configure.in	2006-10-02 16:23:01.000000000 +0200
-@@ -194,7 +194,7 @@
-          CFLAGS="$CFLAGS -g -DDEBUG"
- AC_MSG_RESULT(yes)
- else
--CFLAGS="$CFLAGS -O3"
-+CFLAGS="-O2 $CFLAGS"
- AC_MSG_RESULT(no)
- fi
- 
diff --git a/net-voip/kphoneSI/files/kphoneSI_1.0-Makefile.in.diff b/net-voip/kphoneSI/files/kphoneSI_1.0-Makefile.in.diff
deleted file mode 100644
index 3bdcdd1..0000000
--- a/net-voip/kphoneSI/files/kphoneSI_1.0-Makefile.in.diff
+++ /dev/null
@@ -1,127 +0,0 @@
---- kphoneSI_1.0/icons/Makefile.in.orig	2006-06-17 15:17:05.000000000 +0200
-+++ kphoneSI_1.0/icons/Makefile.in	2006-06-17 15:15:56.000000000 +0200
-@@ -4,9 +4,9 @@
- ICON_DIR=$(SHAREDIR)/icons
- 
- install:
--	install --mode=0755 --directory $(ICON_DIR)
-+	install --mode=0755 --directory $(DESTDIR)$(ICON_DIR)
- 	for T in *.png; do \
--		install --mode=0644 $$T $(ICON_DIR); \
-+		install --mode=0644 $$T $(DESTDIR)$(ICON_DIR); \
- 	done
- 
- uninstall:
---- kphoneSI_1.0/kphone/Makefile.in.orig	2006-03-27 13:34:24.000000000 +0200
-+++ kphoneSI_1.0/kphone/Makefile.in	2006-06-17 15:16:14.000000000 +0200
-@@ -10,19 +10,17 @@
- 
- CFLAGS=@CFLAGS@ -I. -I../gsm -I../ilbc -I../dissipate2 @DEFS@ $(MOREDEFS)
- CXXFLAGS=$(CFLAGS)
--ifeq (@ENABLE_MIKEY@,yes)
--LIBS=@LIBS@ -lssl -lcrypto -lresolv -lsrtp -lmikey -lmutil @LIBJACK@ @LIBALSA@
--else
--LIBS=@LIBS@ -lssl -lcrypto -lresolv -lsrtp @LIBJACK@ @LIBALSA@
--endif
-+LIBS=@LIBS@ -lssl -lcrypto -lresolv @LIBJACK@ @LIBALSA@
- LDFLAGS=@LDFLAGS@ -g
- 
- ifeq (@ENABLE_MIKEY@,yes)
- SM=mikey
-+LIBS+=-lmikey -lmutil
- endif
- 
- ifeq (@ENABLE_SRTP@,yes)
--SR=srtp 
-+SR=srtp
-+LIBS+=-lsrtp
- endif
- 
- SUBLIBS=dissipate2 $(SR) $(SM)  gsm ilbc Speex 
---- kphoneSI_1.0/kphone/Makefile.in.orig	2006-06-17 15:19:14.000000000 +0200
-+++ kphoneSI_1.0/kphone/Makefile.in	2006-06-17 15:19:46.000000000 +0200
-@@ -76,11 +76,11 @@
- all:	kpsi
- 
- install:	all
--	install --mode=0755 --directory $(BIN_DIR)
--	install --strip kpsi $(BIN_DIR)
-+	install --mode=0755 --directory $(DESTDIR)$(BIN_DIR)
-+	install --strip kpsi $(DESTDIR)$(BIN_DIR)
- 
- uninstall:
--	rm -f $(BIN_DIR)/kphone 
-+	rm -f $(BIN_DIR)/kpsi 
- 
- clean:
- 	rm -f kpsi *.o *.a *~ *.moc.cpp *.bak core
---- kphoneSI_1.0/ringing/Makefile.in.orig	2006-06-17 15:22:04.000000000 +0200
-+++ kphoneSI_1.0/ringing/Makefile.in	2006-06-17 15:24:11.000000000 +0200
-@@ -1,10 +1,10 @@
- # Generated automatically from Makefile.in by configure.
- CXX=c++
- 
--prefix=/usr/local
--exec_prefix=${prefix}
--SHARE_DIR=${prefix}/share/apps/kphone
--BIN_DIR=${exec_prefix}/bin
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+SHARE_DIR=@datadir@/KphoneSI
-+BIN_DIR=@bindir@
- 
- 
- LIBS=-lasound  
-@@ -17,11 +17,11 @@
- all:	kphonering
- 
- install:	all
--	install --mode=0755 --directory $(DESTDIR)/$(BIN_DIR)
--	install --strip kphonering $(DESTDIR)/$(BIN_DIR)
-+	install --mode=0755 --directory $(DESTDIR)$(BIN_DIR)
-+	install --strip kphonering $(DESTDIR)$(BIN_DIR)
- 
- uninstall:
--	rm -f $(DESTDIR)/$(BIN_DIR)/kphonering
-+	rm -f $(DESTDIR)$(BIN_DIR)/kphonering
- 
- clean:
- 	rm -f kphonering *.o  *~  *.bak core
---- kphoneSI_1.0/srtp/Makefile.in.orig	2006-06-17 19:55:56.000000000 +0200
-+++ kphoneSI_1.0/srtp/Makefile.in	2006-06-17 19:56:54.000000000 +0200
-@@ -1,8 +1,9 @@
- CXX=@CXX@
- #CC=@CC@
-+AR=ar
- 
- AFLAGS=-g
--CFLAGS=-I/usr/local/include/srtp -I- @CFLAGS@ -I. -I.. @DEFS@ @THREAD_FLAG@
-+CFLAGS=@CFLAGS@ -I. -I.. @DEFS@ @THREAD_FLAG@
- CXXFLAGS=$(CFLAGS)
- 
- LIBS=@LIBS@
-@@ -28,4 +29,4 @@
- 	makedepend -- $(CXXFLAGS) *.cpp
- 
- srtp.a: $(OBJS)
--	ar rcs $@ $(OBJS)
-+	$(AR) rcs $@ $(OBJS)
---- kphoneSI_1.0/srtp-1.4/Makefile.in.orig	2006-06-17 19:55:56.000000000 +0200
-+++ kphoneSI_1.0/srtp-1.4/Makefile.in	2006-06-17 19:56:54.000000000 +0200
-@@ -1,8 +1,9 @@
- CXX=@CXX@
- #CC=@CC@
-+AR=ar
- 
- AFLAGS=-g
--CFLAGS=-I/usr/local/include/srtp -I- @CFLAGS@ -I. -I.. @DEFS@ @THREAD_FLAG@
-+CFLAGS=@CFLAGS@ -I. -I.. @DEFS@ @THREAD_FLAG@
- CXXFLAGS=$(CFLAGS)
- 
- LIBS=@LIBS@
-@@ -28,4 +29,4 @@
- 	makedepend -- $(CXXFLAGS) *.cpp
- 
- srtp.a: $(OBJS)
--	ar rcs $@ $(OBJS)
-+	$(AR) rcs $@ $(OBJS)
diff --git a/net-voip/kphoneSI/files/kphoneSI_1.0-SRTPWrapper.h.diff b/net-voip/kphoneSI/files/kphoneSI_1.0-SRTPWrapper.h.diff
deleted file mode 100644
index 8905334..0000000
--- a/net-voip/kphoneSI/files/kphoneSI_1.0-SRTPWrapper.h.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- kphoneSI_1.0/srtp/SRTPWrapper.h.orig	2006-06-17 20:00:24.000000000 +0200
-+++ kphoneSI_1.0/srtp/SRTPWrapper.h	2006-06-17 20:00:48.000000000 +0200
-@@ -14,7 +14,7 @@
- #define new k_new
- #define protected k_protected
- #ifdef SRTP
--#include "/usr/local/include/srtp/srtp.h"
-+#include <srtp/srtp.h>
- #endif
- #undef protected
- #undef new
---- kphoneSI_1.0/srtp-1.4/SRTPWrapper.h.orig	2006-06-17 20:00:24.000000000 +0200
-+++ kphoneSI_1.0/srtp-1.4/SRTPWrapper.h	2006-06-17 20:00:48.000000000 +0200
-@@ -14,7 +14,7 @@
- #define new k_new
- #define protected k_protected
- #ifdef SRTP
--#include "/usr/local/include/srtp/srtp.h"
-+#include <srtp/srtp.h>
- #endif
- #undef protected
- #undef new
---- kphoneSI_1.0/srtp-1.4/SRTPWrapper.h.orig	2006-06-17 20:19:17.000000000 +0200
-+++ kphoneSI_1.0/srtp-1.4/SRTPWrapper.h	2006-06-17 20:20:44.000000000 +0200
-@@ -108,7 +108,7 @@
-         /**
-          * Reads the key
-          */
--        octet_t* readKey();
-+        unsigned char* readKey();
-         
-         /**
-          * Returns the name of the error value from libsrtp.
---- kphoneSI_1.0/srtp-1.4/SRTPWrapper.cpp.orig	2006-06-17 20:19:55.000000000 +0200
-+++ kphoneSI_1.0/srtp-1.4/SRTPWrapper.cpp	2006-06-17 20:20:27.000000000 +0200
-@@ -222,7 +222,7 @@
- }
- 
- 
--octet_t* SRTPWrapper::readKey(){
-+unsigned char* SRTPWrapper::readKey(){
- 	QSettings settings;
- 	QString qkey = settings.readEntry(KStatics::dBase + "SRTP/KeyValue", "");
- 	string test = qkey;
diff --git a/net-voip/kphoneSI/files/kphoneSI_1.0-kphoneview.h.diff b/net-voip/kphoneSI/files/kphoneSI_1.0-kphoneview.h.diff
deleted file mode 100644
index b2ce2a9..0000000
--- a/net-voip/kphoneSI/files/kphoneSI_1.0-kphoneview.h.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kphoneSI_1.0/kphone/kphoneview.h.orig	2006-06-17 14:33:53.000000000 +0200
-+++ kphoneSI_1.0/kphone/kphoneview.h	2006-06-17 14:34:17.000000000 +0200
-@@ -103,7 +103,7 @@
- *	Check if we are the only (INVITE initiated) call
- */
- 	bool activateAllowed( void);
--	bool KPhoneView::getState( void );
-+	bool getState( void );
- 	widgetIterator  getWList(void)      const {return  widgetIterator ( cwList); }
- signals:
- 	void stateChanged(void);
diff --git a/net-voip/kphoneSI/files/kphoneSI_1.0-srtp-1.4.diff b/net-voip/kphoneSI/files/kphoneSI_1.0-srtp-1.4.diff
deleted file mode 100644
index 0419849..0000000
--- a/net-voip/kphoneSI/files/kphoneSI_1.0-srtp-1.4.diff
+++ /dev/null
@@ -1,71 +0,0 @@
---- kphoneSI_1.0/configure.orig	2006-06-17 20:09:53.000000000 +0200
-+++ kphoneSI_1.0/configure	2006-06-17 20:10:05.000000000 +0200
-@@ -2162,7 +2162,7 @@
- 
- 
- if test "$enable_srtp" = "yes"; then
--	srtp_make="srtp/Makefile"
-+	srtp_make="srtp-1.4/Makefile"
- else
- 	srtp_make=""
- fi
---- kphoneSI_1.0/configure.in.orig	2006-06-17 20:09:49.000000000 +0200
-+++ kphoneSI_1.0/configure.in	2006-06-17 20:10:15.000000000 +0200
-@@ -206,7 +206,7 @@
- AC_LANG_CPLUSPLUS
- 
- if test "$enable_srtp" = "yes"; then
--	srtp_make="srtp/Makefile"
-+	srtp_make="srtp-1.4/Makefile"
- else
- 	srtp_make=""
- fi
---- kphoneSI_1.0/kphone/Makefile.in.orig	2006-06-17 20:16:10.000000000 +0200
-+++ kphoneSI_1.0/kphone/Makefile.in	2006-06-17 20:16:19.000000000 +0200
-@@ -19,7 +19,7 @@
- endif
- 
- ifeq (@ENABLE_SRTP@,yes)
--SR=srtp
-+SR=srtp-1.4
- LIBS+=-lsrtp
- endif
- 
---- kphoneSI_1.0/Makefile.in.orig	2006-06-17 20:15:13.000000000 +0200
-+++ kphoneSI_1.0/Makefile.in	2006-06-17 20:15:24.000000000 +0200
-@@ -1,5 +1,5 @@
- ifeq (@ENABLE_SRTP@,yes)
--SR=srtp
-+SR=srtp-1.4
- endif
- 
- SUBDIRS=po dissipate2 gsm ilbc Speex $(SR) ringing kphone
---- kphoneSI_1.0/kphone/dspoutrtp.h.orig	2006-06-17 20:36:46.000000000 +0200
-+++ kphoneSI_1.0/kphone/dspoutrtp.h	2006-06-17 20:36:51.000000000 +0200
-@@ -14,7 +14,7 @@
- #include "../Speex/speex.h"
- #include "../Speex/speex_define.h"
- #ifdef SRTPWRAPPER_HX
--#include "../srtp/SRTPWrapper.h"
-+#include "../srtp-1.4/SRTPWrapper.h"
- #endif
- #define GSM_ENC_BYTES		33
- #define GSM_DEC_SAMPLES		160
---- kphoneSI_1.0/srtp-1.4/Makefile.in.orig	2006-06-17 20:42:29.000000000 +0200
-+++ kphoneSI_1.0/srtp-1.4/Makefile.in	2006-06-17 20:42:47.000000000 +0200
-@@ -10,7 +10,7 @@
- 
- OBJS = SRTPWrapper.o
- 
--all:	srtp.a
-+all:	srtp-1.4.a
- 
- 
- %.o:	%.S
-@@ -28,5 +28,5 @@
- dep:
- 	makedepend -- $(CXXFLAGS) *.cpp
- 
--srtp.a: $(OBJS)
-+srtp-1.4.a: $(OBJS)
- 	$(AR) rcs $@ $(OBJS)
diff --git a/net-voip/kphoneSI/files/kphoneSI_1.0-use-custom-cflags.patch b/net-voip/kphoneSI/files/kphoneSI_1.0-use-custom-cflags.patch
deleted file mode 100644
index a078203..0000000
--- a/net-voip/kphoneSI/files/kphoneSI_1.0-use-custom-cflags.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- kphoneSI_1.0/configure.in	2006/03/14 14:21:36	1.3
-+++ kphoneSI_1.0/configure.in	2006/05/28 12:55:07	1.4
-@@ -121,7 +121,7 @@
- fi
- 
- 
--CFLAGS="-I$ac_cv_qt_inc -Wall"
-+CFLAGS="-I$ac_cv_qt_inc -Wall $CFLAGS"
- LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname -L/usr/local/lib -L/usr/X11R6/lib64 -L/usr/X11R6/lib"
- 
- dnl Check for X libraries.
-@@ -212,7 +212,7 @@
- fi
- 
- 
--AC_OUTPUT(Makefile kphone/Makefile dissipate2/Makefile ilbc/Makefile gsm/Makefile icons/Makefile po/Makefile $srtp_make )
-+AC_OUTPUT(Makefile kphone/Makefile dissipate2/Makefile ilbc/Makefile gsm/Makefile Speex/Makefile icons/Makefile po/Makefile $srtp_make ringing/Makefile)
- 
- echo ""
- echo "Now type 'make', followed by 'make install' as root."
---- kphoneSI_1.0/configure.orig	2006-06-17 14:57:24.000000000 +0200
-+++ kphoneSI_1.0/configure	2006-06-17 14:59:18.000000000 +0200
-@@ -1296,7 +1296,7 @@
- fi
- 
- 
--CFLAGS="-I$ac_cv_qt_inc -Wall"
-+CFLAGS="-I$ac_cv_qt_inc -Wall $CFLAGS"
- LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname -L/usr/local/lib -L/usr/X11R6/lib64 -L/usr/X11R6/lib"
- 
- ac_ext=c
---- kphoneSI_1.0/configure.in.orig	2006-06-17 15:02:32.000000000 +0200
-+++ kphoneSI_1.0/configure.in	2006-06-17 15:06:35.000000000 +0200
-@@ -198,7 +198,7 @@
-          CFLAGS="$CFLAGS -g -DDEBUG"
- AC_MSG_RESULT(yes)
- else
--CFLAGS="$CFLAGS -O3"
-+CFLAGS="-O2 $CFLAGS"
- AC_MSG_RESULT(no)
- fi
- 
---- kphoneSI_1.0/configure.orig	2006-06-17 15:02:26.000000000 +0200
-+++ kphoneSI_1.0/configure	2006-06-17 15:04:55.000000000 +0200
-@@ -2150,7 +2150,6 @@
-          CFLAGS="$CFLAGS -g -DDEBUG"
- echo "$ac_t""yes" 1>&6
- else
--CFLAGS="$CFLAGS -O3"
- echo "$ac_t""no" 1>&6
- fi
- 
diff --git a/net-voip/kphoneSI/kphoneSI-1.0.2.1.ebuild b/net-voip/kphoneSI/kphoneSI-1.0.2.1.ebuild
deleted file mode 100644
index 02edaf7..0000000
--- a/net-voip/kphoneSI/kphoneSI-1.0.2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit qt3 eutils
-
-DESCRIPTION="A SIP user agent for Linux, with which you can initiate VoIP connections over the Internet."
-HOMEPAGE="http://sourceforge.net/projects/kphone"
-SRC_URI="mirror://sourceforge/kphone/${P/-/_}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="alsa debug srtp"
-
-S=${WORKDIR}/${PN}
-
-DEPEND="=x11-libs/qt-3*
-	dev-libs/openssl
-	alsa? ( media-libs/alsa-lib )
-	srtp? ( >=net-libs/libsrtp-1.4.0 )"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# - re-arrange conditioals in Makefile, only link against srtp if
-	#   it has been enabled at configure time
-	# - add $(DESTDIR) handling to several makefiles and fix kphoneringing Makefile.in
-	#   to use locations defined by configure
-	# - remove srtp include path and prepare to use configure result for AR in the future (AR=@AR@)
-	epatch "${FILESDIR}"/kphoneSI-1.0.2.1-Makefile.in.diff
-
-	# fix #include of srtp.h, octet_t -> unsigned char
-	epatch "${FILESDIR}"/kphoneSI_1.0-SRTPWrapper.h.diff
-
-	# use srtp-1.4 compatible wrapper, change include in dspoutrtp.h (should be changed)
-	# and fix library name in srtp-1.4 Makefile.in (should be changed too)
-	epatch "${FILESDIR}"/kphoneSI-1.0.2.1-srtp-1.4.diff
-
-	# preserve custom cflags passed to configure (parts taken from kphoneSI CVS)
-	epatch "${FILESDIR}"/kphoneSI-1.0.2.1-use-custom-cflags.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable srtp) \
-		|| die "econf failed"
-	emake all || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CHANGES README
-
-	make_desktop_entry "kpsi" KPhoneSI "/usr/share/KPhoneSI/icons/large-phone.png" "Telephony;Qt"
-}
diff --git a/net-voip/kphoneSI/kphoneSI-1.0.ebuild b/net-voip/kphoneSI/kphoneSI-1.0.ebuild
deleted file mode 100644
index d923ce8..0000000
--- a/net-voip/kphoneSI/kphoneSI-1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit qt3 eutils
-
-DESCRIPTION="A SIP user agent for Linux, with which you can initiate VoIP connections over the Internet."
-HOMEPAGE="http://sourceforge.net/projects/kphone"
-SRC_URI="mirror://sourceforge/kphone/${P/-/_}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="alsa debug srtp"
-
-S="${WORKDIR}/${P/-/_}"
-
-DEPEND="=x11-libs/qt-3*
-	dev-libs/openssl
-	alsa? ( media-libs/alsa-lib )
-	srtp? ( >=net-libs/libsrtp-1.4.0 )"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# gcc 4.1 fix
-	epatch "${FILESDIR}"/kphoneSI_1.0-kphoneview.h.diff
-
-	# - re-arrange conditioals in Makefile, only link against srtp if
-	#   it has been enabled at configure time
-	# - add $(DESTDIR) handling to several makefiles and fix kphoneringing Makefile.in
-	#   to use locations defined by configure
-	# - remove srtp include path and prepare to use configure result for AR in the future (AR=@AR@)
-	epatch "${FILESDIR}"/kphoneSI_1.0-Makefile.in.diff
-
-	# fix #include of srtp.h, octet_t -> unsigned char
-	epatch "${FILESDIR}"/kphoneSI_1.0-SRTPWrapper.h.diff
-
-	# use srtp-1.4 compatible wrapper, change include in dspoutrtp.h (should be changed)
-	# and fix library name in srtp-1.4 Makefile.in (should be changed too)
-	epatch "${FILESDIR}"/kphoneSI_1.0-srtp-1.4.diff
-
-	# preserve custom cflags passed to configure (parts taken from kphoneSI CVS)
-	epatch "${FILESDIR}"/kphoneSI_1.0-use-custom-cflags.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable srtp) \
-		|| die "configure failed"
-
-	emake all || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	dodoc CHANGES README
-
-	make_desktop_entry "kpsi" KPhoneSI "/usr/share/KPhoneSI/icons/large-phone.png" "Telephony;Qt"
-}