commit: ebce91a9a86fe3e63561734ff902fc51f478e08c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 26 13:07:33 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Oct 26 13:07:33 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ebce91a9
buildsys: properly disable qglsa applet
.depend | 2 +-
Makefile.am | 3 +++
applets.h | 4 +++-
include_applets.h | 1 -
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.depend b/.depend
index 5de684d..f823923 100644
--- a/.depend
+++ b/.depend
@@ -7,4 +7,4 @@ main.o: main.c porting.h main.h libq/libq.c libq/busybox.h
libq/i18n.h \
libq/prelink.c libq/profile.c libq/vdb.c libq/vdb_get_next_dir.c \
libq/virtuals.c applets.h include_applets.h q.c qcheck.c qdepends.c \
qfile.c qlist.c qlop.c qsearch.c qsize.c qtbz2.c quse.c qxpak.c qpkg.c \
- qgrep.c qatom.c qmerge.c qcache.c qglsa.c qtegrity.c
+ qgrep.c qatom.c qmerge.c qcache.c qtegrity.c
diff --git a/Makefile.am b/Makefile.am
index 425a018..db20879 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,6 +76,7 @@ dist_man_MANS += \
man/qsearch.1 \
man/qsize.1 \
man/qtbz2.1 \
+ man/qtegrity.1 \
man/quse.1 \
man/qxpak.1
APPLETS += \
@@ -164,6 +165,8 @@ EXTRA_DIST += \
tests/atom_explode/basic.good \
tests/atom_explode/basic.tests \
tests/atom_explode/dotest \
+ tests/atom_explode/ebuildlist.xz \
+ tests/atom_explode/portageatoms.xz \
tests/atom_explode/test.c \
tests/copy_file/.gitignore \
tests/copy_file/Makefile \
diff --git a/applets.h b/applets.h
index daf7047..14b0154 100644
--- a/applets.h
+++ b/applets.h
@@ -30,7 +30,7 @@ DECLARE_APPLET(qgrep)
DECLARE_APPLET(qatom)
DECLARE_APPLET(qmerge)
DECLARE_APPLET(qcache)
-DECLARE_APPLET(qglsa) /* disable */
+/*DECLARE_APPLET(qglsa) disable */
DECLARE_APPLET(qtegrity)
#undef DECLARE_APPLET
@@ -52,7 +52,9 @@ static const struct applet_t {
{"qcheck", qcheck_main, "<pkgname>", "verify integrity of
installed packages"},
{"qdepends", qdepends_main, "<pkgname>", "show dependency
info"},
{"qfile", qfile_main, "<filename>", "list all pkgs owning
files"},
+ /*
{"qglsa", qglsa_main, "<action> <list>", "check GLSAs against
system"},
+ */
{"qgrep", qgrep_main, "<misc args>", "grep in ebuilds"},
{"qlist", qlist_main, "<pkgname>", "list files owned by
pkgname"},
{"qlop", qlop_main, "<pkgname>", "emerge log analyzer"},
diff --git a/include_applets.h b/include_applets.h
index 6ff8f8a..916e5f7 100644
--- a/include_applets.h
+++ b/include_applets.h
@@ -14,5 +14,4 @@
#include "qatom.c"
#include "qmerge.c"
#include "qcache.c"
-#include "qglsa.c"
#include "qtegrity.c"
