Revbump for bug #488906 and revert changes to stable ebuild.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 55 insertions, 19 deletions

diff --git a/x11-libs/glamor/ChangeLog b/x11-libs/glamor/ChangeLog
index 656e4ec1987f..518cc390fa3f 100644
--- a/x11-libs/glamor/ChangeLog
+++ b/x11-libs/glamor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/glamor
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/ChangeLog,v 1.24 2013/11/24 20:51:45 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/ChangeLog,v 1.25 2013/11/25 08:56:25 chithanh Exp $
+
+*glamor-0.5.1-r1 (25 Nov 2013)
+
+  25 Nov 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +glamor-0.5.1-r1.ebuild, glamor-0.5.1.ebuild:
+  Revbump for bug #488906 and revert changes to stable ebuild.
 
   24 Nov 2013; Magnus Granberg <zorry@gentoo.org> glamor-0.5.1.ebuild:
   Fix bug 488906 fail to load driver with hardened compiler
diff --git a/x11-libs/glamor/Manifest b/x11-libs/glamor/Manifest
index 534395a0cea5..6b2f4afd8d9c 100644
--- a/x11-libs/glamor/Manifest
+++ b/x11-libs/glamor/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST glamor-0.5.tar.gz 134709 SHA256 92c5a8b1f7484a756e808979d7126a0e89e0848075da2be905ca2c8366eb9608 SHA512 834cf2e1ed67e6b9bad3f249e5d6ed500c31d6876969325ca5461cacd90e7efc39fbf35bf9e87ce60d251f9db93e86ec91b514cdef5d18e303618d785b1a1fa8 WHIRLPOOL 8b5abee26f95dfd50559bc7843f0861e9b7f21dd2bce9cd507ced931e360456217f95bcacd87a0b6e0c1b37ea185d4629f8a36bdb8c4a3736a211348632c2812
 DIST glamor-egl-0.5.1.tar.bz2 415902 SHA256 f42805b68e2bddc90cb5d9d3811e4f2176659c5686f295865839b20b7be7f359 SHA512 64d319e81a08b70f450c171152a218be3cad8ba8995806606a3f8a62e39e8e4c3efdf19576265cc5b3f48b98a8267305878cf58b18351780968101404133292b WHIRLPOOL 82947f2956d64a8908b4ae5679b0a4a9ac8e4bd99cf938f887a73111dc71e2bd75128d819268f53bf9c7d5112e48949d8e425725e5579abc830106873bf6ad1e
 EBUILD glamor-0.5-r1.ebuild 865 SHA256 9dff3751cc51b2e800303390d3bffaa5a18a297f9dbb3c45dc56c66c904f72eb SHA512 0f763be6ff306ee0e1623da1d445902acfc3b16d2450990730101923ec1b251b805002f402e13d7893e9063b17716212eb7fdacdc58135a7ca3af337ba6609bb WHIRLPOOL 7754a65fecf00b1e61e7d99a5a29e836ec6587e601775d06456ed417240bfcfb92f0310c9e6aa1b101554437a1b1778fb55cbda7a687cd525b9601738f1852dc
-EBUILD glamor-0.5.1.ebuild 1076 SHA256 a553c0461ca1d6029fde4683e7e1c9ed8eb58ecff825968f14bf075d8134f86c SHA512 b7f3f963738d14c9c0e3e3e71df338fff39c9231b6dbce3c735698a2ddc847954bea0d1a7172dbf1e7dc327d2bd484561de74a64d33d97ddda5271954e025833 WHIRLPOOL 049c9f2a1dd98b3a5f4df244defa488e21c830fe585e7695b16aa06465fa5657b364772fb735ce5d2bd54e094b9fc89363380b560e670f89c0952d19f8c41cc0
+EBUILD glamor-0.5.1-r1.ebuild 1089 SHA256 a70340f288c844c905f0ccca4659a8550103b90bfa1c0838f440e8be05645035 SHA512 42abfcb12657faf7fdc16c7e4e6125f061ab07af801cbcda88ab4cc5e401a8e08f4caad9eb5bbe0ffbedc8bf423a26ec066067693f724d68834d87a5c6320dad WHIRLPOOL 0c73d0ca7a885235dc91cd5377230103dc66039c64ce65a5fbefdc69c20c737501298b95b1a12e651169bfd129c101dceb686c4e71f90f2b00f8208ff45890c3
+EBUILD glamor-0.5.1.ebuild 945 SHA256 7d0bef199c4935c0c09fe53418e877a63ffbd4d2b6567635495b4e2fbe7f6db6 SHA512 f4c9e9bbdbb2880cb483ddeb66faf35805e3378a45a0ace17ed6d59dbaecc60d0e1d30e04a00e9ba6f7bc6f70042e389d1e1f658e9d204cbd8fc21e256e4e864 WHIRLPOOL 7fe57cc2fcd0e8a334ed331582257823de9c57bf4193d7dbaa828f71de480ad54a0e2c0f75fbca4604c9d24ba1884058bc6f00483f74d9071ea3ca2de7bbd7e8
 EBUILD glamor-0.5.ebuild 823 SHA256 388aa3a7ebbc499aad662bd773f3f877e257edd1bcd6eed29036c695d9975dbe SHA512 509d91cdac4b3463f921e9bb60ffd15b9365610352735891625f04a118eb408df0fcecf06f4f63e9632a0954e583d3f98da98660789d5f0c0292619487cfa83f WHIRLPOOL 9baa0f4dc40c44ea9fcc6dd453db4665315fa26103c3313f89d2f98a312b3e4fb8ee177859e0530971c5df478b4528043e22150812c8b4b3001cdacada5edff4
