Remove old; bump to use new init script (and conf file) that will properly 'use logger' if needed.

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

5 files changed, 52 insertions, 116 deletions

diff --git a/net-proxy/c-icap/ChangeLog b/net-proxy/c-icap/ChangeLog
index 511d1ea3271c..dfdcffe70ce3 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.21 2012/12/04 11:24:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.22 2012/12/28 12:42:46 flameeyes Exp $
+
+*c-icap-0.2.3-r1 (28 Dec 2012)
+
+  28 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org> +c-icap-0.2.3-r1.ebuild,
+  +files/c-icap.conf, +files/c-icap.init.3, -c-icap-0.1.7-r1.ebuild,
+  -c-icap-0.2.3.ebuild:
+  Remove old; bump to use new init script (and conf file) that will properly
+  'use logger' if needed.
 
   04 Dec 2012; <ago@gentoo.org> c-icap-0.2.2.ebuild:
   Stable for x86, wrt bug #441494
diff --git a/net-proxy/c-icap/c-icap-0.1.7-r1.ebuild b/net-proxy/c-icap/c-icap-0.1.7-r1.ebuild
deleted file mode 100644
index 9870beb04cd2..000000000000
--- a/net-proxy/c-icap/c-icap-0.1.7-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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.1.7-r1.ebuild,v 1.5 2012/03/20 14:48:44 jer Exp $
-
-EAPI=2
-
-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.1.3-asneeded.patch"
-	epatch "${FILESDIR}/${PN}-0.1.3-implicit.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" || die
-}
-
-src_install() {
-	emake \
-		LOGDIR="/var/log" \
-		DESTDIR="${D}" install || die
-
-	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 || die
-
-	newinitd "${FILESDIR}/${PN}.init.2" ${PN} || die
-	keepdir /var/log/c-icap || die
-
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-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/c-icap-0.2.3.ebuild b/net-proxy/c-icap/c-icap-0.2.3-r1.ebuild
index eb9387abf70a..76f5d736bde7 100644
--- a/net-proxy/c-icap/c-icap-0.2.3.ebuild
+++ b/net-proxy/c-icap/c-icap-0.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/c-icap-0.2.3-r1.ebuild,v 1.1 2012/12/28 12:42:46 flameeyes Exp $
 
 EAPI=4
 
@@ -83,7 +83,8 @@ src_install() {
 
 	dodoc AUTHORS README TODO ChangeLog
 
-	newinitd "${FILESDIR}/${PN}.init.2" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.3" ${PN}
+	newconfd "${FILESDIR}/${PN}.conf" ${PN}
 	keepdir /var/log/c-icap
 
 	insopts -m0644
diff --git a/net-proxy/c-icap/files/c-icap.conf b/net-proxy/c-icap/files/c-icap.conf
new file mode 100644
index 000000000000..e5be18e7c2de
--- /dev/null
+++ b/net-proxy/c-icap/files/c-icap.conf
@@ -0,0 +1,13 @@
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/files/c-icap.conf,v 1.1 2012/12/28 12:42:46 flameeyes Exp $
+
+# Use this to change the configuration file to use for c-icap.
+configfile=/etc/c-icap/c-icap.conf
+
+# Use this to set any extra option for the daemon. Do not use the -f
+# option here.
+EXTRA_OPTS=""
+
+# If you enabled LDAP support, and you'd like to access tables stored
+# in the local LDAP instance, you want to uncomment the following
+# line.
+#rc_need="slapd"
diff --git a/net-proxy/c-icap/files/c-icap.init.3 b/net-proxy/c-icap/files/c-icap.init.3
new file mode 100644
index 000000000000..f5c57680602b
--- /dev/null
+++ b/net-proxy/c-icap/files/c-icap.init.3
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# 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/files/c-icap.init.3,v 1.1 2012/12/28 12:42:46 flameeyes Exp $
+
+: ${configfile:=/etc/c-icap/c-icap.conf}
+
+get_config() {
+    local value=$(awk '$1 == "'$1'" { print $2 }' ${configfile})
+    echo ${value:-$2}
+}
+
+command="/usr/libexec/c-icap"
+command_arguments="${EXTRA_OPTS} -f ${configfile}"
+pidfile=$(get_config PidFile /var/run/c-icap/c-icap.pid)
+
+depend() {
+	need localmount
+	config ${configfile}
+	[ "$(get_config Logger file_logger)" = "sys_logger" ] && use logger
+}
+
+start_pre() {
+	local cmdsocket=$(get_config CommandsSocket /var/run/c-icap/c-icap.ctl)
+
+	checkpath -d "$(dirname "${cmdsocket}")" "$(dirname "${pidfile}")"
+}