6 files changed, 82 insertions, 82 deletions
diff --git a/src/etc/xbs.d/gnu+hurd_dd.cfg b/src/etc/xbs.d/gnu+hurd_dd.cfg
index 58be117..daf1707 100644
--- a/src/etc/xbs.d/gnu+hurd_dd.cfg
+++ b/src/etc/xbs.d/gnu+hurd_dd.cfg
@@ -33,39 +33,37 @@ PLATFORM_REPOS=()
 PKG_REPOS=("${EXTRA_REPOS[@]}" "${PLATFORM_REPOS[@]}" "${MAIN_REPOS[@]}" "${DD_REPOS[@]}" "${COMMUNITY_REPOS[@]}")
 PKG_MULTILIB_REPOS=("${MAIN_MULTILIB_REPOS[@]}" "${DD_MULTILIB_REPOS[@]}")
 
+# Base Repository
+REPO_DIR="${ROOT_DIR}/${PLATFORM}_dd"
+
 # Directories where packages are shared between repos
-# *relative to REPO_DIR*
-PKG_MAIN_POOLS=("${PKG_POOL_DIR}/abslibre_${PLATFORM}")
-PKG_DD_POOLS=("${PKG_POOL_DIR}/abs_${PLATFORM}")
+PKG_MAIN_POOLS=("${REPO_DIR}/pools/parabola")
+PKG_DD_POOLS=("${REPO_DIR}/pools/arch_${PLATFORM}")
 PKG_POOLS=("${PKG_MAIN_POOLS[@]}" "${PKG_DD_POOLS[@]}")
 
 # Directories where sources are stored
-SRC_MAIN_POOLS=("${SRC_POOL_DIR}/abslibre_${PLATFORM}")
-SRC_DD_POOLS=("${SRC_POOL_DIR}/abs_${PLATFORM}")
+SRC_MAIN_POOLS=("${REPO_DIR}/sources/parabola")
+SRC_DD_POOLS=("${REPO_DIR}/sources/arch_${PLATFORM}")
 SRC_POOLS=("${SRC_MAIN_POOLS[@]}" "${SRC_DD_POOLS[@]}")
 
 # Build System and Repository scripts
-BS_MAIN_NAME="abslibre_${PLATFORM}"
-BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}"
-BS_DD_NAME="abs_${PLATFORM}"
-BS_DD_DIR="${SRV_DIR}/${BS_DD_NAME}"
-BS_GIT="${GIT_BASE}/abslibre/${BS_MAIN_NAME}.git"
-# BS_GIT='http://projects.parabola.gnu/abslibre/${BS_MAIN_NAME}.git'
+BS_MAIN_NAME="abslibre"
+BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}_${PLATFORM}"
+BS_DD_NAME="abs"
+BS_DD_DIR="${SRV_DIR}/${BS_DD_NAME}_${PLATFORM}"
+BS_GIT="${GIT_DIR}/${BS_MAIN_NAME}/${BS_MAIN_NAME}_${PLATFORM}.git" # [ ${GIT_BASE} || http://projects.parabola.gnu ]
 BS_GIT_TMP="${TMP_DIR}/${BS_MAIN_NAME}"
 BLACKLIST_NAME="blacklist_${PLATFORM}.txt"
 BLACKLIST_FILE="${HOME}/blacklist/${BLACKLIST_NAME}.txt"
 BLACKLIST_TMP="${TMP_DIR}/${BLACKLIST_NAME}.txt"
 SYNC_DD_SERVER='rsync.archhurd.org'
 
-# Base Repository
-REPO_DIR="${SRV_DIR}/repo/main"
-
-CLEANUP_DESTDIR="${REPO_DIR}/old/packages_${PLATFORM}_dd"
+CLEANUP_DESTDIR="${REPO_DIR}/old/packages"
 CLEANUP_DRYRUN='false'
 # Time in days to keep moved packages
 CLEANUP_KEEP='30'
 
-SOURCE_CLEANUP_DESTDIR="${REPO_DIR}/old/sources_${PLATFORM}_dd"
+SOURCE_CLEANUP_DESTDIR="${REPO_DIR}/old/sources"
 SOURCE_CLEANUP_DRYRUN='true'
 # Time in days to keep moved sourcepackages
 SOURCE_CLEANUP_KEEP='30'
