diff options
| author |   Remi Cardona <remi@gentoo.org> | 2009-09-22 07:02:17 +0000 |
|---|---|---|
| committer | Remi Cardona <remi@gentoo.org> | 2009-09-22 07:02:17 +0000 |
| commit | 089d9bc0e5a11e6097800a6130c3f50d91ff92de (patch) | |
| tree | 9f26c134aaef684e15ceb9250b8fbc6be365fe6f /x11-base/xorg-x11 | |
| parent | Version bump (diff) | |
| download | historical-089d9bc0e5a11e6097800a6130c3f50d91ff92de.tar.gz historical-089d9bc0e5a11e6097800a6130c3f50d91ff92de.tar.bz2 historical-089d9bc0e5a11e6097800a6130c3f50d91ff92de.zip | |
x11-base/xorg-x11: fix xorg.conf removal (see bug #278268)
Package-Manager: portage-2.2_rc41/cvs/Linux i686
Diffstat (limited to 'x11-base/xorg-x11')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-base/xorg-x11/Manifest | 4 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild | 14 |
3 files changed, 19 insertions, 4 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/Manifest b/x11-base/xorg-x11/Manifest index d38762f210b6..071e10bf9468 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,5 +1,5 @@ EBUILD xorg-x11-7.2.ebuild 3791 RMD160 92764b58f5a8c34d00f484abd19bd0c7b01bb8d2 SHA1 4af5f33bbb7f8a270f5d5505c2d9442d9b5ab2ee SHA256 83e4f03b99d3bda6af6ea35ecbd3b2823f57208e6ceb75a822d3915375252aa8 -EBUILD xorg-x11-7.4-r1.ebuild 3416 RMD160 bb5e13d967acc06ca95620590c4fed69f2d69894 SHA1 f44a87731ffcc070ce3bfe3b2cc37005113fbc70 SHA256 58e7d348e79a3ff9a80ff259242283a66730ecb780c41f7f4f1e4b2caacf592e +EBUILD xorg-x11-7.4-r1.ebuild 3682 RMD160 c9b77386bc02af3e35a6196749be2da4537fe770 SHA1 6d43b377924ca71fdf096fb4bb9f581c1bf21b3a SHA256 fd78ad9dc3bf8d95bdf474ac7836fdbddd7a53bad3707787669d6b52f538889f EBUILD xorg-x11-7.4.ebuild 7559 RMD160 24dad052ee3674554a6b74a58762d380653405f9 SHA1 09afe6b90800ede07b97c5642dd6189300bce1ab SHA256 00ed60ac762518ea6d17fe467211f53c065eea3450964875ce564509a02270f8 -MISC ChangeLog 129323 RMD160 f3247d50ef9a719ce52006661616e1136b748746 SHA1 1cef10a79592585c8703460023978cffcd45185b SHA256 f1ed84d233b9f02701fcd40d39087865800bca8c55974072588a0374544876d4 +MISC ChangeLog 129437 RMD160 6d5546e464191f854cfeb1b9582f1f0b8d0f4300 SHA1 bf76be0fd297a7a7993a86f549623b8dbcd8fbca SHA256 75463022339eef6c74952869b602b2be40ed3aa1e683f9ffd8775c3f77280e89 MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0 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." |