Version bump.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 168 insertions, 2 deletions

diff --git a/net-proxy/c-icap/ChangeLog b/net-proxy/c-icap/ChangeLog
index bbe2420f1a26..37e32d1330d2 100644
--- a/net-proxy/c-icap/ChangeLog
+++ b/net-proxy/c-icap/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2012/11/06 17:06:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.20 2012/11/15 20:27:05 flameeyes Exp $
+
+*c-icap-0.2.3 (15 Nov 2012)
+
+  15 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> +c-icap-0.2.3.ebuild,
+  +files/c-icap-0.2.3-asneeded.patch:
+  Version bump.
 
   06 Nov 2012; <ago@gentoo.org> c-icap-0.2.2.ebuild:
   Stable for amd64, wrt bug #441494
diff --git a/net-proxy/c-icap/Manifest b/net-proxy/c-icap/Manifest
index bb4b1e232805..b7c3593ee90b 100644
--- a/net-proxy/c-icap/Manifest
+++ b/net-proxy/c-icap/Manifest
@@ -1,14 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX c-icap-0.1.3+db-5.0.patch 495 SHA256 5cc9ea93da6e14f546a4fbe34cdfbc796b8e871e6a618de400e709a61556fb01 SHA512 c9f87538922d0c06ab6153779d379b3f5a850c4f9a5c8adf073c2f13de0d585dad2bead8e30a1f138b64427fdeb784fc16cb590c48188beea717cdb25806a8d9 WHIRLPOOL b0f30d8a2341b83a1dd9a0477d7664ae6835e19daa70b08c524770d6a29af814468721ebc286ae4bdafe41b164c00b3d1dd82c8a77fbd76c7a7b03978a675372
 AUX c-icap-0.1.3-asneeded.patch 953 SHA256 353861571ab1116f59115ae4403ae4cdcc3bd799a0f3d1477f3e00fcb23783ee SHA512 b078babdd37ad7e9b3f53abb35fa4fb715c0b429574b6dcf1f05c6bf20adb25c1bdc2fcb5784d76f524b4ef9a82dd136bb875c57617394e460afeddc93a30b9f WHIRLPOOL 9f4dc78511985af6c3570fa484abb99916d5a87d72a5f16a763f4437034863137f0363863f32fff1ba3296ccde229929faedbb720460e016f961e71272300573
 AUX c-icap-0.1.3-implicit.patch 489 SHA256 8268e23ea1810f737a7c376f43a7c8e5a349b6dfa909e25f7018c3432add8dca SHA512 ffb499dc87792a292b48f1b7992693aad1869336fc75d66c01b5648038f2d5ef91a90e6d42e79ec3298c767c504fc3ba8705a17691da5d6c95f15b546e7e3509 WHIRLPOOL d043ed6239424980720a8841051546a2fa884f3686691374e498a5ca13b273c13fdd32611e798477f7839d522811e06254a11a156beaff7b4d8cb3a9734e9ea5
 AUX c-icap-0.1.4-crosscompile.patch 1847 SHA256 5117a04c7472cd405781f9751a35c5226e9bf1d4457bb3da6e5dbad65a18facd SHA512 921eccd75e7c652e5173dc797a9f171d59c67dc3499f99a2750a27d96f78474d8515fa59c38516c06f17308c76dec3b8e17bb627a430c33c83cfd3736b6483fd WHIRLPOOL a4844778c09b883fcfaf81c8fadf59e91d56324b483bbc238fa845bc91308d7e55ab68b706708c7d51fa72ad0482592fdc87d9de7dc264dbd0c65bfd65a405f3
 AUX c-icap-0.1.6-implicit.patch 315 SHA256 b01d114efb6cb3ef5ce2a5945604ae96a7f8ee2b402f77bce0f60e3cd9f34f7e SHA512 bde1fa27bc09fea4d1ca0d3fdf5454fde15a5014109ef213134980d3848ecae3af74b13a8e1253aca7485734de7de2a318bbd9bc92c7e750f1d008386b17cb62 WHIRLPOOL 71da5c378613eab242be89b4704c5f61521a3e1861cf92bf77b6124a573e6823eb1498b8c1b8d359a4ae40ec8406c4739a4e62b5e67e6f6ad1a985551c29ac1b
 AUX c-icap-0.2.2-asneeded.patch 1060 SHA256 c7019c687684edf771ead652ea1f710d7750211c49bef0a65d42a62d82cfbed1 SHA512 d619c6cfc9b51c31bfc1aca30c5942e09ac2187998286785d6b1c3b0aa3f96dbe846eed7bb0f97379b5b9bf06cd7edd27fcbcbf1aee59fabb9576e68f7775bf5 WHIRLPOOL ab9c8aca61ab34b1f5309ebd23bd1672a05bd8c7a9e1225001a2e5ff63276c9b13c40cc3fdd85b71d9733992d214179578ffba1ec4aa3fdb63eddd65067bd756
