diff --git a/paludis/hooks/set_portdir.bash b/paludis/hooks/set_portdir.bash index a87e2ab..c292fa1 100644 --- a/paludis/hooks/set_portdir.bash +++ b/paludis/hooks/set_portdir.bash @@ -2,7 +2,7 @@ # set PORTDIR -PORTDIR="$(cave print-repository-metadata --raw-name location gentoo)" +PORTDIR="$(${CAVE} print-repository-metadata --raw-name location gentoo)" PORTDIR="${PORTDIR#location=}" if [[ -z ${PORTDIR} || "$(dirname ${PORTDIR})" == "/" ]] ; then diff --git a/paludis/hooks/sync_all_post/sync_cache.bash b/paludis/hooks/sync_all_post/sync_cache.bash index c40a515..f691e9d 100644 --- a/paludis/hooks/sync_all_post/sync_cache.bash +++ b/paludis/hooks/sync_all_post/sync_cache.bash @@ -3,23 +3,13 @@ source "${PALUDIS_EBUILD_DIR}/echo_functions.bash" source "/etc/paludis/hooks/set_portdir.bash" +# you may change this to only update cache of specific overlays overlay_list=( - arx-libertatis - desktop-overlay - dotnet - games-overlay - haskell - hasufell-overlay - libressl - media-overlay - prism-overlay - qt - torbrowser - tox-overlay + $(${CAVE} print-repositories | grep -vE '(^gentoo$|^installed$|^installed-unpackaged$|^layman$|^paludis-overlay$|^repository$)') ) ebegin "Syncing metadata cache for gentoo repository" -#rsync -avPq rsync://rsync.gentoo.org/gentoo-portage/metadata/md5-cache/ "${PORTDIR}"/metadata/md5-cache/ +rsync -avPq rsync://rsync.gentoo.org/gentoo-portage/metadata/md5-cache/ "${PORTDIR}"/metadata/md5-cache/ egencache --jobs=$(nproc) --repo=gentoo --update --update-use-local-desc eend $? diff --git a/paludis/hooks/sync_all_post/sync_news.bash b/paludis/hooks/sync_all_post/sync_news.bash index b49bc4b..bfc1e61 100644 --- a/paludis/hooks/sync_all_post/sync_news.bash +++ b/paludis/hooks/sync_all_post/sync_news.bash @@ -1,7 +1,6 @@ #!/bin/bash source "${PALUDIS_EBUILD_DIR}/echo_functions.bash" -source "${PALUDIS_EBUILD_DIR}/die_functions.bash" source "/etc/paludis/hooks/set_portdir.bash" source "/etc/paludis/hooks/util_functions.bash" @@ -18,9 +17,6 @@ ebegin "Cleaning news git repo" git -C "${NEWSDIR}" clean -fdxq eend_die $? -[[ -n "$(find "${NEWSDIR}" -mindepth 1 -maxdepth 1 -type d -name "*-*-*")" ]] && - die "it seems the repository format of proj/gentoo-news has changed! Update your script!" - ebegin "Copying news to base directory" cp -a "${NEWSDIR}"/*/* "${NEWSDIR}" eend $? diff --git a/paludis/package_unmask.conf b/paludis/package_unmask.conf index 5796f74..ce738d9 100644 --- a/paludis/package_unmask.conf +++ b/paludis/package_unmask.conf @@ -91,8 +91,8 @@ app-office/ganttproject-bin::sunrise =net-voip/linphone-3.8.0 ->=media-libs/mediastreamer-2.11.0 ->=net-libs/ortp-0.24.0 ->=net-libs/belle-sip-1.4.0 +#>=net-voip/linphone-3.8.0 +#>=media-libs/mediastreamer-2.11.0 +#>=net-libs/ortp-0.24.0 +#>=net-libs/belle-sip-1.4.0