gentoo resync : 28.04.2021

4 files changed, 85 insertions, 102 deletions

diff --git a/x11-themes/neutral-xcursors/Manifest b/x11-themes/neutral-xcursors/Manifest
index 5e74a38130f3..5cfe314a4b96 100644
--- a/x11-themes/neutral-xcursors/Manifest
+++ b/x11-themes/neutral-xcursors/Manifest
@@ -3,5 +3,5 @@ DIST Neutral++-1.0.3.tar.bz2 43751 BLAKE2B eb5ca2983b7cd5638dadffdcda6e86dde7808
 DIST Neutral++_White-1.1.1.tar.bz2 42982 BLAKE2B b7e4cfe258ae1aeda9c0415136acd9a67c18c00d8c076153109ac86d9c481d9a936fcedecd5e7ea15ae26862c96b824d62cfb8928ae9818c2b3b83e1525532dd SHA512 0027dd2823c605c810904d86fd25d021cde14c24c4b1cb507dd5829ac0cd6763fa96296db76422a1b2667b7e2a4b4ca397bfc26823f5b2656753a507cb71f0a2
 DIST Neutral-1.13a.tar.gz 68777 BLAKE2B 53e999c79d8637cf14af0b1e70b549452b72df6881b4517ea568f67d3b78f4bd73bb51a5c95c84864daf271d7c63cba795ab4a1c7a895c4a361e900f3b9ca5e9 SHA512 bee7d433294e74fd4c4e1e7892b15035c9f880a85da7b5faae16efc517cfd939a14258b36a9aa297db30ff994547262f1c8114a10ec1db497e88245b1905d4c3
 DIST Neutral_Plus-1.2.tar.bz2 61354 BLAKE2B ce3fb7d375228ce7f6179234dbe8461ae6f712177350a5c0b41175d7bf0419e7c385d016b7a7d28b1023798aed478c1c3a504c8d6fe2cb0b1a2790a8b0efa574 SHA512 e20b4aa172561b04d39a3209a0977d6d7d8f1956fb4d60f7dd022b7ae6195890956b76facbe58fe3d5fd6a4b844f0c14da5d09f7f82379048c610e41133a713d
