summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-11-15 06:53:45 +0000
committerMike Frysinger <vapier@gentoo.org>2014-11-15 06:53:45 +0000
commit086a804b267882fa454402449a3f4d6bef19dd27 (patch)
treef0797e5bd908e39069987f658faa63933008c172 /x11-libs
parentMake sure we depend on autotools #529078 by Nikoli. (diff)
downloadgentoo-2-086a804b267882fa454402449a3f4d6bef19dd27.tar.gz
gentoo-2-086a804b267882fa454402449a3f4d6bef19dd27.tar.bz2
gentoo-2-086a804b267882fa454402449a3f4d6bef19dd27.zip
Fix eclass inherit order so autotools-utils does not stomp on xorg-2 setup #506416 by Nikoli.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/glamor/ChangeLog7
-rw-r--r--x11-libs/glamor/glamor-0.6.0-r1.ebuild4
-rw-r--r--x11-libs/glamor/glamor-0.6.0.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/x11-libs/glamor/ChangeLog b/x11-libs/glamor/ChangeLog
index 0a24c56488f8..1b725e445549 100644
--- a/x11-libs/glamor/ChangeLog
+++ b/x11-libs/glamor/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/glamor
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/ChangeLog,v 1.37 2014/07/21 08:41:25 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/ChangeLog,v 1.38 2014/11/15 06:53:45 vapier Exp $
+
+ 15 Nov 2014; Mike Frysinger <vapier@gentoo.org> glamor-0.6.0-r1.ebuild,
+ glamor-0.6.0.ebuild:
+ Fix eclass inherit order so autotools-utils does not stomp on xorg-2 setup
+ #506416 by Nikoli.
21 Jul 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
-glamor-0.5-r1.ebuild, -glamor-0.5.1-r1.ebuild, -glamor-0.5.1.ebuild,
diff --git a/x11-libs/glamor/glamor-0.6.0-r1.ebuild b/x11-libs/glamor/glamor-0.6.0-r1.ebuild
index 36a7a058b1c5..02a22009020d 100644
--- a/x11-libs/glamor/glamor-0.6.0-r1.ebuild
+++ b/x11-libs/glamor/glamor-0.6.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/glamor-0.6.0-r1.ebuild,v 1.2 2014/07/21 08:41:25 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/glamor-0.6.0-r1.ebuild,v 1.3 2014/11/15 06:53:45 vapier Exp $
EAPI=5
@@ -10,7 +10,7 @@ XORG_MODULE=driver/
XORG_MODULE_REBUILD=yes
S=${WORKDIR}/${PN}-egl-${PV}
-inherit autotools-utils xorg-2 toolchain-funcs
+inherit xorg-2 autotools-utils toolchain-funcs
DESCRIPTION="OpenGL based 2D rendering acceleration library"
SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${PN}-egl-${PV}.tar.bz2"
diff --git a/x11-libs/glamor/glamor-0.6.0.ebuild b/x11-libs/glamor/glamor-0.6.0.ebuild
index 231bed37900d..97a6e72abd7f 100644
--- a/x11-libs/glamor/glamor-0.6.0.ebuild
+++ b/x11-libs/glamor/glamor-0.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/glamor-0.6.0.ebuild,v 1.11 2014/07/21 08:41:25 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/glamor-0.6.0.ebuild,v 1.12 2014/11/15 06:53:45 vapier Exp $
EAPI=5
@@ -10,7 +10,7 @@ XORG_MODULE=driver/
XORG_MODULE_REBUILD=yes
S=${WORKDIR}/${PN}-egl-${PV}
-inherit autotools-utils xorg-2 toolchain-funcs
+inherit xorg-2 autotools-utils toolchain-funcs
DESCRIPTION="OpenGL based 2D rendering acceleration library"
SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${PN}-egl-${PV}.tar.bz2"