Version bump, wrt bug #482320. Thanks to Andrew Savchenko <bircoph AT gmail.com> for initial ebuild and patch

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 164 insertions, 7 deletions

diff --git a/net-analyzer/cnet/ChangeLog b/net-analyzer/cnet/ChangeLog
index 62984c63ca3c..6519a48dfca0 100644
--- a/net-analyzer/cnet/ChangeLog
+++ b/net-analyzer/cnet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/cnet
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v 1.16 2009/01/15 05:02:55 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v 1.17 2014/01/16 11:31:45 pinkbyte Exp $
+
+*cnet-3.2.4 (16 Jan 2014)
+
+  16 Jan 2014; Sergey Popov <pinkbyte@gentoo.org> +cnet-3.2.4.ebuild,
+  +files/cnet-3.2.4-gentoo.patch:
+  Version bump, wrt bug #482320. Thanks to Andrew Savchenko <bircoph AT
+  gmail.com> for initial ebuild and patch
 
   15 Jan 2009; Jeroen Roovers <jer@gentoo.org>
   files/cnet-2.0.10-gentoo.patch, cnet-2.0.10.ebuild:
diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest
index 7bae11c6f686..62fdba2ed876 100644
--- a/net-analyzer/cnet/Manifest
+++ b/net-analyzer/cnet/Manifest
@@ -1,5 +1,22 @@
-AUX cnet-2.0.10-gentoo.patch 1489 RMD160 dd3c54c13e034e596896d3e2d9eac2aaed2cdfee SHA1 c16b2ff70fd4452917ae88c37a50753c31de074f SHA256 7deaa0aa194cc028f875ce4964aded2ac49681d33a3afabb96ad5e40b7184a9b
-DIST cnet-2.0.10.tgz 1158887 RMD160 614e4a71cbc90bee9c581e8b14389e12c5ff02d3 SHA1 eab8bd36203c956936c80d71a81e36a32a8acc89 SHA256 7b1e720179b7316d97b8b947155b261dda7ddfd01ff18fb04139c33f4a35bfcb
-EBUILD cnet-2.0.10.ebuild 1010 RMD160 b908488733533d661f7efc1b6a96b6048d013607 SHA1 ec4310ecaf2d4366126ceebcb8f2f7499b6bd99d SHA256 1aa81c377a231321e335aed823545243ad3f8a700c3eef00b3ffc9f73911fa9d
-MISC ChangeLog 2558 RMD160 db556424b5621d0c861b73b685e7d59f2978054c SHA1 f51805dcb359063e1efcd29af12a9a0f8af453a0 SHA256 13eb2d693ed4f1ef1ebd3ba9f0a7a9e6d78c520ab922efca38fe4107fc6f4b59
-MISC metadata.xml 218 RMD160 a812d9696192b58b1390b15f36a55ac9cf235dff SHA1 7055e31d03348a70284f86725fc06f7a77231024 SHA256 d3470d760c9c0bba1b56da4d676f0c3b97d523c57cb050c7baea8de94eed3ddd
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX cnet-2.0.10-gentoo.patch 1489 SHA256 7deaa0aa194cc028f875ce4964aded2ac49681d33a3afabb96ad5e40b7184a9b SHA512 23ae62ed44bd98f3c9d07dcd6578ca9deeb412556da23ee49fdb7d215c250127d0ef9d793ca07e63ca6a2ec5bae2e3767d303a543fc6b194582dc1119ed29d31 WHIRLPOOL 0500af251bec7a45faa3f56b927f323c107f6a06d8bd8766395e7fe9d02e5bdd3c4b6528663a324b6af9a2279b8d12b84642e31fe721f6c4b514a9ded9e053c5
+AUX cnet-3.2.4-gentoo.patch 2413 SHA256 eefff3a707825a6685f026f44adc017b642a4767cce62b8f2f1f78a3c6aec6d0 SHA512 0d2ace465649d356514fc681c721d773a8357667683d93d0c7c02662f1b1f8178795d6f78382e4d3d296d1802ccba1aa52dce2da1d90a4d184c05d9b0051735a WHIRLPOOL 44a7335f8de790c912e9ebb4548b91d22ec66797c54554e155539ebf9e64c0346d9236e1d74b5fe59243dea13d72f332992c9678244ad41b7169eca69c0c55b7
+DIST cnet-2.0.10.tgz 1158887 SHA256 7b1e720179b7316d97b8b947155b261dda7ddfd01ff18fb04139c33f4a35bfcb
+DIST cnet-3.2.4.tgz 2891454 SHA256 b166747e62ac69733e5d2b8317580ff4a33fb9731426481f028f6a41991f2c33 SHA512 7e5f18d0ff04312a8259260b46433b59a7ff1ba5c84a89be94f8403b97853e23ca2d9a212774588cf1dbd0031a10daafd355c85fd13169a095ef8bf4a8e5c52b WHIRLPOOL e190163c52fb05754cfc6a9dc340983b98fba5a896e2ced888ffc7d748f6dff4ea1c59381c99aaea874559b019980a82f9b1dfc576c4aed24c33cb1adf50c70e
+EBUILD cnet-2.0.10.ebuild 1010 SHA256 1aa81c377a231321e335aed823545243ad3f8a700c3eef00b3ffc9f73911fa9d SHA512 3414c7bdec2ab33db55a881ccafc93e0688956e293cf0c055829012361712ecafe005a953a0ee79e7ca7af49467021716cfa70a01c99430680e0bc6580540196 WHIRLPOOL b010ba4527404b3823ec43472a0689affbf9c40fd262401300587fd2fe3ba2c170a189ae77f41208781d8bd929d711a33c137bf2b6155225205ca1728c9619a4
+EBUILD cnet-3.2.4.ebuild 1207 SHA256 bc0a7a8807c9b5249cf84cef790793b160aa7c612c1c33945fff5a205878d548 SHA512 8950497a01d46b7e6abe71bc75dd91fe5f566986506be8c6d2b5e095a1efd2f5e97b13cf98184b02a494f0741ed6e6951685aa9abbae37df343ed8975e6a8005 WHIRLPOOL ee6d8bc15b493fecb0bfb9024bf5b5122bddecbbd4db15a5e28908b03cb43113d79bc1b689540840490f3014f95c3ad2c0db76282ca0420fd100ade45bd6cf70
+MISC ChangeLog 2809 SHA256 e4e73f9c1abd78ba05043146cd1e19cf75133b5b215f8b743498f2a626bd2b7c SHA512 cafb557bdb40d83bfa4a312f7555b3be37d0ad9f1372a597f33f511ac89023cf99792d79bcbf797f5b19578120f2efeb63ce4b5cfea67d4d16c88b9c1a964816 WHIRLPOOL 359bc4bc2ab2f325785f45aad4fb2ce0c3226fa1a3e168f344a7d2e5f7a591467871a3e3de41264f5c5ee2cf3404cbe58b55eab9059656d87d92c57892286e2c
+MISC metadata.xml 218 SHA256 d3470d760c9c0bba1b56da4d676f0c3b97d523c57cb050c7baea8de94eed3ddd SHA512 f17165576bd977ff6ebf67ae26817eba51e6772187b12cae3ff0443cf6f3f84914340753f4cb72d5efffa55e8debc914039f44e63aa5c7a6cf6604dd52824ad9 WHIRLPOOL 9aabc7066f4872c8a0042ad27f8cc56b586b5eea5636855b36fb6f22bd3e1711136ef62aa990821e00b85f416b7604d7fb11000c7c588b3ee2435fee17c65cc9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJS18MgAAoJECo/aRed9267iywIALD4Yu5M+QT5bv/zm4TMiSjL
+rL8kvpc2NeknbRUvJRjdYHM1KQENLhmGT7JBOi2QvZutTB2WkEq2EtAwjJDvHe09
+vk4xZcmKPzDG94nbe8YlIeqtfYVv/cHpkJc/elJQnwkTWzpiDYwSO/1AkLO3edVG
+Ccn47Au9JhWt1/IU+JVykLU1AXudC0YnkGIW6GPqjX/K9d7fycX+a9ED6olnbzuy
+PW1WKN3Aeb5QJQs1qykWwVZuBLmACPPD2rXM2jqch929Xc5xeET1tIxYYF76WEEM
+gHG6WO38yjt6fMSc6txrogMcIP4FA8YOPE98ZauYuE4gtAoMgtBBp+6QLsDi/fA=
+=7Ksp
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/cnet/cnet-3.2.4.ebuild b/net-analyzer/cnet/cnet-3.2.4.ebuild
new file mode 100644
index 000000000000..aa302fd7d1a5
--- /dev/null
+++ b/net-analyzer/cnet/cnet-3.2.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/cnet-3.2.4.ebuild,v 1.1 2014/01/16 11:31:45 pinkbyte Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Network simulation tool"
+HOMEPAGE="http://www.csse.uwa.edu.au/cnet3/"
+SRC_URI="${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND=">=dev-lang/tk-8.5
+	dev-libs/elfutils
+	x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+RESTRICT="fetch"
+
+pkg_nofetch() {
+	einfo "Author demands to fill a download form to collect usage information:"
+	einfo "${HOMEPAGE}/download.html"
+	einfo "Please move downloaded file to ${DISTDIR}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	# Set libdir properly
+	sed -i -e "/CNETPATH/s:local/lib:$(get_libdir):" src/preferences.h || die
+	sed -i -e "/^LIBDIR/s:lib:$(get_libdir):" Makefile || die
+
+	epatch_user
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ANNOUNCE
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${P}/examples
+	fi
+}
diff --git a/net-analyzer/cnet/files/cnet-3.2.4-gentoo.patch b/net-analyzer/cnet/files/cnet-3.2.4-gentoo.patch
new file mode 100644
index 000000000000..7357610dd72c
--- /dev/null
+++ b/net-analyzer/cnet/files/cnet-3.2.4-gentoo.patch
@@ -0,0 +1,78 @@
+--- cnet-3.2.4/Makefile.orig	2012-03-23 11:42:31.000000000 +0400
++++ cnet-3.2.4/Makefile	2013-08-24 16:37:29.449886061 +0400
+@@ -6,7 +6,7 @@
+ # Change the following 4 constants to suit your system:
+ #
+ # PREFIX defines the directory below which cnet will be installed.
+-PREFIX		= /usr/local
++PREFIX		= /usr
+ #PREFIX		= $(HOME)
+ #
+ # BINDIR defines the directory where the cnet binary will be installed.
+@@ -16,7 +16,6 @@
+ LIBDIR		= $(PREFIX)/lib/cnet
+ #
+ # WWWDIR defines the directory to hold cnet's web-based documentation
+-WWWDIR		= /home/httpd/html/cnet
+ #WWWDIR		= $(HOME)/WWW/cnet
+ #
+ # ---------------------------------------------------------------------
+@@ -26,15 +26,14 @@
+ 	@ls -l $(NAME) *.a
+ 
+ install:
+-	make
+-	@mkdir -p  $(BINDIR) $(LIBDIR)
+-	@chmod 755 $(BINDIR) $(LIBDIR)
+-	@cp $(NAME) $(BINDIR)/$(NAME)
+-	@chmod 755 $(BINDIR)/$(NAME)
+-	@rm -rf $(LIBDIR)/*
+-	@cp lib/* *.a $(LIBDIR)
+-	@chmod 644 $(LIBDIR)/*
+-	@ls -l $(BINDIR)/$(NAME) $(LIBDIR)/*.a
++	@mkdir -p  $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
++	@chmod 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
++	@cp $(NAME) $(DESTDIR)$(BINDIR)/$(NAME)
++	@chmod 755 $(DESTDIR)$(BINDIR)/$(NAME)
++	@rm -rf $(DESTDIR)$(LIBDIR)/*
++	@cp lib/* *.a $(DESTDIR)$(LIBDIR)
++	@chmod 644 $(DESTDIR)$(LIBDIR)/*
++	@ls -l $(DESTDIR)$(BINDIR)/$(NAME) $(DESTDIR)$(LIBDIR)/*.a
+ 
+ AND	= html/CLICK html/KEYBOARD html/STOPANDWAIT html/TICKTOCK
+ www:
+--- cnet-3.2.4/src/Makefile.linux.orig	2012-03-23 11:42:33.000000000 +0400
++++ cnet-3.2.4/src/Makefile.linux	2013-08-24 16:25:46.437455826 +0400
+@@ -20,10 +20,10 @@
+ XINCLUDES	= -I/usr/include/tcl8.5
+ XLIBS		= -ltcl8.5 -ltk8.5 -lX11
+ #
+-C99		= gcc -std=c99 -Wall -Werror -pedantic
+-CFLAGS		= -O3 -fPIC $(INCLUDES) $(XINCLUDES)
++C99		= $(CC) -std=c99 -pedantic
++CFLAGS		+= -fPIC $(INCLUDES) $(XINCLUDES)
+ #
+-LD		= gcc -rdynamic
++LD		= $(CC) -rdynamic
+ LIBDIRS		= $(XLIBDIRS)
+ LIBS		= -lelf -ldl -lm
+ STRIP		= strip
+--- cnet-3.2.4/support/Makefile.common.orig	2014-01-16 13:40:28.364197103 +0400
++++ cnet-3.2.4/support/Makefile.common	2014-01-16 13:41:00.956198672 +0400
+@@ -1,13 +1,13 @@
+ #
+ CC		= gcc
+-CFLAGS		= -O -std=c99 -pedantic -Wall -Werror -fPIC
++CFLAGS		+= -O -std=c99 -pedantic -fPIC
+ 
+ DOTH		= cnetsupport.h
+ OBJ		= hashtable.o lexical.o md5.o queue.o vector.o
+ 
+ $(NAME):	$(OBJ)
+-		ar rc $(NAME) $(OBJ)
+-		ranlib $(NAME)
++		$(AR) rc $(NAME) $(OBJ)
++		$(RANLIB) $(NAME)
+ 		@cp -p $(NAME) ..
+ 
+ %.o : %.c $(DOTH)