gentoo resync : 09.06.2018

3 files changed, 12 insertions, 9 deletions

diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
index 258af4792d84..51c0fd56394f 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -1,7 +1,7 @@
 DIST etherape-0.9.14.tar.gz 1438255 BLAKE2B a34ca77cc8862b3de50ca0405d7de083653fb984de85feb7c575b6eb0f340d386add9c851cdd54d8cf5d3d1c3cdddb1c7522673687d94b30f2ab0f91d4251613 SHA512 26e018e49bbea9baf8b4056798e2acab1ad1aba51022ab1258d31499d612a7b12567c4d671da45f79785fbe3c1eda6698b4fe201b055e71e13c9f9b0275c91e3
-DIST etherape-0.9.16.tar.gz 1435235 BLAKE2B af6d0ba7d9532b383322546a42126fd456a2695ec7332cd082addc6ed72bb8e11d058854881157775e767c37c0ca3984074bdbe2f8a098622f48d38e9aa99281 SHA512 0c0b5e04cf1628fe22cfa35ee85b4ab4736265d071c9d179c0dc52e2894f022da7648f236e7ab29e28049a4afc8728ba639a6654da82e299938259fbe01e0d57
 DIST etherape-0.9.17.tar.gz 1436276 BLAKE2B 3ac9496238d5a3653129822c6d21643a5e65afd93ff278532bcad623a0c4dc05b553711dd6f7047774cb758a6f65113a3381a08154001a6c2058415d35f2cd1d SHA512 65f039cd98826fee9a5988235dbdface00e2f17e5bd83eb28339d5bdb9d2b5f8ffe84e071c36418617d68add32e39866eb393f23b008b35fe36662453a02c57a
+DIST etherape-0.9.18.tar.gz 1436265 BLAKE2B b9f3fd625369fdf6790bef75cc97effd3e1a6eec0635472752daf420c890d4a5231bd1baff6ee58937ad27e1d96eaae5b79cc2f9a2b6eeeb7c957d08cbc8f667 SHA512 0ed19966451f9e9b5f5754018d485e7dc59005657ceddf8a75e790c4b7fbf3c8eea56354cf490ec27e18c4bc14c5b3fe648c90facc471dfb14b52ea68abc37d3
 EBUILD etherape-0.9.14.ebuild 611 BLAKE2B 028a91b19cc57e075b974bc1f80c39ce42ba0bac4f89e5afb1e48742e4d44816f5b5ab5e7236cf7a59aebc87a677b11391ebb6294b504dbf45333aa6fb52a142 SHA512 2aff3a594f3e24192554249bb6ebcc5002f47a76cd1c74b4913f33cc08bd824c78e89038d8d7a52a241a382479f8057102689be565544c1e96a0c880ef332ed5
-EBUILD etherape-0.9.16.ebuild 587 BLAKE2B 864c1f5317b245c009e7ee0111e33e91524452455df52a9d9d3fbbc165a41d9aa8d79b01abb4bcc040be763916f1fb0292cac7f51d2c0e571d3a6d30d815221f SHA512 74b56e34c907dd1020dbab8df0a11ada2031d5814d2bfecfd5634e479f5add007e8388ec9b81cb3c04e5d52363ba909df218d3c0ea56661abf27b0219af3ae68
-EBUILD etherape-0.9.17.ebuild 587 BLAKE2B 864c1f5317b245c009e7ee0111e33e91524452455df52a9d9d3fbbc165a41d9aa8d79b01abb4bcc040be763916f1fb0292cac7f51d2c0e571d3a6d30d815221f SHA512 74b56e34c907dd1020dbab8df0a11ada2031d5814d2bfecfd5634e479f5add007e8388ec9b81cb3c04e5d52363ba909df218d3c0ea56661abf27b0219af3ae68
+EBUILD etherape-0.9.17.ebuild 604 BLAKE2B a4ed8fe466630bfa884ea32bbd7c244a5fb16e4bff3ce0031d081b8beaf246563937d542056743aaf4d45c5bd41da724bfd4a92003d5f3948c7d1af9fcd855ac SHA512 fb24c1a48cf6a96d7b000995c18c96e97551f611b15e1e601682f4815164c2283ed69ed55611d04c387eb271f54fa874e5ccc15b46be167b25fcee43934495c8
+EBUILD etherape-0.9.18.ebuild 564 BLAKE2B 093ec296766b484fa508462b6f65d8b56af5884f0c98dda915e60bc69ee5be7936236a4456a5b1dafec25a33ff981383742c197df8f12d0bd1d3db2943268dc7 SHA512 94e51eca55f371dff53d6dd0a4ecc88495edda31374fee272a3eb8af173e1837d114b26c1bac2597877c84af4bbb187bd5e57ec73caeaa4c64ff0ce820482289
 MISC metadata.xml 820 BLAKE2B 613982514b7fe5365b2eb8344cd1e7214d71636fec65aba0f4f2d226047e33ede0a0fb0f096f87d20077d0f1907375eaefbbc04bfc81904dd044bbc567cc887a SHA512 8e7b8953034f14069d5d2aad3c0a1b180ec182c9ae8be46bf2b837629e40f0122b4402c0adfeccb1967844c38b241a122a2735df0d63ad475c2355eb4b454e9b
diff --git a/net-analyzer/etherape/etherape-0.9.17.ebuild b/net-analyzer/etherape/etherape-0.9.17.ebuild
index 4f8df6a0aae4..74efaf843ce3 100644
--- a/net-analyzer/etherape/etherape-0.9.17.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.17.ebuild
@@ -14,10 +14,12 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=gnome-base/libglade-2.0
+	dev-libs/popt
 	gnome-base/libgnomecanvas[glade]
 	net-libs/libpcap
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	>=sys-devel/gettext-0.11.5
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/gnome-doc-utils
diff --git a/net-analyzer/etherape/etherape-0.9.16.ebuild b/net-analyzer/etherape/etherape-0.9.18.ebuild
index 4f8df6a0aae4..1cfcbd672427 100644
--- a/net-analyzer/etherape/etherape-0.9.16.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.18.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome2
 
 DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
 HOMEPAGE="http://etherape.sourceforge.net/"
@@ -13,13 +12,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
-	>=gnome-base/libglade-2.0
-	gnome-base/libgnomecanvas[glade]
+	dev-libs/glib:2
+	dev-libs/popt
 	net-libs/libpcap
+	x11-libs/goocanvas:2.0
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	>=sys-devel/gettext-0.11.5
 	app-text/docbook-xml-dtd:4.1.2
-	app-text/gnome-doc-utils
+	app-text/yelp-tools
 	virtual/pkgconfig
 "