commit: 8df5ac652b38d4c1e903545e9001c2a54f5fab55 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun Apr 9 04:02:25 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Apr 9 04:05:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8df5ac65
x11-misc/xorg-cf-files: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-misc/xorg-cf-files/Manifest | 2 - .../files/xorg-cf-files-1.0.7-linux-riscv.patch | 56 ---------------------- .../xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild | 46 ------------------ 3 files changed, 104 deletions(-) diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest index f52e87655faf..017c98099822 100644 --- a/x11-misc/xorg-cf-files/Manifest +++ b/x11-misc/xorg-cf-files/Manifest @@ -1,3 +1 @@ -DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3 -DIST xorg-cf-files-1.0.7.tar.bz2 345575 BLAKE2B 62ca33673b65cccb4c33c9bc138fac768862d3fd2a8e35d875b4a7af7938df3a2d1437bcb9661c8b84c69a73f60e5ae4a2bf58a003987dcd9293a3a948c97531 SHA512 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e DIST xorg-cf-files-1.0.8.tar.xz 290280 BLAKE2B b822839f2effa091d7e60aa82e0356dc6770116566d9c78a6c0915b8f9e89eb4a3bf78a3bd5380607b3b3e4c1670fb1c6ef0b3ac8ca342cfc1ef141a925c927d SHA512 cc633af889cd82346c3098df9185245c21aa9db7484343f8be9719f6e0b1fc0a9b09afb13b9b864668aa51944f2da797bbe896c807f629e89fc91506e6e63fb9 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 deleted file mode 100644 index 143aa53a0280..000000000000 --- a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.7-linux-riscv.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- 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.7-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild deleted file mode 100644 index 4d120a0e40a1..000000000000 --- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 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 ~loong ~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" -}
