EAPI bump. Add new HOMEPAGE. Run sed once and in src_prepare().

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

6 files changed, 46 insertions, 39 deletions

diff --git a/net-analyzer/ipcad/ChangeLog b/net-analyzer/ipcad/ChangeLog
index ae6fde171605..8af7cf2b8842 100644
--- a/net-analyzer/ipcad/ChangeLog
+++ b/net-analyzer/ipcad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/ipcad
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ChangeLog,v 1.37 2012/12/05 16:23:23 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ChangeLog,v 1.38 2014/07/12 17:45:38 jer Exp $
+
+  12 Jul 2014; Jeroen Roovers <jer@gentoo.org> ipcad-3.7.3.ebuild,
+  files/ipcad-3.7-linux-2.6.27.patch, files/ipcad-3.7.3-signal_h.patch,
+  files/ipcad-3.7-linux-2.6.35.patch:
+  EAPI bump. Add new HOMEPAGE. Run sed once and in src_prepare().
 
   05 Dec 2012; Jeroen Roovers <jer@gentoo.org> ipcad-3.7.3.ebuild:
   Fix LICENSE by Ulrich Müller (bug #446056).
diff --git a/net-analyzer/ipcad/Manifest b/net-analyzer/ipcad/Manifest
index 754bd789bbba..3af9064f0b0c 100644
--- a/net-analyzer/ipcad/Manifest
+++ b/net-analyzer/ipcad/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ipcad-3.7-linux-2.6.27.patch 521 SHA256 a1606dba9b31385751101add747b23e1efa49e16b753e449730b68b2d81f2d67 SHA512 5b440b4983f1ddb44082bd730b88e69cf0c4b79d2ecb0503ed198274c564e45d9d04e01df70a2568460a1ffbd50c30b071812779124cd6b2cceadd59c57d19cb WHIRLPOOL 55415c2842755ee526a0cce84b581c11092fb45501eb6231f8ad80d97caf85a3c5cb1c9228bfd91a7a9d7e653512a39e788fed93bae2ed9abd162c77b71a2c3e
-AUX ipcad-3.7-linux-2.6.35.patch 1267 SHA256 15266ab846c0cc5786811eb47e4d57b521fcf7ee9b7ec620af3eb06db6d57930 SHA512 5dd6829d16ab6cd3dc54f08fb6e166cc352253c9bba36abca03420f00fa47c423ffef58b200a56a86daa812d0572250fb454d549e0ee06ca7ecba7043953446a WHIRLPOOL ac6a46e554976a0ec5ca0ae278c2af78801bded9ccdaf47ce043a4b3c39d3e49ed48b15e225e11850c879feb2d594b8c7bb66f95db3744000b696ed53800604f
-AUX ipcad-3.7.3-signal_h.patch 675 SHA256 029f93fccee07f9ee1fb504b49fc837543d382254d1c50113790e7321681c8d5 SHA512 f40c5fc8406f1d33b210fa6e44d92b1ac2be6143777ce36e4f33d20e6b9eb330d85492d373bfb45d378fee7b3449c0b7f7a3c7ec0e5c94598ba1addce43c7a20 WHIRLPOOL 4ebf13e618f45a7324b9a4d7bafd60ed7ec92602cfa80449eba9e151c1ece53b43f19edf29bc0372b103d5a43363049c757c2a4bef1027e0fe903a6b08f7196d
+AUX ipcad-3.7-linux-2.6.27.patch 440 SHA256 72f09db7ef239ee3f0bd0c7fe80cca0d276131e2c0141a19280030ade0d2465a SHA512 08916ac3635885776d44ccd313bfae1dc85d9de0406572537aa756b152860a10d9f3155cd335e409e8831ed1ae6fe7d95f17836a54d9712bfbb2df5c79e9bf8c WHIRLPOOL e4a7210674b2974d028f0b122ed9f8bd3f9ea68051ce08422749e23bc815d07b20a6add153575b5eeb0f255211cffc34d12893e82be6fde73210f86dc25c3f54
+AUX ipcad-3.7-linux-2.6.35.patch 1219 SHA256 cb1722f230ec0c08aec3acf49f6b425d2b9ab54ab732b550a17d630d622ad03e SHA512 8781cb4074db97a06a461558b1094c2934803fbb00bc619bc97742f908ece1fed1a5303cd337a75a9e3736536d0506b38053b310b30537468a377613127074c9 WHIRLPOOL 38594a6db43565c5f0429be6483617d6e18b14f4cf3dde25720539d2ac754829d61fa7ecf280d08243fafc83b70a7db963949ade5545625b7c575f4804a98bfb
+AUX ipcad-3.7.3-signal_h.patch 669 SHA256 7f5ac9e7ca758151798dcae35f72d95728069c17aef7d1098f9989c115be25c0 SHA512 0b9ede300eed804096642b931f64100d6cd87a4667a0a6b72c8f56d715d1e7a8fcb24009321eddd8dac2adfe6d4d9c6101b07733ecd26745b42bd9dc8c0f08ca WHIRLPOOL 433ce0286368a408cc7816327a555b1933e1a1cab49939f01e1ede6c78db25e4892d077be95d6a229d5f55aad99751d0ab09d01099b9ebee4c7a3013b7103c2d
 AUX ipcad.conf.d 429 SHA256 7b802d54f968ab3797e49934b78ace247274326559bfece2792c2490a7f0339c SHA512 1c632e5b8f0a323a6373d40ca7d5f91e3c56edeefe34be811fa29088f98c7a0df11395d4eb8071d4e673102ed5ed56222af8887d9e821a4d34d16f6efa7088ce WHIRLPOOL 8f0420ed4306acb2187c6dc981de9f94954f946b829b705ad2f04f21c6762a7beef264f9dc602a9f0062ecfbbb11c49338919d770b7cd9a97d7a6dd27c055012
 AUX ipcad.init 924 SHA256 9b6234267f23b50a4959444f90fe318d26d0559121804a100017e17406ffbe93 SHA512 e1bb388d2eaccf72cf8ea9ab6ced0bcd9d63c5269036ba1ea1d0ba67769e816956793bbf554ccdbe450c1081a24cdf4e030479b94b798286aae6947d7e66437d WHIRLPOOL afa2d2222efa76092c72e095f60c762d11f8f20fa03e44c45e23dd9fa972b8caaaff1aa183098e273f5f5c527300c79b526added05a4eb1c02d800a13993e7a6
-DIST ipcad-3.7.3.tar.gz 172457 SHA256 72372d46ae35e4d7cc74d96fbaf8bb0ae189aa9ecfd89026487aca790c2f0716
-EBUILD ipcad-3.7.3.ebuild 1297 SHA256 d7fe8057d7b868a1227076af67e6616f8e09d16a2a894a95fac68fa7b64eb4cd SHA512 e5f43eaf6cb524c9c7edbda22234efad783358102649cea537d0b7431a6353113186bf247e8021921b5c28235eb809e4c28e7c7c00a079fbe322bd6f61ab1da0 WHIRLPOOL 7c9f35578402252b212b57544067cbc33af4bcf8367e7d8a512ec2604dfb1577fc0c4cfe1ddb52429bdbcfa4e60be7e9e2b9d1d2f4afb1d704c0daca1237d8fb
-MISC ChangeLog 5601 SHA256 0a8f3eb87967e63ba0bcc59f0ea0ad47c40a9216a14e2b87ca0411f343970ec9 SHA512 ebd47a7e941f238fedaf0d40cbff2062eb61c0db41216649884ee6d2b23854ca1e44e2d8e34a8e2cebc8e0d218cf8b9463765630584e8e51d8ca656d9d967d73 WHIRLPOOL 7e49c223615a35fc9a912e70fdde65cb5b661ef1de8d5831d36ea468768ef7ce7375313d223eaa29f29b2800b6f5367a3fb48eab8b4fd9c02b3eccc3ceb4f34b
+DIST ipcad-3.7.3.tar.gz 172457 SHA256 72372d46ae35e4d7cc74d96fbaf8bb0ae189aa9ecfd89026487aca790c2f0716 SHA512 a25a2551bd88727c20f969b780e09d2776bf1fe4f684b0a7a6e571bb7b5684743ade0571b7993849b65c58def4550aa88bcb52a91d5cc6c21e562627fb3b80b6 WHIRLPOOL 17f8d9f7d04dd84f83f0910c64b5c4a1aee475bbe79fe058b6ecdab0efe12fe4e04c50aff039fb9c1fa018a0ebe9acbd921f89f47707778e8d3fe625e552144d
+EBUILD ipcad-3.7.3.ebuild 1244 SHA256 54925ed9d1e1fbc9a33404d3112f0045f7566453a73378c1fef3c85e6de6f098 SHA512 c7cc13e6c047f733b572035185bc53bd3410f2b028dd7b7ae1e7b70df75dfb358c736684e7beafdd62e89d7017c44284b941e720c60a6fb8599e68d8f83ff8e2 WHIRLPOOL c6205af96471ae8944fc35a6c66c3be257800f5d6d80c9ba6003f45663eb566b7a98c3d3774ca5738f2cff405773f7015f97a6823345290c45b771c3ce35d133
+MISC ChangeLog 5845 SHA256 5d80e9be0b1e735f49cfbf42b5a036b5e75e7d48f20e27414bd9bb1718c9d64d SHA512 95fb3aa6e75f60d8a84e7d5e7da0d5ebc4b7e54cf074bed5c34ec296bd57357dbf43d0081b93415646ccfa932401ed2c11942bdccf85e3ce7462863efbb72cbe WHIRLPOOL b8731875eb12a43645d7c31d4ee047939b663af7c4c09cd954b00d151d05e29bbcbb622af34cb920e6565ddbafa44181a5c060d1bb0519c0bbe950006c392e66
 MISC metadata.xml 221 SHA256 26daf450814a6f339001173abdb07aa9c0bfae6a5432db67bf6a73c19c9fdd5e SHA512 ca4d25c74eed64bc9b55da9318306799b3e75973c401b896f459cff741fd1d17ff769317bc0623eea8e78ee557ba6e62282da5b3beeca68222d531ad845b6aa9 WHIRLPOOL 80c8b8a3838c70e2e69adec256db99d31f17242225053a4459cd254ebd1a4dd366831de6207a1770274431e2b3bab164efd113a3d39a0929436ce255a65f896b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlC/dP0ACgkQVWmRsqeSphNd8QCfTvcNsEiOVF9VJTvJvX8tcflj
-OacAn1059KIRKIh5UWCx5C6qVXHL/0xm
-=a8gm
+iEYEAREIAAYFAlPBdEMACgkQVWmRsqeSphO/NgCeIvO4pJNDte8iqlh7SLPbjo1s
+yaUAn1M3xQ+RgA0fxy9aPZy2SXaylK2R
+=tW5x
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch b/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch
index 2de1e185844a..3b21efb4ff4e 100644
--- a/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch
+++ b/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch
@@ -1,6 +1,5 @@
-=== modified file 'configure.in'
---- configure.in	2008-11-09 18:27:08 +0000
-+++ configure.in	2008-11-09 18:28:02 +0000
+--- a/configure.in
++++ b/configure.in
 @@ -156,6 +156,7 @@
  ])
  
