Version bump. Remove obsolete files.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

6 files changed, 13 insertions, 135 deletions

diff --git a/net-proxy/c-icap/ChangeLog b/net-proxy/c-icap/ChangeLog
index 80c2c8a814a2..42ecc5862069 100644
--- a/net-proxy/c-icap/ChangeLog
+++ b/net-proxy/c-icap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/c-icap
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.23 2012/12/31 00:30:01 flameeyes Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.24 2013/01/04 13:53:38 flameeyes Exp $
+
+*c-icap-0.2.5 (04 Jan 2013)
+
+  04 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org> +c-icap-0.2.5.ebuild,
+  -c-icap-0.2.4.ebuild, -files/c-icap-0.1.3-asneeded.patch,
+  -files/c-icap-0.1.3-implicit.patch, -files/c-icap-0.2.3-asneeded.patch,
+  -files/c-icap-0.2.4-implicit.patch:
+  Version bump. Remove obsolete files.
 
 *c-icap-0.2.4 (31 Dec 2012)
 
diff --git a/net-proxy/c-icap/c-icap-0.2.4.ebuild b/net-proxy/c-icap/c-icap-0.2.5.ebuild
index 11dd26f79c49..78990f968d5c 100644
--- a/net-proxy/c-icap/c-icap-0.2.4.ebuild
+++ b/net-proxy/c-icap/c-icap-0.2.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/c-icap-0.2.4.ebuild,v 1.1 2012/12/31 00:30:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/c-icap-0.2.5.ebuild,v 1.1 2013/01/04 13:53:38 flameeyes Exp $
 
 EAPI=5
 
-inherit eutils multilib flag-o-matic autotools
+inherit eutils multilib flag-o-matic
 
 MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
