Implementing feature request: <http://bugs.archlinux.org/task/4706>

* Added these three possible options (or !options, more likely), to the
  PKGBUILD possibilities:
  - ccache
  - distcc
  - makeflags
* Removed the --noccache and -j flags from makepkg as their functionality is
  better used by adding the above options to a PKGBUILD- keep the functionality
  where it is needed.

Testing would be appreciated, I didn't do much of that yet.

3 files changed, 18 insertions, 13 deletions

diff --git a/doc/PKGBUILD.5 b/doc/PKGBUILD.5
index 34bdc263..747b9f15 100644
--- a/doc/PKGBUILD.5
+++ b/doc/PKGBUILD.5
@@ -59,7 +59,7 @@ multiple licenses are applicable for a package, list all of them:
 Specifies a special install script that is to be included in the package. This
 file should reside in the same directory as the \fB\*(PB\fP, and will be copied
 into the package by \fBmakepkg\fP. It does not need to be included in the
-\fIsource\fP array. (e.g. \fBinstall=pkgname.install\fP)
+\fIsource\fP array (e.g. \fBinstall=pkgname.install\fP).
 
 .TP
 .B source \fI(array)\fP
@@ -99,8 +99,8 @@ one could install all KDE packages by installing the 'kde' group.
 
 .TP
 .B arch \fI(array)\fP
-Defines on which architectures the given package is available. (e.g.
-\fBarch=('i686' 'x86_64')\fP) 
+Defines on which architectures the given package is available (e.g.
+\fBarch=('i686' 'x86_64')\fP). 
 
 .TP
 .B backup \fI(array)\fP 
@@ -166,6 +166,20 @@ Leave libtool (.la) files in packages. Specify "!libtool" to remove them.
 .B emptydirs
 Leave empty directories in packages.
 .TP
+.B ccache
+Allow the use of \fBccache\fP during build. More useful in its negative form
+"!ccache" with select packages that have problems building with \fBccache\fP.
+.TP
+.B distcc
+Allow the use of \fBdistcc\fP during build. More useful in its negative form
+"!distcc" with select packages that have problems building with \fBdistcc\fP.
+.TP
+.B makeflags
+Allow the use of user-specific makeflags during build as specified in
+\fBmakepkg.conf\fP. More useful in its negative form "!makeflags" with select
+packages that have problems building with custom makeflags such as "-j2" (or
+higher).
+.TP
 .B force
 Force the package to be upgraded by a \fBpacman\fP system upgrade operation,
 even if the version number would normally not trigger such an upgrade. This is
diff --git a/doc/makepkg.8 b/doc/makepkg.8
index 1a0a4eb5..22a39b47 100644
--- a/doc/makepkg.8
+++ b/doc/makepkg.8
@@ -32,10 +32,6 @@ build-time or run-time dependencies, it will look for the dependencies'
 them it will call \fBmakepkg\fP to build and install the missing dependencies.
 The child calls will be made with the \fB-b\fP and \fB-i\fP options.
 .TP
-.B \-B, --noccache
-Disable the use of \fBccache\fP during build (useful for select packages that
-have problems with \fBccache\fP).
-.TP
 .B \-c, --clean
 Clean up leftover work files and directories after a successful build.
 .TP
@@ -72,10 +68,6 @@ Output syntax and command line options.
 .B \-i, --install
 Install or upgrade the package after a successful build using \fBpacman\fP.
 .TP
-.B \-j \fIjobs\fP
-Sets MAKEFLAGS="-j\fIjobs\fP" before building the package. This is useful for
-overriding the \fIMAKEFLAGS\fP setting in \fBmakepkg.conf\fP.
-.TP
 .B \-m, --nocolor
 Disable color in output messages.
 .TP
diff --git a/doc/makepkg.conf.5 b/doc/makepkg.conf.5
index 7b764060..23fc1d1f 100644
--- a/doc/makepkg.conf.5
+++ b/doc/makepkg.conf.5
@@ -68,8 +68,7 @@ Colorize output messages, making output easier to read.
 .B ccache
 Use ccache to cache compilation by default. This allows for faster compiles if
 you are continuously recompiling the same packages. It can be disabled for
-individual packages by passing the \fB-B\fP or \fB--noccache\fP flag to
-\fBmakepkg\fP.
+individual packages by placing \fB!ccache\fP in the \fB\*(PB\fP options array.
 .RE
 .TP
 .B DISTCC_HOSTS="\fIhost1 ...\fP"