commit: 9869c57802fc123b8e785992106ea54fb65512bf Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sun Feb 17 12:53:34 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sun Feb 17 12:54:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9869c578
net-analyzer/argus-clients: Fix USE=mysql Package-Manager: Portage-2.3.60, Repoman-2.3.12 Fixes: https://bugs.gentoo.org/678214 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> .../argus-clients/argus-clients-3.0.8.2-r2.ebuild | 1 + .../argus-clients-3.0.8.2-curses-readline.patch | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild index 34882be08c0..42799057487 100644 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild +++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild @@ -39,6 +39,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch "${FILESDIR}"/${PN}-3.0.8.2-ar.patch + "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch ) src_prepare() { diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-curses-readline.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-curses-readline.patch new file mode 100644 index 00000000000..fc8d3d0ed6e --- /dev/null +++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-curses-readline.patch @@ -0,0 +1,21 @@ +--- a/examples/ramysql/Makefile.in ++++ b/examples/ramysql/Makefile.in +@@ -56,7 +56,8 @@ + + + MYSQLLIB = @MYSQL_LDFLAGS@ +-CURSESLIB = @CURSESLIB@ @V_READLINE@ ++CURSESLIB = @CURSESLIB@ ++V_READLINE = @V_READLINE@ + + + # Standard CFLAGS +@@ -94,7 +95,7 @@ + $(CC) $(CCOPT) -o $@ rasql.o $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB) + + $(INSTALLBIN)/rasqlinsert: rasqlinsert.o raclient.o $(LIB) +- $(CC) $(CCOPT) -o $@ raclient.o rasqlinsert.o @V_PCRE@ $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB) $(CURSESLIB) ++ $(CC) $(CCOPT) -o $@ raclient.o rasqlinsert.o @V_PCRE@ $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB) $(CURSESLIB) $(V_READLINE) + + $(INSTALLBIN)/rasqltimeindex: rasqltimeindex.o $(LIB) + $(CC) $(CCOPT) -o $@ rasqltimeindex.o @V_PCRE@ $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB)