From 9481ae9bb55717929e1632990a23aa5fa9c8d127 Mon Sep 17 00:00:00 2001 From: hasufell Date: Fri, 14 Aug 2015 15:46:59 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- paludis/hooks/sync_all_post/sync_cache.bash | 20 ++++++++++++++ paludis/hooks/sync_all_post/sync_dtd.bash | 24 +++++++++++++++++ paludis/hooks/sync_all_post/sync_glsa.bash | 24 +++++++++++++++++ .../hooks/sync_all_post/sync_herds_xml.bash | 17 ++++++++++++ paludis/hooks/sync_all_post/sync_news.bash | 27 +++++++++++++++++++ paludis/keywords.conf | 5 +++- paludis/repositories/gentoo.conf | 2 +- 7 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 paludis/hooks/sync_all_post/sync_cache.bash create mode 100644 paludis/hooks/sync_all_post/sync_dtd.bash create mode 100644 paludis/hooks/sync_all_post/sync_glsa.bash create mode 100644 paludis/hooks/sync_all_post/sync_herds_xml.bash create mode 100644 paludis/hooks/sync_all_post/sync_news.bash diff --git a/paludis/hooks/sync_all_post/sync_cache.bash b/paludis/hooks/sync_all_post/sync_cache.bash new file mode 100644 index 0000000..c40261e --- /dev/null +++ b/paludis/hooks/sync_all_post/sync_cache.bash @@ -0,0 +1,20 @@ +#!/bin/bash + +source "${PALUDIS_EBUILD_DIR}/echo_functions.bash" + +PORTDIR="/usr/portage" + +[[ -z ${PORTDIR} || "$(dirname ${PORTDIR})" == "/" ]] && die "PORTDIR empty or pointing to root!" + + +die() { + eerror "${1}" + exit 1 +} + +einfo "syncing metadata cache" + +for i in gentoo games-overlay desktop-overlay media-overlay prism-overlay libressl arx-libertatis dotnet haskell qt sage-on-gentoo torbrowser tox-overlay hasufell-overlay; do + egencache --jobs=8 --repo=${i} --update --update-use-local-desc \ + || die "egencache failed for overlay ${i}!" +done diff --git a/paludis/hooks/sync_all_post/sync_dtd.bash b/paludis/hooks/sync_all_post/sync_dtd.bash new file mode 100644 index 0000000..2a1b357 --- /dev/null +++ b/paludis/hooks/sync_all_post/sync_dtd.bash @@ -0,0 +1,24 @@ +#!/bin/bash + +source "${PALUDIS_EBUILD_DIR}/echo_functions.bash" + +PORTDIR="/usr/portage" + +[[ -z ${PORTDIR} || "$(dirname ${PORTDIR})" == "/" ]] && die "PORTDIR empty or pointing to root!" + + +die() { + eerror "${1}" + exit 1 +} + +cd "${PORTDIR}"/metadata || die "could not cd into '${PORTDIR}/metadata'!" +if [[ -e dtd ]] ; then + einfo "dtd dir already exists, updating..." + cd glsa || die "could not cd into 'dtd'!" + git pull --ff || die "could not pull updates!" +else + einfo "dtd directory does not exist, cloning..." + git clone https://anongit.gentoo.org/git/data/dtd.git || die "could not clone repository!" +fi + diff --git a/paludis/hooks/sync_all_post/sync_glsa.bash b/paludis/hooks/sync_all_post/sync_glsa.bash new file mode 100644 index 0000000..684e538 --- /dev/null +++ b/paludis/hooks/sync_all_post/sync_glsa.bash @@ -0,0 +1,24 @@ +#!/bin/bash + +source "${PALUDIS_EBUILD_DIR}/echo_functions.bash" + +PORTDIR="/usr/portage" + +[[ -z ${PORTDIR} || "$(dirname ${PORTDIR})" == "/" ]] && die "PORTDIR empty or pointing to root!" + + +die() { + eerror "${1}" + exit 1 +} + +cd "${PORTDIR}"/metadata || die "could not cd into '${PORTDIR}/metadata'!" +if [[ -e glsa ]] ; then + einfo "glsa dir already exists, updating..." + cd glsa || die "could not cd into 'glsa'!" + git pull --ff || die "could not pull updates!" +else + einfo "glsa directory does not exist, cloning..." + git clone https://anongit.gentoo.org/git/data/glsa.git || die "could not clone repository!" +fi + diff --git a/paludis/hooks/sync_all_post/sync_herds_xml.bash b/paludis/hooks/sync_all_post/sync_herds_xml.bash new file mode 100644 index 0000000..85ba769 --- /dev/null +++ b/paludis/hooks/sync_all_post/sync_herds_xml.bash @@ -0,0 +1,17 @@ +#!/bin/bash + +source "${PALUDIS_EBUILD_DIR}/echo_functions.bash" + +PORTDIR="/usr/portage" + +[[ -z ${PORTDIR} || "$(dirname ${PORTDIR})" == "/" ]] && die "PORTDIR empty or pointing to root!" + + +die() { + eerror "${1}" + exit 1 +} + +cd "${PORTDIR}"/metadata || die "could not cd into '${PORTDIR}/metadata'!" +[[ -e "${PORTDIR}"/metadata/herds.xml ]] && { rm "${PORTDIR}"/metadata/herds.xml || die "failed to rm herds.xml!" ;} +wget https://gitweb.gentoo.org/proj/api.git/plain/files/packages/herds.xml || die "failed to wget herds.xml" diff --git a/paludis/hooks/sync_all_post/sync_news.bash b/paludis/hooks/sync_all_post/sync_news.bash new file mode 100644 index 0000000..6433376 --- /dev/null +++ b/paludis/hooks/sync_all_post/sync_news.bash @@ -0,0 +1,27 @@ +#!/bin/bash + +PORTDIR="/usr/portage" + +source "${PALUDIS_EBUILD_DIR}/echo_functions.bash" + +[[ -z ${PORTDIR} || "$(dirname ${PORTDIR})" == "/" ]] && die "PORTDIR empty or pointing to root!" + + +die() { + eerror "${1}" + exit 1 +} + +cd "${PORTDIR}"/metadata || die "could not cd into '${PORTDIR}/metadata'!" +if [[ -e news ]] ; then + einfo "news dir already exists, updating..." + cd news || die "could not cd into 'news'!" + git pull --ff || die "could not pull updates!" +else + einfo "glsa directory does not exist, cloning..." + git clone https://anongit.gentoo.org/git/proj/gentoo-news.git news || die "could not clone repository!" +fi + +cd "${PORTDIR}"/metadata/news || die "failed to cd into ${PORTDIR}/metadata/news" +git clean -fdxq || die "failed to clean git repo!" +cp -a */* . || die "could not copy news dirs to base news dir!" diff --git a/paludis/keywords.conf b/paludis/keywords.conf index ca4c374..b50f22f 100644 --- a/paludis/keywords.conf +++ b/paludis/keywords.conf @@ -604,7 +604,6 @@ sys-devel/bmake ~amd64 media-sound/pnmixer * =virtual/libintl-0-r1 ~amd64 ~dev-libs/libgcrypt-1.6.3 ~amd64 -=media-libs/harfbuzz-0.9.26-r1 ~amd64 =x11-libs/pango-1.36.3-r2 ~amd64 =x11-libs/cairo-1.12.16-r2 ~amd64 =dev-db/sqlite-3.8.4.3 ~amd64 @@ -892,3 +891,7 @@ dev-python/foolscap ~amd64 #www-servers/apache ~amd64 dev-vcs/git-imerge ~amd64 + + +# texlive-core qtgui, libass +media-libs/harfbuzz ~amd64 diff --git a/paludis/repositories/gentoo.conf b/paludis/repositories/gentoo.conf index 7429dd0..1698565 100644 --- a/paludis/repositories/gentoo.conf +++ b/paludis/repositories/gentoo.conf @@ -1,5 +1,5 @@ location = /usr/portage -sync = +sync = profiles = ${location}/profiles/default/linux/amd64/13.0 /etc/paludis/profile distdir = /mnt/sda2/distfiles format = e