commit:     8be05b72e722873c0d7f6ad243501513c9d58e1b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  2 04:01:37 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Aug  2 04:10:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8be05b72

x11-misc/xorg-cf-files: Version bump to 1.0.7

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-misc/xorg-cf-files/Manifest                   |  1 +
 x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild | 45 +++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 7b8dc93bc73..c4bcd855654 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,2 +1,3 @@
 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

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
new file mode 100644
index 00000000000..e4264f2a2f4
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild
@@ -0,0 +1,45 @@
+# 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 ~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
+)
+
+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"
+}

Reply via email to