Remove old; remove 'need net' from init script.

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

5 files changed, 17 insertions, 155 deletions

diff --git a/net-proxy/c-icap/ChangeLog b/net-proxy/c-icap/ChangeLog
index ae349df05833..a7f7bb95c1a3 100644
--- a/net-proxy/c-icap/ChangeLog
+++ b/net-proxy/c-icap/ChangeLog
@@ -1,6 +1,10 @@
 # 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.16 2012/09/24 15:39:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.17 2012/10/22 02:42:20 flameeyes Exp $
+
+  22 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> -c-icap-0.2.1.ebuild,
+  -files/c-icap-0.2.1-asneeded.patch, files/c-icap.init.2:
+  Remove old; remove 'need net' from init script.
 
 *c-icap-0.2.2 (24 Sep 2012)
 
diff --git a/net-proxy/c-icap/Manifest b/net-proxy/c-icap/Manifest
index ef3edc34c7cb..b2443202fb46 100644
--- a/net-proxy/c-icap/Manifest
+++ b/net-proxy/c-icap/Manifest
@@ -6,26 +6,23 @@ AUX c-icap-0.1.3-asneeded.patch 953 SHA256 353861571ab1116f59115ae4403ae4cdcc3bd
 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.1-asneeded.patch 1062 SHA256 7c0aeaa6eb595c71d3441970dfc0598ea141ab8357e294ce8c51f3cbae99199c SHA512 f824ec0d291b6eb76e6df0c4163a778a3dc522fe707ef5064384ec67af12a34780e5aa88f76b9f4b0b4f94c83644a9261278c1975cfe7b862fd006cfbf7fe0e0 WHIRLPOOL 880e3ab66e16466e2506c7471eac37d08bb300b753fa81893ef5922a8a65acdf30c4b09369f7e709aef5784616367158860a69559809c7a2a0d0ae7ee941d5aa
 AUX c-icap-0.2.2-asneeded.patch 1060 SHA256 c7019c687684edf771ead652ea1f710d7750211c49bef0a65d42a62d82cfbed1 SHA512 d619c6cfc9b51c31bfc1aca30c5942e09ac2187998286785d6b1c3b0aa3f96dbe846eed7bb0f97379b5b9bf06cd7edd27fcbcbf1aee59fabb9576e68f7775bf5 WHIRLPOOL ab9c8aca61ab34b1f5309ebd23bd1672a05bd8c7a9e1225001a2e5ff63276c9b13c40cc3fdd85b71d9733992d214179578ffba1ec4aa3fdb63eddd65067bd756
-AUX c-icap.init.2 579 SHA256 0580dfe6ef40f33d16758de4d85403ecf617d9103bbaf5cef2f765289d77276e SHA512 d7cfa24bfbb9f5f32d5d0188bc2fc04fa019a12da76ba6bea0757af9f9f116c308b7025262b08e574efde65a24dc3902d6ed980b49f91111ed20aeb3615830b0 WHIRLPOOL dc0177324ed7a0b104c8da68466357d139cbd20cc38a094e6257fdd37e982707deed7148a2eacc4e7891f615770e4fac0022bef0b26e5df618f190d44612dc63
+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.1.tar.gz 556687 SHA256 a5ec87f4c38e5df86c966348c9f32c77591da1fab9e113db7ac36ef87c9fb12a SHA512 bed8a647972653f54796eb01230db1d8142bb4b1ab2ce583b178bac697fc72c7138edd8865feb38961ec6c7345213e807804dd492ac8a18b33f7f6c2829c24a3 WHIRLPOOL be0cd9efded8c0113a6d373c218367c101334d891655a7ee2ce0dafad2e2c2da84c4a659d98bd49b392514f127e97d36d0ff944c249ab97b58035f0cf499fefa
 DIST c_icap-0.2.2.tar.gz 581607 SHA256 3236fb63b7cb08df46f591d4a5b0cd6c3806fcd8a9831aa01915acc9435f6ed1 SHA512 798aa5c485e12c623706b73486aee69776d60258e0c6e3fd2c5c08c5ec8eee92115e5883a5a761ce4aaafeab77aff8a94c62117504debbb63b67276837e07fcb WHIRLPOOL f4fe754555a1c0b708bce9a1084fb1ca9677724bbc19d99365c770dd9654057928ff75f0271cef81323689762f5cbf3932c9dad8856e9552654d752f95961e03
 EBUILD c-icap-0.1.7-r1.ebuild 3061 SHA256 4b61dac695fd10ac4ecb26b5991953785d2ca3d2feaf7ec2f798638e913b7dd1 SHA512 804fedf1742d8e27732d3182f4c83b21648b8b1bed7c748d1bca9fc23a027b306bcdf5ec4474dcdb56a87e02822c17ffc87dc1a460cdc1eba30702f1307a683e WHIRLPOOL 32339bd03bd0b83dff2699de02ab660bd1bece0c3cd1291997027118fce5387dedbc9029460cc6c69bc24942d33a602b1779b0135720f7f1ee92cc81519fee4b
