[gentoo-commits] dev/ago:master commit in: app-portage/arch-tools/, net-analyzer/ettercap/

[gentoo-commits] dev/ago:master commit in: app-portage/arch-tools/, net-analyzer/ettercap/

[Agostino Sarubbo]

commit:     860c4f858c87aa6efd63c79949bb3c6ecbab9818
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 20 11:38:53 2012 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 11:38:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ago.git;a=commit;h=860c4f85

sync with changes I did in the main tree

---
 app-portage/arch-tools/Manifest               |    3 +-
 app-portage/arch-tools/arch-tools-9999.ebuild |    3 +-
 net-analyzer/ettercap/Manifest                |    2 +-
 net-analyzer/ettercap/ettercap-9999.ebuild    |   29 ++++++++++++++----------
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/app-portage/arch-tools/Manifest b/app-portage/arch-tools/Manifest
index 5dd829c..52c20b7 100644
--- a/app-portage/arch-tools/Manifest
+++ b/app-portage/arch-tools/Manifest
@@ -1,3 +1,2 @@
-EBUILD arch-tools-9999-r1.ebuild 556 SHA256 b38dc85883f73910d87df1100f0d86c106475dd085c6af426f33609352e1af27 SHA512 d33cdd260a98f4ce1d8cc9defc8b7e672dde997c85ece9570099b07e59266af00e6e209a778a6615fb30ca26909ede67e86cc6222fa9a9504e6a74099089c28c WHIRLPOOL b6901efa7021343eb320feba85a743e901a734f679c352da5bc67f8051f43381097a2082f086d1b3a4f2216600e11b97ef8cb90f59f435575117a69e31f6002f
-EBUILD arch-tools-9999.ebuild 551 SHA256 261b8e6e020f4ff360cb36dbfc6b58c692f74d4013c8f9195b8aaf5fe89d41b2 SHA512 b01e406bcf9b96a582e1f76ed8899e63b4906470e86cd719544c95f7108ba3f0c1668e2e01ffbca2588859e5870338dcd3855181d1de316f9fe3ea75d5852e68 WHIRLPOOL dab163e36843e7db2e385f3e53e0328dda7a592fdaf98c9c07d8b05ef46a7fccdc4d3f92272cf1b3d3ffce074586a7ceb7d0f75fccccdd737432c5cc858f02f9
+EBUILD arch-tools-9999.ebuild 580 SHA256 739c8abaaa02a99259dec2dc9eba96f31bf6b0333f2e91864248b318985c44cf SHA512 8b38ddf11c05c5cb5ba57189fb69e3dd3a576f5537c0aac68417297922c36ff57b4e6ff26b073f5811ad4d1f53fca3ccba89fc0050cfaa91a9794233572e96e7 WHIRLPOOL d1ac5265d956d97aacca6c27630ca95fd2914895579ee1895f7d9b80b2179853b2cfc110bf1462a340a410357080f8dc453fac930dd13578c483d186d532bb32
 MISC metadata.xml 233 SHA256 77226fe2bb71a40e1ad91e1a4ddd1bb5728012844c345b01ccffc1f5ab92270e SHA512 7ca9cf20cfadd69ebd24e89b921aac51290d169b790507577147c823089710f730758b5a0a990311e2db5cc93c2744d85328bf9a09fbd5c75ea5df3a796de487 WHIRLPOOL be83544d3c80e4db47780a2840ccfc7c82c9c0ae0ac85e15347e1e7a1591930f3140d8bbda3b9563e3543aa8c4de1f60def98fd7bafe6b4adf9bd9c259801fb8

diff --git a/app-portage/arch-tools/arch-tools-9999.ebuild b/app-portage/arch-tools/arch-tools-9999.ebuild
index 44a3658..fc26e1c 100644
--- a/app-portage/arch-tools/arch-tools-9999.ebuild
+++ b/app-portage/arch-tools/arch-tools-9999.ebuild
@@ -18,7 +18,8 @@ IUSE=""
 
 DEPEND="dev-lang/python"
 RDEPEND="${DEPEND}
