Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/
Date: Tue, 07 Mar 2017 09:15:06
Message-Id: 1488877952.15b2b0e21b00a3011c182668be3d7beaf4107e91.soap@gentoo
1 commit: 15b2b0e21b00a3011c182668be3d7beaf4107e91
2 Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
3 AuthorDate: Mon Mar 6 15:22:31 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 7 09:12:32 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b2b0e2
7
8 x11-misc/xorg-cf-files: Remove old
9
10 Package-Manager: Portage-2.3.4, Repoman-2.3.2
11 Closes: https://github.com/gentoo/gentoo/pull/4142
12
13 x11-misc/xorg-cf-files/Manifest | 1 -
14 x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild | 31 -----------------------
15 2 files changed, 32 deletions(-)
16
17 diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
18 index 8487f5e82b5..358fb4986a6 100644
19 --- a/x11-misc/xorg-cf-files/Manifest
20 +++ b/x11-misc/xorg-cf-files/Manifest
21 @@ -1,2 +1 @@
22 -DIST xorg-cf-files-1.0.5.tar.bz2 377835 SHA256 ed23b85043edecc38fad4229e0ebdb7ff80b570e746bc03a7c8678d601be7ed4 SHA512 139d2c51538257eac79118ea367cdfbebebcd095f353e784b61c109e008bf8e43eb4ef15bb0c8df74339dbed9d96af4c4d1e023c23d02d5de31dc2ea5b85ce5c WHIRLPOOL 8621de9d25a9672d30d9ee3ed6a617e9c9e9d5a34c945fa458b0318b9bf157569f97ea1697efc463f3bb0ae8c6d0335dd30a6b5499c6baf00c5e172aaa5bf95b
23 DIST xorg-cf-files-1.0.6.tar.bz2 337859 SHA256 4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa WHIRLPOOL ef7d0581bd2d36ba61ccd47d7928dff43839494252af37350582cbab7ca3740cecb7a0d2c913aeb73fafeef1cbde7e2daf7ca9425dad6a6a29dd922dc80d7c97
24
25 diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild
26 deleted file mode 100644
27 index 580d8ecca5f..00000000000
28 --- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild
29 +++ /dev/null
30 @@ -1,31 +0,0 @@
31 -# Copyright 1999-2017 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI="5"
35 -
36 -inherit xorg-2
37 -
38 -DESCRIPTION="Old Imake-related build files"
39 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
40 -IUSE=""
41 -
42 -RDEPEND=""
43 -DEPEND="${RDEPEND}"
44 -
45 -PATCHES=(
46 - "${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
47 -)
48 -
49 -src_install() {
50 - xorg-2_src_install
51 - echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> "${ED}"/usr/$(get_libdir)/X11/config/host.def
52 - sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
53 - 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"
54 - sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
55 - sed -i -e "/# define Solaris64bitSubdir/d" "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
56 - sed -i -e 's/-DNOSTDHDRS//g' "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
57 -
58 - sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
59 - 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"
60 - 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"
61 -}