-MISC ChangeLog 3336 SHA256 c689e8ebc26577940ed69bb14be26031736bf4e613d93fdeaae856d9057f852a SHA512 ce94e6262f95ad6421801ddd2e2e092109f8dbbf3927f7697409cd93a59e83293502385b37dc25658842d4167840402528f98ed5547df3791e97fa0b335c8a4e WHIRLPOOL fb50492f451b92235457471cf3fd9e7a3d1aed8e47090d7c3a12b4306057c0452a70d42e55a7edda175c9f4f18a572b1fd8001e5e881c3a3fd6c1116531e2475
+MISC ChangeLog 3552 SHA256 00de76669ca2899f568db93f3944903760a221a48819007c6b65ac897eb203a2 SHA512 62714ea2d7dd0780f9f44453f21cfe5df0ffb8dc502aa377e3be78a7fad64582013ad0a6405131a8d6698859ded2c3f469411c294facd49c3f2a95ab3f28e44e WHIRLPOOL 30e35e8582ccabe8f740db0c0bdd560d30dcdef394bac1926dad7322b452bf050439115b13309d089430ef98586ca6ae880d1bac6f0328318d048b7fe95a9b52
 MISC metadata.xml 223 SHA256 205a40dbb7a17f67f6d4efcda4c5649d9f56f9b27f2e00d370a24f61103bff26 SHA512 5a5214399812d56f3393dc5baa5066e0127c99aeed8cbd3315d1fb3e7119232a5cd94272e46c7ede9a1b25c7f99909754a09962514b9748f3537cd1f7d627033 WHIRLPOOL fe893e5445e4ac431992a98c126ea52ed7495b334e217b992d86a3aa200ba587d1a5ca3ff9e83a68f1216ce47e3093125ca0d4bb572b0654bf0e7a587b1cc57c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
-
-iEYEAREIAAYFAlKSZsgACgkQe6JQqv15gH93LwCfe3fMg9LV1rhrY3GqIIfwSn4D
-RmEAn2jz/fB5sMlxMcwZyLQ/L5K6kT3C
-=DM51
------END PGP SIGNATURE-----
diff --git a/x11-libs/glamor/glamor-0.5.1-r1.ebuild b/x11-libs/glamor/glamor-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..ef905444f7e0
--- /dev/null
+++ b/x11-libs/glamor/glamor-0.5.1-r1.ebuild
@@ -0,0 +1,43 @@
+# 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
index eec04bcb794e..e6412c3b2b0d 100644
--- a/x11-libs/glamor/glamor-0.5.1.ebuild
+++ b/x11-libs/glamor/glamor-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # 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.9 2013/11/24 20:51:45 zorry Exp $
+# $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
 
@@ -10,7 +10,7 @@ XORG_MODULE=driver/
 XORG_MODULE_REBUILD=yes
 S=${WORKDIR}/${PN}-egl-${PV}
 
-inherit xorg-2 toolchain-funcs
+inherit xorg-2
 
 DESCRIPTION="OpenGL based 2D rendering acceleration library"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${PN}-egl-${PV}.tar.bz2"
@@ -36,8 +36,4 @@ 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
 }