1 |
commit: b276c66e6d1712262845641d5b1de448809b1f4a |
2 |
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 11 15:42:30 2014 +0000 |
4 |
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de> |
5 |
CommitDate: Tue Feb 11 15:42:30 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b276c66e |
7 |
|
8 |
x11-base/xorg-server: sync metadata and new libunwind flag with portage |
9 |
|
10 |
--- |
11 |
x11-base/xorg-server/metadata.xml | 4 ++++ |
12 |
x11-base/xorg-server/xorg-server-9999.ebuild | 4 +++- |
13 |
2 files changed, 7 insertions(+), 1 deletion(-) |
14 |
|
15 |
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml |
16 |
index b24447f..922e8ed 100644 |
17 |
--- a/x11-base/xorg-server/metadata.xml |
18 |
+++ b/x11-base/xorg-server/metadata.xml |
19 |
@@ -7,8 +7,12 @@ |
20 |
<flag name='kdrive'>Build the kdrive X servers</flag> |
21 |
<flag name='tslib'>Build with tslib support for touchscreen devices</flag> |
22 |
<flag name='udev'>Enable devices discovery via udev</flag> |
23 |
+ <flag name='unwind'>Enable libunwind usage for backtraces</flag> |
24 |
<flag name='xnest'>Build the Xnest server</flag> |
25 |
<flag name='xorg'>Build the Xorg X server (HIGHLY RECOMMENDED)</flag> |
26 |
<flag name='xvfb'>Build the Xvfb server</flag> |
27 |
</use> |
28 |
+<upstream> |
29 |
+ <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id> |
30 |
+</upstream> |
31 |
</pkgmetadata> |
32 |
|
33 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
34 |
index 996f9b1..81192bc 100644 |
35 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
36 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
37 |
@@ -13,7 +13,7 @@ SLOT="0/${PV}" |
38 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
39 |
|
40 |
IUSE_SERVERS="dmx kdrive xnest xorg xvfb" |
41 |
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid systemd tslib +udev" |
42 |
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid systemd tslib +udev unwind" |
43 |
|
44 |
RDEPEND=">=app-admin/eselect-opengl-1.0.8 |
45 |
dev-libs/openssl |
46 |
@@ -57,6 +57,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8 |
47 |
) |
48 |
tslib? ( >=x11-libs/tslib-1.0 ) |
49 |
udev? ( >=virtual/udev-150 ) |
50 |
+ unwind ( sys-libs/libunwind ) |
51 |
>=x11-apps/xinit-1.3 |
52 |
selinux? ( sec-policy/selinux-xserver ) |
53 |
systemd? ( sys-apps/systemd )" |
54 |
@@ -140,6 +141,7 @@ src_configure() { |
55 |
$(use_enable kdrive kdrive-evdev) |
56 |
$(use_enable suid install-setuid) |
57 |
$(use_enable tslib) |
58 |
+ $(use_enable unwind libunwind) |
59 |
$(use_enable !minimal record) |
60 |
$(use_enable !minimal xfree86-utils) |
61 |
$(use_enable !minimal install-libxf86config) |