summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbie Hopkins <herbs@gentoo.org>2005-08-30 13:15:35 +0000
committerHerbie Hopkins <herbs@gentoo.org>2005-08-30 13:15:35 +0000
commit9bf487d82201c1ae41a16d0450aa9d473897c653 (patch)
treef09945697cd74d05d9ee0e1411d4b7349cff156e
parents/lib/$(get_libdir) (diff)
downloadgentoo-2-9bf487d82201c1ae41a16d0450aa9d473897c653.tar.gz
gentoo-2-9bf487d82201c1ae41a16d0450aa9d473897c653.tar.bz2
gentoo-2-9bf487d82201c1ae41a16d0450aa9d473897c653.zip
s/lib/$(get_libdir)
(Portage version: 2.0.51.22-r2)
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/Manifest6
-rw-r--r--x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild6
-rw-r--r--x11-misc/xkbdata/xkbdata-0.99.0.ebuild4
4 files changed, 13 insertions, 9 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index ce353779a136..7de39286c830 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-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,
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 47d43c4fa2e5..059a762d427f 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,5 +1,5 @@
-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
+MD5 b14311afb284acf56180f93f3b7372bf xorg-server-0.99.1-r5.ebuild 3704
+MD5 6d273b28844a44a1057bdd2aa1eb98ba ChangeLog 6873
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
diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild
index 7a428887c748..c547ef3af057 100644
--- a/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild
+++ b/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild
@@ -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)
diff --git a/x11-misc/xkbdata/xkbdata-0.99.0.ebuild b/x11-misc/xkbdata/xkbdata-0.99.0.ebuild
index 78d2e030f6d1..b8ca64170eac 100644
--- a/x11-misc/xkbdata/xkbdata-0.99.0.ebuild
+++ b/x11-misc/xkbdata/xkbdata-0.99.0.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbdata/xkbdata-0.99.0.ebuild,v 1.7 2005/08/30 13:05:50 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbdata/xkbdata-0.99.0.ebuild,v 1.8 2005/08/30 13:11:37 herbs Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
-inherit x-modular
+inherit x-modular multilib
DESCRIPTION="X.Org xkbdata data"
KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"