EAPI bump. Convert sed scripts to patch.

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

5 files changed, 59 insertions, 33 deletions

diff --git a/net-analyzer/rain/ChangeLog b/net-analyzer/rain/ChangeLog
index 6634fd7808d8..c471fdb869ff 100644
--- a/net-analyzer/rain/ChangeLog
+++ b/net-analyzer/rain/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/rain
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rain/ChangeLog,v 1.9 2010/09/15 16:29:47 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rain/ChangeLog,v 1.10 2014/07/16 22:14:11 jer Exp $
+
+  16 Jul 2014; Jeroen Roovers <jer@gentoo.org> rain-1.2.9_beta1.ebuild,
+  +files/rain-1.2.9_beta1-gentoo.patch, metadata.xml:
+  EAPI bump. Convert sed scripts to patch.
 
   15 Sep 2010; Jeroen Roovers <jer@gentoo.org> rain-1.2.9_beta1.ebuild:
   Remove useless DEPEND. Fix prefix.
diff --git a/net-analyzer/rain/Manifest b/net-analyzer/rain/Manifest
index a2a16726dc60..f46acd0e6786 100644
--- a/net-analyzer/rain/Manifest
+++ b/net-analyzer/rain/Manifest
@@ -1,7 +1,18 @@
-DIST rain-1.2.8r2.tar.bz2 72057 RMD160 1853ff265ce1667f8291a2979d825b0796a386e4 SHA1 a6b7a1d5654a068d164189f344f1bb65cd1997c5 SHA256 a523931dff1b859a945c951838031db4fdb035f5ff84360b0fffed751177b74e
-DIST rain_1.2.9beta1-1.diff.gz 1828 RMD160 b18f18cfe630338bf666953e7bc21ae7248a5359 SHA1 f2dca2db2d89d8de4cbc8b2115fa56d865ae0f87 SHA256 803f331835af83e0e47b7d4e5e07c2ea25b75de0ab274565bb4582b549774648
-DIST rain_1.2.9beta1.orig.tar.gz 79098 RMD160 b684b2ab03a13f912ee58fe4836e62373c938388 SHA1 05319c29be32e8a6fe4abb52ac0f60676e4bc262 SHA256 1c2d21c5187a9511da257c946f65ce1b4e962d2822970b2a3db85b73daf1bb45
-EBUILD rain-1.2.8_p2.ebuild 767 RMD160 6f048f68eb023806813d78f0b9dbca0698d4927c SHA1 b0b0e1d869cbba2dd92901050f358c3c5a67732c SHA256 62b0aa5f864f4bc801cfbaeda861fa980ff214654992aa7bd3f94be94358f1e4
-EBUILD rain-1.2.9_beta1.ebuild 1175 RMD160 527a9a04d245865d33d3675d5ca4f9e4741fe4b9 SHA1 e5dcab3d23122cda0313905059d70b63119c34e3 SHA256 323635a959ceed464a23bef56a4fd84a82d23edd6a8e1608ee3cb2d1698b1071
-MISC ChangeLog 1290 RMD160 183cc1d858603b3884768240d0fe319a4e92befa SHA1 da26606e953988ff6e9cd24ba718b05560b46b2d SHA256 5efcdab710d13d7e222b9086c7c1b539b8b78bd5a36275231acbd37b55a62cc6
-MISC metadata.xml 278 RMD160 7c7e7deb79ef0fe9dc76bb46a84341da98e71536 SHA1 a0771d7ee73b4bc7785585ef51572e4c81fd731c SHA256 590ddf889b65558acb18cfbf34ee3ae9ffbbbd35fcd3eadcca7120065aa37505
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX rain-1.2.9_beta1-gentoo.patch 1213 SHA256 8cb1fe805bcc4011fa39b8c367b4c05ac39435964386300441a905964c161dd7 SHA512 7a7f623ee8d7e72c91fce9f4185c14e5c4ac6764229f63f37a324f5683c4fa8b99c298e04d2fa51d093eb86547fde2c98c4e66e592c3ec92970616684d672a69 WHIRLPOOL 7135b58ab8d6556509d4476725a341ae15b0015186e2af6fc427ca3c9a6e91fe90041e5dfedb509096ea1571f7e3fe83b3b3eeb4883e1f6e1396f7d893e5ab71
+DIST rain-1.2.8r2.tar.bz2 72057 SHA256 a523931dff1b859a945c951838031db4fdb035f5ff84360b0fffed751177b74e
+DIST rain_1.2.9beta1-1.diff.gz 1828 SHA256 803f331835af83e0e47b7d4e5e07c2ea25b75de0ab274565bb4582b549774648 SHA512 5e871fddbf475d8e73c88a3f7340199cdfae8f54446aced599be7658e0be2c6b7a7ef2626cd13dff577df5c81187fa07bc8ec3a7ab386752e4be321d9a372843 WHIRLPOOL 64ca4e5edc1c49cb00ffa5c58c7dc132f85268400ab69e8448a0d45ebfb4a56d8081ea7d109f5e921c0c1b56d3eb658cd8805aa0952798ae8e6ac426cf4191f6
+DIST rain_1.2.9beta1.orig.tar.gz 79098 SHA256 1c2d21c5187a9511da257c946f65ce1b4e962d2822970b2a3db85b73daf1bb45 SHA512 5e61ac26872e453c6da9e600e3fb427425d2f79a7a5f569ab93308c0b0f4509b6a0d5b45b138f04b9f8bee7b16b8b63be28b7ede65a92f5d4a3384e73e12036d WHIRLPOOL e0b4996c321d3842ae058dbb15959b46ce490b72860bd568a58d126f60d813c6ea943b5b7eb208973f698c89eab632e3d859f64dc4978a8f08c83ed5fef1f11f
+EBUILD rain-1.2.8_p2.ebuild 767 SHA256 62b0aa5f864f4bc801cfbaeda861fa980ff214654992aa7bd3f94be94358f1e4 SHA512 ecc639ba685fce6accce02b6b71de37e1d999f205641e215a236b146e3661cba47a5be3142013108f644ef48de98c9f4f76f5286c76e9446da1c63350fd167ce WHIRLPOOL 52be6ac9f43c9ec03bb3b080d43197cd4f3140f1f22fbaa3fb91ed62392ff2ac6a17e9562f617db501d46669f9a147f2cc871696ed451b2ba1fc1e2e3302fb3c
+EBUILD rain-1.2.9_beta1.ebuild 822 SHA256 3fad0e21e523a45bdb5698b5d7e4bc91512ce92bb7eadb264d9f5178cc4aa12c SHA512 3175a0e7ddd3dbaa57381267e89af29fb9f8094ae95163c463dfcb55bfa1ef9be4780c6657767b850fdd28a5284b8878020d0bbbbe905b8884bf106d84c9e9fc WHIRLPOOL 769daa4d59c69a28a3bac74e00402a59c7a6fce443f4a6bdb599c801f4f024c002d16e07fac35e1c777b19a584c1b6fb1e1a446a51cc030705ece6dcd754c07c
+MISC ChangeLog 1461 SHA256 e422a8e0cfaebab5a9c67dab11746bb566bff0d311ce8e88ba402ef3af9e4fad SHA512 e89b83a978ce5ce12cac3d197a369323a2cde492126eb5ebd28bada2b43d509ea9a91c105a37659f84ba89799710e00199184718a0bab131d622e087a08640c0 WHIRLPOOL bce71921c4fd1a1467b4ee0ba5e3afe8ea6094ed8670be5a979d3a1c7adea05f08d9b742953aed8f520275e7a6ac7b414328b020c60fa68a8dff0b4895ffc9f5
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlPG+TQACgkQVWmRsqeSphOxxQCfd+4cpCnPu4IpRkXFjBH8naC8
+a2MAniw5KdXPhGGYlGlWzosbpNhgYljc
+=w3Cm
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/rain/files/rain-1.2.9_beta1-gentoo.patch b/net-analyzer/rain/files/rain-1.2.9_beta1-gentoo.patch
new file mode 100644
index 000000000000..01666a0bfab2
--- /dev/null
+++ b/net-analyzer/rain/files/rain-1.2.9_beta1-gentoo.patch
@@ -0,0 +1,27 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -6,12 +6,12 @@
+ RAIN_PLATFORM=@host@
+ RAIN_VERSION="1.2.9beta1"
+ RAIN_URL=http://www.tenebrous.com/rain/
+-CFLAGS= -g -Wall $(LIBS) -I./include -DHAVE_CONFIG_H -D_GNU_SOURCE -DRAIN_PLATFORM=\"$(RAIN_PLATFORM)\" -DRAIN_VERSION=\"$(RAIN_VERSION)\" -DRAIN_URL=\"$(RAIN_URL)\"
++CFLAGS= @CFLAGS@ -Wall $(LIBS) -I./include -DHAVE_CONFIG_H -D_GNU_SOURCE -DRAIN_PLATFORM=\"$(RAIN_PLATFORM)\" -DRAIN_VERSION=\"$(RAIN_VERSION)\" -DRAIN_URL=\"$(RAIN_URL)\"
+ INSTALLER=@INSTALL@
+ MAKE=@SET_MAKE@
+-MANDIR=/usr/local/man
++MANDIR=/usr/share/man
+ MAN1DIR=$(MANDIR)/man1
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
+ 
+ all:
+ 	@echo Making all
+@@ -30,7 +30,7 @@
+ 	-$(CC) $(CFLAGS) -c source/rain_udp.c
+ 	-$(CC) $(CFLAGS) -c source/rain_main.c
+ 
+-	-$(CC) -o rain rain_command_line.o rain_defaults.o rain_die.o rain_icmp.o rain_igmp.o rain_inet_common.o rain_main.o rain_mem.o rain_resolv.o rain_services.o rain_signal.o rain_string.o rain_tcp.o rain_udp.o
++	-$(CC) $(CFLAGS) $(LDFLAGS) -o rain rain_command_line.o rain_defaults.o rain_die.o rain_icmp.o rain_igmp.o rain_inet_common.o rain_main.o rain_mem.o rain_resolv.o rain_services.o rain_signal.o rain_string.o rain_tcp.o rain_udp.o
+ 
+ 	@echo done.
+ 
diff --git a/net-analyzer/rain/metadata.xml b/net-analyzer/rain/metadata.xml
index 11418abd05a1..03aa50bab7e3 100644
--- a/net-analyzer/rain/metadata.xml
+++ b/net-analyzer/rain/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>powerful tool for testing stability of hardware and software utilizing IP protocols</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/rain/rain-1.2.9_beta1.ebuild b/net-analyzer/rain/rain-1.2.9_beta1.ebuild
index ab690b36fdf7..29a465d78ec5 100644
--- a/net-analyzer/rain/rain-1.2.9_beta1.ebuild
+++ b/net-analyzer/rain/rain-1.2.9_beta1.ebuild
@@ -1,44 +1,29 @@
-# Copyright 1999-2010 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/rain/rain-1.2.9_beta1.ebuild,v 1.2 2010/09/15 16:29:47 jer Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rain/rain-1.2.9_beta1.ebuild,v 1.3 2014/07/16 22:14:11 jer Exp $
 
