Respect user flags. Fixes bug 333805. Thanks to Diego for report. Fix icon path, don't install unnecessary docs.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 130 insertions, 12 deletions

diff --git a/net-analyzer/gspoof/ChangeLog b/net-analyzer/gspoof/ChangeLog
index 6a9dc667d22b..32200b3d9816 100644
--- a/net-analyzer/gspoof/ChangeLog
+++ b/net-analyzer/gspoof/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/gspoof
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gspoof/ChangeLog,v 1.9 2010/03/31 18:45:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gspoof/ChangeLog,v 1.10 2010/08/21 15:23:25 xarthisius Exp $
+
+*gspoof-3.2-r1 (21 Aug 2010)
+
+  21 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> +gspoof-3.2-r1.ebuild,
+  +files/gspoof-3.2-icon.patch:
+  Respect user flags. Fixes bug 333805. Thanks to Diego for report. Fix icon
+  path, don't install unnecessary docs.
 
   31 Mar 2010; Michał Januszewski <spock@gentoo.org> metadata.xml:
   Remove myself from metadata, add maintainer-needed.
diff --git a/net-analyzer/gspoof/Manifest b/net-analyzer/gspoof/Manifest
index 13ddd9ee3cfe..3b0ed0c5c987 100644
--- a/net-analyzer/gspoof/Manifest
+++ b/net-analyzer/gspoof/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gspoof-3.2-icon.patch 2943 RMD160 387ddd0f402a61e053cebdc31b6932d12217f6ac SHA1 90420757603917f99de63469db26fc0eb6d260e6 SHA256 cfde70028b46a0392e036cb4b2f3ea4d2ac4c5ada9a3d5f16b0db8de7e82c339
 AUX gspoof-def-values.patch 903 RMD160 16dfeacb4ecd67a21a32d5833d5ff17ce47f25f2 SHA1 a0a84fd181960008573c3a5b27ef095b27291955 SHA256 5ebd86d3f290c356e94fced05784ba0fa03ae1299f30fbd8c84f985546c9cc59
 DIST gspoof-3.2.tar.gz 69340 RMD160 2030e4b99d5191ae9dadec617eec2ae73b021775 SHA1 e31ef5104395d23cafa7106bc6f713d940a4bb68 SHA256 65f12bf8ca23d3fa6af0cedda4fb6c28c955a909e1787bd5dda14404a0280019
