commit: c69e9b1346e6c0e02b363de277e5b60986bf1789
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 6 11:36:23 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Sep 6 11:36:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c69e9b13
net-analyzer/ntopng: Clean up patches.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-analyzer/ntopng/files/ntopng-2.4-cxx.patch | 10 +++---
.../ntopng/files/ntopng-2.4-dont-build-ndpi.patch | 4 +--
.../ntopng/files/ntopng-2.4-mysqltool.patch | 4 +--
...configure-3.0.patch => ntopng-3.0-gentoo.patch} | 6 ++--
.../ntopng/files/ntopng-3.0-mysqltool.patch | 4 +--
.../{ntopng-3.0.ebuild => ntopng-3.0-r1.ebuild} | 40 ++++++----------------
6 files changed, 22 insertions(+), 46 deletions(-)
diff --git a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
index 330f681e754..6de1a43f9b8 100644
--- a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
+++ b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
@@ -1,6 +1,5 @@
-diff -ru ntopng-2.4-stable.orig/configure.ac ntopng-2.4-stable/configure.ac
---- ntopng-2.4-stable.orig/configure.ac 2016-11-20 03:59:19.928851928
-0800
-+++ ntopng-2.4-stable/configure.ac 2016-11-20 03:59:53.717850915 -0800
+--- a/configure.ac
++++ b/configure.ac
@@ -341,14 +341,6 @@
GMAKE="make"
fi
@@ -16,9 +15,8 @@ diff -ru ntopng-2.4-stable.orig/configure.ac
ntopng-2.4-stable/configure.ac
GIT=`which git`
if test x$GIT = x
then
-diff -ru ntopng-2.4-stable.orig/Makefile.in ntopng-2.4-stable/Makefile.in
---- ntopng-2.4-stable.orig/Makefile.in 2016-06-27 12:31:18.000000000 -0700
-+++ ntopng-2.4-stable/Makefile.in 2016-11-20 04:00:31.037849796 -0800
+--- a/Makefile.in
++++ b/Makefile.in
@@ -4,7 +4,6 @@
SHELL=/bin/sh
OS := $(shell uname -s)
diff --git a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
index b189cbabe28..ec628cd3224 100644
--- a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
+++ b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
@@ -1,5 +1,5 @@
---- configure.ac.old 2016-04-25 21:29:36.452888380 +0200
-+++ configure.ac 2016-04-25 21:30:04.679554971 +0200
+--- a/configure.ac.old
++++ b/configure.ac
@@ -62,13 +62,6 @@
fi
diff --git a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
index fd403a2c8bf..a80e966b85d 100644
--- a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
+++ b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig 2016-11-19 19:16:20.167724203 +0100
-+++ configure.ac 2016-11-19 19:16:32.684391101 +0100
+--- a/configure.ac
++++ b/configure.ac
@@ -302,13 +302,7 @@
if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
MYSQLTOOL="mariadb_config"
diff --git a/net-analyzer/ntopng/files/configure-3.0.patch
b/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch
similarity index 87%
rename from net-analyzer/ntopng/files/configure-3.0.patch
rename to net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch
index a2476f5b407..90d7aace545 100644
--- a/net-analyzer/ntopng/files/configure-3.0.patch
+++ b/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig 2017-06-09 06:47:34.214516588 +0200
-+++ configure.ac 2017-06-09 06:48:01.547849759 +0200
+--- a/configure.ac
++++ b/configure.ac
@@ -19,7 +19,6 @@
# On CentOS 6 `git rev-list HEAD --count` does not work
#
@@ -42,8 +42,6 @@
if test -d "/usr/include/openssl"; then :
AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl"
---- configure.ac.orig 2017-06-09 09:58:17.021114895 +0200
-+++ configure.ac 2017-06-09 09:58:24.227781519 +0200
@@ -53,15 +53,6 @@
SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto"
fi
diff --git a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
index e433f4e9559..4d2244b582b 100644
--- a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
+++ b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig 2017-06-09 09:52:26.387783657 +0200
-+++ configure.ac 2017-06-09 09:54:53.361116113 +0200
+--- a/configure.ac
++++ b/configure.ac
@@ -335,13 +335,7 @@
if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
MYSQLTOOL="mariadb_config"
diff --git a/net-analyzer/ntopng/ntopng-3.0.ebuild
b/net-analyzer/ntopng/ntopng-3.0-r1.ebuild
similarity index 61%
rename from net-analyzer/ntopng/ntopng-3.0.ebuild
rename to net-analyzer/ntopng/ntopng-3.0-r1.ebuild
index 234efdce69c..3fe29fa7818 100644
--- a/net-analyzer/ntopng/ntopng-3.0.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit autotools eutils user toolchain-funcs
+EAPI=6
+inherit autotools user toolchain-funcs
DESCRIPTION="Network traffic analyzer with web interface"
HOMEPAGE="http://www.ntop.org/";
@@ -11,7 +11,6 @@ SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
DEPEND="dev-db/sqlite:3
dev-python/pyzmq
@@ -28,38 +27,19 @@ DEPEND="dev-db/sqlite:3
virtual/libmysqlclient"
RDEPEND="${DEPEND}
dev-db/redis"
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-mysqltool.patch
+)
src_prepare() {
+ sed -e "s/@VERSION@/${PV}/g;s/@SHORT_VERSION@/${PV}/g" <
"${S}/configure.seed" > "${S}/configure.ac" || die
+
default
- cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed
"s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac"
- epatch "${FILESDIR}/configure-${PV}.patch"
- epatch "${FILESDIR}/${P}-mysqltool.patch"
-# epatch "${FILESDIR}/${P}-dont-build-ndpi.patch"
-# epatch "${FILESDIR}/${P}-mysqltool.patch"
-# epatch "${FILESDIR}/${P}-cxx.patch"
-# sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac"
- eautoreconf
-# cd "${S}/nDPI"
-# eautoreconf
+ eautoreconf
}
-# src_configure() {
-# tc-export CC CXX LD NM OBJDUMP PKG_CONFIG
-# cd "${S}/nDPI"
-# econf
-# cd "${S}"
-# econf
-# }
-#
-# src_compile() {
-# cd "${S}/nDPI"
-# emake
-#
-# cd "${S}"
-# emake
-# }
-
src_install() {
SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
dodir ${SHARE_NTOPNG_DIR}
@@ -88,5 +68,5 @@ pkg_setup() {
}
pkg_postinst() {
- elog "ntopng default creadential are user='admin' password='admin'"
+ elog "ntopng default credentials are user='admin' password='admin'"
}
