Remove sys-apps/sed dependency. Remove unneeded sed scripts.

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

5 files changed, 15 insertions, 20 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 7e6174a13953..0c2d0a874e82 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.513 2013/06/10 00:04:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.514 2013/06/10 03:38:17 jer Exp $
+
+  10 Jun 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.16.ebuild,
+  wireshark-1.8.8.ebuild, wireshark-1.10.0.ebuild:
+  Remove sys-apps/sed dependency. Remove unneeded sed scripts.
 
   10 Jun 2013; Jeroen Roovers <jer@gentoo.org> -wireshark-1.6.15.ebuild,
   -wireshark-1.8.7.ebuild, wireshark-1.8.8.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 34329bf3659c..cdb18862560c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,15 +7,15 @@ AUX wireshark-1.8.3-gnutls3.patch 460 SHA256 75db77b9dd286272583c6def9ce9ebe2fee
 DIST wireshark-1.10.0.tar.bz2 27101631 SHA256 1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add SHA512 1d1b37e50fc35da96de142d21bc02e171f8412ce7b6017ca1b1a1e48daa3da05a06612d68ae1317fb338a0fdc82999a3c56b02250e1ca09ac25a9dacac1c7c86 WHIRLPOOL 238bc0be297e09fca289c9a74d6cc96864be29e598fdaabfb8de4edc4ff591cd948790015748ee49b7db5c6eff824e74107a8428fc144af5b89c00b56ae7dd77
 DIST wireshark-1.6.16.tar.bz2 22152321 SHA256 7b280a8c2d2247fa1a0e351c50d25634e679397da3ea7ee9f64c27eacbcebc54 SHA512 12fd6a5201a97f21e0d674adf2ec9b280ab1f78fdea10e605f3b74b06ef87ce9d31f0a132bb805481154a693b6b621ea18b1ca16bc471a98dce0823ba78f6c7f WHIRLPOOL 40f13a1be22e673dc97d2f708b981dcac57844b18369b52babe7e44f3628975b9034de4ce19552a28c3dc7df0b16f762eefecc5447e5041ae2a2c60273c197e4
 DIST wireshark-1.8.8.tar.bz2 24273325 SHA256 4358bff34b685a210b7f99fe7d3c233d07a487bb76237efb834afdc44cf5ac38 SHA512 8dd08702e4e6442891b83d870f03332188a9a95da27592721f04baeedeb2d6f7f3fb80ba0eaa57f58d0d1cbea4229078b07b2b04351e50559ee05594bfa3f070 WHIRLPOOL f89c6dc9e5b898a633b11c7bcb0218a025440dee138e766c3eea64c67633e20817731502d1abbbfb551b2d634b17e81b2c84b29bc2731415ec4a1fe3f75169fa
-EBUILD wireshark-1.10.0.ebuild 5911 SHA256 2e9eb7f1e95189960a8bd04441662a0dfd93e9b43ce6cacfd887c3e86a0795f9 SHA512 d4575db0807cab2fdb1bd2d0623e1cf08f8d2c1c486cf5894d7fca944d140f8046b0f4df380e274f62451a8c42c59938e75fd40a6bc1ef97513cffbb905eebe6 WHIRLPOOL 76ff194e49ab2bd10ad6407274496ef6ee46645ffffa2f4134ffef7d69bd776d93e2482eb4ebcdb38ead5e2f558862d7cbbb21e35a3b95000b309ac0e9e364a0
-EBUILD wireshark-1.6.16.ebuild 5439 SHA256 0c6ac944f5939de8b2be917d633bdb59bf786c410c59267ebbd8cca0ad821535 SHA512 51edf21735b1a4d4d2533cd22daf6f6beadc097be845cd2c43ea5fba47ec2962b3d234e9558b55a7c32cbdf8667bc22e2cf364dfdbb9df7bbe2867c458a29487 WHIRLPOOL a9a1a306e9e2048c7b1df2d9df636adc3d6cecf9e4f9e3e6951104e1681383ba229692befd784c172fe8493e4360807c73ceb93309a368a7f4e9d6ae222da46c
-EBUILD wireshark-1.8.8.ebuild 5843 SHA256 110d483776ab177f86b9a19d1b8dd9d51ca91e9b031b045b95a3955e610b4e66 SHA512 b285f43578d2e59764ebcd14047b9eebd25a05bd90e41a9234341906e66f5e3a333b8c5974b083223bebbafa45498d24b8d6250ded0691a051b7b744ec5b9c23 WHIRLPOOL 4db86db424548099e07de1c90026744326689d2f1ccb995d1ee4a8f8320e896a897ebdc352d103a072639173beffdd8e2ffda1ed4f169f2ac4d92cf573220a30
-MISC ChangeLog 74610 SHA256 f61c0648f2092783ca2a8ac424f4187a187894aa557262aea1de7ac37f186857 SHA512 47a20b4e7401cbc538c90a83da9a685a2dd3b56d1134ba470567f05a34d2823cb809c6f69cd7dd20c7b587be0ee6275e85c1674dc0a9725923d99acad587ed71 WHIRLPOOL fbdd46afb6c799c22f2df25192ddb883c5db01ea0bf49d84ebc909b865574666265dcfeb3925ac5e8fb6ced73d8fcc6b4e3d13af85f8d228b61bab8d38f9739a
+EBUILD wireshark-1.10.0.ebuild 5795 SHA256 1186f02ff1cc35ba4dfe033c72c70b42de0c1d46d76e44f1462a2d71af337491 SHA512 8eff46862d352327db3799b932d7dda30cb102afd3f56fea95a961607d2921151c73a201bddce8d17c6a07447ca48a12dfbc0354f951b68f9b0f68d526d91541 WHIRLPOOL bc865239e6d596939e928a62f12f54eb4b100c94c2d9c63e05525ae9670fab8de93dd864761318ddcda9c9196af2ed6d92a76499dbeb0674460f0dc66c552074
+EBUILD wireshark-1.6.16.ebuild 5426 SHA256 7e18d769ffc6457a37943d1145482f79a2d5ea6eab6ffeea42dff36bf50a95e2 SHA512 30440889e857b32592785ef9c4088de83498ec654d3997a6e10a1db21ec2c172202faddfd8234b6685ce0a2ed265e08c77f09a80f120e26019828d31cd9c2162 WHIRLPOOL 77c70d8900a36862c1050dbb6ede364f85d4980f99c50ef68d014246fd13dee4419171cdaa725d4920f5a559010025b52e2c34685433b196f8f1e2fd1bd25771
+EBUILD wireshark-1.8.8.ebuild 5758 SHA256 76302cc884c924a34ff7770c4760169f1ebeec188d627562216a0b54e8c60953 SHA512 46b83a5182d64c2de1821cff701f88d3f76bd6476b88aa46c31830d1f4844202c199653a13061c0c0010edb41e63ec6cc75de260556b5f2b3d193583436371d6 WHIRLPOOL 81b4c1c0025ba36ac3b39ced77852ef09f0f90773b749cbf42763ab4563d352d59fd59bb276ac2cc51ad485ff4f1c1abdbc84699c7cffb01c382af920150eb65
+MISC ChangeLog 74797 SHA256 b1131d77501593898f9d44b9354d3fc6eeb988d05efe7a6393daa5e35ba81f6a SHA512 db6b38fd8d6336a840653ac0a1a1d916b3d9647cf3779254aee43fb9dea51641e384e4d91e364bb4c6e37a030e9b77774e298b2a1a017f044ebf200bbd7d91ce WHIRLPOOL 137b0d74ef1c65d6b4ca625ac1de731ae87bf4d48c46f56d70c0a9d31ec439a14c5dc321a06c88ed8d4f45a4aa22693ca916754372b772fbe4393448d39a928a
 MISC metadata.xml 2318 SHA256 c1a2d9ac8e094eb2931748b1e1816afea96792b7aacef67e07de4dc5e5eb5c9d SHA512 f277625dfa5d456978168c49bda809121fa51272d96620392525c444058735084eb555643d336d4011033f3e259676e896146bd6c87c38bf2b1f09a7abd7ba68 WHIRLPOOL 3d59521c183b41c07f114efb3928bcc7f4317ed031cd20e5c1bdcd9daae83f40ff7db0018a64d7d561e3bd1128994f1d7860bb7578e1537dbba246d16c4386b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlG1GBkACgkQVWmRsqeSphMMDgCePV2yZmB8EGgBHH+9Km9FL0Y+