+AUX c-icap-0.2.3-asneeded.patch 1074 SHA256 b80906e1897e512b01a75f915ffae3645b68a38f7f7226841d9962974dfb4fe3 SHA512 7d9380e7c19d7c80619839fadc718ae1693945a0703445fcd0937ea2c9589493aaf4e7a27e128ab27de7c6680d5d588bf081d2d3bc9c2394b7bdfa0fdca6407a WHIRLPOOL 6cbe3c0861c295996773e47375681f81774eaf51d106151f9b612d5da32504ee84e4aa8b65bc5ee041347884b2aba31df2a934f318c47b44834eda1fa223e5f8
 AUX c-icap.init.2 575 SHA256 c5ff4b5cb9ba0640cb370089bd2fbd8f363ce1d225714e9bdaae7f0d32af64ab SHA512 62a34b68d61c37d15d0125c45292f9e09f06ba717e7bd5bdec3cc6f0f9b3238e674342b7f6ee04de566a708537e4c90d8605d9273dc2b288e5b9cb3ad4546b2d WHIRLPOOL c1e5ccb02a3f7fed5ce27fbc639a1c07cf453bd3717cb120539c23f9391f284f6766e6a5e41706256cb97352287bf5452064772dc4850b0d4f032033864ef753
 AUX c-icap.logrotate 188 SHA256 a1ebd01837312c1fbb5b110486656656001c9b70ab0008f5ee73de6222005b54 SHA512 edc8dbbbaa06cf062b307e37ffee1dee9d566cc4b8a6947422125a22d956bcc639c483712ff6b6f6e9eb30852b4b0d5c293f1279463af89e8fc199828792a9e7 WHIRLPOOL f20fa59b07edd5c1b1a86d6d5e59523ba17b011d019af9b521f03f10a9f821c5d31230161abeabbd77a020ca59425e91e48588e85a469a9452ed8ff296390d3d
 DIST c_icap-0.1.7.tar.gz 530022 SHA256 abc263426ca789bc182c04a5bfcf2820d9059902d36c8680baf1032218c50b09 SHA512 942ab3a6952e354e7cf3f09c0106bfc5cfe9df49b885e6863d8a55c1b2337a97d5220b7df8c8f2e0bcde70de7d8ed6b5845a46a9240563e70afed0f931ff0875 WHIRLPOOL fbb42d7c1d63d42e7b9c3f9dceb169b014b56e20eb81b78020c55c9d6ece3602004d1915bd5bd0f18b6f203ed7d122e72b5e34711f23e1b5472b4cda5aa2b4b3
 DIST c_icap-0.2.2.tar.gz 581607 SHA256 3236fb63b7cb08df46f591d4a5b0cd6c3806fcd8a9831aa01915acc9435f6ed1 SHA512 798aa5c485e12c623706b73486aee69776d60258e0c6e3fd2c5c08c5ec8eee92115e5883a5a761ce4aaafeab77aff8a94c62117504debbb63b67276837e07fcb WHIRLPOOL f4fe754555a1c0b708bce9a1084fb1ca9677724bbc19d99365c770dd9654057928ff75f0271cef81323689762f5cbf3932c9dad8856e9552654d752f95961e03
