gentoo resync : 31.01.2018

4 files changed, 125 insertions, 58 deletions

diff --git a/net-analyzer/nast/Manifest b/net-analyzer/nast/Manifest
index e7e4abdcbe64..f6e2c3c57fc3 100644
--- a/net-analyzer/nast/Manifest
+++ b/net-analyzer/nast/Manifest
@@ -1,4 +1,5 @@
-AUX nast-0.2.0-gentoo.patch 3029 BLAKE2B 5a3e2974f3d4681dbd762e420878353b72f8a466630112e7b6ce4a32a81e59c7bae2568ae8c00a8438efc892be7fddfac2715bc1b3973a72cca38ca9ecf1849c SHA512 fbbd0b5d8426bacf64958032381d5d236d26985802b5c86327fd4102742563a56c7cb873e0f51758b1e2c3ed53d6bf7b57da497eaa401f5ed4eb32941d22adb1
+AUX nast-0.2.0-gentoo.patch 3056 BLAKE2B e64a4e76fb4c9b0bb4e325f5addae07d740f8b4d6dc76a4011e16a9dddcff137f5a3fba013f8d29db342cd08b37228e2daf7e78b18607e385e71b9eb7b84a4c4 SHA512 9ce75c031dde2a8460d187ee082d182d9aa60524475ca1a5972dce5e4b20c68275c90dfc7a7fec5ae2585a5815ca4dc2a9e059ba31de64ad4f890f811cfea4c3
 DIST nast-0.2.0.tar.gz 147568 BLAKE2B f51a0b3cebfac04cb3aa57f627099aecf893722ca8552c0e6f7f67266e13729e5c54c533cd7599c6d7cfa50c89ad5181439d4c1bc5bba883438213b45b4221ee SHA512 fbf29f9c2ae783e38d40054577a697f631c6590075ef80aa970002f1133c681a4cc1fcd715bc6140cc361c609dcebe8c6bf74544e8710363d30649398b3e388c
-EBUILD nast-0.2.0-r1.ebuild 744 BLAKE2B d2f84616a130610850c0ed17c7b027627dac6efb921a4fcb80fba38c533bdc483e71a899adaafef270879e492837e9e599b9e3e077c8357c3e448bc06a4e6d37 SHA512 5403f70c4b64204494a85443366348be0ef2fe02963d986f7487485141642d619c3042019e322f6ef0d0e8c5e9a2438bab79b944a2a113a30945e15d57a7a127
+EBUILD nast-0.2.0-r1.ebuild 746 BLAKE2B 1ce039f23876bf15ca06f509a6ecfaa8fa60337f818b33074e2426b9fb27aaf337f3f8e787cffe6c47b09c8c0e884d367adffb2999c1942097a802c32d140d18 SHA512 a28997e6077a1fc61467289fbbd584a01343fb2ff7561b3c09941175bc7a8a84ad5812f382cc8b62283dcde0374913954cf7b1901b13efaf8bc9cb49e408aca8
+EBUILD nast-0.2.0-r2.ebuild 754 BLAKE2B 09ec474b2d1d620508804a6e8e2cdb970b8e8cfc0ea3ef8588165e97bb24b8d4419969f54a7f381a06043427de7af5440fa5eb40cec849aa1a09c5397391ff50 SHA512 29526619e81a3eaafd2dd618566abec177ab7aa12d9cc4a5313f719bb1b8bdd0b0963a02134c3f6311a2e079677e8d51d01a2c434d331abb9b1e60074b906785
 MISC metadata.xml 362 BLAKE2B 71e940947887c3c558f6c84124909fef707dd02fd9fbaee18d58df8c0bcef64e01bb65731c64def6d619392b6ed35b2232054e31d63c3c3ab8a59e70c1a36276 SHA512 594d05be889c3a8d6019ee0762773f8abb71f4da276c3a546704ae4e073856fa404f5f9b466502b19423ac9e7f00ad8c2ef85d4adbfebf7fdd0184189e454148