-EBUILD c-icap-0.2.1.ebuild 3017 SHA256 60a7987609bbe62597649531897866958d756e7824839f70c32be5fc441d4943 SHA512 483cfc6b51cb79a328a37e05dd3ca546af088d5dfc63e39cf4e25c3a4ecca24542ec33860d3829f6a536e2af70b76989f4fbbacc938160cbbefaafc2e74cf1ac WHIRLPOOL 444e775a070f1f5287e6d89135f1e8d2a30bcccc7559990a7643768843078c2e1111795957c3ac743ae2cd501ff15bcefe349be429ed204e75aa65dad5997012
 EBUILD c-icap-0.2.2.ebuild 2982 SHA256 643b13c64874cc170b8fb7f4a3d2e2eeb4bef894c9fd8d1f0fbf9723fd645dc3 SHA512 78dcaa45ef55f7f29e66d71cf36fb5765d2cdfd96584741f288a0eb120ea41be87a78945716c645e8498242083abfad915283679a406b9b5f8bfffa1fa748467 WHIRLPOOL 171572c2197e4adc5cd4dec0cbed9bcf3aae06092727a25e8507f43f95cf6324dbab10cd9c832c3469124f9597a11a37983c4b7f0b365dd414d1ff98cab35678
-MISC ChangeLog 2810 SHA256 2f0e5dd38ea03a73c8c5f1d1e27bd827dda9455dba9477181f3b85f58885e889 SHA512 45670a681bd3afa07c0773622ce47f9afadb91d97ebedc100031075a25aeaea6469851dc715e503358a62a9c7fbe65419c7f460fead3eab186e00759d156c330 WHIRLPOOL 2bbc9d708d36357c9e6a358ff35a44b09f911d111980bfc4598d468fd1182e8c369058dd82c229cc09e5971a792a44ab02e6c32bedc47f3aadf62208d3c9e836
+MISC ChangeLog 2998 SHA256 417029277141aef94165a719a0e75c098ce0676ac6150d14745c346346920f04 SHA512 ced9c41b592f766b22e3ebc673e781629ec797e8f07f3a12c9f764b1a6bf88c99e23826b7a725a107c2aa59fb7d565296354cfa69ec49f630450bf7c8345b0c8 WHIRLPOOL 807c7afb9f021615570a9e9ba75cf012508b017a858710210728ea780c840f5ccda0ac79754b27a0a59e989983334db9d8bf4bbea28ec87b783edc1040595150
 MISC metadata.xml 314 SHA256 62f7e0195ddb28bcab113616feba8f590429a33552ec9bf96f5e3ad5c5f4e542 SHA512 2bc33979e81c3b5e27aac5fa048357ab3c3b52bda6892fd7423ddbaeeebc76a06e972b6c6b21b9f76164e25f28879dff3552132d06cad52ff75f71df36938348 WHIRLPOOL 168fc9f4e5140f1b07bc437e7f92cc8ce6c47e8ec9739824c7c1340f2bfe1036b27c39de4a604f4c415cfe6473115cfb45a98920b2349503c0eeebd18b80d3f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQYH8JAAoJEBzRPIrUMBNCZDIIAI8IoU/n3ecCViLJBcD/Xlwd
