diff options
| author |   Rémi Cardona <remi@gentoo.org> | 2009-09-22 07:02:17 +0000 |
|---|---|---|
| committer | Rémi Cardona <remi@gentoo.org> | 2009-09-22 07:02:17 +0000 |
| commit | 87289343fb37e1dd48077549e525920299f3dd6a (patch) | |
| tree | 77d1a2116cebdd4ee13bb23af2294442612f4f0c /x11-base | |
| parent | Version bump (diff) | |
| download | gentoo-2-87289343fb37e1dd48077549e525920299f3dd6a.tar.gz gentoo-2-87289343fb37e1dd48077549e525920299f3dd6a.tar.bz2 gentoo-2-87289343fb37e1dd48077549e525920299f3dd6a.zip | |
x11-base/xorg-x11: fix xorg.conf removal (see bug #278268)
(Portage version: 2.2_rc41/cvs/Linux i686)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild | 14 |
2 files changed, 17 insertions, 2 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index e0df409364d9..fca4b31ef25f 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.611 2009/09/21 15:28:53 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.612 2009/09/22 07:02:17 remi Exp $ + + 22 Sep 2009; Rémi Cardona <remi@gentoo.org> xorg-x11-7.4-r1.ebuild: + fix xorg.conf removal (see bug #278268) *xorg-x11-7.4-r1 (21 Sep 2009) diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild index f5e7cbae2578..97d3d2596d18 100644 --- a/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild +++ b/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild,v 1.1 2009/09/21 15:28:53 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild,v 1.2 2009/09/22 07:02:17 remi Exp $ EAPI="2" @@ -121,7 +121,19 @@ RDEPEND="${RDEPEND} DEPEND="${RDEPEND}" +pkg_preinst() { + # Save xorg.conf because of bug #278268 + if [[ -f "${ROOT}etc/X11/xorg.conf" ]]; then + cp "${ROOT}etc/X11/xorg.conf" "${T}" + fi +} + pkg_postinst() { + # Restore saved xorg.conf + if [[ -f "${T}/xorg.conf" ]]; then + cp "${T}/xorg.conf" "${ROOT}etc/X11/xorg.conf" + fi + elog elog "Please note that the xcursors are in ${ROOT}usr/share/cursors/${PN}." elog "Any custom cursor sets should be placed in that directory." |