diff --git a/src/etc/xbs.d/gnu+hurd_nd.cfg b/src/etc/xbs.d/gnu+hurd_nd.cfg
index b6feb28..37ec3da 100644
--- a/src/etc/xbs.d/gnu+hurd_nd.cfg
+++ b/src/etc/xbs.d/gnu+hurd_nd.cfg
@@ -33,33 +33,37 @@ PLATFORM_REPOS=()
 PKG_REPOS=("${EXTRA_REPOS[@]}" "${PLATFORM_REPOS[@]}" "${MAIN_REPOS[@]}" "${DD_REPOS[@]}" "${COMMUNITY_REPOS[@]}")
 PKG_MULTILIB_REPOS=("${MAIN_MULTILIB_REPOS[@]}" "${DD_MULTILIB_REPOS[@]}")
 
+# Base Repository
+REPO_DIR="${ROOT_DIR}/${PLATFORM}_nd"
+
 # Directories where packages are shared between repos
-# *relative to REPO_DIR*
-PKG_MAIN_POOLS=("${PKG_POOL_DIR}/${PLATFORM}")
+PKG_MAIN_POOLS=("${REPO_DIR}/pools/parabola")
 PKG_DD_POOLS=()
 PKG_POOLS=("${PKG_MAIN_POOLS[@]}" "${PKG_DD_POOLS[@]}")
 
 # Directories where sources are stored
-SRC_MAIN_POOLS=("${SRC_POOL_DIR}/${PLATFORM}")
+SRC_MAIN_POOLS=("${REPO_DIR}/sources/parabola")
 SRC_DD_POOLS=()
 SRC_POOLS=("${SRC_MAIN_POOLS[@]}" "${SRC_DD_POOLS[@]}")
 
 # Build System and Repository scripts
-BS_MAIN_NAME="pbs_${PLATFORM}"
-BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}"
-BS_GIT="${GIT_BASE}/${BS_MAIN_NAME}/pmr.git"
-# BS_GIT='http://projects.parabola.gnu/${BS_MAIN_NAME}/pmr.git'
+BS_MAIN_NAME="pbs"
+BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}_${PLATFORM}"
+BS_DD_NAME=
+BS_DD_DIR=
+BS_GIT="${GIT_DIR}/${BS_MAIN_NAME}/pmr.git" # [ ${GIT_BASE} || http://projects.parabola.gnu ]
 BS_GIT_TMP="${TMP_DIR}/${BS_MAIN_NAME}"
+BLACKLIST_NAME=
+BLACKLIST_FILE=
+BLACKLIST_TMP=
+SYNC_DD_SERVER=
 
-# Base Repository
-REPO_DIR="${SRV_DIR}/repo/main"
-
-CLEANUP_DESTDIR="${REPO_DIR}/old/packages_${PLATFORM}"
+CLEANUP_DESTDIR="${REPO_DIR}/old/packages"
 CLEANUP_DRYRUN='false'
 # Time in days to keep moved packages
 CLEANUP_KEEP='30'
 
-SOURCE_CLEANUP_DESTDIR="${REPO_DIR}/old/sources_${PLATFORM}"
+SOURCE_CLEANUP_DESTDIR="${REPO_DIR}/old/sources"
 SOURCE_CLEANUP_DRYRUN='true'
 # Time in days to keep moved sourcepackages
 SOURCE_CLEANUP_KEEP='30'
diff --git a/src/etc/xbs.d/gnu+linux-arm_dd.cfg b/src/etc/xbs.d/gnu+linux-arm_dd.cfg
index 3b8a9fb..e4e00ad 100644
--- a/src/etc/xbs.d/gnu+linux-arm_dd.cfg
+++ b/src/etc/xbs.d/gnu+linux-arm_dd.cfg
@@ -33,39 +33,37 @@ PLATFORM_REPOS=('nonsystemd' 'nonsystemd-testing')
 PKG_REPOS=("${EXTRA_REPOS[@]}" "${PLATFORM_REPOS[@]}" "${MAIN_REPOS[@]}" "${DD_REPOS[@]}" "${COMMUNITY_REPOS[@]}")
 PKG_MULTILIB_REPOS=("${MAIN_MULTILIB_REPOS[@]}" "${DD_MULTILIB_REPOS[@]}")
 
+# Base Repository
+REPO_DIR="${ROOT_DIR}/${PLATFORM}_arm_dd"
+
 # Directories where packages are shared between repos
-# *relative to REPO_DIR*
-PKG_MAIN_POOLS=("${PKG_POOL_DIR}/abslibre_${PLATFORM}_arm")
-PKG_DD_POOLS=("${PKG_POOL_DIR}/abs_${PLATFORM}_arm")
+PKG_MAIN_POOLS=("${REPO_DIR}/pools/parabola")
+PKG_DD_POOLS=("${REPO_DIR}/pools/arch_${PLATFORM}_arm")
 PKG_POOLS=("${PKG_MAIN_POOLS[@]}" "${PKG_DD_POOLS[@]}")
 
 # Directories where sources are stored
