Remove obsolete version.

(Portage version: 2.1.2.11)

5 files changed, 6 insertions, 638 deletions

diff --git a/app-mobilephone/kannel/ChangeLog b/app-mobilephone/kannel/ChangeLog
index c3c38c15fbe9..5d08eed1a5ac 100644
--- a/app-mobilephone/kannel/ChangeLog
+++ b/app-mobilephone/kannel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-mobilephone/kannel
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/ChangeLog,v 1.12 2007/04/24 06:50:57 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/ChangeLog,v 1.13 2007/08/18 07:08:38 mrness Exp $
+
+  18 Aug 2007; Alin Năstac <mrness@gentoo.org>
+  -files/kannel-1.4.0-custom-wap-ports.patch,
+  -files/kannel-1.4.0-mysql-list.patch, -kannel-1.4.0-r2.ebuild:
+  Remove obsolete version.
 
   24 Apr 2007; Christian Faulhammer <opfer@gentoo.org> kannel-1.4.1.ebuild:
   stable x86, bug 175512
diff --git a/app-mobilephone/kannel/files/digest-kannel-1.4.0-r2 b/app-mobilephone/kannel/files/digest-kannel-1.4.0-r2
deleted file mode 100644
index 54ca6b3fec82..000000000000
--- a/app-mobilephone/kannel/files/digest-kannel-1.4.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b6fbb1599b377c44c35a5338746c42d3 gateway-1.4.0.tar.gz 2465341
-RMD160 54eeca755fe942ab7fb28e3854fb60755670d80b gateway-1.4.0.tar.gz 2465341
-SHA256 33a3858780a6e1a0e38aa005a62e8682baedf77ba0222d22f91c9cdfd79c592f gateway-1.4.0.tar.gz 2465341
diff --git a/app-mobilephone/kannel/files/kannel-1.4.0-custom-wap-ports.patch b/app-mobilephone/kannel/files/kannel-1.4.0-custom-wap-ports.patch
deleted file mode 100644
index f53553648184..000000000000
--- a/app-mobilephone/kannel/files/kannel-1.4.0-custom-wap-ports.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-diff -Nru gateway-1.4.0.orig/gw/bb_udp.c gateway-1.4.0/gw/bb_udp.c
---- gateway-1.4.0.orig/gw/bb_udp.c	2004-05-15 11:16:01.000000000 +0300
-+++ gateway-1.4.0/gw/bb_udp.c	2006-05-01 14:24:31.219193000 +0300
-@@ -78,7 +78,7 @@
- #include "gwlib/gwlib.h"
- #include "msg.h"
- #include "bearerbox.h"
--
-+#include "custports.h"
- /* passed from bearerbox core */
- 
- extern volatile sig_atomic_t bb_status;
-@@ -352,13 +352,13 @@
-     while (list_len(ifs) > 0) {
-         iface = list_extract_first(ifs);
- 	info(0, "Adding interface %s", octstr_get_cstr(iface));
--        add_service(9200, octstr_get_cstr(iface));   /* wsp 	*/
--        add_service(9201, octstr_get_cstr(iface));   /* wsp/wtp	*/
-+        add_service(port_wsp, octstr_get_cstr(iface));   /* wsp 	*/
-+        add_service(port_wtp, octstr_get_cstr(iface));   /* wsp/wtp	*/
-     
- #ifdef HAVE_WTLS_OPENSSL
-         if (allow_wtls) {
--             add_service(9202, octstr_get_cstr(iface));   /* wsp/wtls	*/
--             add_service(9203, octstr_get_cstr(iface));   /* wsp/wtp/wtls */
-+             add_service(port_wsps, octstr_get_cstr(iface));   /* wsp/wtls	*/
-+             add_service(port_wtps, octstr_get_cstr(iface));   /* wsp/wtp/wtls */
-         }
- #else
-         if (allow_wtls)
-diff -Nru gateway-1.4.0.orig/gw/bearerbox.c gateway-1.4.0/gw/bearerbox.c
---- gateway-1.4.0.orig/gw/bearerbox.c	2004-06-28 18:48:29.000000000 +0300
-+++ gateway-1.4.0/gw/bearerbox.c	2006-05-01 14:24:31.223193250 +0300
-@@ -77,6 +77,7 @@
- #include "bearerbox.h"
- #include "shared.h"
- #include "dlr.h"
-+#include "custports.h"
- 
- /* global variables; included to other modules as needed */
- 
-@@ -280,7 +281,6 @@
- {
-     static int started = 0;
-     if (started) return 0;
--
-     udp_start(cfg);
- 
-     start_wap(cfg);
-@@ -353,6 +353,7 @@
-     int ssl_enabled = 0;
- #endif /* HAVE_LIBSSL */
- 
-+    ReadCustomPorts(cfg);
-     /* defaults: use localtime and markers for access-log */
-     lf = m = 1;
- 	
-diff -Nru gateway-1.4.0.orig/gw/custports.c gateway-1.4.0/gw/custports.c
---- gateway-1.4.0.orig/gw/custports.c	1970-01-01 02:00:00.000000000 +0200
-+++ gateway-1.4.0/gw/custports.c	2006-05-01 14:26:36.815042250 +0300
-@@ -0,0 +1,88 @@
-+/* ==================================================================== 
-+ * The Kannel Software License, Version 1.0 
-+ * 
-+ * Copyright (c) 2001-2004 Kannel Group  
-+ * Copyright (c) 1998-2001 WapIT Ltd.   
-+ * All rights reserved. 
-+ * 
-+ * Redistribution and use in source and binary forms, with or without 
-+ * modification, are permitted provided that the following conditions 
-+ * are met: 
-+ * 
-+ * 1. Redistributions of source code must retain the above copyright 
-+ *    notice, this list of conditions and the following disclaimer. 
-+ * 
-+ * 2. Redistributions in binary form must reproduce the above copyright 
-+ *    notice, this list of conditions and the following disclaimer in 
-+ *    the documentation and/or other materials provided with the 
-+ *    distribution. 
-+ * 
-+ * 3. The end-user documentation included with the redistribution, 
-+ *    if any, must include the following acknowledgment: 
-+ *       "This product includes software developed by the 
-+ *        Kannel Group (http://www.kannel.org/)." 
-+ *    Alternately, this acknowledgment may appear in the software itself, 
-+ *    if and wherever such third-party acknowledgments normally appear. 
-+ * 
-+ * 4. The names "Kannel" and "Kannel Group" must not be used to 
-+ *    endorse or promote products derived from this software without 
-+ *    prior written permission. For written permission, please  
-+ *    contact org@kannel.org. 
-+ * 
-+ * 5. Products derived from this software may not be called "Kannel", 
-+ *    nor may "Kannel" appear in their name, without prior written 
-+ *    permission of the Kannel Group. 
-+ * 
-+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 
-+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-+ * DISCLAIMED.  IN NO EVENT SHALL THE KANNEL GROUP OR ITS CONTRIBUTORS 
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,  
-+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  
-+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR  
-+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  
-+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  
-+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  
-+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-+ * ==================================================================== 
-+ * 
-+ * This software consists of voluntary contributions made by many 
-+ * individuals on behalf of the Kannel Group.  For more information on  
-+ * the Kannel Group, please see <http://www.kannel.org/>. 
-+ * 
-+ * Portions of this software are based upon software originally written at  
-+ * WapIT Ltd., Helsinki, Finland for the Kannel project.  
-+ */ 
-+
-+/*
-+ * gw/custports.c
-+ *
-+ * Implementation of reading custom UDP ports used by wapbox
-+ *
-+ * Lubor Kolar <kolar@porcus.cz>, 14.03.2006
-+ */
-+ 
-+#include <custports.h>
-+
-+long port_wsp = 9200; // connectionless default
-+long port_wtp = 9201; // connection-oriented default
-+long port_wsps = 9202; // connectionless secure default
-+long port_wtps = 9203; // connection-oriented secure
-+
-+
-+void ReadCustomPorts(Cfg *config)
-+{
-+    CfgGroup *grp;
-+    grp = cfg_get_single_group(config, octstr_imm("wapbox"));
-+    if(grp == NULL)
-+        return;
-+	         
-+    if(cfg_get_integer(&port_wsp, grp, octstr_imm("wsp-port")) != -1)
-+        info(0, "Using custom WSP port %ld", port_wsp);
-+    if(cfg_get_integer(&port_wtp, grp, octstr_imm("wtp-port")) != -1)
-+        info(0, "Using custom WSP/WTP port %ld", port_wtp);
-+    if(cfg_get_integer(&port_wsps, grp, octstr_imm("wsps-port")) != -1)
-+        info(0, "Using custom WSP/WTLS port %ld", port_wsps);
-+    if(cfg_get_integer(&port_wtps, grp, octstr_imm("wtps-port")) != -1)
-+        info(0, "Using custom WSP/WTP/WTLS port %ld", port_wtps);
-+}
-diff -Nru gateway-1.4.0.orig/gw/custports.h gateway-1.4.0/gw/custports.h
---- gateway-1.4.0.orig/gw/custports.h	1970-01-01 02:00:00.000000000 +0200
-+++ gateway-1.4.0/gw/custports.h	2006-05-01 14:24:31.223193250 +0300
-@@ -0,0 +1,77 @@
-+/* ==================================================================== 
-+ * The Kannel Software License, Version 1.0 
-+ * 
-+ * Copyright (c) 2001-2004 Kannel Group  
-+ * Copyright (c) 1998-2001 WapIT Ltd.   
-+ * All rights reserved. 
-+ * 
-+ * Redistribution and use in source and binary forms, with or without 
-+ * modification, are permitted provided that the following conditions 
-+ * are met: 
-+ * 
-+ * 1. Redistributions of source code must retain the above copyright 
-+ *    notice, this list of conditions and the following disclaimer. 
-+ * 
-+ * 2. Redistributions in binary form must reproduce the above copyright 
-+ *    notice, this list of conditions and the following disclaimer in 
-+ *    the documentation and/or other materials provided with the 
-+ *    distribution. 
-+ * 
-+ * 3. The end-user documentation included with the redistribution, 
-+ *    if any, must include the following acknowledgment: 
-+ *       "This product includes software developed by the 
-+ *        Kannel Group (http://www.kannel.org/)." 
-+ *    Alternately, this acknowledgment may appear in the software itself, 
-+ *    if and wherever such third-party acknowledgments normally appear. 
-+ * 
-+ * 4. The names "Kannel" and "Kannel Group" must not be used to 
-+ *    endorse or promote products derived from this software without 
-+ *    prior written permission. For written permission, please  
-+ *    contact org@kannel.org. 
-+ * 
-+ * 5. Products derived from this software may not be called "Kannel", 
-+ *    nor may "Kannel" appear in their name, without prior written 
-+ *    permission of the Kannel Group. 
-+ * 
-+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 
-+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-+ * DISCLAIMED.  IN NO EVENT SHALL THE KANNEL GROUP OR ITS CONTRIBUTORS 
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,  
-+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  
-+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR  
-+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  
-+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  
-+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  
-+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-+ * ==================================================================== 
-+ * 
-+ * This software consists of voluntary contributions made by many 
-+ * individuals on behalf of the Kannel Group.  For more information on  
-+ * the Kannel Group, please see <http://www.kannel.org/>. 
-+ * 
-+ * Portions of this software are based upon software originally written at  
-+ * WapIT Ltd., Helsinki, Finland for the Kannel project.  
-+ */ 
-+
-+/*
-+ * gw/custports.h
-+ *
-+ * Implementation of wapbox custom UDP ports)
-+ *
-+ * Lubor Kolar <kolar@porcus.cz>, 14.03.2006
-+ */
-+
-+#ifndef	CUSTPORTS_H
-+#define	CUSTPORTS_H
-+
-+#include "gwlib/gwlib.h"
-+
-+extern long port_wsp; // connectionless 
-+extern long port_wtp; // connection-oriented
-+extern long port_wsps; // connectionless secure
-+extern long port_wtps; // connection-oriented secure
-+
-+void ReadCustomPorts(Cfg *config);
-+#endif /* CUSTPORTS_H */
-+
-diff -Nru gateway-1.4.0.orig/gw/wapbox.c gateway-1.4.0/gw/wapbox.c
---- gateway-1.4.0.orig/gw/wapbox.c	2004-08-28 21:09:19.000000000 +0300
-+++ gateway-1.4.0/gw/wapbox.c	2006-05-01 14:24:31.223193250 +0300
-@@ -84,17 +84,11 @@
- #include "gwlib/pki.h"
- #endif
- #include "radius/radius_acct.h"
-+#include "custports.h"
- 
- static void config_reload(int reload);
- static long logfilelevel=-1;
- 
--enum {
--    CONNECTIONLESS_PORT = 9200,
--    CONNECTION_ORIENTED_PORT = 9201,
--    WTLS_CONNECTIONLESS_PORT = 9202,
--    WTLS_CONNECTION_ORIENTED_PORT = 9203
--};
--
- enum { DEFAULT_TIMER_FREQ = 1};
- 
- static Octstr *bearerbox_host;
-@@ -128,6 +122,8 @@
- 
-     cfg_dump(cfg);
-     
-+    ReadCustomPorts(cfg);
-+    
-     /*
-      * Extract info from the core group.
-      */
-@@ -751,9 +747,9 @@
- 	     * XXXX here should be suspend/resume, add RSN
- 	     */
- 	} else if (msg_type(msg) == wdp_datagram) {
--        switch (msg->wdp_datagram.destination_port) {
--        case CONNECTIONLESS_PORT:
--        case CONNECTION_ORIENTED_PORT:
-+	if(msg->wdp_datagram.destination_port == port_wsp 
-+	   || msg->wdp_datagram.destination_port == port_wtp)
-+	{
- 	    	dgram = wap_event_create(T_DUnitdata_Ind);
- 	    	dgram->u.T_DUnitdata_Ind.addr_tuple = wap_addr_tuple_create(
- 				msg->wdp_datagram.source_address,
-@@ -764,19 +760,22 @@
- 	    	msg->wdp_datagram.user_data = NULL;
- 
-           	wap_dispatch_datagram(dgram); 
--			break;
--        case WTLS_CONNECTIONLESS_PORT:
--        case WTLS_CONNECTION_ORIENTED_PORT:
-+	}
-+	else
-+	if(msg->wdp_datagram.destination_port == port_wsps 
-+	   || msg->wdp_datagram.destination_port == port_wtps)
-+	{
- #if (HAVE_WTLS_OPENSSL)
-             dgram = wtls_unpack_wdp_datagram(msg);
-             if (dgram != NULL)
-                 wtls_dispatch_event(dgram);
- #endif
--			break;
--        default:
-+	}
-+        else
-+	{
-                 panic(0,"Bad packet received! This shouldn't happen!");
-                 break;
--        } 
-+        } 	
- 	} else {
- 	    warning(0, "Received other message than wdp/admin, ignoring!");
- 	}
-diff -Nru gateway-1.4.0.orig/gw/wap_push_ppg.c gateway-1.4.0/gw/wap_push_ppg.c
---- gateway-1.4.0.orig/gw/wap_push_ppg.c	2004-06-20 21:26:16.000000000 +0300
-+++ gateway-1.4.0/gw/wap_push_ppg.c	2006-05-01 14:24:31.223193250 +0300
-@@ -88,6 +88,7 @@
- #include "wap_push_pap_compiler.h"
- #include "wap_push_pap_mime.h"
- #include "wap_push_ppg_pushuser.h"
-+#include "custports.h"
- 
- enum {
-     TIME_EXPIRED = 0,
-@@ -1767,10 +1768,10 @@
- 
-     if (!cless_accepted) {
-         cliport = CONNECTED_CLIPORT;
--        servport = CONNECTED_SERVPORT;
-+        servport = port_wtp;
-     } else {
-         cliport = CONNECTIONLESS_PUSH_CLIPORT;
--        servport = CONNECTIONLESS_SERVPORT;
-+        servport = port_wsp;
-     }
-     
-     address_type = (**e).u.Push_Message.address_type;
-diff -Nru gateway-1.4.0.orig/gw/wap_push_ppg.h gateway-1.4.0/gw/wap_push_ppg.h
---- gateway-1.4.0.orig/gw/wap_push_ppg.h	2004-01-22 16:08:24.000000000 +0200
-+++ gateway-1.4.0/gw/wap_push_ppg.h	2006-05-01 14:24:31.223193250 +0300
-@@ -167,9 +167,7 @@
-  */
- enum {
-     CONNECTIONLESS_PUSH_CLIPORT = 2948,
--    CONNECTIONLESS_SERVPORT = 9200,
-     CONNECTED_CLIPORT = 9209,
--    CONNECTED_SERVPORT = 9201
- };
- 
- struct PPGSessionMachine {
-diff -Nru gateway-1.4.0.orig/gwlib/cfg.def gateway-1.4.0/gwlib/cfg.def
---- gateway-1.4.0.orig/gwlib/cfg.def	2004-06-28 18:18:35.000000000 +0300
-+++ gateway-1.4.0/gwlib/cfg.def	2006-05-01 14:24:31.227193500 +0300
-@@ -148,6 +148,10 @@
-     OCTSTR(http-interface-name)
-     OCTSTR(concatenation)
-     OCTSTR(max-messages)
-+    OCTSTR(wsp-port)
-+    OCTSTR(wtp-port)
-+    OCTSTR(wsps-port)
-+    OCTSTR(wtps-port)
- )
- 
- 
diff --git a/app-mobilephone/kannel/files/kannel-1.4.0-mysql-list.patch b/app-mobilephone/kannel/files/kannel-1.4.0-mysql-list.patch
deleted file mode 100644
index 4553aaed25fc..000000000000
--- a/app-mobilephone/kannel/files/kannel-1.4.0-mysql-list.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-diff -Nru gateway-1.4.0.orig/checks/check_list.c gateway-1.4.0/checks/check_list.c
---- gateway-1.4.0.orig/checks/check_list.c	2004-01-22 16:08:24.000000000 +0200
-+++ gateway-1.4.0/checks/check_list.c	2005-12-06 23:52:08.521615000 +0200
-@@ -155,7 +155,7 @@
- 
- 	while (list_len(list) > 0) {
- 		item = list_get(list, 0);
--		list_delete(list, 0, 1);
-+		list_delete_at(list, 0, 1);
- 		warning(0, "main: %ld %ld %ld", (long) item->producer, 
- 				item->num, item->index);
- 	}
-diff -Nru gateway-1.4.0.orig/gw/bb_smscconn.c gateway-1.4.0/gw/bb_smscconn.c
---- gateway-1.4.0.orig/gw/bb_smscconn.c	2004-11-18 18:31:32.000000000 +0200
-+++ gateway-1.4.0/gw/bb_smscconn.c	2005-12-06 23:51:42.752004500 +0200
-@@ -631,7 +631,7 @@
-         }
-         
-         /* drop old connection from the active smsc list */
--        list_delete(smsc_list, i, 1);
-+        list_delete_at(smsc_list, i, 1);
-         /* destroy the connection */
-         smscconn_destroy(conn);
-         list_insert(smsc_list, i, new_conn);
-diff -Nru gateway-1.4.0.orig/gw/dlr_mem.c gateway-1.4.0/gw/dlr_mem.c
---- gateway-1.4.0.orig/gw/dlr_mem.c	2004-08-08 22:50:18.000000000 +0300
-+++ gateway-1.4.0/gw/dlr_mem.c	2005-12-06 23:51:54.400732500 +0200
-@@ -102,7 +102,7 @@
-     gw_rwlock_wrlock(&rwlock);
-     len = list_len(dlr_waiting_list);
-     for (i=0; i < len; i++)
--        list_delete(dlr_waiting_list, i, 1);
-+        list_delete_at(dlr_waiting_list, i, 1);
-     gw_rwlock_unlock(&rwlock);
- }
- 
-@@ -171,7 +171,7 @@
-         dlr = list_get(dlr_waiting_list, i);
- 
-         if (dlr_mem_entry_match(dlr, smsc, ts, dst) == 0) {
--            list_delete(dlr_waiting_list, i, 1);
-+            list_delete_at(dlr_waiting_list, i, 1);
-             dlr_entry_destroy(dlr);
-             break;
-         }
-diff -Nru gateway-1.4.0.orig/gw/smsc/smsc_soap.c gateway-1.4.0/gw/smsc/smsc_soap.c
---- gateway-1.4.0.orig/gw/smsc/smsc_soap.c	2004-08-28 21:09:19.000000000 +0300
-+++ gateway-1.4.0/gw/smsc/smsc_soap.c	2005-12-06 23:51:59.533053250 +0200
-@@ -1955,7 +1955,7 @@
-             debug("bb.soap.init_query",0,"SOAP[%s]: init_query getting a client",octstr_get_cstr(privdata->name));
- 
-             /* client is not busy - get it */
--            list_delete(privdata->soap_client, index, 1);
-+            list_delete_at(privdata->soap_client, index, 1);
-             break;
-         }
-         cur_client = NULL;
-diff -Nru gateway-1.4.0.orig/gwlib/dbpool.c gateway-1.4.0/gwlib/dbpool.c
---- gateway-1.4.0.orig/gwlib/dbpool.c	2004-06-08 13:25:16.000000000 +0300
-+++ gateway-1.4.0/gwlib/dbpool.c	2005-12-06 23:46:43.589308000 +0200
-@@ -311,7 +311,7 @@
-         pconn = list_get(p->pool, i);
-         if (p->db_ops->check(pconn->conn) != 0) {
-             /* something was wrong, reinitialize the connection */
--            list_delete(p->pool, i, 1);
-+            list_delete_at(p->pool, i, 1);
-             dbpool_conn_destroy(pconn);
-             p->curr_size--;
-             reinit++;
-diff -Nru gateway-1.4.0.orig/gwlib/http.c gateway-1.4.0/gwlib/http.c
---- gateway-1.4.0.orig/gwlib/http.c	2004-08-11 19:41:29.000000000 +0300
-+++ gateway-1.4.0/gwlib/http.c	2005-12-06 23:47:02.922516250 +0200
-@@ -2707,7 +2707,7 @@
- 		    /* Delete old header */
- 		    header = list_get(headers, i);
- 		    octstr_destroy(header);
--                    list_delete(headers, i, 1);
-+                    list_delete_at(headers, i, 1);
- 
- 		    /* Adds comma and new value to old header value */
-                     octstr_append(value, octstr_imm(", "));
-@@ -2722,7 +2722,7 @@
- 		    /* Delete this header */
- 		    header = list_get(headers, j);
- 		    octstr_destroy(header);
--                    list_delete(headers, j, 1);
-+                    list_delete_at(headers, j, 1);
-                     j--;
-                 }
-             }
-@@ -2833,7 +2833,7 @@
-     while (i < list_len(headers)) {
- 	h = list_get(headers, i);
- 	if (header_is_called(h, name)) {
--	    list_delete(headers, i, 1);
-+	    list_delete_at(headers, i, 1);
- 	    octstr_destroy(h);
- 	    count++;
- 	} else
-@@ -3087,7 +3087,7 @@
-         if (octstr_get_char(element, pos) == '=') {
-             octstr_append_char(auth_scheme, ';');
-             octstr_append(auth_scheme, element);
--            list_delete(result, i, 1);
-+            list_delete_at(result, i, 1);
-             octstr_destroy(element);
-         } else {
-             unsigned char semicolon = ';';
-diff -Nru gateway-1.4.0.orig/gwlib/list.c gateway-1.4.0/gwlib/list.c
---- gateway-1.4.0.orig/gwlib/list.c	2004-08-11 19:41:29.000000000 +0300
-+++ gateway-1.4.0/gwlib/list.c	2005-12-06 23:47:16.827385250 +0200
-@@ -226,7 +226,7 @@
- }
- 
- 
--void list_delete(List *list, long pos, long count)
-+void list_delete_at(List *list, long pos, long count)
- {
-     lock(list);
-     delete_items_from_list(list, pos, count);
-diff -Nru gateway-1.4.0.orig/gwlib/list.h gateway-1.4.0/gwlib/list.h
---- gateway-1.4.0.orig/gwlib/list.h	2004-06-28 12:53:38.000000000 +0300
-+++ gateway-1.4.0/gwlib/list.h	2005-12-06 23:45:40.361356500 +0200
-@@ -176,7 +176,7 @@
-  * Delete items from the list. Note that this does _not_ free the memory
-  * for the items, they are just dropped from the list.
-  */
--void list_delete(List *list, long pos, long count);
-+void list_delete_at(List *list, long pos, long count);
- 
- 
- /*
-diff -Nru gateway-1.4.0.orig/wap/cookies.c gateway-1.4.0/wap/cookies.c
---- gateway-1.4.0.orig/wap/cookies.c	2004-03-11 20:02:39.000000000 +0200
-+++ gateway-1.4.0/wap/cookies.c	2005-12-06 23:46:05.638936250 +0200
-@@ -393,7 +393,7 @@
- 			
-             /* We have a match according to 4.3.3 - discard the old one */
-             cookie_destroy(value);
--            list_delete(cookies, pos, 1);
-+            list_delete_at(cookies, pos, 1);
- 
-             /* Discard the new cookie also if max-age is 0 - set if expiry date is up */
-             if (cookie->max_age == 0) {
-@@ -445,7 +445,7 @@
- 					debug("wap.wsp.http", 0, "expire_cookies: Expired cookie (%s)",
- 						  octstr_get_cstr(value->name));
- 					cookie_destroy(value);
--					list_delete(cookies, pos, 1);
-+					list_delete_at(cookies, pos, 1);
- 				}
- 			}
- 		}
-diff -Nru gateway-1.4.0.orig/wap/wsp_headers.c gateway-1.4.0/wap/wsp_headers.c
---- gateway-1.4.0.orig/wap/wsp_headers.c	2004-08-08 23:39:56.000000000 +0300
-+++ gateway-1.4.0/wap/wsp_headers.c	2005-12-06 23:46:13.303415250 +0200
-@@ -2041,7 +2041,7 @@
-             Parameter *parm = list_get(parms, i);
-             if (octstr_case_compare(realm, parm->key) == 0) {
-                 realmparm = parm;
--                list_delete(parms, i, 1);
-+                list_delete_at(parms, i, 1);
-                 break;
-             }
-         }
-diff -Nru gateway-1.4.0.orig/wap/wsp_session.c gateway-1.4.0/wap/wsp_session.c
---- gateway-1.4.0.orig/wap/wsp_session.c	2004-01-22 16:08:25.000000000 +0200
-+++ gateway-1.4.0/wap/wsp_session.c	2005-12-06 23:46:30.436486000 +0200
-@@ -816,7 +816,7 @@
- 	bad_cap:
- 		error(0, "WSP: Found illegal value in capabilities reply.");
- 		wsp_cap_dump(cap);
--		list_delete(caps, i, 1);
-+		list_delete_at(caps, i, 1);
- 		i--;
- 		wsp_cap_destroy(cap);
- 		continue;
-@@ -964,7 +964,7 @@
- 
- 		count = wsp_cap_count(req, cap->id, cap->name);
- 		if (count == 0 && is_default_cap(cap)) {
--			list_delete(caps, i, 1);
-+			list_delete_at(caps, i, 1);
- 			wsp_cap_destroy(cap);
- 		} else {
- 			i++;
diff --git a/app-mobilephone/kannel/kannel-1.4.0-r2.ebuild b/app-mobilephone/kannel/kannel-1.4.0-r2.ebuild
deleted file mode 100644
index 5afa8a88e154..000000000000
--- a/app-mobilephone/kannel/kannel-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/kannel-1.4.0-r2.ebuild,v 1.4 2007/04/22 00:08:44 mrness Exp $
-inherit eutils
-
-DESCRIPTION="Powerful SMS and WAP gateway"
-HOMEPAGE="http://www.kannel.org/"
-SRC_URI="http://www.kannel.org/download/${PV}/gateway-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="ssl mysql sqlite postgres pcre doc debug pam"
-
-RDEPEND="virtual/libc
-	>=dev-libs/libxml2-2.6.17
-	>=dev-lang/perl-5.8.5
-	>=sys-libs/zlib-1.2.2
-	ssl? ( >=dev-libs/openssl-0.9.7d )
-	mysql? ( >=virtual/mysql-4.0 )
-	sqlite? ( dev-db/sqlite )
-	postgres? ( dev-db/postgresql )
-	pcre? ( dev-libs/libpcre )
-	doc? ( media-gfx/transfig
-		app-text/jadetex
-		app-text/docbook-dsssl-stylesheets )
-	pam? ( >=sys-libs/pam-0.77 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-1.875d"
-
-S="${WORKDIR}/gateway-${PV}"
-
-pkg_setup() {
-	enewgroup kannel
-	enewuser kannel -1 -1 /var/log/kannel kannel
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-mysql-list.patch"
-	epatch "${FILESDIR}/${P}-custom-wap-ports.patch"
-
-	cd "${S}"
-	#by default, use current directory for logging
-	sed -i -e 's:/tmp/::' doc/examples/kannel.conf
-	#correct doc path
-	sed -i -e "s:share/doc/kannel:share/doc/${P}:" configure configure.in
-}
-
-src_compile() {
-	econf \
-		--enable-localtime \
-		--disable-start-stop-daemon \
-		$(use_enable pam) \
-		$(use_enable debug debug) \
-		$(use_enable pcre) \
-		$(use_enable doc docs) \
-		$(use_enable ssl) \
-		$(use_with mysql) \
-		$(use_with sqlite) \
-		$(use_with postgres pgsql) \
-		|| die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	use doc && make DESTDIR="${D}" install-docs
-	dodoc README LICENSE
-
-	diropts -g kannel -m0750
-	dodir /etc/kannel
-	insinto /etc/kannel
-	newins doc/examples/kannel.conf kannel.conf.sample
-	newins doc/examples/modems.conf modems.conf.sample
-	use mysql && newins doc/examples/dlr-mysql.conf dlr-mysql.conf.sample
-
-	diropts -g kannel -m0770
-	keepdir /var/log/kannel
-
-	newinitd "${FILESDIR}/kannel-initd" kannel
-	newconfd "${FILESDIR}/kannel-confd" kannel
-}
-
-pkg_preinst() {
-	pkg_setup
-}