use the APPLET_ define style to enable/disable applets as solar was doing before

21 files changed, 58 insertions, 82 deletions

diff --git a/.depend b/.depend
index e36701e6..cba57cb0 100644
--- a/.depend
+++ b/.depend
@@ -2,6 +2,4 @@ main.o: main.c libq/libq.c libq/busybox.h libq/i18n.h libq/libq.h \
   libq/colors.c libq/xmalloc.c libq/xstrdup.c libq/xasprintf.c \
   libq/hash_fd.c libq/md5_sha1_sum.c libq/human_readable.c libq/rmspace.c \
   libq/atom_explode.c libq/atom_compare.c libq/vdb_get_next_dir.c \
-  libq/virtuals.c applets.h config.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 qglsa.c
+  libq/virtuals.c applets.h config.h
diff --git a/Makefile b/Makefile
index 627423ad..7e562d4c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Copyright 2005-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-projects/portage-utils/Makefile,v 1.41 2006/01/24 23:35:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-projects/portage-utils/Makefile,v 1.42 2006/01/25 01:51:42 vapier Exp $
 ####################################################################
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -46,11 +46,11 @@ HFLAGS    += -DVERSION=\"$(PV)\"
 endif
 
 #####################################################
-APPLETS_SHELL := sed -n '/^DECLARE_APPLET/s:.*(\(.*\)).*:\1:p' applets.h
-APPLETS   := $(shell $(APPLETS_SHELL))
+APPLETS   := $(shell sed -n '/^DECLARE_APPLET/s:.*(\(.*\))$$:\1:p' applets.h)
 SRC       := $(APPLETS:%=%.c) main.c
 MPAGES    := man/q.1
-HFLAGS += $(shell for x in $(APPLETS) ; do echo -n "-DAPPLET_$$x "; done)
+HFLAGS    += $(foreach a,$(APPLETS),-DAPPLET_$a)
+
 all: q
 	@:
 
@@ -66,7 +66,7 @@ endif
 	@$(CC) $(WFLAGS) $(LDFLAGS) $(CFLAGS) $(HFLAGS) main.c -o q
 
 depend:
-	$(APPLETS_SHELL) | sed -e 's:^:#include ":;s:$$:.c":' > include_applets.h
+	sed -n '/^DECLARE_APPLET/s:.*(\(.*\)).*:#include "\1.c":p' applets.h > include_applets.h
 	@#$(CC) $(CFLAGS) -MM $(SRC) > .depend
 	$(CC) $(HFLAGS) $(CFLAGS) -MM main.c > .depend
 
diff --git a/applets.h b/applets.h
index 137386e8..7d8adedf 100644
--- a/applets.h
+++ b/applets.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/applets.h,v 1.13 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/applets.h,v 1.14 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
@@ -29,8 +29,8 @@ DECLARE_APPLET(qxpak)
 DECLARE_APPLET(qpkg)
 DECLARE_APPLET(qgrep)
 DECLARE_APPLET(qatom)
-DECLARE_APPLET(qmerge)
-DECLARE_APPLET(qglsa)
+DECLARE_APPLET(qmerge) /* disable */
+DECLARE_APPLET(qglsa) /* disable */
 #undef DECLARE_APPLET
 
 struct applet_t {
diff --git a/config.h b/config.h
deleted file mode 100644
index adf1cdde..00000000
--- a/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* control which applets to include
- *
- * #undef OMIT_QFOO  -> include QFOO
- * #define OMIT_QBAR -> disable QBAR
- */
-
-#undef OMIT_QATOM
-#undef OMIT_QCHECK
-#undef OMIT_QDEPENDS
-#undef OMIT_QFILE
-#define OMIT_QGLSA
-#undef OMIT_QGREP
-#undef OMIT_QLIST
-#undef OMIT_QLOP
-#define OMIT_QMERGE
-#undef OMIT_QPKG
-#undef OMIT_QSEARCH
-#undef OMIT_QSIZE
-#undef OMIT_QTBZ2
-#undef OMIT_QUSE
-#undef OMIT_QXPAK
diff --git a/main.c b/main.c
index 0983292c..2b6bb46c 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.102 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.103 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
@@ -983,5 +983,4 @@ int main(int argc, char **argv)
 	return q_main(argc, argv);
 }
 