-EBUILD neutral-xcursors-20150106.ebuild 2796 BLAKE2B 8b55bf5af02261f75b115b38d76a1ce6329dffe85931ae31b177ab8272a43f111875b7649e89971cfe0311f304ba68bb92f59e5e480fcb98227eacc342247204 SHA512 10d3f76aeaff140092753d43ea6b0a7d5569e54309345f31d5765f154d61463150277efaa90eabda189fd60416e02b290af8068a73b518300733651c7142eb9e
-MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
+EBUILD neutral-xcursors-20150106-r1.ebuild 1824 BLAKE2B d9c1922d30b0d20379bbf928bcb0be56e37fcab1a2141f85e4c60295b06791fb71902081f6e009e02dac98dc80ec634a02d227f6423190ef76bcd8d1eb345d2a SHA512 5c574d668aa74cb99f44ba47bd7d0651b5d19c596722978ebe62b1d032add120acb134bd0637861c955f37de150fc27c903e08cb8fbfe9d1d047022503f4f8d1
+MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/x11-themes/neutral-xcursors/metadata.xml b/x11-themes/neutral-xcursors/metadata.xml
index 585b0dc75dda..3c58a0219fbe 100644
--- a/x11-themes/neutral-xcursors/metadata.xml
+++ b/x11-themes/neutral-xcursors/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	</pkgmetadata>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/x11-themes/neutral-xcursors/neutral-xcursors-20150106-r1.ebuild b/x11-themes/neutral-xcursors/neutral-xcursors-20150106-r1.ebuild
new file mode 100644
index 000000000000..28dbb5e6b7d4
--- /dev/null
+++ b/x11-themes/neutral-xcursors/neutral-xcursors-20150106-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+NEUTRAL_PN="Neutral"
+NEUTRAL_PV="1.13a"
+NEUTRAL_P="${NEUTRAL_PN}-${NEUTRAL_PV}"
+
+PLUS_PN="Neutral_Plus"
+PLUS_PV="1.2"
+PLUS_P="${PLUS_PN}-${PLUS_PV}"
+
+PLUSPLUS_PN="Neutral++"
+PLUSPLUS_PV="1.0.3"
+PLUSPLUS_P="${PLUSPLUS_PN}-${PLUSPLUS_PV}"
+
+WHITE_PN="Neutral++_White"
+WHITE_PV="1.1.1"
+WHITE_P="${WHITE_PN}-${WHITE_PV}"
+
+DESCRIPTION="A family of smoothed and shadowed cursors that resemble the standard X ones"
+HOMEPAGE="
+	https://store.kde.org/p/999947/
+	https://store.kde.org/p/999928/
+	https://store.kde.org/p/999941/
+	https://store.kde.org/p/999806/
+"
+
+SRC_URI="
+	mirror://gentoo/${NEUTRAL_P}.tar.gz
+	mirror://gentoo/${PLUS_P}.tar.bz2
+	mirror://gentoo/${PLUSPLUS_P}.tar.bz2
+	mirror://gentoo/${WHITE_P}.tar.bz2
+"
+S="${WORKDIR}"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+
+DEPEND="x11-apps/xcursorgen"
+RDEPEND="x11-libs/libXcursor"
+
+src_prepare() {
+	default
+
+	mv neutral Neutral || die
+	mkdir -p "${PLUS_PN}"/source/cursors || die
+}
+
+src_compile() {
+	local cursor_dirs=( "${NEUTRAL_PN}" "${PLUS_PN}" "${PLUSPLUS_PN}" "${WHITE_PN}"	)
+	for cursor_dir in "${cursor_dirs[@]}"; do
+		pushd "${cursor_dir}"/source
+			./make.sh || die
+		popd
+	done
+}
+
+src_install() {
+	pushd "${NEUTRAL_PN}"
+		insinto /usr/share/cursors/xorg-x11/"${NEUTRAL_PN}"
+		doins -r index.theme source/cursors/
+	popd
+
+	pushd "${PLUS_PN}"
+		insinto /usr/share/cursors/xorg-x11/"${PLUS_PN}"
+		doins -r "${FILESDIR}/index.theme" source/cursors/
+	popd
+
+	pushd "${PLUSPLUS_PN}"
+		insinto /usr/share/cursors/xorg-x11/"${PLUSPLUS_PN}"
+		doins -r index.theme cursors/
+	popd
+
+	pushd "${WHITE_PN}"
+		insinto /usr/share/cursors/xorg-x11/"${WHITE_PN}"
+		doins -r index.theme cursors/
+	popd
+}
diff --git a/x11-themes/neutral-xcursors/neutral-xcursors-20150106.ebuild b/x11-themes/neutral-xcursors/neutral-xcursors-20150106.ebuild
deleted file mode 100644
index d60e6d4a9bb0..000000000000
--- a/x11-themes/neutral-xcursors/neutral-xcursors-20150106.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-NEUTRAL_PN="Neutral"
-NEUTRAL_PV="1.13a"		# 2006-03-06
-NEUTRAL_P="${NEUTRAL_PN}-${NEUTRAL_PV}"
-
-PLUS_PN="Neutral_Plus"
-PLUS_PV="1.2"			# 2007-06-23
-PLUS_P="${PLUS_PN}-${PLUS_PV}"
-
-PLUSPLUS_PN="Neutral++"
-PLUSPLUS_PV="1.0.3"		# 2015-01-06
-PLUSPLUS_P="${PLUSPLUS_PN}-${PLUSPLUS_PV}"
-
-WHITE_PN="Neutral++_White"
-WHITE_PV="1.1.1"		# 2015-01-06
-WHITE_P="${WHITE_PN}-${WHITE_PV}"
-
-inherit gnome2-utils vcs-snapshot
-
-DESCRIPTION="A family of smoothed and shadowed cursors that resemble the standard X ones"
-HOMEPAGE="
-	https://opendesktop.org/content/show.php/Neutral?content=28310
-	https://opendesktop.org/content/show.php/Neutral+Plus?content=48837
-	https://opendesktop.org/content/show.php/Neutral%2B%2B?content=108142
-	https://opendesktop.org/content/show.php/Neutral%2B%2B+White?content=108143
-"
-# Neutral++{,_White} URIs return tar.xz archives that are actually tar.bz2.
-SRC_URI="
-	https://opendesktop.org/CONTENT/content-files/28310-neutral-${NEUTRAL_PV}.tar.gz -> ${NEUTRAL_P}.tar.gz
-	https://opendesktop.org/CONTENT/content-files/48837-Neutral_Plus_${PLUS_PV}.tar.bz2 -> ${PLUS_P}.tar.bz2
-	https://opendesktop.org/CONTENT/content-files/108142-Neutral++-${PLUSPLUS_PV}.tar.xz -> ${PLUSPLUS_P}.tar.bz2
-	https://opendesktop.org/CONTENT/content-files/108143-Neutral++_White-${WHITE_PV}.tar.xz -> ${WHITE_P}.tar.bz2
-"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/xcursorgen"
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default_src_prepare
-	sed -i -e 's|neutral|Neutral|g' ${NEUTRAL_P}/index.theme || die
-	mkdir -p ${PLUS_P}/source/cursors || die
-}
-
-src_compile() {
-	local cursor_dir
-	for cursor_dir in ${NEUTRAL_P} ${PLUS_P} ${PLUSPLUS_P} ${WHITE_P}; do
-		pushd ${cursor_dir}/source > /dev/null || die
-			sh make.sh || die
-		popd > /dev/null || die
-	done
-}
-
-src_install() {
-	pushd ${NEUTRAL_P} > /dev/null || die
-		insinto /usr/share/icons/${NEUTRAL_PN}
-		doins -r index.theme source/cursors/
-	popd > /dev/null || die
-
-	pushd ${PLUS_P} > /dev/null || die
-		insinto /usr/share/icons/${PLUS_PN}
-		# Upstream ships an invalid (as per freedesktop.org) index.theme.
-		# See https://www.freedesktop.org/wiki/Specifications/icon-theme-spec/
-		doins -r "${FILESDIR}/index.theme" source/cursors/
-	popd > /dev/null || die
-
-	pushd ${PLUSPLUS_P} > /dev/null || die
-		insinto /usr/share/icons/${PLUSPLUS_PN}
-		doins -r index.theme cursors/
-	popd > /dev/null || die
-
-	pushd ${WHITE_P} > /dev/null || die
-		insinto /usr/share/icons/${WHITE_PN}
-		doins -r index.theme cursors/
-	popd > /dev/null || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}