diff --git a/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.35.patch b/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.35.patch
index ae80adb2ae1f..84cc52da6bfb 100644
--- a/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.35.patch
+++ b/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.35.patch
@@ -6,8 +6,8 @@ In file included from ipcad.h:33:0,
                  from disp.c:29:
 		 psrc.h:93:23: error: field ‘peer’ has incomplete type
 
---- configure.in	2011-01-20 09:03:05 +0000
-+++ configure.in	2011-01-20 09:03:14 +0000
+--- a/configure.in
++++ b/configure.in
 @@ -155,17 +155,29 @@
  #endif
  ])
diff --git a/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch b/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch
index 29a04f7da531..f05664de949f 100644
--- a/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch
+++ b/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch
@@ -1,7 +1,7 @@
---- main.c
-+++ main.c
+--- a/main.c
++++ b/main.c
 @@ -26,6 +26,8 @@
-  * $Id: ipcad-3.7.3-signal_h.patch,v 1.2 2011/03/31 17:28:14 ssuominen Exp $
+  * $Id: ipcad-3.7.3-signal_h.patch,v 1.3 2014/07/12 17:45:38 jer Exp $
   */
  
 +#include <signal.h> /* signal */
@@ -9,20 +9,20 @@
  #include "ipcad.h"
  #include "cfgvar.h"
  #include "servers.h"
