EAPI bump. Remove readme from pkg_postinst(). Convert sed script into patch.

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

5 files changed, 43 insertions, 45 deletions

diff --git a/net-analyzer/ipband/ChangeLog b/net-analyzer/ipband/ChangeLog
index 6dbe8229065a..566d2727bc21 100644
--- a/net-analyzer/ipband/ChangeLog
+++ b/net-analyzer/ipband/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ipband
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipband/ChangeLog,v 1.10 2012/01/17 18:21:16 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipband/ChangeLog,v 1.11 2014/07/12 17:34:14 jer Exp $
+
+  12 Jul 2014; Jeroen Roovers <jer@gentoo.org> ipband-0.8.1-r1.ebuild,
+  files/ipband-0.8.1-gentoo.patch, +files/ipband-0.8.1-postfix.patch:
+  EAPI bump. Remove readme from pkg_postinst(). Convert sed script into patch.
 
   17 Jan 2012; Jeroen Roovers <jer@gentoo.org> -ipband-0.8.ebuild:
   Old.
diff --git a/net-analyzer/ipband/Manifest b/net-analyzer/ipband/Manifest
index 97eca2a5e904..2375c0b96caf 100644
--- a/net-analyzer/ipband/Manifest
+++ b/net-analyzer/ipband/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX ipband-0.8.1-gentoo.patch 426 RMD160 c9d23c5970a79cdbda94f44d12d611b85c692b6c SHA1 2fa4cc3c551417563ee34b6041529a6ea63b92bb SHA256 dc2fa8f2b9ccbd2045734b7a857dd7fec5923780995c1043f05ac24bb28fb86b
-AUX ipband-init 561 RMD160 257a9e4e64693e63dfe76fc99556b55d15fac45f SHA1 32e406e675c68d0bac1d951faf8322355b821af0 SHA256 62d2fa20348140699d26388ca6787d13af79b8c0aa2d1bcba4abafbaa5d5d63d
-DIST ipband-0.8.1.tgz 36675 RMD160 6269e5273fb1506f655e0ca1f8ea8f357a7205ec SHA1 401bfa12f81e6a6c57f827bdb3d22445e33e2f64 SHA256 f0a5860647d5364df812f7660d28f1ee8fbd35eb27088ab0cd445963db5806ad
-EBUILD ipband-0.8.1-r1.ebuild 1712 RMD160 d46c4b1cdada99ff48a809ec62800585ab250545 SHA1 b133bea44b2d72f86a455f5a0ce38d40167d2b7d SHA256 e073cc53c133d9b87f47d9f3909485d25d81a9655fd4b48d13d8e15345133d7f
-MISC ChangeLog 1537 RMD160 272c10ae3912b8f453ea035a943a71b6854fbab5 SHA1 ad738fa3778f9180c9b61d697515b5ea2d5bafad SHA256 352fb8ef4cb3347bd24844b3803b1e617e7e7f3a67039ffc89877ccca98f3fa4
-MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
+AUX ipband-0.8.1-gentoo.patch 353 SHA256 13dbfc565bbd6aa41dfe4c6f54aad3773edf451ed4ae223baa1da716ef971825 SHA512 4d07dfeac19d5c7e0f82007082ef902c5b736aaf26d53dda2c66941f198e9dc0c1c1506c939eae7a491891c3b5bf988cdba37366d5b21005a66503b835fda16e WHIRLPOOL 19c44e28a552d35c5a7e9e58ebc0d25c476546c4452f85e7a4e042ac29e6bcc1978908605df9894532b6445e0a3fe1be7d8a3627d728be0a710cbc729aafe2c3
+AUX ipband-0.8.1-postfix.patch 447 SHA256 b84ba07267717d80fa03d2ebc37b2fb8c7f8e9f89ed2895c0054dadcefe47402 SHA512 9f7948e6bbaba4c7bf9c0fde4c21735a176b522a5765f8c05b4747dabdef1a80f600d2dbb95a24561346edde294f5ad8f3d60a139130149fa320f03701fee9a3 WHIRLPOOL 625ddadbf6ea454ec5eb636caec901f42be920a14e4c7cf10665c8816f8f2bfe8271f7e88fa11d8ec2355a455d642345a7d021addfaa98499b28c1e123d7c836
+AUX ipband-init 561 SHA256 62d2fa20348140699d26388ca6787d13af79b8c0aa2d1bcba4abafbaa5d5d63d SHA512 09d6ea10f621c869e43f45f37e879fbd666db01fdfa1e50b3d8e91b2c5c1dbf2b08a36651cd6a7e89867139289f60fd20a8f92034bfea408a18087b78f428228 WHIRLPOOL a7679c62a468c0ee80ee4f910a83b3aed5cd5ba9626224d299a6d129f2347bd76f1155812457746f6121ca7bf2e1f4f421356f7a2c4669813fddce9404fc7bc9
+DIST ipband-0.8.1.tgz 36675 SHA256 f0a5860647d5364df812f7660d28f1ee8fbd35eb27088ab0cd445963db5806ad SHA512 66347652fee7c7426620260ae615de2f4cfeedacac21d606643e4ae8da204cc81780bfd3f4062a16a9172a78a4a7799fc97e0141750ed26b0e21c8ac2eab3c4f WHIRLPOOL 85239172494d3210bf690c3fbef9b2f867661e75f727cd4804c3c3ea1a6b3ea52fac6194e45c7f5a0c7ec0fe2011cfbeeb2f0293f47228c678707a3c5d971527
+EBUILD ipband-0.8.1-r1.ebuild 849 SHA256 e92158566f81a13020aff15bf41dbc7be7d7673f31fcf8d3f5a1661a07d0a809 SHA512 004c607fcc3c19158e06f79dded39570446d23ed3f9b03909c8f10254f8533cc35aadc1d0bed9ff621b43f801eaf42386ed9286def2006aa3ca563d6e99d494e WHIRLPOOL 2db7c39046a0473fb493f9810d72fcd6836294352db5d2b5cb76faa9865a4f9ed695c0ea10c53337017086d42dcb7ac65c72c3ae168a442974a522eff4736f76
+MISC ChangeLog 1758 SHA256 730693d6b6ecdad40c243e99dd42e5019a99c98cab01828f84d142696b555c28 SHA512 cdf5b04d81944c509257a75497e1151301130e812d671e2f3ba9fef52d6ced63ceda0f84236cbcdfde3e05535056b1c5f8a5dc4b9cfbcf12e55185da15f9d86e WHIRLPOOL 7f5b67fde2c0dc4ae77e79cd42a8819afb8bdad6ed74d4c11846434120eeef7f58b37a3e1607dcb1a42ba8f2497064766bdbf69be4eb61b379010385560c98f8
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEARECAAYFAk8VvCIACgkQVWmRsqeSphMzhQCdH34JT8uSdm4cHe03XV974myW
-doEAn1RHSFQIn5Aty6qw2FIhuN3IrFb+
-=pKbz
+iEYEAREIAAYFAlPBcZgACgkQVWmRsqeSphNvCQCfXw7dhwO231W+uXx1eQ8mkOZZ
+QMIAmwU/v3ZPCyLAGxvunECYC2seN6oe
+=kH+a
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ipband/files/ipband-0.8.1-gentoo.patch b/net-analyzer/ipband/files/ipband-0.8.1-gentoo.patch
index 0a5a39b21489..e3929da8cfb4 100644
--- a/net-analyzer/ipband/files/ipband-0.8.1-gentoo.patch
+++ b/net-analyzer/ipband/files/ipband-0.8.1-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2008-06-17 19:23:19.000000000 +0200
-+++ Makefile	2010-10-19 16:23:35.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -12,7 +12,6 @@
  CPPFLAGS=-I/usr/include/pcap
  LIBS=-lpcap