-OewZa8vXjVmlUkkA4IbloYxp8dImHt+3MhiX83c5zcrv/5HgQueoWa7adiu1R0tB
-8l41zmhL+VvjirPhBArEIcRxwjziBtg8P1ju/cBSnwNJkzBZnZ5LPg+Q9jWrjwDQ
-6zQBwniNkpoLv21+zNbYZM6j+RKfaHbQWoopj8E3Aa8IYHlf7l1u2RD5416ashkW
-ky/F30K3Npn1qihn8WtgLHPDts1Z399xLxUViOQqYBaxjEM0qPehjuq1DBPC//UD
-n1dRbWa4DQiHn+oSVZMxuqI5oMOP7x9jpbIxDPAQYNXFF7spb8zdZrKbAhXHz+o=
-=IJ1w
+iQEcBAEBCAAGBQJQhLKQAAoJEBzRPIrUMBNCSSEH/jNfE4cdDOqfi2okvTqk4aFj
+EzcaQJiSfEblfPSncc8nlWiO42PfU1pr6JbJCJr6dLQEXuh34VoLtc13spxWRFru
+AB7zwVXZX0hNpCjld8tUmzWJL/W41Bh9C06idlilUIVuLqeDuwPj1uEwoklhj6sv
+qi78TLINRa2RxeiEbmadiFMcLuMC/qhPOqzNf2DJVoNlBRVGMFUJCpnGK9h56Nze
+jF3+/wOwQdRX+8DM1Ml6C1wvl5HYYlQNg8YyAk/AWwGWvfmFvLa3+yIpnXDJZ5hO
+NA0eedW/LTaPYbzUMkf64r5bFWxt9iTZnocSXAcKVLZ/qtzXPkQkzP1pGmmDmkM=
+=vN4P
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/c-icap/c-icap-0.2.1.ebuild b/net-proxy/c-icap/c-icap-0.2.1.ebuild
deleted file mode 100644
index b361f6a4fdc0..000000000000
--- a/net-proxy/c-icap/c-icap-0.2.1.ebuild
+++ /dev/null
@@ -1,112 +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.2.1.ebuild,v 1.1 2012/06/29 14:09:12 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.1-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" || 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/files/c-icap-0.2.1-asneeded.patch b/net-proxy/c-icap/files/c-icap-0.2.1-asneeded.patch
deleted file mode 100644
index 5a5801c3e760..000000000000
--- a/net-proxy/c-icap/files/c-icap-0.2.1-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_LDFLAG@
-+libicapapi_la_LIBADD = @ZLIB_ADD_LDFLAG@ @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.init.2 b/net-proxy/c-icap/files/c-icap.init.2
index a649e7c8b206..461cac7a612a 100644
--- a/net-proxy/c-icap/files/c-icap.init.2
+++ b/net-proxy/c-icap/files/c-icap.init.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# 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.2,v 1.1 2011/10/21 23:56:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/files/c-icap.init.2,v 1.2 2012/10/22 02:42:20 flameeyes Exp $
 
 pidfile=$(awk '$1 == "PidFile" { print $2 }' /etc/c-icap/c-icap.conf)
 
@@ -9,7 +9,7 @@ command="/usr/libexec/c-icap"
 command_arguments="${EXTRA_OPTS}"
 
 depend() {
-    need localmount net
+    need localmount
 }
 
 start_pre() {