public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/tex:main commit in: /
@ 2023-11-17 14:28 Florian Schmaus
  0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2023-11-17 14:28 UTC (permalink / raw
  To: gentoo-commits

commit:     5aab424009fda30a15c3fe71669e2b3decd60e1f
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 17 14:26:54 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 14:26:54 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=5aab4240

populate-distdir: make sure that USE="doc source" is enabled

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 populate-distdir | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/populate-distdir b/populate-distdir
index 857dd0c..30d4e39 100755
--- a/populate-distdir
+++ b/populate-distdir
@@ -12,5 +12,7 @@ fi
 	
 export DISTDIR
 
+export USE="doc source"
+
 find "${TEX_OVERLAY_PATH}" -type f -name '*.ebuild' -print0 |\
 	xargs --null -I {} ebuild {} fetch


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/tex:main commit in: /
@ 2024-11-20 15:04 Florian Schmaus
  0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2024-11-20 15:04 UTC (permalink / raw
  To: gentoo-commits

commit:     e46f7f9f4ec09e4fb84653187a2846f778441581
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 15:04:36 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 15:04:36 2024 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=e46f7f9f

populate-distdir: add new options

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 populate-distdir | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/populate-distdir b/populate-distdir
index b63abfa..3865ef6 100755
--- a/populate-distdir
+++ b/populate-distdir
@@ -3,8 +3,29 @@ set -euo pipefail
 
 SCRIPT_DIR=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
 
+DISTDIR="$(portageq distdir)"
+EBUILD_ACTION="fetch"
+
+while getopts em OPT; do
+	case $OPT in
+		e)
+			DISTDIR="${SCRIPT_DIR}/distdir"
+			;;
+		m)
+			EBUILD_ACTION="manifest"
+			;;
+		*)
+			echo "usage: ${0##*/} [-e] [-m]"
+			echo -e "\t-e -- extra distdir"
+			echo -e "\t-m -- generate manifest (instead of fetching distfiles)"
+			echo -e "\t      will populate DISTDIR only with distfiles not yet in manifest"
+			exit 2
+	esac
+done
+shift $(( OPTIND - 1 ))
+OPTIND=1
+
 : "${TEX_OVERLAY_PATH:=$(portageq get_repo_path / tex-overlay)}"
-: "${DISTDIR:="${SCRIPT_DIR}/distdir"}"
 
 if [[ ! -d "${DISTDIR}" ]]; then
 	mkdir "${DISTDIR}"
@@ -17,4 +38,4 @@ export DISTDIR
 export USE="doc source"
 
 find "${TEX_OVERLAY_PATH}" -type f -name '*.ebuild' -print0 |\
