diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2013-05-28 21:17:56 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2013-05-28 21:17:56 +0000 |
| commit | d224d2ffeec58c1efff5e361b86207455ad75ec1 (patch) | |
| tree | 65b770f68bdde17aa1fdcb13c5e2ab507388c7cc /x11-misc/xorg-cf-files | |
| parent | better fix for keystone 2012.2.4 cve-2013-2104 (diff) | |
| download | gentoo-2-d224d2ffeec58c1efff5e361b86207455ad75ec1.tar.gz gentoo-2-d224d2ffeec58c1efff5e361b86207455ad75ec1.tar.bz2 gentoo-2-d224d2ffeec58c1efff5e361b86207455ad75ec1.zip | |
Support multilib-nosymlink, bug #343461
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'x11-misc/xorg-cf-files')
| -rw-r--r-- | x11-misc/xorg-cf-files/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild | 32 |
2 files changed, 39 insertions, 1 deletions
diff --git a/x11-misc/xorg-cf-files/ChangeLog b/x11-misc/xorg-cf-files/ChangeLog index 37b5eecf156d..8f02754a6548 100644 --- a/x11-misc/xorg-cf-files/ChangeLog +++ b/x11-misc/xorg-cf-files/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/xorg-cf-files # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xorg-cf-files/ChangeLog,v 1.47 2013/02/21 18:47:07 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xorg-cf-files/ChangeLog,v 1.48 2013/05/28 21:17:56 blueness Exp $ + +*xorg-cf-files-1.0.4-r1 (28 May 2013) + + 28 May 2013; Anthony G. Basile <blueness@gentoo.org> + +xorg-cf-files-1.0.4-r1.ebuild: + Support multilib-nosymlink, bug #343461 21 Feb 2013; Zac Medico <zmedico@gentoo.org> xorg-cf-files-1.0.4.ebuild: Add ~arm-linux keyword. diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild new file mode 100644 index 000000000000..b0338e7d3577 --- /dev/null +++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild,v 1.1 2013/05/28 21:17:56 blueness Exp $ + +EAPI="5" + +inherit xorg-2 + +DESCRIPTION="Old Imake-related build files" +KEYWORDS="~alpha ~amd64 ~arm ~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 + 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 + sed -i -e 's/-DNOSTDHDRS//g' "${ED}"/usr/$(get_libdir)/X11/config/sun.cf + + 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" +} |