-SRC_MAIN_POOLS=("${SRC_POOL_DIR}/abslibre_${PLATFORM}_arm")
-SRC_DD_POOLS=("${SRC_POOL_DIR}/abs_${PLATFORM}_arm")
+SRC_MAIN_POOLS=("${REPO_DIR}/sources/parabola")
+SRC_DD_POOLS=("${REPO_DIR}/sources/arch_${PLATFORM}_arm")
 SRC_POOLS=("${SRC_MAIN_POOLS[@]}" "${SRC_DD_POOLS[@]}")
 
 # Build System and Repository scripts
-BS_MAIN_NAME="abslibre_${PLATFORM}_arm"
-BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}"
-BS_DD_NAME="abs_${PLATFORM}_arm"
-BS_DD_DIR="${SRV_DIR}/${BS_DD_NAME}"
-BS_GIT="${GIT_BASE}/abslibre/${BS_MAIN_NAME}.git"
-# BS_GIT='http://projects.parabola.gnu/abslibre/${BS_MAIN_NAME}.git'
+BS_MAIN_NAME="abslibre"
+BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}_${PLATFORM}_arm"
+BS_DD_NAME="abs"
+BS_DD_DIR="${SRV_DIR}/${BS_DD_NAME}_${PLATFORM}_arm"
+BS_GIT="${GIT_DIR}/${BS_MAIN_NAME}/${BS_MAIN_NAME}_${PLATFORM}_arm.git" # [ ${GIT_BASE} || http://projects.parabola.gnu ]
 BS_GIT_TMP="${TMP_DIR}/${BS_MAIN_NAME}"
 BLACKLIST_NAME="blacklist_${PLATFORM}_arm.txt"
 BLACKLIST_FILE="${HOME}/blacklist/${BLACKLIST_NAME}.txt"
 BLACKLIST_TMP="${TMP_DIR}/${BLACKLIST_NAME}.txt"
 SYNC_DD_SERVER='rsync.archlinuxarm.org'
 
-# Base Repository
-REPO_DIR="${SRV_DIR}/repo/main"
-
-CLEANUP_DESTDIR="${REPO_DIR}/old/packages_${PLATFORM}_ddarm"
+CLEANUP_DESTDIR="${REPO_DIR}/old/packages"
 CLEANUP_DRYRUN='false'
 # Time in days to keep moved packages
 CLEANUP_KEEP='30'
 
-SOURCE_CLEANUP_DESTDIR="${REPO_DIR}/old/sources_${PLATFORM}_ddarm"
+SOURCE_CLEANUP_DESTDIR="${REPO_DIR}/old/sources"
 SOURCE_CLEANUP_DRYRUN='true'
 # Time in days to keep moved sourcepackages
 SOURCE_CLEANUP_KEEP='30'
diff --git a/src/etc/xbs.d/gnu+linux-legacy_dd.cfg b/src/etc/xbs.d/gnu+linux-legacy_dd.cfg
index 4398a30..34e6fea 100644
--- a/src/etc/xbs.d/gnu+linux-legacy_dd.cfg
+++ b/src/etc/xbs.d/gnu+linux-legacy_dd.cfg
@@ -33,15 +33,17 @@ PLATFORM_REPOS=('nonsystemd' 'nonsystemd-testing')
 PKG_REPOS=("${EXTRA_REPOS[@]}" "${PLATFORM_REPOS[@]}" "${MAIN_REPOS[@]}" "${DD_REPOS[@]}" "${COMMUNITY_REPOS[@]}")
 PKG_MULTILIB_REPOS=("${MAIN_MULTILIB_REPOS[@]}" "${DD_MULTILIB_REPOS[@]}")
 
+# Base Repository
+REPO_DIR="${ROOT_DIR}/${PLATFORM}_dd"
+
 # Directories where packages are shared between repos
-# *relative to REPO_DIR*
-PKG_MAIN_POOLS=('pool/parabola')
-PKG_DD_POOLS=('pool'/{packages,community})
+PKG_MAIN_POOLS=("${ROOT_DIR}/pool/parabola")
+PKG_DD_POOLS=("${ROOT_DIR}/pool/"{packages,community})
 PKG_POOLS=("${PKG_MAIN_POOLS[@]}" "${PKG_DD_POOLS[@]}")
 
 # Directories where sources are stored
-SRC_MAIN_POOLS=('sources/parabola')
-SRC_DD_POOLS=('sources'/{packages,community})
+SRC_MAIN_POOLS=("${ROOT_DIR}/sources/parabola")
+SRC_DD_POOLS=("${ROOT_DIR}/sources/"{packages,community})
 SRC_POOLS=("${SRC_MAIN_POOLS[@]}" "${SRC_DD_POOLS[@]}")
 
 # Build System and Repository scripts
