diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2006-04-30 19:01:09 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-04-30 19:01:09 +0000 |
| commit | 0d61f71d29ee6567140381d247a561e3f60694a7 (patch) | |
| tree | bc62ee5fcd1d7a2128b4e9ff0237042b1812d26b /x11-base | |
| parent | Add ~amd64 and ~x86-fbsd keywords. Change license to Artistic-2 as asked by g... (diff) | |
| download | historical-0d61f71d29ee6567140381d247a561e3f60694a7.tar.gz historical-0d61f71d29ee6567140381d247a561e3f60694a7.tar.bz2 historical-0d61f71d29ee6567140381d247a561e3f60694a7.zip | |
(#131817) Move the nptl diemsg out of an if, since we also use it in the else.
Package-Manager: portage-2.1_pre9-r5
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/Manifest | 16 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.0.99.902.ebuild | 4 |
3 files changed, 15 insertions, 11 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index e2ac31229c60..c34ce2fa5523 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-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.110 2006/04/29 16:38:38 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.111 2006/04/30 19:01:09 spyderous Exp $ + + 30 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-1.0.99.902.ebuild: + (#131817) Move the nptl diemsg out of an if, since we also use it in the else. *xorg-server-1.0.99.902 (29 Apr 2006) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 326a5861b641..248d342cf044 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -68,14 +68,14 @@ EBUILD xorg-server-1.0.99.901-r1.ebuild 7932 RMD160 ef34c4ed8c42aebccd127c8fbb2a MD5 141998be253621e023240ccdd21a274a xorg-server-1.0.99.901-r1.ebuild 7932 RMD160 ef34c4ed8c42aebccd127c8fbb2a03a65d326376 xorg-server-1.0.99.901-r1.ebuild 7932 SHA256 f149083d1471d936b294e60209f8519a499963798c04fb82fe07e2f34c5f49a6 xorg-server-1.0.99.901-r1.ebuild 7932 -EBUILD xorg-server-1.0.99.902.ebuild 7752 RMD160 70c41a9ddad82c0d166c1feaa38290a80f5f9218 SHA1 d15a89f977de5c5b2c870b90c0e2e2a01ca2184d SHA256 31bdffd795b62625c4825759a201c62777735ce3546ff42b9393e84708162e2b size 7752 -MD5 96e769249413dc86972f980c64c83ea6 xorg-server-1.0.99.902.ebuild 7752 -RMD160 70c41a9ddad82c0d166c1feaa38290a80f5f9218 xorg-server-1.0.99.902.ebuild 7752 -SHA256 31bdffd795b62625c4825759a201c62777735ce3546ff42b9393e84708162e2b xorg-server-1.0.99.902.ebuild 7752 -MISC ChangeLog 23621 RMD160 b0cb521bd9f5cfb3b63bec219beb3607576f2d36 SHA1 42370308158173fc44a37882f588a6c5dfc5452d SHA256 ba993767a11d003edede1e7784a0f41f524f558e7a9343e59448e12ca9c98e65 size 23621 -MD5 b396ac08c1a732742def4f3259a7efbd ChangeLog 23621 -RMD160 b0cb521bd9f5cfb3b63bec219beb3607576f2d36 ChangeLog 23621 -SHA256 ba993767a11d003edede1e7784a0f41f524f558e7a9343e59448e12ca9c98e65 ChangeLog 23621 +EBUILD xorg-server-1.0.99.902.ebuild 7747 RMD160 6984b4a86aa0d0fa3040010179c2c06467807d9a SHA1 56cbc1a95bbb1ac055c3c63ff7ee0fe95c9cf569 SHA256 1908acedcff92f2ba03c777c37875305a8d69770f0749a55f1875543b59740bd size 7747 +MD5 2a7289582ea46b6642994ce33702e03c xorg-server-1.0.99.902.ebuild 7747 +RMD160 6984b4a86aa0d0fa3040010179c2c06467807d9a xorg-server-1.0.99.902.ebuild 7747 +SHA256 1908acedcff92f2ba03c777c37875305a8d69770f0749a55f1875543b59740bd xorg-server-1.0.99.902.ebuild 7747 +MISC ChangeLog 23787 RMD160 51143de0950856b133fe1296e2fce81a81aa1abe SHA1 cce5cc74fe787fb0bb091faae265814806df18bf SHA256 c0806beecab26a8c2ff701c84f261590b763deacb6b8133262920f5ee57b3da2 size 23787 +MD5 f7adec9887b22992c01e57571a0c0cc1 ChangeLog 23787 +RMD160 51143de0950856b133fe1296e2fce81a81aa1abe ChangeLog 23787 +SHA256 c0806beecab26a8c2ff701c84f261590b763deacb6b8133262920f5ee57b3da2 ChangeLog 23787 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 size 156 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 diff --git a/x11-base/xorg-server/xorg-server-1.0.99.902.ebuild b/x11-base/xorg-server/xorg-server-1.0.99.902.ebuild index 96d3ded30b3b..7e104466ccd8 100644 --- a/x11-base/xorg-server/xorg-server-1.0.99.902.ebuild +++ b/x11-base/xorg-server/xorg-server-1.0.99.902.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.0.99.902.ebuild,v 1.1 2006/04/29 16:38:38 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.99.902.ebuild,v 1.2 2006/04/30 19:01:09 spyderous Exp $ # Must be before x-modular eclass is inherited # Hack to make sure autoreconf gets run @@ -146,8 +146,8 @@ pkg_setup() { --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 ${conf_opts}" + local diemsg="You must build xorg-server and mesa with the same nptl USE setting." if built_with_use media-libs/mesa nptl; then - local diemsg="You must build xorg-server and mesa with the same nptl USE setting." use nptl || die "${diemsg}" else use nptl && die "${diemsg}" |