+EAPI=5
 inherit autotools eutils
 
 MY_P=${P/_/}
 MY_P=${MY_P/-/_}
 DESCRIPTION="powerful tool for testing stability of hardware and software utilizing IP protocols"
 HOMEPAGE="http://www.mirrors.wiretapped.net/security/packet-construction/rain/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SRC_URI="
 	mirror://ubuntu/pool/universe/r/${PN}/${MY_P}.orig.tar.gz
 	mirror://ubuntu/pool/universe/r/${PN}/${MY_P}-1.diff.gz
 "
 
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
 S="${WORKDIR}/${MY_P/_/-}"
 
 src_prepare() {
-	# Debian patch
 	epatch "${WORKDIR}"/${MY_P}-1.diff
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 
-	# respect CFLAGS, LDFLAGS, correct man path
-	sed -i Makefile.in \
-		-e 's|-g|@CFLAGS@|' \
-		-e 's|/usr/local/man|/usr/share/man|g' \
-		-e 's|^SBINDIR=|&/usr|g' \
-		-e 's|$(CC) -o|$(CC) $(CFLAGS) $(LDFLAGS) -o|g' \
-		|| die "sed Makefile.in"
-
-	# generate a new configure that respects/exports CC
 	eautoreconf
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install"
-	dodoc BUGS CHANGES README TODO
-}
+DOCS=( BUGS CHANGES README TODO )