s/lib/$(get_libdir)
authorHerbie Hopkins <herbs@gentoo.org>
Tue, 30 Aug 2005 13:15:35 +0000 (13:15 +0000)
committerHerbie Hopkins <herbs@gentoo.org>
Tue, 30 Aug 2005 13:15:35 +0000 (13:15 +0000)
Package-Manager: portage-2.0.51.22-r2

x11-base/xorg-server/ChangeLog
x11-base/xorg-server/Manifest
x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild

index ce353779a136522c7ba1e44c1e76fb804122e695..7de39286c830ca6bdb66a39abe81e7ba93e5dfd5 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.34 2005/08/23 01:06:27 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.35 2005/08/30 13:15:35 herbs Exp $
+
+  30 Aug 2005; Herbie Hopkins <herbs@gentoo.org>
+  xorg-server-0.99.1-r5.ebuild:
+  s/lib/$(get_libdir)
 
   23 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -files/check-for-glproto.patch, -files/fix-xf86misc-typo.patch,
index 47d43c4fa2e5743d96f6cb8dad07fbbdc3fd9da1..6680131e8ab64309be50744eed049d4614916f18 100644 (file)
@@ -1,5 +1,15 @@
-MD5 a1aa5c945f39820c9b056e6f3a56ad9d xorg-server-0.99.1-r5.ebuild 3685
-MD5 4026dba9ac6a9d5aa9a39b5929f358d6 ChangeLog 6769
-MD5 09038114af03ae42879f9729972ce96e files/digest-xorg-server-0.99.1-r5 241
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 790669b658cbafeb12022147568f5d61 xorg-server-0.99.1-r5.ebuild 3700
+MD5 520d1e65c678874d2aee81d915d4e6c7 ChangeLog 6869
 MD5 1fa8d5da48c29537eeca2a0b63fd31a2 files/fix-xnest.patch 682
 MD5 bef863b379ee69c1339b0e01e4d51284 files/0.99.1-r5-check-for-glproto.patch 859
+MD5 09038114af03ae42879f9729972ce96e files/digest-xorg-server-0.99.1-r5 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDFFwN2G5bA0cA/ScRAp7cAKDZ2SLaQ84HTalWFv36YzM+ztNvqQCfTpaP
+MZWPqjgUMKN4l81f+hPbcI8=
+=x6Lp
+-----END PGP SIGNATURE-----
index 7a428887c7486e95c12d3d6a2ba8f1af87dbcd06..c547ef3af0571afbcaeb94b947e77b756f0c58de 100644 (file)
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild,v 1.2 2005/08/23 01:04:45 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild,v 1.3 2005/08/30 13:15:35 herbs Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
 SNAPSHOT="yes"
 
-inherit flag-o-matic x-modular
+inherit flag-o-matic x-modular multilib
 
 OPENGL_DIR="xorg-x11"
 
@@ -89,7 +89,7 @@ pkg_setup() {
                --enable-xevie
                --sysconfdir=/etc/X11
                --localstatedir=/var
-               --with-xkb-path=/usr/lib/X11/xkb
+               --with-xkb-path=/usr/$(get_libdir)/X11/xkb
                --disable-static"
 #              $(use_enable xprint)