contrib/openrc/init.d/package-cache: Don't include 'distfiles' in source

Portage will request ${MIRROR}/distfiles/${FILENAME}, so we don't want
the 'distfiles' part in the source directory.  With the shift, we can
also use a single cache for both source (distfiles) and binary
packages (PKGDIR, which defaults to /usr/portage/packages) if there
are any binary packages on the upstream mirror.

diff --git a/contrib/openrc/init.d/package-cache b/contrib/openrc/init.d/package-cache
index d8a9a97fd333fc01f220ef82f64c4f9f46628f39..e7c75bd30ad5e8b2abc2147a4339f5dfbb215ec7 100755 (executable)
--- a/contrib/openrc/init.d/package-cache
+++ b/contrib/openrc/init.d/package-cache
@@ -2,10 +2,10 @@
 
 PC_USER="${PC_USER:-package-cache}"
 PC_GROUP="${PC_GROUP:-portage}"
 
 PC_USER="${PC_USER:-package-cache}"
 PC_GROUP="${PC_GROUP:-portage}"

-CACHE_DIR="${CACHE_DIR:-/usr/portage/distfiles}"
+CACHE_DIR="${CACHE_DIR:-/usr/portage}"

 HOST="${HOST:-0.0.0.0}"
 PORT="${PORT:-4000}"
 HOST="${HOST:-0.0.0.0}"
 PORT="${PORT:-4000}"

-SOURCES="${SOURCES:-http://distfiles.gentoo.org/distfiles}"
+SOURCES="${SOURCES:-http://distfiles.gentoo.org}"

 SOURCE_OPTS=()
 for SOURCE in ${SOURCES}
 do
 SOURCE_OPTS=()
 for SOURCE in ${SOURCES}
 do