---- pps.c
-+++ pps.c
+--- a/pps.c
++++ b/pps.c
 @@ -26,6 +26,7 @@
-  * $Id: ipcad-3.7.3-signal_h.patch,v 1.2 2011/03/31 17:28:14 ssuominen Exp $
+  * $Id: ipcad-3.7.3-signal_h.patch,v 1.3 2014/07/12 17:45:38 jer Exp $
   */
  
 +#include <signal.h> /* sigprocmask */
  
  #include "ipcad.h"
  #include "opt.h"
---- servers.c
-+++ servers.c
+--- a/servers.c
++++ b/servers.c
 @@ -26,6 +26,8 @@
-  * $Id: ipcad-3.7.3-signal_h.patch,v 1.2 2011/03/31 17:28:14 ssuominen Exp $
+  * $Id: ipcad-3.7.3-signal_h.patch,v 1.3 2014/07/12 17:45:38 jer Exp $
   */
  
 +#include <signal.h> /* pthread_kill and sigprocmask */
diff --git a/net-analyzer/ipcad/ipcad-3.7.3.ebuild b/net-analyzer/ipcad/ipcad-3.7.3.ebuild
index 75511781d342..b5562497fa7b 100644
--- a/net-analyzer/ipcad/ipcad-3.7.3.ebuild
+++ b/net-analyzer/ipcad/ipcad-3.7.3.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ipcad-3.7.3.ebuild,v 1.6 2012/12/05 16:23:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ipcad-3.7.3.ebuild,v 1.7 2014/07/12 17:45:38 jer Exp $
 