+DIST c_icap-0.2.3.tar.gz 581549 SHA256 78ae3d3a577bb8570d77ca5cf2f266deaf72d77c6df64399e64e3bee363122ee SHA512 319e3ef6a021d372e0f8a2226e107e8b7ea450d115f4f907fdea36db9ab22b3a6ddcb5b7d4fe2e334e23cb1f17abf586445779663d302c3ed94e27a637a554b1 WHIRLPOOL 32fd9fd9b83739234c3ea00f66fb46868a624f424413b20d18c5ffa45d5f2a733ebda63d5d81b1b46c4978e2cd522669d3bcd9922c6a43a489f53173b8efac51
 EBUILD c-icap-0.1.7-r1.ebuild 3061 SHA256 4b61dac695fd10ac4ecb26b5991953785d2ca3d2feaf7ec2f798638e913b7dd1 SHA512 804fedf1742d8e27732d3182f4c83b21648b8b1bed7c748d1bca9fc23a027b306bcdf5ec4474dcdb56a87e02822c17ffc87dc1a460cdc1eba30702f1307a683e WHIRLPOOL 32339bd03bd0b83dff2699de02ab660bd1bece0c3cd1291997027118fce5387dedbc9029460cc6c69bc24942d33a602b1779b0135720f7f1ee92cc81519fee4b
 EBUILD c-icap-0.2.2.ebuild 3095 SHA256 f71f52501de50aac5dc7e6037e5208b9c7073c7d69c5475d8adc2353c92411d1 SHA512 0a86c714f83cd62e638ff7d4cf1ed93a18302ae72c93f6f705ad53a7eda93a3a028f51a1cf917c786d002f7db26a6c7593e8ebb85488571b0961629dd5fcf369 WHIRLPOOL 0e5e2a206a6806e643480b4308106a1a3618df92917c9620c0d0c587b4acf071f42b6547936f9aeb6a10c234ef73ef51f7a3f2c8cbd7b8527a3d73c597dac008
-MISC ChangeLog 3247 SHA256 2ef67d42e8d904b241f64a71270bf7626ce075bde5908604c12cc02e3150230a SHA512 8c623db07fc95245492f86bc9df97b296dc2fa555ac45d137125d9361536066bffbb1bb6722f2c8a2293891baf9a86ea0f775620b0e6a1b61e5e166e49f2c3c4 WHIRLPOOL a36e8a1d702c44edb4c87a1f63f5ec894d5690b44eeaeed4dc781b3f837a7beb0dd237f7209e12a383ff2d834940da7e5bd7449e707338fbd458b4e4d56f54d0
+EBUILD c-icap-0.2.3.ebuild 3102 SHA256 442375f8bc93a527cb5fc601320369eda8637ea05710b34fad3f55b18e2d9d35 SHA512 26e5d20f57f38d09320be9d7bc84cd0381b25eacf447e07f3f49f96312a55e275323ba3fc15dc511a2abcb0542bf996028da241efa03ef146faae20eea6b4723 WHIRLPOOL 03e1a860a8799097435a036a0552594f8805356ee47da9a5131e82c22b728f5de0cfc7eaa5d5b7a018a8174d977849113b14f676be303534dab009d146934f64
+MISC ChangeLog 3415 SHA256 76eb4c273fd5e820bc11dda9fd8499ad73566aa5df17b575348e18727a30f3b4 SHA512 c28bb454324c32f488d30daddd8694054d716b458ffafd1983ed9f7285b685223f7498cca0d3952f91713fad29a30f5e9491ddc35f7fab767636f098cc3a3959 WHIRLPOOL 24ee8edc7ad810dbb2d722ba0d8b08a345159c6bba0b2ab135e8694c66ea70447b0e20507f8121efa3162820e3e85cd8920bc03b6328f209f1cfbc50d4360f77
 MISC metadata.xml 314 SHA256 62f7e0195ddb28bcab113616feba8f590429a33552ec9bf96f5e3ad5c5f4e542 SHA512 2bc33979e81c3b5e27aac5fa048357ab3c3b52bda6892fd7423ddbaeeebc76a06e972b6c6b21b9f76164e25f28879dff3552132d06cad52ff75f71df36938348 WHIRLPOOL 168fc9f4e5140f1b07bc437e7f92cc8ce6c47e8ec9739824c7c1340f2bfe1036b27c39de4a604f4c415cfe6473115cfb45a98920b2349503c0eeebd18b80d3f3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQpVB2AAoJEBzRPIrUMBNCM8QH/08X1xABSrPZ+qoeNkT6waKm