@@ -27,15 +27,6 @@ RDEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.2.3-asneeded.patch"
-	epatch "${FILESDIR}/${PN}-0.1.3+db-5.0.patch"
-	epatch "${FILESDIR}/${PN}-0.1.4-crosscompile.patch"
-	epatch "${FILESDIR}/${PN}-0.1.6-implicit.patch"
-	epatch "${FILESDIR}/${PN}-0.2.4-implicit.patch"
-	eautoreconf
-}
-
 src_configure() {
 	# some void *** pointers get casted around and can be troublesome to
 	# fix properly.
diff --git a/net-proxy/c-icap/files/c-icap-0.1.3-asneeded.patch b/net-proxy/c-icap/files/c-icap-0.1.3-asneeded.patch
deleted file mode 100644
index 44adca98fa7f..000000000000
--- a/net-proxy/c-icap/files/c-icap-0.1.3-asneeded.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: c_icap-0.1.3/Makefile.am
-===================================================================
---- c_icap-0.1.3.orig/Makefile.am
-+++ c_icap-0.1.3/Makefile.am
-@@ -37,8 +37,8 @@ c_icap_SOURCES = aserver.c request.c cfg
- # libicapapi ......
- libicapapi_la_CFLAGS= -Iinclude/ @ZLIB_ADD_FLAG@ -DCI_BUILD_LIB
- 
--libicapapi_la_LIBADD = @ZLIB_ADD_LDFLAG@
--libicapapi_la_LDFLAGS= -shared -version-info @CICAPLIB_VERSION@
-+libicapapi_la_LIBADD = @ZLIB_ADD_LDFLAG@ @THREADS_LDADD@ @DL_ADD_FLAG@
-+libicapapi_la_LDFLAGS= -shared -version-info @CICAPLIB_VERSION@ @THREADS_LDFLAGS@
- 
- 
- #c_icap the main server 
-@@ -47,7 +47,7 @@ c_icap_CFLAGS= -Iinclude/ -DCONFDIR=\"$(
-                           -DSERVDIR=\"$(SERVICESDIR)\" -DLOGDIR=\"$(LOGDIR)\"  \
-                           -DDATADIR=\"$(DATADIR)\"
- 
--c_icap_LDADD = @THREADS_LDADD@ libicapapi.la @DL_ADD_FLAG@
-+c_icap_LDADD = libicapapi.la
- c_icap_LDFLAGS = -rdynamic -rpath @libdir@ @THREADS_LDFLAGS@
- 
- 
diff --git a/net-proxy/c-icap/files/c-icap-0.1.3-implicit.patch b/net-proxy/c-icap/files/c-icap-0.1.3-implicit.patch
deleted file mode 100644
index 64c9eaddef2d..000000000000
--- a/net-proxy/c-icap/files/c-icap-0.1.3-implicit.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: c_icap-0.1.3/cfg_param.c
-===================================================================
---- c_icap-0.1.3.orig/cfg_param.c
-+++ c_icap-0.1.3/cfg_param.c
-@@ -30,6 +30,7 @@
- #include "cfg_param.h"
- #include "commands.h"
- #include "acl.h"
-+#include "txtTemplate.h"
- 
- #define LINESIZE 8192
- #define MAX_DIRECTIVE_SIZE 80
-@@ -870,6 +871,8 @@ void system_shutdown()
-     ci_txt_template_close();
- }
- 
-+extern void reset_http_auth();
-+
- int system_reconfigure()
- {
-      int old_port;
diff --git a/net-proxy/c-icap/files/c-icap-0.2.3-asneeded.patch b/net-proxy/c-icap/files/c-icap-0.2.3-asneeded.patch
deleted file mode 100644
index 8aff57e58b14..000000000000
--- a/net-proxy/c-icap/files/c-icap-0.2.3-asneeded.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: c_icap-0.2.1/Makefile.am
-===================================================================
---- c_icap-0.2.1.orig/Makefile.am
-+++ c_icap-0.2.1/Makefile.am
-@@ -37,7 +37,7 @@ c_icap_SOURCES = aserver.c request.c cfg
- # libicapapi ......
- libicapapi_la_CFLAGS= -Iinclude/ @ZLIB_ADD_FLAG@ -DCI_BUILD_LIB
- 
--libicapapi_la_LIBADD = @ZLIB_ADD_LDADD@ @DL_ADD_FLAG@
-+libicapapi_la_LIBADD = @ZLIB_ADD_LDADD@ @DL_ADD_FLAG@ @THREADS_LDADD@
- libicapapi_la_LDFLAGS= -shared -version-info @CICAPLIB_VERSION@
- 
- 
-@@ -47,10 +47,10 @@ c_icap_CFLAGS= -Iinclude/ -DCONFDIR=\"$(
-                           -DSERVDIR=\"$(SERVICESDIR)\" -DLOGDIR=\"$(LOGDIR)\"  \
-                           -DDATADIR=\"$(DATADIR)\"
- 
--c_icap_LDADD = libicapapi.la @DL_ADD_FLAG@ @THREADS_LDADD@
--c_icap_LDFLAGS = -rdynamic -rpath @libdir@ @THREADS_LDFLAGS@
-+c_icap_LDADD = libicapapi.la
-+c_icap_LDFLAGS = -rdynamic @THREADS_LDFLAGS@
- 
--EXT_PROGRAMS_MKLIB = -licapapi @DL_ADD_FLAG@ @THREADS_LDADD@
-+EXT_PROGRAMS_MKLIB = -licapapi
- 
- 
- INCS = access.h body.h cfg_param.h c-icap-conf.h c-icap.h ci_threads.h \
diff --git a/net-proxy/c-icap/files/c-icap-0.2.4-implicit.patch b/net-proxy/c-icap/files/c-icap-0.2.4-implicit.patch
deleted file mode 100644
index 706b56d7e6e4..000000000000
--- a/net-proxy/c-icap/files/c-icap-0.2.4-implicit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: c_icap-0.2.4/aserver.c
-===================================================================
---- c_icap-0.2.4.orig/aserver.c
-+++ c_icap-0.2.4/aserver.c
-@@ -41,6 +41,7 @@ extern int MAX_SECS_TO_LINGER;
- char MY_HOSTNAME[CI_MAXHOSTNAMELEN + 1];
- 
- void init_conf_tables();
-+int init_body_system();
- int config(int, char **);
- int init_server(char *address, int port, int *family);
- int start_server();
-Index: c_icap-0.2.4/include/mem.h
-===================================================================
---- c_icap-0.2.4.orig/include/mem.h
-+++ c_icap-0.2.4/include/mem.h
-@@ -66,6 +66,7 @@ CI_DECLARE_FUNC(void) ci_buffers_destroy
- CI_DECLARE_FUNC(void *)  ci_buffer_alloc(int block_size);
- CI_DECLARE_FUNC(void *)  ci_buffer_realloc(void *data, int block_size);
- CI_DECLARE_FUNC(void)    ci_buffer_free(void *data);
-+CI_DECLARE_FUNC(size_t)  ci_buffer_blocksize(void *data);
- 
- CI_DECLARE_FUNC(int)     ci_object_pool_register(const char *name, int size);
- CI_DECLARE_FUNC(void)    ci_object_pool_unregister(int id);
-Index: c_icap-0.2.4/tests/test_cache.c
-===================================================================
---- c_icap-0.2.4.orig/tests/test_cache.c
-+++ c_icap-0.2.4/tests/test_cache.c
-@@ -27,6 +27,7 @@ void *copy_from_str(void *val, int val_s
-     return (void *)ci_str_ops.dup((char *)val, allocator);
- }
- 
-+int mem_init();
- int main(int argc,char *argv[]) {
-     int i;
-     struct ci_cache *cache;
-Index: c_icap-0.2.4/util.c
-===================================================================
---- c_icap-0.2.4.orig/util.c
-+++ c_icap-0.2.4/util.c
-@@ -20,7 +20,7 @@
- #include "common.h"
- #include "c-icap.h"
- #include "util.h"
--
-+#include <ctype.h>
- 
- #ifndef HAVE_STRNSTR
- const char *strnstr(const char *s, const char *find, size_t slen)