-EBUILD gspoof-3.2.ebuild 778 RMD160 448277e95ec7013fa66642d7e4beaf80ba07be31 SHA1 96946484554ae86ed19140360cba2eb46449e4d1 SHA256 070f5d5d3d581dc3537e6477af0d174bc5df80d6dd81de4327ef73269415cff5
-MISC ChangeLog 1107 RMD160 4cd2c194b35d813b6e2141ddfe6d62179531deb0 SHA1 0fd581a8376b1ba2ba7053ee7eb01fb5a6f87924 SHA256 4fa0486cf4d936e59b4716c8bedd5e19af8d889fdd43f6e6bad2198dcd8d9f6a
+EBUILD gspoof-3.2-r1.ebuild 850 RMD160 567b661faddd41ec2a2ee469b8103fd73205c3b9 SHA1 efeef79a67fec65152732fd963861ecdf9cc8321 SHA256 951a1ce3a1f28ecd042db00a1c1878a7d34f083d355f05d506621c1d29f8a368
+EBUILD gspoof-3.2.ebuild 779 RMD160 6acc64ce6edc218cf0727fe13d030b0920a1cbd7 SHA1 ebd83d7efd96aba599afbb4be258769418b334f5 SHA256 f410f2b6bfb021ab2e8c05fed45b8a362e20291f99a67c81b78a3ec5852f372c
+MISC ChangeLog 1370 RMD160 89bcda53fa57c172ac3ce95a0629a606bad4d4e5 SHA1 76a9528b4da657d5b552382cf8f5f4d7219e6b65 SHA256 07ecd5d2c097739c54ca9f7bb6a4026ab7397684765a1dec412a9197f08f10d0
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkuzmFIACgkQchej4aZK9/fBbQCfX1K2s3e40xItTgWvuNKwm92D
-5p8An29yhtt1BHmqwQcmmHQMq3UOXAN6
-=kXBj
+iJwEAQECAAYFAkxv73cACgkQIiMqcbOVdxRxCgP/TmLVnu31On/7Myv/ch3bHt0g
+xvruDC8cg5QAPYFZYc7Jn3d9YU/g6m+88jI7DeGeZg7+2jl3fmQzFVw62qpu3bnB
+dP/LciGIXeF9aQOoAHY8xnu6ifZMEmj4gvWq57Cgj8uPij/nPa6WpvHdS5lgw88+
+c42DHnsyxehWkZxZu/A=
+=EZ9r
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/gspoof/files/gspoof-3.2-icon.patch b/net-analyzer/gspoof/files/gspoof-3.2-icon.patch
new file mode 100644
index 000000000000..df13a08677db
--- /dev/null
+++ b/net-analyzer/gspoof/files/gspoof-3.2-icon.patch
@@ -0,0 +1,71 @@
+Fix icon path and name.
+
+--- gtk.c
++++ gtk.c
+@@ -24,9 +24,7 @@
+    gtk_set_locale ();
+    gtk_init (&_argc, &_argv);
+ 
+-   add_pixmap_directory ("pixmap");
+-   add_pixmap_directory ("/usr/local/share/gspoof/pixmap");
+-   add_pixmap_directory ("/usr/share/gspoof/pixmap");
++   add_pixmap_directory ("/usr/share/pixmaps");
+ 
+    MainWin = create_MainWin();
+ 
+--- interface.c
++++ interface.c
+@@ -102,7 +102,7 @@
+    gtk_widget_set_size_request (MainWin, 640, 480);
+    gtk_window_set_title (GTK_WINDOW (MainWin), BANNER);
+    gtk_window_set_position (GTK_WINDOW (MainWin), GTK_WIN_POS_CENTER);
+-   MainWin_icon_pixbuf = create_pixbuf ("icon.png");
++   MainWin_icon_pixbuf = create_pixbuf ("gspoof.png");
+    if (MainWin_icon_pixbuf)
+      {
+ 	gtk_window_set_icon (GTK_WINDOW (MainWin), MainWin_icon_pixbuf);
+@@ -663,7 +663,7 @@
+    gtk_widget_set_extension_events (DataWin, GDK_EXTENSION_EVENTS_CURSOR);
+    gtk_window_set_title (GTK_WINDOW (DataWin), _("Payload options"));
+    gtk_window_set_position (GTK_WINDOW (DataWin), GTK_WIN_POS_CENTER);
+-   DataWin_icon_pixbuf = create_pixbuf ("icon.png");
++   DataWin_icon_pixbuf = create_pixbuf ("gspoof.png");
+    if (DataWin_icon_pixbuf)
+      {
+ 	gtk_window_set_icon (GTK_WINDOW (DataWin), DataWin_icon_pixbuf);
+@@ -754,7 +754,7 @@
+    gtk_window_set_title (GTK_WINDOW (MultiPackets), _("Pseudo-flood options"));
+    gtk_window_set_position (GTK_WINDOW (MultiPackets), GTK_WIN_POS_CENTER);
+    gtk_window_set_resizable (GTK_WINDOW (MultiPackets), FALSE);
+-   MultiPackets_icon_pixbuf = create_pixbuf ("icon.png");
++   MultiPackets_icon_pixbuf = create_pixbuf ("gspoof.png");
+    if (MultiPackets_icon_pixbuf)
+      {
+ 	gtk_window_set_icon (GTK_WINDOW (MultiPackets), MultiPackets_icon_pixbuf);
+@@ -884,7 +884,7 @@
+    gtk_window_set_position (GTK_WINDOW (AboutWin), GTK_WIN_POS_CENTER);
+    gtk_window_set_default_size (GTK_WINDOW (AboutWin), 350, 200);
+    gtk_window_set_resizable (GTK_WINDOW (AboutWin), FALSE);
+-   AboutWin_icon_pixbuf = create_pixbuf ("icon.png");
++   AboutWin_icon_pixbuf = create_pixbuf ("gspoof.png");
+    if (AboutWin_icon_pixbuf)
+      {
+ 	gtk_window_set_icon (GTK_WINDOW (AboutWin), AboutWin_icon_pixbuf);
+@@ -896,7 +896,7 @@
+    gtk_container_add (GTK_CONTAINER (AboutWin), hbox1);
+    gtk_container_set_border_width (GTK_CONTAINER (hbox1), 2);
+ 
+-   image16 = create_pixmap (AboutWin, "icon.png");
++   image16 = create_pixmap (AboutWin, "gspoof.png");
+    gtk_widget_show (image16);
+    gtk_box_pack_start (GTK_BOX (hbox1), image16, TRUE, TRUE, 0);
+ 
+@@ -936,7 +936,7 @@
+    gtk_widget_set_size_request (ECNWin, -1, 90);
+    gtk_window_set_title (GTK_WINDOW (ECNWin), _("ECN options"));
+    gtk_window_set_position (GTK_WINDOW (ECNWin), GTK_WIN_POS_CENTER);
+-   ECNWin_icon_pixbuf = create_pixbuf ("icon.png");
++   ECNWin_icon_pixbuf = create_pixbuf ("gspoof.png");
+    if (ECNWin_icon_pixbuf)
+      {
+ 	gtk_window_set_icon (GTK_WINDOW (ECNWin), ECNWin_icon_pixbuf);
diff --git a/net-analyzer/gspoof/gspoof-3.2-r1.ebuild b/net-analyzer/gspoof/gspoof-3.2-r1.ebuild
new file mode 100644
index 000000000000..a5051e9ce3df
--- /dev/null
+++ b/net-analyzer/gspoof/gspoof-3.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gspoof/gspoof-3.2-r1.ebuild,v 1.1 2010/08/21 15:23:25 xarthisius Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A simple GTK/command line TCP/IP packet generator"
+HOMEPAGE="http://gspoof.sourceforge.net/"
+SRC_URI="http://gspoof.sourceforge.net/src/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+DEPEND="x11-libs/gtk+:2
+	dev-libs/glib:2
+	net-libs/libnet:1.1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-def-values.patch \
+		"${FILESDIR}"/${P}-icon.patch
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dobin gspoof || die
+	newicon pixmap/icon.png ${PN}.png || die
+	dodoc README CHANGELOG TODO || die
+}
diff --git a/net-analyzer/gspoof/gspoof-3.2.ebuild b/net-analyzer/gspoof/gspoof-3.2.ebuild
index c0c7363c1a8d..68e403df90f2 100644
--- a/net-analyzer/gspoof/gspoof-3.2.ebuild
+++ b/net-analyzer/gspoof/gspoof-3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gspoof/gspoof-3.2.ebuild,v 1.8 2006/09/15 15:27:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gspoof/gspoof-3.2.ebuild,v 1.9 2010/08/21 15:23:25 xarthisius Exp $
 
 inherit eutils
 
@@ -19,8 +19,8 @@ DEPEND="=x11-libs/gtk+-2*
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gspoof-def-values.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/gspoof-def-values.patch
 }
 
 src_install() {
@@ -30,5 +30,5 @@ src_install() {
 	insinto /usr/share/gspoof/pixmap
 	doins pixmap/icon.png
 
-	dodoc Makefile README CHANGELOG TODO LICENSE VERSION
+	dodoc Makefile README CHANGELOG TODO VERSION
 }