+f9+ewBmvZHHUCd+vwa0/iyq45YxEQ7kWHIjD+8X+tEd2JRCMpZHAJF5fCFxPT0Qs
+T+fvYfT6Y5VT71fKWnOTisbeX2gqjYF9KqZPqxF4+CnXzi6i6lXJDbfDqp/91TaR
+oBcHWrA9GdKYpJaBIdMLu9ZoHK18asE0V11xfWKtAdQZOl59y4AXYV86py1ehvju
+aOAcwwEZcOnhLEoGkIrGeszHe7IdcSk2EHNR/KT07+UOl2heniAKBuV/N7RHzuUj
+05AVEj3ULEnWYz4MPqv63maXvcDZM5yap0DJuzbgkxehc74Y7SbHfQ7C3JLuKzg=
+=oyaK
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/c-icap/c-icap-0.2.3.ebuild b/net-proxy/c-icap/c-icap-0.2.3.ebuild
new file mode 100644
index 000000000000..eb9387abf70a
--- /dev/null
+++ b/net-proxy/c-icap/c-icap-0.2.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2012 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.3.ebuild,v 1.1 2012/11/15 20:27:05 flameeyes Exp $
+
+EAPI=4
+
+inherit eutils multilib flag-o-matic autotools
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="C Implementation of an ICAP server"
+HOMEPAGE="http://c-icap.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="berkdb ipv6 ldap"
+
+RDEPEND="berkdb? ( sys-libs/db )
+	ldap? ( net-nds/openldap )
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	sys-apps/openrc"
+
+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"
+	eautoreconf
+}
+
+src_configure() {
+	# some void *** pointers get casted around and can be troublesome to
+	# fix properly.
+	append-flags -fno-strict-aliasing
+
+	econf \
+		--sysconfdir=/etc/${PN} \
+		--disable-dependency-tracking \
+		--disable-maintainer-mode \
+		--disable-static \
+		--enable-large-files \
+		$(use_enable ipv6) \
+		$(use_with berkdb bdb) \
+		$(use_with ldap)
+}
+
+src_compile() {
+	emake LOGDIR="/var/log"
+}
+
+src_install() {
+	emake \
+		LOGDIR="/var/log" \
+		DESTDIR="${D}" install
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Move the daemon out of the way
+	dodir /usr/libexec
+	mv "${D}"/usr/bin/c-icap "${D}"/usr/libexec || die
+
+	# Remove the default configuration files since we have etc-update to
+	# take care of it for us.
+	rm "${D}"/etc/${PN}/c-icap.*.default || die
+
+	# Fix the configuration file; for some reason it's a bit messy
+	# around.
+	sed -i \
+		-e 's:/usr/var/:/var/:g' \
+		-e 's:/var/log/:/var/log/c-icap/:g' \
+		-e 's:/usr/etc/:/etc/c-icap/:g' \
+		-e 's:/usr/local/c-icap/etc/:/etc/c-icap/:g' \
+		-e 's:/usr/lib/:/usr/'$(get_libdir)'/:g' \
+		"${D}"/etc/${PN}/c-icap.conf \
+		|| die
+
+	dodoc AUTHORS README TODO ChangeLog
+
+	newinitd "${FILESDIR}/${PN}.init.2" ${PN}
+	keepdir /var/log/c-icap
+
+	insopts -m0644
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	# avoid triggering portage's symlink protection; this is handled by
+	# the init script anyway.
+	rm -rf "${D}"/var/run
+}
+
+pkg_postinst() {
+	elog "To enable Squid to call the ICAP modules from a local server you should set"
+	elog "the following in your squid.conf:"
+	elog ""
+	elog "    icap_enable on"
+	elog ""
+	elog "    # not strictly needed, but some modules might make use of these"
+	elog "    icap_send_client_ip on"
+	elog "    icap_send_client_username on"
+	elog ""
+	elog "    icap_service service_req reqmod_precache bypass=1 icap://localhost:1344/service"
+	elog "    adaptation_access service_req allow all"
+	elog ""
+	elog "    icap_service service_resp respmod_precache bypass=0 icap://localhost:1344/service"
+	elog "    adaptation_access service_resp allow all"
+	elog ""
+	elog "You obviously will have to replace \"service\" with the actual ICAP service to"
+	elog "use."
+}
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
new file mode 100644
index 000000000000..8aff57e58b14
--- /dev/null
+++ b/net-proxy/c-icap/files/c-icap-0.2.3-asneeded.patch
@@ -0,0 +1,27 @@
+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 \