-	<www-client/pybugz-0.10"
+	app-portage/gentoolkit-dev
+	>=www-client/pybugz-0.10"
 
 src_install () {
 	for i in *.py;do newbin ${i} ${i/.py/};done

diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 95bb3ee..abf3a11 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,2 +1,2 @@
-EBUILD ettercap-9999.ebuild 1281 SHA256 69ec1820e7edc8cbfb7aa149215c5db24f703c94404c3cbb9bb5a38581e73572 SHA512 46c57a4ab918ab42e50d37db429c017c82008b0be986be3bdfd189e4e9678f915b4bdf16ccc06f987d5f679e9650abf59c6a7de1d17312f07dd1fc9c38878f66 WHIRLPOOL e6e6a0ce868c1ebd25bbd303dca0c1bb6c4ad46caafcca9b324572d3d1085f34b1afd54461347611faf722ad933598f3bf32c789170ca082722c6fa8eccab5b8
+EBUILD ettercap-9999.ebuild 1362 SHA256 d530b9402ecfaa0eca11fe9508b90b3172c9631ef5348d21c15e131c14bdf2cf SHA512 746960d19bb499816241790003dcc6949c7cf841a005934b6bb074a1fc29d3caaf4bef577c80eda356d52148a4317e04503211471441baca5ede010540536355 WHIRLPOOL 5fbe5ebad16a7413c1336d3d04085411520b139ce55575eff634a8786b69609c5a1c263021075d2e91b848969aee7f0b04e9cc1564ed599f0bb271a7121c3c00
 MISC metadata.xml 321 SHA256 302f247e355f4901e0823ea2910ac536b06f6e9e7a5c72d56030ffd2c36f536f SHA512 17510fbf0242c37760eb8c2317d733cc40cd8fe8bc514539e0ccb86723a92f3c359510998e6eae59128d1b9979e27ac02866972a417496e19d08d0fe947f799e WHIRLPOOL ef0e7086ae967cf2e7154cceb5a24484b55ef21d1c86e0690372a7a45e7928ac05a89c036fa9c11d81f7da68eb81b10959941fdedcf7cbfdf843b9317ad10ce4

diff --git a/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild
index 8effbc6..7c6b13c 100644
--- a/net-analyzer/ettercap/ettercap-9999.ebuild
+++ b/net-analyzer/ettercap/ettercap-9999.ebuild
@@ -4,33 +4,37 @@
 
 EAPI=4
 
+CMAKE_MIN_VERSION=2.8
+
 inherit cmake-utils git-2
 
-DESCRIPTION="A suite for man in the middle attacks and network mapping"
-HOMEPAGE="http://ettercap.sourceforge.net/"
+DESCRIPTION="A suite for man in the middle attacks"
+HOMEPAGE="http://ettercap.sourceforge.net https://github.com/Ettercap/ettercap"
 EGIT_REPO_URI="git://github.com/Ettercap/${PN}.git"
-EGIT_BRANCH="${PN}_rc"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="gtk ipv6 ncurses plugins ssl"
+IUSE="gtk ipv6 ncurses +plugins ssl"
 
 RDEPEND="dev-libs/libpcre
 	net-libs/libnet:1.1
-	net-libs/libpcap
+	>net-libs/libpcap-0.8.1
 	sys-libs/zlib
 	gtk? (
-		dev-libs/atk
-		dev-libs/glib:2
+		>=dev-libs/atk-1.2.4
+		>=dev-libs/glib-2.2.2:2
 		media-libs/freetype
 		x11-libs/cairo
 		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-		x11-libs/pango
+		>=x11-libs/gtk+-2.2.2:2
+		>=x11-libs/pango-1.2.3
+	)
+	ncurses? ( >=sys-libs/ncurses-5.3 )
+	plugins? (
+		>=net-misc/curl-7.26.0
+		sys-devel/libtool
 	)
-	ncurses? ( sys-libs/ncurses )
-	plugins? ( >=net-misc/curl-7.26.0 )
 	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
 	app-text/ghostscript-gpl
@@ -39,7 +43,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	#ettercap defaults to using mozilla so let's try to use xdg-open and pray it works
-	sed -i 's#mozilla -remote openurl(http://%host%url)#xdg-open 'http://%host%url'#' "${S}"/share/etter.conf || die
+	sed -i 's#mozilla -remote openurl(http://%host%url)#xdg-open 'http://%host%url'#' \
+	share/etter.conf || die
 }
 
 src_configure() {