Make mesa dependency more strict, bug #516706

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)

7 files changed, 10 insertions, 159 deletions

diff --git a/x11-libs/glamor/ChangeLog b/x11-libs/glamor/ChangeLog
index 8939efd45ef9..0a24c56488f8 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.36 2014/04/19 17:47:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/ChangeLog,v 1.37 2014/07/21 08:41:25 chithanh Exp $
+
+  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,
+  -glamor-0.5.ebuild, glamor-0.6.0-r1.ebuild, glamor-0.6.0.ebuild:
+  Make mesa dependency more strict, bug #516706
 
   19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> glamor-0.6.0.ebuild:
   Stable for sparc, wrt bug #500368
diff --git a/x11-libs/glamor/glamor-0.5-r1.ebuild b/x11-libs/glamor/glamor-0.5-r1.ebuild
deleted file mode 100644
index 4ea1bc29a360..000000000000
--- a/x11-libs/glamor/glamor-0.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/glamor-0.5-r1.ebuild,v 1.1 2013/03/12 16:43:56 chithanh Exp $
-
-EAPI=5
-
-XORG_DRI=always
-XORG_EAUTORECONF=yes
-XORG_MODULE_REBUILD=yes
-
-inherit xorg-2
-
-DESCRIPTION="OpenGL based 2D rendering acceleration library"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gles"
-
-RDEPEND=">=x11-base/xorg-server-1.10
-	media-libs/mesa[egl,gbm]
-	gles? (
-		|| ( media-libs/mesa[gles2] media-libs/mesa[gles] )
-	)
-	>=x11-libs/pixman-0.21.8"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable gles glamor-gles2)
-	)
-	xorg-2_src_configure
-}
-
-src_prepare() {
-	sed -i 's/inst_LTLIBRARIES/lib_LTLIBRARIES/' src/Makefile.am || die
-	xorg-2_src_prepare
-}
diff --git a/x11-libs/glamor/glamor-0.5.1-r1.ebuild b/x11-libs/glamor/glamor-0.5.1-r1.ebuild
deleted file mode 100644
index ef905444f7e0..000000000000
--- a/x11-libs/glamor/glamor-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/glamor-0.5.1-r1.ebuild,v 1.1 2013/11/25 08:56:25 chithanh Exp $
-
-EAPI=5
-
-XORG_DRI=always
-XORG_EAUTORECONF=yes
-XORG_MODULE=driver/
-XORG_MODULE_REBUILD=yes
-S=${WORKDIR}/${PN}-egl-${PV}
-
-inherit xorg-2 toolchain-funcs
-
-DESCRIPTION="OpenGL based 2D rendering acceleration library"
-SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${PN}-egl-${PV}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gles"
-
-RDEPEND=">=x11-base/xorg-server-1.10
-	media-libs/mesa[egl,gbm]
-	gles? (
-		|| ( media-libs/mesa[gles2] media-libs/mesa[gles] )
-	)
-	>=x11-libs/pixman-0.21.8"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable gles glamor-gles2)
-	)
-	xorg-2_src_configure
-}
-
-src_prepare() {
-	sed -i 's/inst_LTLIBRARIES/lib_LTLIBRARIES/' src/Makefile.am || die
-	xorg-2_src_prepare
-	# fail to load grafic driver with hardened compiler #488906
-	if gcc-specs-now ; then
-		append-ldflags -Wl,-z,lazy
-	fi
-}
diff --git a/x11-libs/glamor/glamor-0.5.1.ebuild b/x11-libs/glamor/glamor-0.5.1.ebuild
deleted file mode 100644
index e6412c3b2b0d..000000000000
--- a/x11-libs/glamor/glamor-0.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/glamor-0.5.1.ebuild,v 1.10 2013/11/25 08:56:25 chithanh Exp $
-
-EAPI=5
-
-XORG_DRI=always
-XORG_EAUTORECONF=yes
-XORG_MODULE=driver/
-XORG_MODULE_REBUILD=yes
-S=${WORKDIR}/${PN}-egl-${PV}
-
-inherit xorg-2
-
-DESCRIPTION="OpenGL based 2D rendering acceleration library"
-SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${PN}-egl-${PV}.tar.bz2"
-
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="gles"
-
-RDEPEND=">=x11-base/xorg-server-1.10
-	media-libs/mesa[egl,gbm]
-	gles? (
-		|| ( media-libs/mesa[gles2] media-libs/mesa[gles] )
-	)
-	>=x11-libs/pixman-0.21.8"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable gles glamor-gles2)
-	)
-	xorg-2_src_configure
-}
-
-src_prepare() {
-	sed -i 's/inst_LTLIBRARIES/lib_LTLIBRARIES/' src/Makefile.am || die
-	xorg-2_src_prepare
-}
diff --git a/x11-libs/glamor/glamor-0.5.ebuild b/x11-libs/glamor/glamor-0.5.ebuild
deleted file mode 100644
index 0b4ad06cd41c..000000000000
--- a/x11-libs/glamor/glamor-0.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/glamor-0.5.ebuild,v 1.10 2013/03/12 16:43:56 chithanh Exp $
-
-EAPI=4
-
-XORG_DRI=always
-XORG_EAUTORECONF=yes
-inherit xorg-2
-
-DESCRIPTION="OpenGL based 2D rendering acceleration library"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="gles"
-
-RDEPEND=">=x11-base/xorg-server-1.10
-	media-libs/mesa[egl,gbm]
-	gles? (
-		|| ( media-libs/mesa[gles2] media-libs/mesa[gles] )
-	)
-	>=x11-libs/pixman-0.21.8"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable gles glamor-gles2)
-	)
-}
-
-src_prepare() {
-	sed -i 's/inst_LTLIBRARIES/lib_LTLIBRARIES/' src/Makefile.am || die
-	xorg-2_src_prepare
-}
diff --git a/x11-libs/glamor/glamor-0.6.0-r1.ebuild b/x11-libs/glamor/glamor-0.6.0-r1.ebuild
index ab6ef74facc8..36a7a058b1c5 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.1 2014/03/30 19:05:43 chithanh Exp $
+# $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 $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gles xv"
 
 RDEPEND=">=x11-base/xorg-server-1.10
-	media-libs/mesa[egl,gbm]
+	>=media-libs/mesa-10[egl,gbm]
 	gles? (
 		|| ( media-libs/mesa[gles2] media-libs/mesa[gles] )
 	)
diff --git a/x11-libs/glamor/glamor-0.6.0.ebuild b/x11-libs/glamor/glamor-0.6.0.ebuild
index 19e83c3fb540..231bed37900d 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.10 2014/04/19 17:47:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/glamor-0.6.0.ebuild,v 1.11 2014/07/21 08:41:25 chithanh Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="gles xv"
 
 RDEPEND=">=x11-base/xorg-server-1.10
-	media-libs/mesa[egl,gbm]
+	>=media-libs/mesa-10[egl,gbm]
 	gles? (
 		|| ( media-libs/mesa[gles2] media-libs/mesa[gles] )
 	)