-#include "config.h"
 #include "include_applets.h"
diff --git a/qatom.c b/qatom.c
index 940562c6..50064fa5 100644
--- a/qatom.c
+++ b/qatom.c
@@ -1,13 +1,13 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qatom.c,v 1.3 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qatom.c,v 1.4 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#ifndef OMIT_QATOM
+#ifdef APPLET_qatom
 
 #define QATOM_FLAGS "c" COMMON_FLAGS
 static struct option const qatom_long_opts[] = {
@@ -19,7 +19,7 @@ static const char *qatom_opts_help[] = {
 	COMMON_OPTS_HELP
 };
 
-static const char qatom_rcsid[] = "$Id: qatom.c,v 1.3 2006/01/24 23:35:08 vapier Exp $";
+static const char qatom_rcsid[] = "$Id: qatom.c,v 1.4 2006/01/25 01:51:42 vapier Exp $";
 #define qatom_usage(ret) usage(ret, QATOM_FLAGS, qatom_long_opts, qatom_opts_help, lookup_applet_idx("qatom"))
 
 int qatom_main(int argc, char **argv)
diff --git a/qcheck.c b/qcheck.c
index 35455954..9e19679c 100644
--- a/qcheck.c
+++ b/qcheck.c
@@ -1,13 +1,13 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcheck.c,v 1.22 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcheck.c,v 1.23 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#ifndef OMIT_QCHECK
+#ifdef APPLET_qcheck
 
 #define QCHECK_FLAGS "a" COMMON_FLAGS
 static struct option const qcheck_long_opts[] = {
@@ -18,7 +18,7 @@ static const char *qcheck_opts_help[] = {
 	"List all packages",
 	COMMON_OPTS_HELP
 };
-static const char qcheck_rcsid[] = "$Id: qcheck.c,v 1.22 2006/01/24 23:35:08 vapier Exp $";
+static const char qcheck_rcsid[] = "$Id: qcheck.c,v 1.23 2006/01/25 01:51:42 vapier Exp $";
 #define qcheck_usage(ret) usage(ret, QCHECK_FLAGS, qcheck_long_opts, qcheck_opts_help, lookup_applet_idx("qcheck"))
 
 
diff --git a/qdepends.c b/qdepends.c
index dac121b8..e0f8ba4c 100644
--- a/qdepends.c
+++ b/qdepends.c
@@ -1,13 +1,13 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v 1.34 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v 1.35 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#ifndef OMIT_QDEPENDS
+#ifdef APPLET_qdepends
 
 #define QDEPENDS_FLAGS "drpaNk:Q:" COMMON_FLAGS
 static struct option const qdepends_long_opts[] = {
@@ -30,7 +30,7 @@ static const char *qdepends_opts_help[] = {
 	"Show all DEPEND info",
 	COMMON_OPTS_HELP
 };
-static const char qdepends_rcsid[] = "$Id: qdepends.c,v 1.34 2006/01/24 23:35:08 vapier Exp $";
+static const char qdepends_rcsid[] = "$Id: qdepends.c,v 1.35 2006/01/25 01:51:42 vapier Exp $";
 #define qdepends_usage(ret) usage(ret, QDEPENDS_FLAGS, qdepends_long_opts, qdepends_opts_help, lookup_applet_idx("qdepends"))
 
 static char qdep_name_only = 0;
diff --git a/qfile.c b/qfile.c
index 52d834bf..1e422f28 100644
--- a/qfile.c
+++ b/qfile.c
@@ -1,13 +1,13 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qfile.c,v 1.24 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qfile.c,v 1.25 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#ifndef OMIT_QFILE
+#ifdef APPLET_qfile
 
 #define QFILE_FLAGS "e" COMMON_FLAGS
 static struct option const qfile_long_opts[] = {
@@ -18,7 +18,7 @@ static const char *qfile_opts_help[] = {
 	"Exact match",
 	COMMON_OPTS_HELP
 };
-static char qfile_rcsid[] = "$Id: qfile.c,v 1.24 2006/01/24 23:35:08 vapier Exp $";
+static char qfile_rcsid[] = "$Id: qfile.c,v 1.25 2006/01/25 01:51:42 vapier Exp $";
 #define qfile_usage(ret) usage(ret, QFILE_FLAGS, qfile_long_opts, qfile_opts_help, lookup_applet_idx("qfile"))
 
 void qfile(char *path, char *fullname);
diff --git a/qglsa.c b/qglsa.c
index adf43460..5407a402 100644
--- a/qglsa.c
+++ b/qglsa.c
@@ -1,13 +1,13 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qglsa.c,v 1.2 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qglsa.c,v 1.3 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#ifndef OMIT_QGLSA
+#ifdef APPLET_glsa
 
 #define QGLSA_DB "/var/cache/edb/glsa"
 
@@ -31,7 +31,7 @@ static const char *qglsa_opts_help[] = {
 	"Mark specified GLSAs as fixed",
 	COMMON_OPTS_HELP
 };
-static const char qglsa_rcsid[] = "$Id: qglsa.c,v 1.2 2006/01/24 23:35:08 vapier Exp $";
+static const char qglsa_rcsid[] = "$Id: qglsa.c,v 1.3 2006/01/25 01:51:42 vapier Exp $";
 #define qglsa_usage(ret) usage(ret, QGLSA_FLAGS, qglsa_long_opts, qglsa_opts_help, lookup_applet_idx("qglsa"))
 
 
diff --git a/qgrep.c b/qgrep.c
index 5166c75c..0c617f5e 100644
--- a/qgrep.c
+++ b/qgrep.c
@@ -1,14 +1,14 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qgrep.c,v 1.11 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qgrep.c,v 1.12 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  * Copyright 2005 Petteri Räty    - <betelgeuse@gentoo.org>
  */
 
-#ifndef OMIT_QGREP
+#ifdef APPLET_qgrep
 
 #define QGREP_FLAGS "IiHce" COMMON_FLAGS
 static struct option const qgrep_long_opts[] = {
@@ -27,7 +27,7 @@ static const char *qgrep_opts_help[] = {
 	"Use PATTERN as a regular expression",
 	COMMON_OPTS_HELP
 };
-static const char qgrep_rcsid[] = "$Id: qgrep.c,v 1.11 2006/01/24 23:35:08 vapier Exp $";
+static const char qgrep_rcsid[] = "$Id: qgrep.c,v 1.12 2006/01/25 01:51:42 vapier Exp $";
 #define qgrep_usage(ret) usage(ret, QGREP_FLAGS, qgrep_long_opts, qgrep_opts_help, lookup_applet_idx("qgrep"))
 
 int qgrep_main(int argc, char **argv)
diff --git a/qlist.c b/qlist.c
index 3d896013..085fc54d 100644
--- a/qlist.c
+++ b/qlist.c
@@ -1,14 +1,14 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlist.c,v 1.30 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlist.c,v 1.31 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  * Copyright 2005 Martin Schlemmer - <azarah@gentoo.org>
  */
 
-#ifndef OMIT_QLIST
+#ifdef APPLET_qlist
 
 #define QLIST_FLAGS "IDedos" COMMON_FLAGS
 static struct option const qlist_long_opts[] = {
@@ -31,7 +31,7 @@ static const char *qlist_opts_help[] = {
 	/* "query filename for pkgname", */
 	COMMON_OPTS_HELP
 };
-static const char qlist_rcsid[] = "$Id: qlist.c,v 1.30 2006/01/24 23:35:08 vapier Exp $";
+static const char qlist_rcsid[] = "$Id: qlist.c,v 1.31 2006/01/25 01:51:42 vapier Exp $";
 #define qlist_usage(ret) usage(ret, QLIST_FLAGS, qlist_long_opts, qlist_opts_help, lookup_applet_idx("qlist"))
 
 
diff --git a/qlop.c b/qlop.c
index 18ded554..fb94a147 100644
--- a/qlop.c
+++ b/qlop.c
@@ -1,13 +1,13 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlop.c,v 1.27 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlop.c,v 1.28 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#ifndef OMIT_QLOP
+#ifdef APPLET_qlop
 
 #ifdef __linux__
 # include <asm/param.h>
@@ -41,7 +41,7 @@ static const char *qlop_opts_help[] = {
 	"Read emerge logfile instead of " QLOP_DEFAULT_LOGFILE,
 	COMMON_OPTS_HELP
 };
-static const char qlop_rcsid[] = "$Id: qlop.c,v 1.27 2006/01/24 23:35:08 vapier Exp $";
+static const char qlop_rcsid[] = "$Id: qlop.c,v 1.28 2006/01/25 01:51:42 vapier Exp $";
 #define qlop_usage(ret) usage(ret, QLOP_FLAGS, qlop_long_opts, qlop_opts_help, lookup_applet_idx("qlop"))
 
 #define QLOP_LIST    0x01
diff --git a/qmerge.c b/qmerge.c
index cb23841a..48035788 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1,13 +1,13 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.23 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.24 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#ifndef OMIT_QMERGE
+#ifdef APPLET_qmerge
 
 /*
   --nofiles                        don't verify files in package
@@ -46,7 +46,7 @@ static const char *qmerge_opts_help[] = {
         COMMON_OPTS_HELP
 };
 
-static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.23 2006/01/24 23:35:08 vapier Exp $";
+static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.24 2006/01/25 01:51:42 vapier Exp $";
 #define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge"))
 
 char pretend = 0;
diff --git a/qpkg.c b/qpkg.c
index afd11361..33f4e510 100644
--- a/qpkg.c
+++ b/qpkg.c
@@ -1,13 +1,13 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qpkg.c,v 1.11 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qpkg.c,v 1.12 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#ifndef OMIT_QPKG
+#ifdef APPLET_qpkg
 
 #define QPKG_FLAGS "" COMMON_FLAGS
 static struct option const qpkg_long_opts[] = {
@@ -16,7 +16,7 @@ static struct option const qpkg_long_opts[] = {
 static const char *qpkg_opts_help[] = {
 	COMMON_OPTS_HELP
 };
-static const char qpkg_rcsid[] = "$Id: qpkg.c,v 1.11 2006/01/24 23:35:08 vapier Exp $";
+static const char qpkg_rcsid[] = "$Id: qpkg.c,v 1.12 2006/01/25 01:51:42 vapier Exp $";
 #define qpkg_usage(ret) usage(ret, QPKG_FLAGS, qpkg_long_opts, qpkg_opts_help, lookup_applet_idx("qpkg"))
 
 
diff --git a/qsearch.c b/qsearch.c
index 42782913..5d318966 100644
--- a/qsearch.c
+++ b/qsearch.c
@@ -1,13 +1,13 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qsearch.c,v 1.27 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qsearch.c,v 1.28 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#ifndef OMIT_QSEARCH
+#ifdef APPLET_qsearch
 
 #define QSEARCH_FLAGS "acsSNH" COMMON_FLAGS
 static struct option const qsearch_long_opts[] = {
@@ -28,7 +28,7 @@ static const char *qsearch_opts_help[] = {
 	"Show homepage info",
 	COMMON_OPTS_HELP
 };
-static const char qsearch_rcsid[] = "$Id: qsearch.c,v 1.27 2006/01/24 23:35:08 vapier Exp $";
+static const char qsearch_rcsid[] = "$Id: qsearch.c,v 1.28 2006/01/25 01:51:42 vapier Exp $";
 #define qsearch_usage(ret) usage(ret, QSEARCH_FLAGS, qsearch_long_opts, qsearch_opts_help, lookup_applet_idx("qsearch"))
 
 
diff --git a/qsize.c b/qsize.c
index f2913a23..02f57d35 100644
--- a/qsize.c
+++ b/qsize.c
@@ -1,13 +1,13 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qsize.c,v 1.19 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qsize.c,v 1.20 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#ifndef OMIT_QSIZE
+#ifdef APPLET_qsize
 
 #define QSIZE_FLAGS "fasSmkb" COMMON_FLAGS
 static struct option const qsize_long_opts[] = {
@@ -30,7 +30,7 @@ static const char *qsize_opts_help[] = {
 	"Display size in bytes",
 	COMMON_OPTS_HELP
 };
-static const char qsize_rcsid[] = "$Id: qsize.c,v 1.19 2006/01/24 23:35:08 vapier Exp $";
+static const char qsize_rcsid[] = "$Id: qsize.c,v 1.20 2006/01/25 01:51:42 vapier Exp $";
 #define qsize_usage(ret) usage(ret, QSIZE_FLAGS, qsize_long_opts, qsize_opts_help, lookup_applet_idx("qsize"))
 
 
diff --git a/qtbz2.c b/qtbz2.c
index eec825e2..b1675caa 100644
--- a/qtbz2.c
+++ b/qtbz2.c
@@ -1,13 +1,13 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qtbz2.c,v 1.10 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qtbz2.c,v 1.11 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#ifndef OMIT_QTBZ2
+#ifdef APPLET_qtbz2
 
 /*
 # The format for a tbz2/xpak:
@@ -46,7 +46,7 @@ static const char *qtbz2_opts_help[] = {
 	"Write files to stdout",
 	COMMON_OPTS_HELP
 };
-static const char qtbz2_rcsid[] = "$Id: qtbz2.c,v 1.10 2006/01/24 23:35:08 vapier Exp $";
+static const char qtbz2_rcsid[] = "$Id: qtbz2.c,v 1.11 2006/01/25 01:51:42 vapier Exp $";
 #define qtbz2_usage(ret) usage(ret, QTBZ2_FLAGS, qtbz2_long_opts, qtbz2_opts_help, lookup_applet_idx("qtbz2"))
 
 
diff --git a/quse.c b/quse.c
index 81ad8dad..aad1138b 100644
--- a/quse.c
+++ b/quse.c
@@ -1,13 +1,13 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/quse.c,v 1.46 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/quse.c,v 1.47 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#ifndef OMIT_QUSE
+#ifdef APPLET_quse
 
 /*
  quse -CKe -- '-*' {'~',-,}{alpha,amd64,hppa,ia64,ppc,ppc64,sparc,x86}
@@ -33,7 +33,7 @@ static const char *quse_opts_help[] = {
 	/* "Use your own variable formats. -F NAME=", */
 	COMMON_OPTS_HELP
 };
-static const char quse_rcsid[] = "$Id: quse.c,v 1.46 2006/01/24 23:35:08 vapier Exp $";
+static const char quse_rcsid[] = "$Id: quse.c,v 1.47 2006/01/25 01:51:42 vapier Exp $";
 #define quse_usage(ret) usage(ret, QUSE_FLAGS, quse_long_opts, quse_opts_help, lookup_applet_idx("quse"))
 
 int quse_describe_flag(int ind, int argc, char **argv);
diff --git a/qxpak.c b/qxpak.c
index b7c6a6dd..50a2b2cc 100644
--- a/qxpak.c
+++ b/qxpak.c
@@ -1,13 +1,13 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qxpak.c,v 1.10 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qxpak.c,v 1.11 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#ifndef OMIT_QXPAK
+#ifdef APPLET_qxpak
 
 /*
 # The format for a tbz2/xpak:
@@ -48,7 +48,7 @@ static const char *qxpak_opts_help[] = {
 	"Write files to stdout",
 	COMMON_OPTS_HELP
 };
-static const char qxpak_rcsid[] = "$Id: qxpak.c,v 1.10 2006/01/24 23:35:08 vapier Exp $";
+static const char qxpak_rcsid[] = "$Id: qxpak.c,v 1.11 2006/01/25 01:51:42 vapier Exp $";
 #define qxpak_usage(ret) usage(ret, QXPAK_FLAGS, qxpak_long_opts, qxpak_opts_help, lookup_applet_idx("qxpak"))
 
 
diff --git a/template.c b/template.c
index af60ccb2..523d25ae 100644
--- a/template.c
+++ b/template.c
@@ -1,13 +1,13 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/template.c,v 1.9 2006/01/24 23:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/template.c,v 1.10 2006/01/25 01:51:42 vapier Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#ifndef OMIT_QTEMP
+#ifdef APPLET_qtemp
 
 #define QTEMP_FLAGS "" COMMON_FLAGS
 static struct option const qtemp_long_opts[] = {
@@ -17,7 +17,7 @@ static const char *qtemp_opts_help[] = {
 	COMMON_OPTS_HELP
 };
 
-static const char qtemp_rcsid[] = "$Id: template.c,v 1.9 2006/01/24 23:35:08 vapier Exp $";
+static const char qtemp_rcsid[] = "$Id: template.c,v 1.10 2006/01/25 01:51:42 vapier Exp $";
 #define qtemp_usage(ret) usage(ret, QTEMP_FLAGS, qtemp_long_opts, qtemp_opts_help, lookup_applet_idx("qtemp"))