gentoo resync : 05.12.2021

5 files changed, 2 insertions, 128 deletions

diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 121776402410..e5a2c4941e3d 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,9 +1,5 @@
-AUX xorg-cf-files-1.0.6-no-ar-l.patch 495 BLAKE2B fe86e089f8bf374c9fa17b2608aa4b9e84201aa55065f0a7d9bbcf2ee921e85d2694ec31cb6f570fbb4bd37d15d2bb49c930528640416b0e7434b8eb037dbbc8 SHA512 6227ded01e55325946160131c6742fd8b13d145ac9f64b69d08db44dd809063e8886ab8fa97c52bbf34ff536f3b17c988d49d2bc6d1837770c13ba4d8242a9b1
 AUX xorg-cf-files-1.0.7-linux-riscv.patch 1936 BLAKE2B 5c518c78519552a2cdbfb067b02130e583e40dd39bc7c2ad7591f4900e7423f50f7c99a6ec47dbe7a44d31bf7c36b5f550f97d2c484ba8e8ea9f7883a6125b2e SHA512 876ee2c392b8ac6ace459779d4620e6d66c6701065c09604c619686b67fee757faf4b6d2299712f330d8f1bb78be7429250b7f3c08df7513b4a22c8749360781
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
-DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
 DIST xorg-cf-files-1.0.7.tar.bz2 345575 BLAKE2B 62ca33673b65cccb4c33c9bc138fac768862d3fd2a8e35d875b4a7af7938df3a2d1437bcb9661c8b84c69a73f60e5ae4a2bf58a003987dcd9293a3a948c97531 SHA512 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e
-EBUILD xorg-cf-files-1.0.6-r2.ebuild 2116 BLAKE2B 6f4a625d0ad8a2f3f06c9ad48da26c6801d1b571aa1325e89aee77527bc47bc5fc30d8b440b54c6d9353d2c9869e6a51c865e36d4ee9cdc2bd597144b7e151ff SHA512 65ec70b79bbee5f2f256e9356b9fff0350e0dc6fee458f5de401a667ebb2a2f72bfce80fb59c6b0b2e720d12c3efdf06b9266150c485936d2641df7f8721826d
-EBUILD xorg-cf-files-1.0.7-r1.ebuild 2002 BLAKE2B eb530751955e94571d4d7082d4c3708cfe0b2aa400354b8ccfce59df8258ad874b066bf250a391003159a6d15679860892aa0bb81f240cdc90a429611afa4a17 SHA512 5feee912e64ba8a5463260333d001647314de9a689c819ea2ae6c7757b0ce19536edf9221cf54d9fb8f6c53067d4c131cc60ebc9c9f805db9572f9b9c8e0e1db
-EBUILD xorg-cf-files-1.0.7.ebuild 1952 BLAKE2B 42449687e7df6c45332fe5c4da007a6900f5ddcf5c5a265003583e44b26a5fc48c3e45592287de69834394f26c6ecfbafa756f5b2b4fccb7cdbf32c02985c0c9 SHA512 163a67ae8db397254eb2091353754579b069becaadf3938786d7dfc8a161bf457e8dbce199613f990cb2e089735ddccff3ce19a9a3ef0eaa7446845c56faacdc
+EBUILD xorg-cf-files-1.0.7-r1.ebuild 1997 BLAKE2B e0c65969ed946cab88b086b2bab177283aebbdd0b674499195f64f19c285084cac5d5f5ef9caa2d04182adb4b4ff71e4d912726924a2148c5979a13bcae28706 SHA512 701bb63cb65e4c9ee8a529e4a5b3389ab90fe22e8d0bfae0a3aea958216df32f23372a72e24a51cd8114ae6e1f53596321a26666bb15259d1f11747de0c61798
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch
deleted file mode 100644
index 52e07f319544..000000000000
--- a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-l argument was formerly ignored by binutils, but since 2.36 is used
-for something other than what was intended here (tmp files location).
-https://bugs.gentoo.org/782514
---- a/Imake.tmpl
-+++ b/Imake.tmpl
-@@ -1083,3 +1083,3 @@
- #else
--#define ArCmd ArCmdBase clq
-+#define ArCmd ArCmdBase cq
- #endif
-@@ -1090,3 +1090,3 @@
- #else
--#define ArAddCmd ArCmdBase rul
-+#define ArAddCmd ArCmdBase ru
- #endif
-@@ -1097,3 +1097,3 @@
- #else
--#define ArExtCmd ArCmdBase xl
-+#define ArExtCmd ArCmdBase x
- #endif
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
deleted file mode 100644
index 5ac95d9db225..000000000000
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Old Imake-related build files"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf"
-SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
-	https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-	app-arch/bzip2
-"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-ar-l.patch
-	"${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch
-)
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-	)
-
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \
-		"${ED}"/usr/$(get_libdir)/X11/config/host.def || die
-	sed -i -e "s|LibDirName *lib$|LibDirName $(get_libdir)|" \
-		"${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
-	sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" \
-		"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
-	sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" \
-		"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
-	sed -i -e "/#  define Solaris64bitSubdir/d" \
-		"${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
-	sed -i -e 's/-DNOSTDHDRS//g' \
-		"${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
-
-	sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" \
-		"${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
-	sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir /usr/$(get_libdir)|" \
-		"${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
-	sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir /usr/$(get_libdir)|" \
-		"${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
-}
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
index e975dcc5e261..b562cc67023d 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild
deleted file mode 100644
index 55cb574d3bae..000000000000
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Old Imake-related build files"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf"
-SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
-	https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	virtual/pkgconfig
-	app-arch/bzip2
-"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch
-)
-
-src_install() {
-	default
-	echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \
-		"${ED}"/usr/$(get_libdir)/X11/config/host.def || die
-	sed -i -e "s|LibDirName *lib$|LibDirName $(get_libdir)|" \
-		"${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
-	sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" \
-		"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
-	sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" \
-		"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
-	sed -i -e "/#  define Solaris64bitSubdir/d" \
-		"${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
-	sed -i -e 's/-DNOSTDHDRS//g' \
-		"${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
-
-	sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" \
-		"${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
-	sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir /usr/$(get_libdir)|" \
-		"${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
-	sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir /usr/$(get_libdir)|" \
-		"${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
-}