diff --git a/net-analyzer/nast/files/nast-0.2.0-gentoo.patch b/net-analyzer/nast/files/nast-0.2.0-gentoo.patch
index f8f05ab3a16c..015354e51862 100644
--- a/net-analyzer/nast/files/nast-0.2.0-gentoo.patch
+++ b/net-analyzer/nast/files/nast-0.2.0-gentoo.patch
@@ -1,79 +1,104 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -84,14 +84,14 @@
+@@ -83,22 +83,6 @@
+ # -- libnet --
  #
  
- filechk="yes"
+-filechk="yes"
 -AC_CHECK_FILE(/usr/lib/libnet.a,, filechk="no")
-+AC_CHECK_FILE(/usr/lib/libnet.so,, filechk="no")
- if test "$filechk" = "no"; then
+-if test "$filechk" = "no"; then
 - AC_CHECK_FILE(/usr/local/lib/libnet.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
-+ AC_CHECK_FILE(/usr/local/lib/libnet.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
- fi
- 
- if test "$filechk" = "no"; then AC_MSG_ERROR([
- 
+-fi
+-
+-if test "$filechk" = "no"; then AC_MSG_ERROR([
+-
 -Libnet archive file (libnet.a) not found in /usr or /usr/local!
-+Libnet archive file (libnet.so) not found in /usr or /usr/local!
- 
- Libnet-1.1.x Packet Shaping Library is required.
- You can download it from official web site: http://www.packetfactory.net/libnet
-@@ -111,14 +111,14 @@
+-
+-Libnet-1.1.x Packet Shaping Library is required.
+-You can download it from official web site: http://www.packetfactory.net/libnet
+-
+-])
+-fi
+-
+ AC_CHECK_LIB(net, libnet_name2addr4,, AC_MSG_ERROR([
+ 
+ Libnet-1.1.x Packet Shaping Library not found! It's required.
+@@ -110,22 +94,6 @@
+ # -- libpcap --
  #
  
- filechk="yes"
+-filechk="yes"
 -AC_CHECK_FILE(/usr/lib/libpcap.a,, filechk="no")
-+AC_CHECK_FILE(/usr/lib/libpcap.so,, filechk="no")
- if test "$filechk" = "no"; then
+-if test "$filechk" = "no"; then
 - AC_CHECK_FILE(/usr/local/lib/libpcap.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
-+ AC_CHECK_FILE(/usr/local/lib/libpcap.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
- fi
- 
- if test "$filechk" = "no"; then AC_MSG_ERROR([
- 
+-fi
+-
+-if test "$filechk" = "no"; then AC_MSG_ERROR([
+-
 -Libpcap archive file (libpcap.a) not found in /usr or /usr/local!
-+Libpcap archive file (libpcap.so) not found in /usr or /usr/local!
- 
- Libpcap-0.7.1 Packet Capture Library is required. 
- You can download it from official web site: http://www.tcpdump.org/#current
-@@ -137,16 +137,18 @@
+-
+-Libpcap-0.7.1 Packet Capture Library is required. 
+-You can download it from official web site: http://www.tcpdump.org/#current
+-
+-])
+-fi
+-
+ AC_CHECK_LIB(pcap, pcap_dispatch,, AC_MSG_ERROR([
+ 
+ Libpcap-0.7.1 Packet Capture Library not found! It's required. 
+@@ -137,25 +105,7 @@
  # -- libncurses support --
  #
  
-+PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],)
-+
- filechk="yes"
+-filechk="yes"
 -AC_CHECK_FILE(/usr/lib/libncurses.a,, filechk="no")
-+AC_CHECK_FILE(/usr/lib/libncurses.so,, filechk="no")
- if test "$filechk" = "no"; then
+-if test "$filechk" = "no"; then
 - AC_CHECK_FILE(/usr/local/lib/libncurses.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
-+ AC_CHECK_FILE(/usr/local/lib/libncurses.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
- fi
- 
- if test "$filechk" = "no"; 
- then AC_MSG_WARN([
- 
+-fi
+-
+-if test "$filechk" = "no"; 
+-then AC_MSG_WARN([
+-
 -Libncurses archive file (libncurses.a) not found in /usr or /usr/local!
-+Libncurses archive file (libncurses.so) not found in /usr or /usr/local!
+-
+-Ncurses library (*) not found in your system.
+-You can download it from official web site: http://www.gnu.org/software/ncurses/ncurses.html
+-(*): CRT screen handling and optimization package
+-
+-Building without ncurses menu support (-G flag will doesn't work)
+-
+-])
+-fi
++PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],)
  
- Ncurses library (*) not found in your system.
- You can download it from official web site: http://www.gnu.org/software/ncurses/ncurses.html
-@@ -174,15 +176,15 @@
+ ENABLE_NCRS="no"
+ AC_CHECK_LIB(ncurses, initscr, ENABLE_NCRS="yes"; NCURSES=ncurses/n_nast.o; LIBS="-lncurses $LIBS"; AC_DEFINE(HAVE_LIBNCURSES), AC_MSG_RESULT([
+@@ -173,28 +123,6 @@
+ #  --lmenu support--
  #
  
- filechk="yes"
+-filechk="yes"
 -AC_CHECK_FILE(/usr/lib/libmenu.a,, filechk="no")
-+AC_CHECK_FILE(/usr/lib/libmenu.so,, filechk="no")
- if test "$filechk" = "no"; then
+-if test "$filechk" = "no"; then
 - AC_CHECK_FILE(/usr/local/lib/libmenu.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
-+ AC_CHECK_FILE(/usr/local/lib/libmenu.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
- fi
- 
- if test "$filechk" = "no"; 
- then AC_MSG_WARN([
- 
+-fi
+-
+-if test "$filechk" = "no"; 
+-then AC_MSG_WARN([
+-
 -Menu archive file (libncurses.a) not found in /usr or /usr/local!
-+Menu archive file (libncurses.so) not found in /usr or /usr/local!
- 
+-
+-
+-Menu library (*) not found in your system.
+-You can download it from official web site: http://www.gnu.org/software/ncurses/ncurses.html
+-(*): CRT screen handling and optimization package
+-
+-
+-Building without ncurses menu support (-G flag will doesn't work)
+-])
+-
+-fi
+-
+ ENABLE_NCRS="no"
+ AC_CHECK_LIB(menu, menu_opts_off, ENABLE_NCRS="yes"; MENU=ncurses/n_menu.o; LIBS="-lmenu $LIBS"; AC_DEFINE(HAVE_LIBMENU), AC_MSG_RESULT([
  
- Menu library (*) not found in your system.
diff --git a/net-analyzer/nast/nast-0.2.0-r1.ebuild b/net-analyzer/nast/nast-0.2.0-r1.ebuild
index 1b4c53803c5b..9eefa451cd9c 100644
--- a/net-analyzer/nast/nast-0.2.0-r1.ebuild
+++ b/net-analyzer/nast/nast-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ IUSE="ncurses"
 RDEPEND="
 	>=net-libs/libnet-1.1.1
 	net-libs/libpcap
-	ncurses? ( >=sys-libs/ncurses-5.4 )
+	ncurses? ( >=sys-libs/ncurses-5.4:= )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-analyzer/nast/nast-0.2.0-r2.ebuild b/net-analyzer/nast/nast-0.2.0-r2.ebuild
new file mode 100644
index 000000000000..493d47ee9f4b
--- /dev/null
+++ b/net-analyzer/nast/nast-0.2.0-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="NAST - Network Analyzer Sniffer Tool"
+HOMEPAGE="https://sourceforge.net/projects/nast.berlios/"
+SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ncurses"
+
+RDEPEND="
+	>=net-libs/libnet-1.1.1
+	net-libs/libpcap
+	ncurses? ( >=sys-libs/ncurses-5.4:= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dosbin nast
+	doman nast.8
+	dodoc AUTHORS BUGS CREDITS ChangeLog NCURSES_README README TODO
+}