reinit the tree, so we can have metadata

5 files changed, 382 insertions, 0 deletions

diff --git a/net-misc/tiers/Manifest b/net-misc/tiers/Manifest
new file mode 100644
index 000000000000..9d9f9a03d404
--- /dev/null
+++ b/net-misc/tiers/Manifest
@@ -0,0 +1,8 @@
+AUX tiers-1.1-gcc43.patch 3170 SHA256 6a21f9746322ba88dcae0db73c954e192c1aedd2bccad6dd20d8c214b8dd3e59 SHA512 6dfd0fe2f74403f1ee51bf0a4c86bd1a54518f362377f4d61e603639b90e44aac00aadfaa243d6f52a07b9eb2bb690e248895cf43ce888e424217d7a49d95fa5 WHIRLPOOL e62e60b150ad4c09a64b82958d13b4375bf038d07eb869b8eef6e213893be715bdebcb12788e36bf07a78801e7f99cf1cfabf064b4debdb1252bcdf0aba05945
+AUX tiers1.1-gccfixes.patch 5840 SHA256 6d8df49d28d422c3bd9d22b08d152584472de433e819dfa416fa0de2d91dc5aa SHA512 81913aa857d3251c358e91aa1644324399e60cf1bf7811ccc96d482ee4d56c5ba38138b882380f39d842e78f44d9d985465221b98283d2654bb8f4898552775e WHIRLPOOL a5f26344635ca23bfd4905e15be94f612deee6ddd7dc037008274bcee2230ce6414685bad10b7b31d7112290e35f7a7e6a42a62da20a33228d3ba9aeedbea596
+DIST tiers1.1.tar.gz 392532 SHA256 d7c44866fdfa70efe22f69942e1624ffeaa4ba1be47e335f8422f1b50a18c017 SHA512 b72a98aeeb3e1799536e1424e8f60bffcef59c61cc709232a670174c80d23fb4c3b60249c7ff2a33442b62b81a493b7ecef4bf0e950147fa8fe81bb9eabb9a08 WHIRLPOOL fbfbe71652239c2ca664340814b883187c037634012aa21ae4c4fb456185b2215dc97a3b5c03c017014f2fe5566dafece520a81f3a5483dcf238ffafd2245eaf
+DIST tiers2ns-lan.awk 3258 SHA256 675540db87c0ab24fb1a0b67fdd48d6b981de5d1bcb2da808ca69ed29d4bf583 SHA512 562204765e0e7c973e6d88c494e5aba9cd47d79c68309359cd232c34be6175f727411a64a6033a246a042987f1ad423008857eaf25c6254bd006c4a3ff4d083e WHIRLPOOL 4533e6811c783307e20d796d95c7aa0cd3adca7729ca24b001a1a6cb65c620e13c0a81fe28ead3a80ad5d317d893684579dabc567296a217842df835a7de13ab
+EBUILD tiers-1.1.ebuild 1305 SHA256 bd5e11bc9a85b1beef18c060939bf2467f0d526a267415567c4898183d5cfadc SHA512 acf71c4258556615789062c608dc430740ad85adf553700b479a03985fdc2fa4186d11fb62b85ef2d0a762c662789ecfca500c2c47644941e03240b722c8de1d WHIRLPOOL e597adcff17ee83b77e433a6b05c98301c0d2cdaa549bc67f8a5a0e04780e09c8482a0d410098f1617f5a83bf82b532c5b0474588da53616624ad2b4b7c641cd
+MISC ChangeLog 2230 SHA256 b6719d251798cfa62b8e0d36160280d7d15b11190a8838abcee1220c5c51f875 SHA512 e2aaff584912dfcd96448847ed7ad47b2e32b0c99baf5fd39ccbe7e461d012abed801578475b36da9c9b11d7c0e2c3ac974c9a27e1f6f9ed09c75b3d1813ed4d WHIRLPOOL 35175c270346c84e6142081c118678547ddc543ff9f470b6c712fcde0304bcfa7f925c41c1b2a81d80a17f177251911f0b97b9300d58bd4466ff0b4926188da6
+MISC ChangeLog-2015 1953 SHA256 331e875a6e559e1bbb00d546db8f384543ebf9d3ea2de05fbb7918600e59690c SHA512 d510294259cdc744bf850181b6b800beca1d8a25da73193247ebd72d0351fe24fa5777d892955cefe6001d5246f2e70db06d6f74f708e939d9bbe9c4aa9fe144 WHIRLPOOL f631a8f1ed9e91e08922405af2a8ee385c9e2bdd2e2e18ad707578da998e1a5507586f50bfa297c808f77a20c8b02d1cb363a817a237627eeb2400275e51d391
+MISC metadata.xml 216 SHA256 f7475919f28a8a93ec8bd025c8f8bbab918f66d0d1737420c876f0480308fe6a SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd WHIRLPOOL 163285b60aa93e00993af659dc1e29a9eb245bd3415dd5ec75b284250596165f469028102b72fa0c344834443a44c1bbcf6272fe6a3f5211f721fc96e1c6ec16
diff --git a/net-misc/tiers/files/tiers-1.1-gcc43.patch b/net-misc/tiers/files/tiers-1.1-gcc43.patch
new file mode 100644
index 000000000000..4f167daf13ce
--- /dev/null
+++ b/net-misc/tiers/files/tiers-1.1-gcc43.patch
@@ -0,0 +1,118 @@
+--- tiers1.1b/src/tiers_create.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_create.cc	2009-01-21 03:57:39.000000000 -0400
+@@ -16,7 +16,7 @@
+ //////////////////////////////////////////////////////////////////////////////
+ 
+ // tiers.cc
+-#include <iostream.h>
++#include <iostream>
+ 
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+--- tiers1.1b/src/tiers.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers.cc	2009-01-21 03:57:22.000000000 -0400
+@@ -17,8 +17,9 @@
+ 
+ // tiers.cc
+ 
+-#include <iostream.h>
+-#include <limits.h>
++#include <iostream>
++#include <cstdlib>
++#include <climits>
+ 
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+--- tiers1.1b/src/tiers_misc.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_misc.cc	2009-01-21 04:07:21.000000000 -0400
+@@ -16,9 +16,9 @@
+ //////////////////////////////////////////////////////////////////////////////
+ 
+ // tiers_misc.cc
+-#include <iostream.h>
+-#include <math.h>
+-#include <limits.h>	// for ULONG_MAX
++#include <iostream>
++#include <cmath>
++#include <climits>	// for ULONG_MAX
+ 
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+--- tiers1.1b/src/tiers_main.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_main.cc	2009-01-21 04:08:13.000000000 -0400
+@@ -17,9 +17,9 @@
+ 
+ // tiers_main.cc
+ 
+-#include <iostream.h>
+-#include <stdlib.h>	// for strtoul
+-#include <math.h>		// for random
++#include <iostream>
++#include <cstdlib>	// for strtoul
++#include <cmath>	// for random
+ 
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+--- tiers1.1b/src/tiers_output.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_output.cc	2009-01-21 04:00:09.000000000 -0400
+@@ -17,7 +17,7 @@
+ 
+ // tiers_output.cc
+ 
+-#include <iostream.h>
++#include <iostream>
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+ #endif
+--- tiers1.1b/src/tiers_output_gnuplot.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_output_gnuplot.cc	2009-01-21 04:00:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ 
+ // tiers_output_gnuplot.cc
+ 
+-#include <iostream.h>
++#include <iostream>
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+ #endif
+--- tiers1.1b/src/tiers_prims.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_prims.cc	2009-01-21 04:10:24.000000000 -0400
+@@ -17,9 +17,9 @@
+ 
+ // tiers_prims.cc
+ 
+-#include <iostream.h>
+-#include <math.h>	// for random
+-#include <limits.h>	// for ULONG_MAX
++#include <iostream>
++#include <cmath>	// for random
++#include <climits>	// for ULONG_MAX
+ 
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+--- tiers1.1b/src/tiers_red_intra.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_red_intra.cc	2009-01-21 04:01:21.000000000 -0400
+@@ -17,8 +17,8 @@
+ 
+ // tiers_red_intra.cc
+ 
+-#include <iostream.h>
+-#include <limits.h>	// for ULONG_MAX
++#include <iostream>
++#include <climits>	// for ULONG_MAX
+ 
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+--- tiers1.1b/src/tiers_red_inter.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_red_inter.cc	2009-01-21 04:01:46.000000000 -0400
+@@ -17,8 +17,8 @@
+ 
+ // tiers_red_inter.cc
+ 
+-#include <iostream.h>
+-#include <limits.h>	// for ULONG_MAX
++#include <iostream>
++#include <climits>	// for ULONG_MAX
+ 
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
diff --git a/net-misc/tiers/files/tiers1.1-gccfixes.patch b/net-misc/tiers/files/tiers1.1-gccfixes.patch
new file mode 100644
index 000000000000..db340cad1f04
--- /dev/null
+++ b/net-misc/tiers/files/tiers1.1-gccfixes.patch
@@ -0,0 +1,201 @@
+diff -urN tiers1.1/src/Makefile tiers1.1.new/src/Makefile
+--- tiers1.1/src/Makefile	1997-07-12 23:22:30.000000000 -0700
++++ tiers1.1.new/src/Makefile	2004-01-11 04:56:33.000000000 -0800
+@@ -31,7 +31,9 @@
+ # flags
+ #
+ #FLAGS= -fconserve-space -fno-inline -Wall -Winline -Wpointer-arith -g -DDEBUG
+-FLAGS= -g -fconserve-space
++FLAGS = $(CFLAGS) -fPIC #-g -fconserve-space
++CONFIGFILE = ./tiers_config
++FLAGS += -DCONFIGFILE="\"$(CONFIGFILE)\""
+ 
+ #
+ # tools
+diff -urN tiers1.1/src/tiers.cc tiers1.1.new/src/tiers.cc
+--- tiers1.1/src/tiers.cc	1997-03-04 13:54:18.000000000 -0800
++++ tiers1.1.new/src/tiers.cc	2004-01-11 04:56:33.000000000 -0800
+@@ -24,6 +24,7 @@
+ #include "tiers.hh"
+ #endif
+ 
++#include "tiers_vars.hh"
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////
+@@ -506,4 +507,3 @@
+ }
+   
+ // end of file
+-
+diff -urN tiers1.1/src/tiers.hh tiers1.1.new/src/tiers.hh
+--- tiers1.1/src/tiers.hh	1998-01-12 02:10:46.000000000 -0800
++++ tiers1.1.new/src/tiers.hh	2004-01-11 04:56:33.000000000 -0800
+@@ -20,6 +20,8 @@
+ #ifndef _TIERS_HH
+ #define _TIERS_HH
+ 
++using namespace std;
++
+ 
+ ////////////////////////////////////////////////////////////////////////
+ // Model
+@@ -264,46 +266,46 @@
+ // Defined in tiers_config.cc
+ 
+ // Type of output produced by the model, e.g. Model::GENERIC, Model::GNUPLOT
+-Model::OpType OP_TYPE;
++extern Model::OpType OP_TYPE;
+ 
+ // If set, TIERS_VERBOSE causes the output to contain the
+ // parameters used to generate the model and helpful headings
+ // If undefined, the output is a simple list of nodes and edges
+-bool TIERS_VERBOSE;
++extern bool TIERS_VERBOSE;
+ 
+ // If set, TIERS_LABEL_XXX causes the output to contain a label for
+ // each of the nodes of type XXX
+-bool TIERS_LABEL_WAN;
+-bool TIERS_LABEL_MAN;
+-bool TIERS_LABEL_LAN;
++extern bool TIERS_LABEL_WAN;
++extern bool TIERS_LABEL_MAN;
++extern bool TIERS_LABEL_LAN;
+ 
+ 
+ // If defined as true, the operation of the model is more verbose
+ // If undefined, the model should run with no debugging output
+-bool TIERS_DEBUG;
++extern bool TIERS_DEBUG;
+ 
+ // If defined as true, then an undirected list of edges is produced in the 
+ // output, i.e. the edges (i,j) and (j,i) only appear once in the output
+ // Note that all LAN edges are assumed bidirectional
+-bool REMOVE_DUP_EDGES;
++extern bool REMOVE_DUP_EDGES;
+ 
+ // Set these true to apply proxmity tests to nodes in each network type
+-bool PROXIMITY_TEST_WAN;
+-bool PROXIMITY_TEST_MAN;
+-bool PROXIMITY_TEST_LAN;
++extern bool PROXIMITY_TEST_WAN;
++extern bool PROXIMITY_TEST_MAN;
++extern bool PROXIMITY_TEST_LAN;
+ 
+ // The size of a unit in WAN, MAN and LAN grids
+ // e.g. 1000km, 1km, 1m would be best, but the current values fit with 
+ // typical int sizes
+-unsigned long int WAN_SCALE;
+-unsigned long int MAN_SCALE;
+-unsigned long int LAN_SCALE;	
++extern unsigned long int WAN_SCALE;
++extern unsigned long int MAN_SCALE;
++extern unsigned long int LAN_SCALE;	
+ 
+ // GRID is the size of the square grid on which points are placed
+-unsigned long int GRID;
++extern unsigned long int GRID;
+ 
+ // The comment character for output
+-char COM;
++extern char COM;
+ 
+ 
+ //
+@@ -311,13 +313,13 @@
+ //
+ 
+ // The output directory for results from gnuplot
+-char *title;
++extern char *title;
+ 
+ // The title for results from gnuplot
+-char *outputdir;
++extern char *outputdir;
+ 
+ // Create a unique identifier for each model
+-long int ModelId;
++extern long int ModelId;
+ 
+ // Forward declaration
+ unsigned long int max(unsigned long int A, unsigned long int B);
+diff -urN tiers1.1/src/tiers_config.cc tiers1.1.new/src/tiers_config.cc
+--- tiers1.1/src/tiers_config.cc	1997-07-13 02:55:53.000000000 -0700
++++ tiers1.1.new/src/tiers_config.cc	2004-01-11 04:58:36.000000000 -0800
+@@ -17,7 +17,8 @@
+ 
+ // tiers_config.cc
+ 
+-#include <fstream.h>	// for ifstream
++#include <fstream>	// for ifstream
++#include <iostream>	// for ifstream
+ #include <string.h>	// for strcpy
+ #include <stdlib.h>	// for strtoul
+ 
+@@ -36,10 +37,13 @@
+ {
+   bool ret = true;
+ 
+-  ifstream config_file("./tiers_config");
++#ifndef CONFIGFILE
++#error You need to define CONFIGFILE on the commandline
++#endif
++  ifstream config_file(CONFIGFILE);
+   if (!config_file)
+ 	{
+-	  cerr << "Tiers:: cannot open file './tiers_config'" << endl;
++	  cerr << "Tiers:: cannot open file '" << CONFIGFILE << "'" << endl;
+ 	}
+ 
+   // Read the contents of the file in, skipping blank lines or lines which 
+diff -urN tiers1.1/src/tiers_main.cc tiers1.1.new/src/tiers_main.cc
+--- tiers1.1/src/tiers_main.cc	1997-07-06 00:58:31.000000000 -0700
++++ tiers1.1.new/src/tiers_main.cc	2004-01-11 04:56:33.000000000 -0800
+@@ -25,11 +25,11 @@
+ #include "tiers.hh"
+ #endif
+ 
+-extern "C" 
+-{
+-  long int time(int dummy);
+-  char * initstate(unsigned seed, char *state, int n);
+-}
++//extern "C" 
++//{
++//  long int time(int dummy);
++//  char * initstate(unsigned seed, char *state, int n);
++//}
+ 
+ unsigned long int NW;	// maximum number of WANs, currently 1
+ unsigned long int NM;	// maximum number of MANs per WAN
+@@ -63,7 +63,7 @@
+   cout.setf( ios::unitbuf );
+ 
+ // TIERS_VERBOSE
+-#ifdef 0 
++#ifdef FALSE
+   cout << "Main:: Processing arguments. Arguments are:"
+        << endl;
+   for (int i = 0; i < argc; i++)
+diff -urN tiers1.1/src/tiers_vars.hh tiers1.1.new/src/tiers_vars.hh
+--- tiers1.1/src/tiers_vars.hh	1969-12-31 16:00:00.000000000 -0800
++++ tiers1.1.new/src/tiers_vars.hh	2004-01-11 04:56:33.000000000 -0800
+@@ -0,0 +1,18 @@
++Model::OpType OP_TYPE;
++bool TIERS_VERBOSE;
++bool TIERS_LABEL_WAN;
++bool TIERS_LABEL_MAN;
++bool TIERS_LABEL_LAN;
++bool TIERS_DEBUG;
++bool REMOVE_DUP_EDGES;
++bool PROXIMITY_TEST_WAN;
++bool PROXIMITY_TEST_MAN;
++bool PROXIMITY_TEST_LAN;
++unsigned long int WAN_SCALE;
++unsigned long int MAN_SCALE;
++unsigned long int LAN_SCALE;	
++unsigned long int GRID;
++char COM;
++char *title;
++char *outputdir;
++long int ModelId;
diff --git a/net-misc/tiers/metadata.xml b/net-misc/tiers/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/net-misc/tiers/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/tiers/tiers-1.1.ebuild b/net-misc/tiers/tiers-1.1.ebuild
new file mode 100644
index 000000000000..fc8a2d38b9dc
--- /dev/null
+++ b/net-misc/tiers/tiers-1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+MY_P="${PN}${PV}"
+DESCRIPTION="Random network topography generator"
+HOMEPAGE="http://www.isi.edu/nsnam/ns/ns-topogen.html#tiers"
+SRC_URI="http://www.isi.edu/nsnam/dist/topogen/${MY_P}.tar.gz
+		 http://www.isi.edu/nsnam/dist/topogen/tiers2ns-lan.awk"
+
+LICENSE="mapm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="sys-devel/gcc"
+RDEPEND="virtual/awk
+	sci-visualization/gnuplot"
+
+S=${WORKDIR}/${PN}${PV}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${MY_P}-gccfixes.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	sed -e '1a\#!/bin/sh' -e '1d' -e "s|-f |-f /usr/share/${PN}/|g" -i "${S}"/bin/strip4gnuplot3.5
+}
+
+src_compile() {
+	cd "${S}"/src
+	emake CFLAGS="${CFLAGS}" CONFIGFILE="/etc/tiers-gnuplot.conf" EXEC="../bin/tiers-gnuplot" || die
+	# cleanup for a sec
+	rm *.o
+	emake CFLAGS="${CFLAGS}" CONFIGFILE="/etc/tiers.conf" EXEC="../bin/tiers" || die
+}
+
+src_install() {
+	dobin bin/tiers bin/tiers-gnuplot bin/strip4gnuplot3.5
+	insinto /etc
+	newins src/tiers_config.generic tiers.conf
+	newins src/tiers_config.gnuplot tiers-gnuplot.conf
+	insinto /usr/share/${PN}
+	doins bin/*.awk "${DISTDIR}"/tiers2ns-lan.awk
+	dodoc CHANGES COPYRIGHT README docs/*
+}