-EAPI=2
+EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="IP Cisco Accounting Daemon"
-HOMEPAGE="http://ipcad.sourceforge.net/"
+HOMEPAGE="http://sourceforge.net/projects/ipcad/ http://lionet.info/ipcad/"
 SRC_URI="mirror://sourceforge/ipcad/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="net-libs/libpcap
-	net-firewall/iptables"
+RDEPEND="
+	net-libs/libpcap
+	net-firewall/iptables
+"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -24,18 +25,20 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-3.7-linux-2.6.35.patch \
 		"${FILESDIR}"/${P}-signal_h.patch
 
+	sed -i \
+		-e "s|^chroot = /adm/tmp;|chroot = /var/ipcad;|" \
+		-e "s|^interface|#&|" \
+		-e "s|^aggregate|#&|" \
+		-e "s|^pidfile = ipcad.pid;|pidfile = /run/ipcad.pid;|" \
+		ipcad.conf.default || die
+
 	eautoreconf
 }
 
 src_install() {
-	sed -i -e "s/^chroot = \/adm\/tmp;/chroot = \/var\/ipcad;/" ipcad.conf.default
-	sed -i -e "s/^interface/#interface/" ipcad.conf.default
-	sed -i -e "s/^aggregate/#aggregate/" ipcad.conf.default
-	sed -i -e "s/^pidfile = ipcad.pid;/pidfile = \/run\/ipcad.pid;/" ipcad.conf.default
-
 	dodoc AUTHORS ChangeLog README BUGS FAQ ipcad.conf.simple ipcad.conf.default
 
-	dosbin ipcad || die
+	dosbin ipcad
 
 	insinto /etc
 	insopts -m0600