@@ -49,17 +51,13 @@ BS_MAIN_NAME="abslibre"
 BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}"
 BS_DD_NAME="abs"
 BS_DD_DIR="${SRV_DIR}/${BS_DD_NAME}"
-BS_GIT="${GIT_BASE}/abslibre/${BS_MAIN_NAME}.git"
-# BS_GIT='http://projects.parabola.gnu/abslibre/${BS_MAIN_NAME}.git'
+BS_GIT="${GIT_DIR}/${BS_MAIN_NAME}/${BS_MAIN_NAME}.git" # [ ${GIT_BASE} || http://projects.parabola.gnu ]
 BS_GIT_TMP="${TMP_DIR}/${BS_MAIN_NAME}"
 BLACKLIST_NAME="blacklist.txt"
 BLACKLIST_FILE="${HOME}/blacklist/${BLACKLIST_NAME}.txt"
 BLACKLIST_TMP="${TMP_DIR}/${BLACKLIST_NAME}.txt"
 SYNC_DD_SERVER='rsync.archlinux.org'
 
-# Base Repository
-REPO_DIR="${SRV_DIR}/repo/main"
-
 CLEANUP_DESTDIR="${REPO_DIR}/old/packages"
 CLEANUP_DRYRUN='false'
 # Time in days to keep moved packages
diff --git a/src/etc/xbs.d/gnu+linux_dd.cfg b/src/etc/xbs.d/gnu+linux_dd.cfg
index 2cff8f4..3a3fdef 100644
--- a/src/etc/xbs.d/gnu+linux_dd.cfg
+++ b/src/etc/xbs.d/gnu+linux_dd.cfg
@@ -33,39 +33,37 @@ PLATFORM_REPOS=('nonsystemd' 'nonsystemd-testing')
 PKG_REPOS=("${EXTRA_REPOS[@]}" "${PLATFORM_REPOS[@]}" "${MAIN_REPOS[@]}" "${DD_REPOS[@]}" "${COMMUNITY_REPOS[@]}")
 PKG_MULTILIB_REPOS=("${MAIN_MULTILIB_REPOS[@]}" "${DD_MULTILIB_REPOS[@]}")
 
+# Base Repository
+REPO_DIR="${ROOT_DIR}/${PLATFORM}_dd"
+
 # Directories where packages are shared between repos
-# *relative to REPO_DIR*
-PKG_MAIN_POOLS=("${PKG_POOL_DIR}/abslibre_${PLATFORM}")
-PKG_DD_POOLS=("${PKG_POOL_DIR}"/abs_{packages,community}_"${PLATFORM}")
+PKG_MAIN_POOLS=("${REPO_DIR}/pools/parabola")
+PKG_DD_POOLS=("${REPO_DIR}/pools/arch_"{main,community}"_${PLATFORM}")
 PKG_POOLS=("${PKG_MAIN_POOLS[@]}" "${PKG_DD_POOLS[@]}")
 
 # Directories where sources are stored
-SRC_MAIN_POOLS=("${SRC_POOL_DIR}/abslibre_${PLATFORM}")
-SRC_DD_POOLS=("${SRC_POOL_DIR}"/abs_{packages,community}_"${PLATFORM}")
+SRC_MAIN_POOLS=("${REPO_DIR}/sources/parabola")
+SRC_DD_POOLS=("${REPO_DIR}/sources/arch_"{main,community}"_${PLATFORM}")
 SRC_POOLS=("${SRC_MAIN_POOLS[@]}" "${SRC_DD_POOLS[@]}")
 
 # Build System and Repository scripts
-BS_MAIN_NAME="abslibre_${PLATFORM}"
-BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}"
-BS_DD_NAME="abs_${PLATFORM}"
-BS_DD_DIR="${SRV_DIR}/${BS_DD_NAME}"
-BS_GIT="${GIT_BASE}/abslibre/${BS_MAIN_NAME}.git"
-# BS_GIT='http://projects.parabola.gnu/abslibre/${BS_MAIN_NAME}.git'
+BS_MAIN_NAME="abslibre"
+BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}_${PLATFORM}"
+BS_DD_NAME="abs"
+BS_DD_DIR="${SRV_DIR}/${BS_DD_NAME}_${PLATFORM}"
+BS_GIT="${GIT_DIR}/${BS_MAIN_NAME}/${BS_MAIN_NAME}_${PLATFORM}.git" # [ ${GIT_BASE} || http://projects.parabola.gnu ]
 BS_GIT_TMP="${TMP_DIR}/${BS_MAIN_NAME}"
 BLACKLIST_NAME="blacklist_${PLATFORM}.txt"
 BLACKLIST_FILE="${HOME}/blacklist/${BLACKLIST_NAME}.txt"
 BLACKLIST_TMP="${TMP_DIR}/${BLACKLIST_NAME}.txt"
 SYNC_DD_SERVER='rsync.archlinux.org'
 
