Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/gentoo-xcursors/
Date: Sat, 30 Jul 2022 23:32:27
Message-Id: 1659223349.477015c0b557b557c8cd527b93fd5ba8d6b42000.sam@gentoo
1 commit: 477015c0b557b557c8cd527b93fd5ba8d6b42000
2 Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
3 AuthorDate: Fri Jul 29 11:21:06 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 30 23:22:29 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477015c0
7
8 x11-themes/gentoo-xcursors: fix blocked symlink installation
9
10 A directory was replaced by a symlink but that does not work due to
11 bug #834600.
12
13 Straight to stable since the broken ebuild landed in stable and the
14 package isn't compiling anything.
15
16 Closes: https://bugs.gentoo.org/861785
17 Co-developed-by: John Duncan
18 Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
19 Signed-off-by: Sam James <sam <AT> gentoo.org>
20
21 .../gentoo-xcursors-0.3.2-r3.ebuild | 51 ++++++++++++++++++++++
22 1 file changed, 51 insertions(+)
23
24 diff --git a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r3.ebuild b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r3.ebuild
25 new file mode 100644
26 index 000000000000..a891f268b288
27 --- /dev/null
28 +++ b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r3.ebuild
29 @@ -0,0 +1,51 @@
30 +# Copyright 1999-2022 Gentoo Authors
31 +# Distributed under the terms of the GNU General Public License v2
32 +
33 +EAPI=8
34 +
35 +DESCRIPTION="A high quality set of animated mouse cursors"
36 +HOMEPAGE="https://schlomp.space/tastytea/gentoo-xcursors"
37 +SRC_URI="https://schlomp.space/tastytea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
38 +S="${WORKDIR}/${PN}"
39 +
40 +LICENSE="MIT"
41 +SLOT="0"
42 +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
43 +
44 +src_install() {
45 + insinto /usr/share/icons
46 + doins -r cursors/*
47 +
48 + # Add symlinks in Gentoo-specific location for backwards compatibility, #848606
49 + mkdir -p ${ED}/usr/share/cursors/xorg-x11 || die
50 + cd ${ED}/usr/share/cursors/xorg-x11 || die
51 + for cursorset in ../../icons/*; do
52 + dosym ${cursorset} /usr/share/cursors/xorg-x11/${cursorset##*/}
53 + done
54 +}
55 +
56 +pkg_preinst() {
57 + # Needed until bug #834600 is solved
58 + if [[ -n ${REPLACING_VERSIONS} ]] ; then
59 + GENTOOCURSORS="${EROOT}/usr/share/cursors/xorg-x11"
60 + if [[ -d "${GENTOOCURSORS}/gentoo" ]] ; then
61 + rm -r "${GENTOOCURSORS}/gentoo" || die
62 + fi
63 + if [[ -d "${GENTOOCURSORS}/gentoo-blue" ]] ; then
64 + rm -r "${GENTOOCURSORS}/gentoo-blue" || die
65 + fi
66 + if [[ -d "${GENTOOCURSORS}/gentoo-silver" ]] ; then
67 + rm -r "${GENTOOCURSORS}/gentoo-silver" || die
68 + fi
69 +
70 + if [[ -L "${GENTOOCURSORS}"/gentoo.backup.0000 ]]; then
71 + einfo "There are symlinks left from a previous failed upgrade."
72 + einfo "Remove ${GENTOOCURSORS}/gentoo*.backup.* manually to get rid of them."
73 + fi
74 + fi
75 +}
76 +
77 +pkg_postinst() {
78 + einfo "To use this set of cursors, consult <https://wiki.gentoo.org/wiki/Cursor_themes>."
79 + einfo "The three sets installed are gentoo, gentoo-silver and gentoo-blue."
80 +}