-5GsAnAngp1TeuTRnjKvw2L+Dl/Vll+vJ
-=J1UW
+iEYEAREIAAYFAlG1SioACgkQVWmRsqeSphM7dgCdH9+SWQ65uzB1wvz7G4isb3ao
+E1IAnjMZGgDy/JwbGNzOlkBBf2DrUQ1w
+=saZ4
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.10.0.ebuild b/net-analyzer/wireshark/wireshark-1.10.0.ebuild
index f4182b8f2adc..1a28021381a5 100644
--- a/net-analyzer/wireshark/wireshark-1.10.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.0.ebuild,v 1.1 2013/06/06 15:20:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.0.ebuild,v 1.2 2013/06/10 03:38:17 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -58,7 +58,6 @@ DEPEND="
 		www-client/lynx
 	)
 	>=virtual/perl-Pod-Simple-3.170.0
-	sys-apps/sed
 	sys-devel/bison
 	sys-devel/flex
 	virtual/perl-Getopt-Long
@@ -86,11 +85,6 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch
 
-	sed -i \
-		-e '/^Icon/s|.png||g' \
-		-e '/^MimeType.*[[:alnum:]]$/s|$|;|g' \
-		${PN}.desktop || die
-
 	eautoreconf
 }
 
diff --git a/net-analyzer/wireshark/wireshark-1.6.16.ebuild b/net-analyzer/wireshark/wireshark-1.6.16.ebuild
index ff1a979214c5..7d5342eabc5f 100644
--- a/net-analyzer/wireshark/wireshark-1.6.16.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.16.ebuild,v 1.9 2013/06/09 19:06:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.16.ebuild,v 1.10 2013/06/10 03:38:17 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -51,7 +51,6 @@ DEPEND="
 		dev-libs/libxslt
 		doc-pdf? ( dev-java/fop )
 	)
-	sys-apps/sed
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
diff --git a/net-analyzer/wireshark/wireshark-1.8.8.ebuild b/net-analyzer/wireshark/wireshark-1.8.8.ebuild
index f44e543ee540..8c43991ec2ab 100644
--- a/net-analyzer/wireshark/wireshark-1.8.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.8.ebuild,v 1.9 2013/06/10 00:04:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.8.ebuild,v 1.10 2013/06/10 03:38:17 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -54,7 +54,6 @@ DEPEND="
 		doc-pdf? ( dev-java/fop )
 	)
 	>=virtual/perl-Pod-Simple-3.170.0
-	sys-apps/sed
 	sys-devel/bison
 	sys-devel/flex
 	virtual/perl-Getopt-Long
@@ -83,7 +82,6 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
 		"${FILESDIR}"/${PN}-1.8.3-gnutls3.patch
 	sed -i -e '/^Icon/s|.png||g' ${PN}.desktop || die
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.in || die
 	eautoreconf
 }