-	xargs --null -I {} ebuild {} fetch
+	xargs --null -I {} ebuild {} "${EBUILD_ACTION}"


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/tex:main commit in: /
@ 2024-03-01 11:00 Florian Schmaus
  0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2024-03-01 11:00 UTC (permalink / raw
  To: gentoo-commits

commit:     0167b4919c0bc36d0bb1bb603640add3b9aecd5b
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  1 11:00:07 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 11:00:07 2024 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=0167b491

add overlay-to-gentoo

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 overlay-to-gentoo | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/overlay-to-gentoo b/overlay-to-gentoo
new file mode 100755
index 0000000..34d739b
--- /dev/null
+++ b/overlay-to-gentoo
@@ -0,0 +1,99 @@
+#!/usr/bin/env bash
+set -eu
+
+# Defines a somewhat sensible order in which packages should be merged
+# into ::gentoo.
+PACKAGES=(
+	dev-libs/kpathsea
+	dev-libs/ptexenc
+
+	app-text/dvipsk
+	app-text/ttf2pk2
+	app-text/ps2pkm
+	app-text/dvisvgm
+
+	dev-tex/biblatex
+	dev-tex/biber
+
+	dev-tex/latexmk
+	dev-tex/glossaries
+	dev-tex/tex4ht
+	dev-tex/minted
+	dev-tex/bibtexu
+	dev-tex/pgf
+	dev-tex/latex-beamer
+
+	app-text/texlive-core
+
+	dev-texlive/texlive-basic
+	dev-texlive/texlive-luatex
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexrecommended
+	dev-texlive/texlive-plaingeneric
+
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-langportuguese
+	dev-texlive/texlive-publishers
+	dev-texlive/texlive-langpolish
+	dev-texlive/texlive-langcyrillic
+	dev-texlive/texlive-langspanish
+	dev-texlive/texlive-langkorean
+	dev-texlive/texlive-langczechslovak
+	dev-texlive/texlive-music
+	dev-texlive/texlive-pstricks
+	dev-texlive/texlive-xetex
+	dev-texlive/texlive-langjapanese
+	dev-texlive/texlive-fontsextra
+	dev-texlive/texlive-langother
+	dev-texlive/texlive-formatsextra
+	dev-texlive/texlive-langitalian
+	dev-texlive/texlive-langfrench
+	dev-texlive/texlive-pictures
+	dev-texlive/texlive-mathscience
+	dev-texlive/texlive-metapost
+	dev-texlive/texlive-latexextra
+	dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-langarabic
+	dev-texlive/texlive-context
+	dev-texlive/texlive-fontsrecommended
+	dev-texlive/texlive-langgreek
+	dev-texlive/texlive-langeuropean
+	dev-texlive/texlive-games
+	dev-texlive/texlive-langchinese
+	dev-texlive/texlive-langenglish
+	dev-texlive/texlive-binextra
+	dev-texlive/texlive-humanities
+	dev-texlive/texlive-langgerman
+	dev-texlive/texlive-langcjk
+
+	app-text/texlive
+)
+
+GENTOO_DIR="$(portageq get_repo_path / gentoo)"
+TEX_OVERLAY_DIR="$(portageq get_repo_path / tex-overlay)"
+
+for PACKAGE in "${PACKAGES[@]}"; do
+	SOURCE="${TEX_OVERLAY_DIR}/${PACKAGE}"
+	DEST="${GENTOO_DIR}/${PACKAGE}"
+
+	[[ ! -d "${DEST}" ]] && mkdir "${DEST}"
+
+	cp "${SOURCE}"/*.ebuild "${DEST}"
+	cp "${SOURCE}"/metadata.xml "${DEST}"
+	if [[ -d "${SOURCE}"/files ]]; then
+		[[ ! -d "${DEST}"/files ]] && mkdir "${DEST}"/files
+
+		cp "${SOURCE}"/files/* "${DEST}"/files
+	fi
+
+	cd "${DEST}"
+
+	git add .
+
+	if git diff-index --quiet @; then
+		echo "Nothing to commit for ${PACKAGE}"
+		continue
+	fi
+
+	pkgdev commit
+done


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/tex:main commit in: /
@ 2024-02-28 13:01 Florian Schmaus
  0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2024-02-28 13:01 UTC (permalink / raw
  To: gentoo-commits

commit:     b56f2bfbab0fb176b34edb8dd38ee180a3911162
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 12:58:27 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 13:01:35 2024 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=b56f2bfb

bootstrap-tex4ht: remove duplicate 'wget'

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 bootstrap-tex4ht | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-tex4ht b/bootstrap-tex4ht
index 303dbe0..513a645 100755
--- a/bootstrap-tex4ht
+++ b/bootstrap-tex4ht
@@ -13,7 +13,7 @@ pushd tex4ht-svn
 TEX4HT_SVN_VERSION=$(svnversion)
 popd
 if [[ ! -d texmf-dist ]]; then
-    wget wget https://mirrors.ctan.org/systems/texlive/tlnet/archive/tex4ht.tar.xz
+    wget https://mirrors.ctan.org/systems/texlive/tlnet/archive/tex4ht.tar.xz
     unp tex4ht.tar.xz
 fi
 if [[ ! -d bin ]]; then


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/tex:main commit in: /
@ 2024-02-11 10:33 Florian Schmaus
  0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2024-02-11 10:33 UTC (permalink / raw
  To: gentoo-commits

commit:     bb700f5ac06a12017f519ea4bf07ae6a463b8b4d
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 10:33:12 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 10:33:12 2024 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=bb700f5a

populate-distdir: add quotes

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 populate-distdir | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/populate-distdir b/populate-distdir
index 6baaed9..b63abfa 100755
--- a/populate-distdir
+++ b/populate-distdir
@@ -3,8 +3,8 @@ set -euo pipefail
 
 SCRIPT_DIR=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
 
-: ${TEX_OVERLAY_PATH:=$(portageq get_repo_path / tex-overlay)}
-: ${DISTDIR:="${SCRIPT_DIR}/distdir"}
+: "${TEX_OVERLAY_PATH:=$(portageq get_repo_path / tex-overlay)}"
+: "${DISTDIR:="${SCRIPT_DIR}/distdir"}"
 
 if [[ ! -d "${DISTDIR}" ]]; then
 	mkdir "${DISTDIR}"


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/tex:main commit in: /
@ 2024-02-11 10:31 Florian Schmaus
  0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2024-02-11 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     90016a8aba0de9114f1b1b5834a99eeeacabb508
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 10:16:48 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 10:30:34 2024 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=90016a8a

populate-distdir: improve, download doc and source too

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 populate-distdir | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/populate-distdir b/populate-distdir
index 75e4042..7f805f5 100755
--- a/populate-distdir
+++ b/populate-distdir
@@ -3,14 +3,18 @@ set -euo pipefail
 
 SCRIPT_DIR=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
 
-: ${TEX_OVERLAY_PATH:=$(portageq get_repo_path / tex-overlay)
-: ${DISTDIR:="${SCRIPT_DIR}/distdir"}
+: "${TEX_OVERLAY_PATH:=$(portageq get_repo_path / tex-overlay)}"
+: "${DISTDIR:=$(portageq distdir)}"
 
 if [[ ! -d "${DISTDIR}" ]]; then
 	mkdir "${DISTDIR}"
+	# https://bford.info/cachedir/
+	echo "Signature: 8a477f597d28d172789f06886806bc55" > "${DISTDIR}/CACHEDIR.TAG"
 fi
 	
 export DISTDIR
 
+export USE="doc source"
+
 find "${TEX_OVERLAY_PATH}" -type f -name '*.ebuild' -print0 |\
 	xargs --null -I {} ebuild {} manifest fetch


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/tex:main commit in: /
@ 2024-02-11 10:31 Florian Schmaus
  0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2024-02-11 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     fd54e74f1014536a986f02044ab19705db1af0c9
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 10:34:26 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 10:34:26 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=fd54e74f

add diff-tex script

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 diff-tex | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/diff-tex b/diff-tex
new file mode 100755
index 0000000..560d93b
--- /dev/null
+++ b/diff-tex
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+set -eu
+
+GENTOO_REPO_DIR=$(portageq get_repo_path / gentoo)
+TEX_REPO_DIR=$(portageq get_repo_path / tex-overlay)
+
+case "${1}" in
+	core)
+		diff -u \
+			 "${GENTOO_REPO_DIR}/app-text/texlive-core/texlive-core-2021-r7.ebuild" \
+			 "${TEX_REPO_DIR}/app-text/texlive-core/texlive-core-2023.ebuild"
+		;;
+	eclass)
+		diff -u \
+			 "${GENTOO_REPO_DIR}/eclass/texlive-common.eclass" \
+			 "${TEX_REPO_DIR}/eclass/texlive-common.eclass"
+		diff -u \
+			 "${GENTOO_REPO_DIR}/eclass/texlive-module.eclass" \
+			 "${TEX_REPO_DIR}/eclass/texlive-module.eclass"
+		;;
+esac	


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/tex:main commit in: /
@ 2024-02-11 10:31 Florian Schmaus
  0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2024-02-11 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     89960538d2af3780d6e2572823734195e963b7c9
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 10:31:17 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 10:31:44 2024 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=89960538

Merge remote-tracking branch 'local-tex-dev/main'

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 diff-tex         | 37 +++++++++++++++++++++++++++++++++++++
 populate-distdir |  2 ++
 switch-tex       | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+)


^ permalink raw reply	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/tex:main commit in: /
@ 2024-02-11 10:31 Florian Schmaus
  0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2024-02-11 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     fe14794aaebf35e37e205213f261953f4005339c
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 16:18:20 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 16:18:20 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=fe14794a

diff-tex: add generic function to diff the ebuilds of a package

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 diff-tex | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/diff-tex b/diff-tex
index 7813947..e80934e 100755
--- a/diff-tex
+++ b/diff-tex
@@ -4,11 +4,30 @@ set -eu
 GENTOO_REPO_DIR=$(portageq get_repo_path / gentoo)
 TEX_REPO_DIR=$(portageq get_repo_path / tex-overlay)
 
+diff_package() {
+	local pkg="${1}"
+	local cat="${pkg%%/*}"
+
+	local max_gentoo_repo_version=$(pquery --max -r gentoo ${pkg})
+	max_gentoo_repo_version="${max_gentoo_repo_version##${cat}}"
+
+	local max_tex_repo_version=$(pquery --max -r tex-overlay ${pkg})
+	max_tex_repo_version="${max_tex_repo_version##${cat}}"
+
+	local max_gentoo_repo_ebuild="${GENTOO_REPO_DIR}/${pkg}/${max_gentoo_repo_version}.ebuild"
+	local max_tex_repo_ebuild="${TEX_REPO_DIR}/${pkg}/${max_tex_repo_version}.ebuild"
+
+	diff -u \
+		 "${max_gentoo_repo_ebuild}" \
+		 "${max_tex_repo_ebuild}"
+}
+
 case "${1}" in
+	biblatex)
+		diff_package dev-tex/biblatex
+		;;
 	core)
-		diff -u \
-			 "${GENTOO_REPO_DIR}/app-text/texlive-core/texlive-core-2021-r7.ebuild" \
-			 "${TEX_REPO_DIR}/app-text/texlive-core/texlive-core-2023.ebuild"
+		diff_package app-text/texlive-core
 		;;
 	eclass)
 		diff -u \


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/tex:main commit in: /
@ 2024-02-11 10:31 Florian Schmaus
  0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2024-02-11 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     14dac6ea4d9b7dca2fa38dce132b0c288190215d
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 11:21:50 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 11:21:50 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=14dac6ea

add switch-tex script

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 switch-tex | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/switch-tex b/switch-tex
new file mode 100755
index 0000000..2a89671
--- /dev/null
+++ b/switch-tex
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+
+TEXLIVE_2021_PKGS=(
+	=app-text/texlive-2021-r1
+	=app-text/texlive-core-2021-r7
+	=dev-libs/kpathsea-6.3.3_p20210325-r1
+	=dev-libs/ptexenc-1.3.9_p20210325-r1
+	=dev-tex/biber-2.16-r1
+	=dev-tex/biblatex-3.16
+	=dev-tex/bibtexu-3.71_p20210325
+	=dev-tex/latex-beamer-3.68
+)
+
+TEXLIVE_2023_PKGS=(
+	=app-text/texlive-2023
+	=app-text/texlive-core-2023
+	=dev-libs/kpathsea-6.3.5_p20230311
+	=dev-libs/ptexenc-1.4.3_p20230311
+	=dev-tex/biber-2.19
+	=dev-tex/biblatex-3.19
+	=dev-tex/bibtexu-4.00_p20230311
+	=dev-tex/latex-beamer-3.70
+)
+
+EMERGE_OPTS=(
+	--oneshot
+	--verbose
+	--tree
+)
+
+
+if [[ ! -v NO_UPDATE ]]; then
+	EMERGE_OPTS+=(--update)
+fi
+
+TEXLIVE_VERSION="$1"
+shift
+
+case ${TEXLIVE_VERSION} in
+	21)
+		emerge \
+			${EMERGE_OPTS[*]} \
+			--usepkg ${USEPKG:-y} \
+			$* \
+			${TEXLIVE_2021_PKGS[@]}
+		;;
+	23)
+		ACCEPT_KEYWORDS="~amd64" \
+					   emerge \
+					   ${EMERGE_OPTS[*]} \
+					   --usepkg ${USEPKG:-n} \
+					   --buildpkg ${BUILDPKG:-n} \
+					   $* \
+					   ${TEXLIVE_2023_PKGS[@]}
+		;;
+esac


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/tex:main commit in: /
@ 2024-02-11 10:31 Florian Schmaus
  0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2024-02-11 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     36bef437c3c22334aac5eeb6074a5aee48d00e0b
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 11:47:03 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 11:47:08 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=36bef437

diff-tex: use "pquery --one-attr path"

Thanks to Arthur Zamarin for pointing this out.

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 diff-tex | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/diff-tex b/diff-tex
index e80934e..f77898f 100755
--- a/diff-tex
+++ b/diff-tex
@@ -1,27 +1,29 @@
 #!/usr/bin/env bash
 set -eu
 
-GENTOO_REPO_DIR=$(portageq get_repo_path / gentoo)
-TEX_REPO_DIR=$(portageq get_repo_path / tex-overlay)
-
 diff_package() {
 	local pkg="${1}"
-	local cat="${pkg%%/*}"
-
-	local max_gentoo_repo_version=$(pquery --max -r gentoo ${pkg})
-	max_gentoo_repo_version="${max_gentoo_repo_version##${cat}}"
 
-	local max_tex_repo_version=$(pquery --max -r tex-overlay ${pkg})
-	max_tex_repo_version="${max_tex_repo_version##${cat}}"
-
-	local max_gentoo_repo_ebuild="${GENTOO_REPO_DIR}/${pkg}/${max_gentoo_repo_version}.ebuild"
-	local max_tex_repo_ebuild="${TEX_REPO_DIR}/${pkg}/${max_tex_repo_version}.ebuild"
+	local max_gentoo_repo_ebuild=$(pquery --max --one-attr path -r gentoo ${pkg})
+	local max_tex_repo_ebuild=$(pquery    --max --one-attr path -r tex-overlay ${pkg})
 
 	diff -u \
 		 "${max_gentoo_repo_ebuild}" \
 		 "${max_tex_repo_ebuild}"
 }
 
+diff_eclass() {
+	local gentoo_repo_dir=$(portageq get_repo_path / gentoo)
+	local tex_repo_dir=$(portageq get_repo_path / tex-overlay)
+
+	diff -u \
+		 "${gentoo_repo_dir}/eclass/texlive-common.eclass" \
+		 "${tex_repo_dir}/eclass/texlive-common.eclass"
+	diff -u \
+		 "${gentoo_repo_dir}/eclass/texlive-module.eclass" \
+		 "${tex_repo_dir}/eclass/texlive-module.eclass"
+}
+
 case "${1}" in
 	biblatex)
 		diff_package dev-tex/biblatex
@@ -30,11 +32,6 @@ case "${1}" in
 		diff_package app-text/texlive-core
 		;;
 	eclass)
-		diff -u \
-			 "${GENTOO_REPO_DIR}/eclass/texlive-common.eclass" \
-			 "${TEX_REPO_DIR}/eclass/texlive-common.eclass"
-		diff -u \
-			 "${GENTOO_REPO_DIR}/eclass/texlive-module.eclass" \
-			 "${TEX_REPO_DIR}/eclass/texlive-module.eclass"
+		diff_eclass
 		;;
 esac


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/tex:main commit in: /
@ 2024-02-11 10:31 Florian Schmaus
  0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2024-02-11 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     cecaed0940f2738c908e386a00029c675afc74e4
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 11:21:41 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 11:21:44 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=cecaed09

diff-tex: whitespace fixes

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 diff-tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diff-tex b/diff-tex
index 560d93b..7813947 100755
--- a/diff-tex
+++ b/diff-tex
@@ -18,4 +18,4 @@ case "${1}" in
 			 "${GENTOO_REPO_DIR}/eclass/texlive-module.eclass" \
 			 "${TEX_REPO_DIR}/eclass/texlive-module.eclass"
 		;;
-esac	
+esac


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/tex:main commit in: /
@ 2023-11-17 14:28 Florian Schmaus
  0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2023-11-17 14:28 UTC (permalink / raw
  To: gentoo-commits

commit:     f6aa9dde07759665df701c790a1cacf0ad65bc9e
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 17 14:26:40 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 14:26:40 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=f6aa9dde

populate-distdir: only invoke ebuild with 'fetch'

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 populate-distdir | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/populate-distdir b/populate-distdir
index b548539..857dd0c 100755
--- a/populate-distdir
+++ b/populate-distdir
@@ -13,4 +13,4 @@ fi
 export DISTDIR
 
 find "${TEX_OVERLAY_PATH}" -type f -name '*.ebuild' -print0 |\
-	xargs --null -I {} ebuild {} manifest fetch
+	xargs --null -I {} ebuild {} fetch


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/tex:main commit in: /
@ 2023-11-17 14:28 Florian Schmaus
  0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2023-11-17 14:28 UTC (permalink / raw
  To: gentoo-commits

commit:     01d7128042102de929bb41a29607af9560d39c0e
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 17 14:26:23 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 14:26:23 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=01d71280

populate-distdir: fix syntax

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 populate-distdir | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/populate-distdir b/populate-distdir
index 75e4042..b548539 100755
--- a/populate-distdir
+++ b/populate-distdir
@@ -3,7 +3,7 @@ set -euo pipefail
 
 SCRIPT_DIR=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
 
-: ${TEX_OVERLAY_PATH:=$(portageq get_repo_path / tex-overlay)
+: ${TEX_OVERLAY_PATH:=$(portageq get_repo_path / tex-overlay)}
 : ${DISTDIR:="${SCRIPT_DIR}/distdir"}
 
 if [[ ! -d "${DISTDIR}" ]]; then


^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2024-11-20 15:04 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-17 14:28 [gentoo-commits] proj/tex:main commit in: / Florian Schmaus
  -- strict thread matches above, loose matches on Subject: below --
2024-11-20 15:04 Florian Schmaus
2024-03-01 11:00 Florian Schmaus
2024-02-28 13:01 Florian Schmaus
2024-02-11 10:33 Florian Schmaus
2024-02-11 10:31 Florian Schmaus
2024-02-11 10:31 Florian Schmaus
2024-02-11 10:31 Florian Schmaus
2024-02-11 10:31 Florian Schmaus
2024-02-11 10:31 Florian Schmaus
2024-02-11 10:31 Florian Schmaus
2024-02-11 10:31 Florian Schmaus
2023-11-17 14:28 Florian Schmaus
2023-11-17 14:28 Florian Schmaus

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox