[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

[Manuel Rüger]

commit:     3516e28e0d3ed69c1162eea9aab0e9efe5cf60df
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 16:10:47 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 16:10:47 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3516e28e

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

Package-Manager: portage-2.2.26

 x11-misc/xorg-cf-files/Manifest                   |  1 +
 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 32 +++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 8c70a67..8487f5e 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1 +1,2 @@
 DIST xorg-cf-files-1.0.5.tar.bz2 377835 SHA256 
ed23b85043edecc38fad4229e0ebdb7ff80b570e746bc03a7c8678d601be7ed4 SHA512 
139d2c51538257eac79118ea367cdfbebebcd095f353e784b61c109e008bf8e43eb4ef15bb0c8df74339dbed9d96af4c4d1e023c23d02d5de31dc2ea5b85ce5c
 WHIRLPOOL 
8621de9d25a9672d30d9ee3ed6a617e9c9e9d5a34c945fa458b0318b9bf157569f97ea1697efc463f3bb0ae8c6d0335dd30a6b5499c6baf00c5e172aaa5bf95b
+DIST xorg-cf-files-1.0.6.tar.bz2 337859 SHA256 
4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d SHA512 
1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
 WHIRLPOOL 
ef7d0581bd2d36ba61ccd47d7928dff43839494252af37350582cbab7ca3740cecb7a0d2c913aeb73fafeef1cbde7e2daf7ca9425dad6a6a29dd922dc80d7c97

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
new file mode 100644
index 0000000..a72a36f
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Old Imake-related build files"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
+)
+
+src_install() {
+       xorg-2_src_install
+       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"
+}