-# Base Repository
-REPO_DIR="${SRV_DIR}/repo/main"
-
-CLEANUP_DESTDIR="${REPO_DIR}/old/packages_${PLATFORM}_dd"
+CLEANUP_DESTDIR="${REPO_DIR}/old/packages"
 CLEANUP_DRYRUN='false'
 # Time in days to keep moved packages
 CLEANUP_KEEP='30'
 
-SOURCE_CLEANUP_DESTDIR="${REPO_DIR}/old/sources_${PLATFORM}_dd"
+SOURCE_CLEANUP_DESTDIR="${REPO_DIR}/old/sources"
 SOURCE_CLEANUP_DRYRUN='true'
 # Time in days to keep moved sourcepackages
 SOURCE_CLEANUP_KEEP='30'
diff --git a/src/etc/xbs.d/gnu+linux_nd.cfg b/src/etc/xbs.d/gnu+linux_nd.cfg
index 80be453..7fb1d81 100644
--- a/src/etc/xbs.d/gnu+linux_nd.cfg
+++ b/src/etc/xbs.d/gnu+linux_nd.cfg
@@ -33,33 +33,37 @@ PLATFORM_REPOS=()
 PKG_REPOS=("${EXTRA_REPOS[@]}" "${PLATFORM_REPOS[@]}" "${MAIN_REPOS[@]}" "${DD_REPOS[@]}" "${COMMUNITY_REPOS[@]}")
 PKG_MULTILIB_REPOS=("${MAIN_MULTILIB_REPOS[@]}" "${DD_MULTILIB_REPOS[@]}")
 
+# Base Repository
+REPO_DIR="${ROOT_DIR}/${PLATFORM}_nd"
+
 # Directories where packages are shared between repos
-# *relative to REPO_DIR*
-PKG_MAIN_POOLS=("${PKG_POOL_DIR}/${PLATFORM}")
+PKG_MAIN_POOLS=("${REPO_DIR}/pools/parabola")
 PKG_DD_POOLS=()
 PKG_POOLS=("${PKG_MAIN_POOLS[@]}" "${PKG_DD_POOLS[@]}")
 
 # Directories where sources are stored
-SRC_MAIN_POOLS=("${SRC_POOL_DIR}/${PLATFORM}")
+SRC_MAIN_POOLS=("${REPO_DIR}/sources/parabola")
 SRC_DD_POOLS=()
 SRC_POOLS=("${SRC_MAIN_POOLS[@]}" "${SRC_DD_POOLS[@]}")
 
 # Build System and Repository scripts
-BS_MAIN_NAME="pbs_${PLATFORM}"
-BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}"
-BS_GIT="${GIT_BASE}/${BS_MAIN_NAME}/pmr.git"
-# BS_GIT='http://projects.parabola.gnu/${BS_MAIN_NAME}/pmr.git'
+BS_MAIN_NAME="pbs"
+BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}_${PLATFORM}"
+BS_DD_NAME=
+BS_DD_DIR=
+BS_GIT="${GIT_DIR}/${BS_MAIN_NAME}/pmr.git" # [ ${GIT_BASE} || http://projects.parabola.gnu ]
 BS_GIT_TMP="${TMP_DIR}/${BS_MAIN_NAME}"
+BLACKLIST_NAME=
+BLACKLIST_FILE=
+BLACKLIST_TMP=
+SYNC_DD_SERVER=
 
-# Base Repository
-REPO_DIR="${SRV_DIR}/repo/main"
-
-CLEANUP_DESTDIR="${REPO_DIR}/old/packages_${PLATFORM}"
+CLEANUP_DESTDIR="${REPO_DIR}/old/packages"
 CLEANUP_DRYRUN='false'
 # Time in days to keep moved packages
 CLEANUP_KEEP='30'
 
-SOURCE_CLEANUP_DESTDIR="${REPO_DIR}/old/sources_${PLATFORM}"
+SOURCE_CLEANUP_DESTDIR="${REPO_DIR}/old/sources"
 SOURCE_CLEANUP_DRYRUN='true'
 # Time in days to keep moved sourcepackages
 SOURCE_CLEANUP_KEEP='30'