Fix automagic dependency on libunwind, bug #500792.

(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 12 insertions, 5 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 29d5d69c5890..6d88dab0d64b 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.780 2013/12/31 22:36:41 mattst88 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.781 2014/02/11 15:36:01 chithanh Exp $
+
+  11 Feb 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> metadata.xml,
+  xorg-server-1.15.0.ebuild:
+  Fix automagic dependency on libunwind, bug #500792.
 
   31 Dec 2013; Matt Turner <mattst88@gentoo.org> xorg-server-1.15.0.ebuild:
   Remove unnecessary XORG_AUTORECONF. Remove link to nonexistant upgrade guide,
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
index fdbf50e57cbb..c5056f1c920a 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -6,6 +6,7 @@
 	<flag name='dmx'>Build the Distributed Multiheaded X server</flag>
 	<flag name='kdrive'>Build the kdrive X servers</flag>
 	<flag name='tslib'>Build with tslib support for touchscreen devices</flag>
+	<flag name='unwind'>Enable libunwind usage for backtraces</flag>
 	<flag name='xnest'>Build the Xnest server</flag>
 	<flag name='xorg'>Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
 	<flag name='xvfb'>Build the Xvfb server</flag>
diff --git a/x11-base/xorg-server/xorg-server-1.15.0.ebuild b/x11-base/xorg-server/xorg-server-1.15.0.ebuild
index dc8005595398..05391343c60b 100644
--- a/x11-base/xorg-server/xorg-server-1.15.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.15.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.0.ebuild,v 1.2 2013/12/31 22:36:41 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.0.ebuild,v 1.3 2014/02/11 15:36:01 chithanh Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev unwind"
 
 RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
@@ -57,6 +57,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	)
 	tslib? ( >=x11-libs/tslib-1.0 )
 	udev? ( >=virtual/udev-150 )
+	unwind? ( sys-libs/libunwind )
 	>=x11-apps/xinit-1.3
 	selinux? ( sec-policy/selinux-xserver )"
 
@@ -139,6 +140,7 @@ src_configure() {
 		$(use_enable kdrive kdrive-evdev)
 		$(use_enable suid install-setuid)
 		$(use_enable tslib)
+		$(use_enable unwind libunwind)
 		$(use_enable !minimal record)
 		$(use_enable !minimal xfree86-utils)
 		$(use_enable !minimal install-libxf86config)