net-analyzer/ntopng: fixes problems with hardcoded g++ calls

Thanks to Thomas Deutschmann this should finally fixes problems with 600246.

Package-Manager: portage-2.3.2

diff --git a/net-analyzer/ntopng/metadata.xml b/net-analyzer/ntopng/metadata.xml
index 9b7a6e84d80c8a2f388a701d4d20a77ca89fd7b4..cab61f7e001dc9cec419c8f873124f530fad09b8 100644 (file)
--- a/net-analyzer/ntopng/metadata.xml
+++ b/net-analyzer/ntopng/metadata.xml
@@ -7,7 +7,4 @@
   <upstream>
     <remote-id type="sourceforge">ntop</remote-id>
   </upstream>
-  <use>
-    <flag name="redis">Enable REDIS support</flag>
-  </use>
 </pkgmetadata>

diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild b/net-analyzer/ntopng/ntopng-2.4.ebuild
index 6f8199cb47ff96aca9d375d47cf4f9540a297de4..75e58cca8c34c78bf4d53d858f22ccd30d4dc415 100644 (file)
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.4.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit autotools eutils user
+inherit autotools eutils user toolchain-funcs
 
 DESCRIPTION="Network traffic analyzer with web interface"
 HOMEPAGE="http://www.ntop.org/"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="redis"
+IUSE=""
 
 DEPEND="dev-db/sqlite:3
        dev-python/pyzmq
@@ -20,14 +20,14 @@ DEPEND="dev-db/sqlite:3
        dev-libs/json-c
        dev-libs/geoip
        dev-libs/glib:2
-       redis? ( dev-libs/hiredis )
+       dev-libs/hiredis
        dev-libs/libxml2
        net-analyzer/rrdtool
        net-libs/libpcap
        net-misc/curl
        virtual/libmysqlclient"
 RDEPEND="${DEPEND}
-       redis? ( dev-db/redis )"
+       dev-db/redis"
 
 S="${WORKDIR}/${P}-stable"
 
@@ -44,6 +44,7 @@ src_prepare() {
 }
 
 src_configure() {
+       tc-export CC CXX LD NM OBJDUMP PKG_CONFIG
        cd "${S}/nDPI"
        econf
        cd "${S}"