diff --git a/net-analyzer/ipband/files/ipband-0.8.1-postfix.patch b/net-analyzer/ipband/files/ipband-0.8.1-postfix.patch
new file mode 100644
index 000000000000..9db8313afb30
--- /dev/null
+++ b/net-analyzer/ipband/files/ipband-0.8.1-postfix.patch
@@ -0,0 +1,13 @@
+--- a/ipband.sample.conf
++++ b/ipband.sample.conf
+@@ -61,7 +61,10 @@
+ #   MTA string. Default is "/usr/sbin/sendmail -t -ba". Change it to
+ #   whatever runs MTA of your choice. Note that the stringis tokenized and 
+ #   passed to exec(), so that shell's metacharacters are not interpreted.
++# Sendmail
+ #mtastring "/usr/sbin/sendmail -t -ba"
++# Postfix
++#mtastring "/usr/sbin/sendmail -t"
+ 
+ #   Default number of subnet mask bits.
+ #maskbits 24
diff --git a/net-analyzer/ipband/ipband-0.8.1-r1.ebuild b/net-analyzer/ipband/ipband-0.8.1-r1.ebuild
index f4ea0c2df7b5..dd0e944629e8 100644
--- a/net-analyzer/ipband/ipband-0.8.1-r1.ebuild
+++ b/net-analyzer/ipband/ipband-0.8.1-r1.ebuild
@@ -1,8 +1,8 @@
-# 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/ipband/ipband-0.8.1-r1.ebuild,v 1.2 2012/01/15 15:37:27 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipband/ipband-0.8.1-r1.ebuild,v 1.3 2014/07/12 17:34:14 jer Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit eutils toolchain-funcs
 
@@ -13,45 +13,25 @@ SRC_URI="http://ipband.sourceforge.net/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
 
 DEPEND=">=net-libs/libpcap-0.4"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	# Provide a postfix MTA string in the author's ipband.conf example
-	sed -ri ipband.sample.conf \
-		-e 's:(#mtastring.*):# Sendmail\n\1\n# Postfix\n#mtastring "/usr/sbin/sendmail -t":g' \
-		|| die "sed ipband.sample.conf"
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-postfix.patch
 
-	# Do not strip, and do respect CC, LDFLAGS
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
 	tc-export CC
-	emake || die "Compile problem"
 }
 
 src_install() {
+	dobin ipband
 	doman ipband.8
 	dodoc CHANGELOG README
-	dobin ipband
+
 	newinitd "${FILESDIR}"/ipband-init ipband
-	insinto /etc/ ; newins ipband.sample.conf ipband.conf
-}
 
-pkg_postinst() {
-	ewarn "If you plan to use ipband as a service, you must edit"
-	ewarn "/etc/ipband.conf"
-	elog ""
-	elog "The following command line example will:"
-	elog "  o Listen on eth0"
-	elog "  o Group results into a summary relative to 192.168.1.0/24"
-	elog "  o Average bandwidth every 5 seconds"
-	elog "  o Report when average bandwidth has exceeded 7 kB/sec"
-	elog "    over the previous 10 seconds. The report is written to"
-	elog "    stdout but can also be emailed or stored in a file."
-	elog ""
-	elog "ipband eth0 -L 192.168.1.0/24 -a 5 -r 10 -b 7 -o -"
+	insinto /etc/
+	newins ipband.sample.conf ipband.conf
 }