diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2006-10-15 15:01:24 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-10-15 15:01:24 +0000 |
| commit | 358bba3abd704d7fb85dea4d361997791c36f1ac (patch) | |
| tree | f99cad6c885086a634f7011682f0765b666336df /x11-base | |
| parent | Stable on ppc64 (diff) | |
| download | historical-358bba3abd704d7fb85dea4d361997791c36f1ac.tar.gz historical-358bba3abd704d7fb85dea4d361997791c36f1ac.tar.bz2 historical-358bba3abd704d7fb85dea4d361997791c36f1ac.zip | |
Don't try to install xorg.conf.example with USE="minimal". (Bug #151421,
George Kargiotakis)
Package-Manager: portage-2.1.2_pre3-r2
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-server/Manifest | 16 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild | 13 |
3 files changed, 22 insertions, 14 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 1ed1e700b3ea..0373c02feffc 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,11 @@ # 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.178 2006/10/14 17:43:33 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.179 2006/10/15 15:01:24 joshuabaergen Exp $ + + 15 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.1-r1.ebuild: + Don't try to install xorg.conf.example with USE="minimal". (Bug #151421, + George Kargiotakis) 14 Oct 2006; Aron Griffis <agriffis@gentoo.org> xorg-server-1.1.1-r1.ebuild: diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 5b6478fa1aab..28c8819e3b96 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -125,18 +125,18 @@ EBUILD xorg-server-1.1.0-r1.ebuild 24569 RMD160 89333463053a1326e882153cc1aa5b9e MD5 6931e96ed29cdf066cf9bf399c751ad5 xorg-server-1.1.0-r1.ebuild 24569 RMD160 89333463053a1326e882153cc1aa5b9e81b27eb0 xorg-server-1.1.0-r1.ebuild 24569 SHA256 8eedd866ec4963ae94241d3ea90a8e80e2aa3f35a0f20fa793fde05e338bb995 xorg-server-1.1.0-r1.ebuild 24569 -EBUILD xorg-server-1.1.1-r1.ebuild 16641 RMD160 e2fd4964c4c07e7d446f269a4bc469db0edbe6a4 SHA1 8e664051de8b82155732ad0a014de333cf11585f SHA256 1700c18a1064f954b1fcf96af180e0dbbfd7b53d483f956b0e52b498026e1e6a -MD5 2383e49ec9becdf0d69bab835a3ea07b xorg-server-1.1.1-r1.ebuild 16641 -RMD160 e2fd4964c4c07e7d446f269a4bc469db0edbe6a4 xorg-server-1.1.1-r1.ebuild 16641 -SHA256 1700c18a1064f954b1fcf96af180e0dbbfd7b53d483f956b0e52b498026e1e6a xorg-server-1.1.1-r1.ebuild 16641 +EBUILD xorg-server-1.1.1-r1.ebuild 16737 RMD160 b4a7244776d3c8e2518ae2351b56ebbe61a713cb SHA1 e10332c0a33e33e60f851d2a90cc55daf574d0d9 SHA256 c9964321520db44f5d6a902d75f658373655a129684e5d5b7c0ddbe7f5a14519 +MD5 98dd040d449b7781a694c6936cf7d365 xorg-server-1.1.1-r1.ebuild 16737 +RMD160 b4a7244776d3c8e2518ae2351b56ebbe61a713cb xorg-server-1.1.1-r1.ebuild 16737 +SHA256 c9964321520db44f5d6a902d75f658373655a129684e5d5b7c0ddbe7f5a14519 xorg-server-1.1.1-r1.ebuild 16737 EBUILD xorg-server-1.1.1.ebuild 15382 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac SHA1 527956284fa7c6f68126db52adb3a25ac078d171 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb MD5 9a5fa768a77f72877ec3303f890f614e xorg-server-1.1.1.ebuild 15382 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac xorg-server-1.1.1.ebuild 15382 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb xorg-server-1.1.1.ebuild 15382 -MISC ChangeLog 36734 RMD160 d1d550b87e2a426cf97b1d3b2865fe63ed0c9217 SHA1 5b55b07883c07e8dbaab2c9418d72a42e7befc03 SHA256 faa319ae762560206a535cae6ed02331ecb7fc668ce47bde4d9bfde6aa7e8c56 -MD5 2239d9749b868b204aed49e2c83b759d ChangeLog 36734 -RMD160 d1d550b87e2a426cf97b1d3b2865fe63ed0c9217 ChangeLog 36734 -SHA256 faa319ae762560206a535cae6ed02331ecb7fc668ce47bde4d9bfde6aa7e8c56 ChangeLog 36734 +MISC ChangeLog 36925 RMD160 18dcbce3aacf17f2c19a50bc9a4ed854b302613f SHA1 87e409cf54426418f61e753a9d5d073225ce79af SHA256 d2cec1e568fe9d636e42c04101c993a4a9ae247db093bdf9fdd35bc238274e2f +MD5 7410aa2ffcac12f4a6d165bc3082d406 ChangeLog 36925 +RMD160 18dcbce3aacf17f2c19a50bc9a4ed854b302613f ChangeLog 36925 +SHA256 d2cec1e568fe9d636e42c04101c993a4a9ae247db093bdf9fdd35bc238274e2f ChangeLog 36925 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 diff --git a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild index fd682305b68d..a6cbf5e97e89 100644 --- a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.1.1-r1.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.1.1-r1.ebuild,v 1.13 2006/10/14 17:43:33 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.14 2006/10/15 15:01:24 joshuabaergen Exp $ # Must be before x-modular eclass is inherited SNAPSHOT="yes" @@ -434,10 +434,13 @@ src_install() { doins hw/xfree86/common/{extra,vesa}modes \ || die "couldn't install extra modes" - # Install xorg.conf.example - insinto /etc/X11 - doins hw/xfree86/xorg.conf.example \ - || die "couldn't install xorg.conf.example" + # Bug #151421 - this file is not built with USE="minimal" + if ! use minimal; then + # Install xorg.conf.example + insinto /etc/X11 + doins hw/xfree86/xorg.conf.example \ + || die "couldn't install xorg.conf.example" + fi } pkg_postinst() { |