From 068424b26532f3551a81421a9be67ed206e5c11a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 11 Aug 2021 07:02:28 +0100 Subject: gentoo resync : 11.08.2021 --- x11-misc/xorg-cf-files/Manifest | 6 ++- .../files/xorg-cf-files-1.0.7-linux-riscv.patch | 56 ++++++++++++++++++++++ .../xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild | 2 +- .../xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild | 46 ++++++++++++++++++ x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild | 2 +- 5 files changed, 108 insertions(+), 4 deletions(-) create mode 100644 x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.7-linux-riscv.patch create mode 100644 x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild (limited to 'x11-misc/xorg-cf-files') diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest index c804b73c5d3d..f2d8b5397902 100644 --- a/x11-misc/xorg-cf-files/Manifest +++ b/x11-misc/xorg-cf-files/Manifest @@ -1,7 +1,9 @@ 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 2123 BLAKE2B 8a5f9dede53e80a256f151ebd12b88b97ce43eb4a4dccb6343fa8cb93afee17eac50a53ad02e756ab1fa9ac27802f9fa184d45893a333f5f9ed4cfa7b15c1f12 SHA512 b87c68d66f7cd591a90bfe178e3bb84fdb273b2e54f64ff5ed2d5ff993dba5ff6b94803cf01795e9cc25e87d2d46b22576aa442e8aa473f0a706c1d834c3062f -EBUILD xorg-cf-files-1.0.7.ebuild 1959 BLAKE2B d9c578e1f82a7915b43028e2371efb9d6d3c761057e6b157bb7a6c5e89e00c8df24d69f41666de474f7b73921fdcbbeb9aea1668d85cea0bc3d2ec4a60ca4f0e SHA512 2e91c5dcfc1ab511fcd747920b5f52b4afc7774847804e1fa59670f2bac70c7bc93c173d1e4c5ec8cbb72eb29a11e3fba8513e7d867e2cd74a26a0aef768bdcc +EBUILD xorg-cf-files-1.0.6-r2.ebuild 2116 BLAKE2B 6f4a625d0ad8a2f3f06c9ad48da26c6801d1b571aa1325e89aee77527bc47bc5fc30d8b440b54c6d9353d2c9869e6a51c865e36d4ee9cdc2bd597144b7e151ff SHA512 65ec70b79bbee5f2f256e9356b9fff0350e0dc6fee458f5de401a667ebb2a2f72bfce80fb59c6b0b2e720d12c3efdf06b9266150c485936d2641df7f8721826d +EBUILD xorg-cf-files-1.0.7-r1.ebuild 2004 BLAKE2B 0c33adcd29491cd41243dc25bb0b574f903a14efcfe7e89927ebc40b6ef8e8ed040d27fe6a7206435e7f33f103cb135b4fa785441157964bb800e4bf9d777c1e SHA512 6a224874cd5d4361624938c618f0691031623cc7948a0a4cc5544cf3fc44b56c4d52032f314a646c124d40c4784521601a05280a3cb0630ddec28d810fc3c20a +EBUILD xorg-cf-files-1.0.7.ebuild 1952 BLAKE2B 42449687e7df6c45332fe5c4da007a6900f5ddcf5c5a265003583e44b26a5fc48c3e45592287de69834394f26c6ecfbafa756f5b2b4fccb7cdbf32c02985c0c9 SHA512 163a67ae8db397254eb2091353754579b069becaadf3938786d7dfc8a161bf457e8dbce199613f990cb2e089735ddccff3ce19a9a3ef0eaa7446845c56faacdc MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.7-linux-riscv.patch b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.7-linux-riscv.patch new file mode 100644 index 000000000000..143aa53a0280 --- /dev/null +++ b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.7-linux-riscv.patch @@ -0,0 +1,56 @@ +--- a/Imake.cf ++++ b/Imake.cf +@@ -1037,6 +1037,17 @@ + # define AArch64Architecture + # undef __aarch64__ + # endif ++# if defined(__riscv) ++# undef __riscv ++# if __riscv_xlen == 64 ++# undef __riscv_xlen ++# define RV64Architecture ++# endif ++# if __riscv_xlen == 32 ++# undef __riscv_xlen ++# define RV32Architecture ++# endif ++# endif + #endif /* linux || __GLIBC__ */ + + #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) +--- a/linux.cf ++++ b/linux.cf +@@ -584,7 +584,7 @@ + #define MkdirHierCmd mkdir -p + + #ifndef HaveLib64 +-# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) ++# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) || defined (RV64Architecture) + # define HaveLib64 YES + # else + # define HaveLib64 NO +@@ -1000,6 +1000,24 @@ + # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 + #endif /* AArch64Architecture */ + ++#ifdef RV64Architecture ++# ifndef OptimizedCDebugFlags ++# define OptimizedCDebugFlags -O2 GccAliasingArgs ++# endif ++# define LinuxMachineDefines -D__riscv -D__riscv_xlen=64 ++# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME ++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 ++#endif /* RV64Architecture */ ++ ++#ifdef RV32Architecture ++# ifndef OptimizedCDebugFlags ++# define OptimizedCDebugFlags -O2 GccAliasingArgs ++# endif ++# define LinuxMachineDefines -D__riscv -D__riscv_xlen=32 ++# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME ++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines ++#endif /* RV32Architecture */ ++ + #ifndef StandardDefines + # ifdef __linux__ + # define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines 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 index 728aed4cf895..5ac95d9db225 100644 --- 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 @@ -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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="" BDEPEND=" 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 new file mode 100644 index 000000000000..0c86ae1b1599 --- /dev/null +++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 ~riscv ~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 + "${FILESDIR}"/${PN}-1.0.7-linux-riscv.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" +} 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 index e4264f2a2f4f..55cb574d3bae 100644 --- 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 @@ -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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" BDEPEND=" virtual/pkgconfig -- cgit v1.2.3