summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-04-13 20:59:08 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-04-13 20:59:08 +0000
commit43d12e1a16b29fb8affbcdd08e3679d88363ac5f (patch)
tree3764bc4869316ce720b7e915431bf3b322b1e040 /x11-base
parentStable on amd64 wrt bug #313155 (diff)
downloadhistorical-43d12e1a16b29fb8affbcdd08e3679d88363ac5f.tar.gz
historical-43d12e1a16b29fb8affbcdd08e3679d88363ac5f.tar.bz2
historical-43d12e1a16b29fb8affbcdd08e3679d88363ac5f.zip
Actualy use correct variable.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 RepoMan-Options: --force
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/Manifest10
-rw-r--r--x11-base/xorg-server/xorg-server-1.8.0.ebuild6
3 files changed, 13 insertions, 9 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 47fa6e5cac11..46f411c7c021 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.500 2010/04/13 20:43:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.501 2010/04/13 20:59:08 scarabeus Exp $
+
+ 13 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ xorg-server-1.8.0.ebuild:
+ Actualy use correct variable.
13 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
xorg-server-1.8.0.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f56077a552e6..3094bbd86b1c 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -21,13 +21,13 @@ DIST xorg-server-1.8.0.tar.bz2 5097035 RMD160 4dedc88bcbbbe545b0e795d541edb3c665
EBUILD xorg-server-1.5.3-r6.ebuild 15607 RMD160 13afb38910b3e04ff352c363aea529f984066de9 SHA1 55d4538178c2d4a1d3775ac605b03a852e9813db SHA256 230f98c9cdcebd42f94f1364a1a0ae317de9772968bcd97229e1be2e08f1d4af
EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 7dc826b80d62c7bad6bc36dbcd9d5134ac8def0e SHA1 fca33f2816607703c3ed2612be1238f9cd6f28da SHA256 71441f59df32e25dad5deae4838e312e62a87497e0e4362cd297e27f33b96584
EBUILD xorg-server-1.7.6.ebuild 7316 RMD160 365ff9876f752f5b72eae8b8b1015e9cb248b209 SHA1 1fd284118c3cd59ad0939789f8c3e7a16088ec0b SHA256 23977e1ee2dd9554605883b4b5b2cab6ec8a30fa244377c6492d7d26da657fec
-EBUILD xorg-server-1.8.0.ebuild 8133 RMD160 8d0b6f1d90bb0ed94b285bd6d34a04b650091733 SHA1 63e6966a85cf326082290472325d7b2193b86998 SHA256 00218e416abd6e9b9df54f642532dd8bbe9714889c9ab27ceff828591895808f
-MISC ChangeLog 112703 RMD160 13e13081c3c05f5e16c7396e6b91d19d52f623ad SHA1 9bcda427a06d0c2b5e66f354600fe5826d754828 SHA256 0ddd83a6da6656adc078740dd5b9ebea3f23931de5bfd96877e302d3004e1eb9
+EBUILD xorg-server-1.8.0.ebuild 8133 RMD160 fd1bc694dfb7ec4be66a059fc62263cbfbe8824b SHA1 fc1bf7b6d8e67d3f08d2a151724a400c770f356a SHA256 58e4684bcb838cfa69f24d5a331053cd4f4b0ccc404fc1bfb43b57e1e7349c0e
+MISC ChangeLog 112819 RMD160 d1360a80db68e18d0fa37ff632fe432d9e7ffc65 SHA1 658fd65827f1e099e7fd668f6158398c3e86a52e SHA256 6e35d3c38d1d0c71b06f08d8aa14d3b49746f32e8aedf626c58fdb868b775753
MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAkvE15UACgkQHB6c3gNBRYfSIQCffZRORJFt02OZmbEuBDfhdX2G
-MfkAoI2xDegKsc95hAOru8Wl4zgrI+pj
-=i48n
+iEYEARECAAYFAkvE2yQACgkQHB6c3gNBRYciygCfat3GSvhVrkLniMm2b2VDNNQs
+y1sAn2YRWBhs/Br3iMLsgJr9fzaI1/Ya
+=gIEK
-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.8.0.ebuild b/x11-base/xorg-server/xorg-server-1.8.0.ebuild
index 48489177b666..5dc2cd753cea 100644
--- a/x11-base/xorg-server/xorg-server-1.8.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.8.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.0.ebuild,v 1.3 2010/04/13 20:43:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.0.ebuild,v 1.4 2010/04/13 20:59:08 scarabeus Exp $
EAPI=3
XORG_EAUTORECONF="yes"
@@ -196,10 +196,10 @@ src_configure() {
src_compile() {
emake # no die here intentional
if [[ $? != 0 ]]; then
- [[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OPENGL_DIR}; )
+ [[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OLD_IMPLEM}; )
die "Compilation failed"
fi
- [[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OPENGL_DIR}; )
+ [[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OLD_IMPLEM}; )
}
src_install() {