From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 873831381FB for ; Tue, 25 Dec 2012 12:34:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CEDFE032F; Tue, 25 Dec 2012 12:34:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73D3BE032F for ; Tue, 25 Dec 2012 12:34:33 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6163A33D860 for ; Tue, 25 Dec 2012 12:34:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CD3DDE543D for ; Tue, 25 Dec 2012 12:34:30 +0000 (UTC) From: "Chi-Thanh Christopher Nguyen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chi-Thanh Christopher Nguyen" Message-ID: <1356438867.4461c03d010d8fda2720004930f8c79eb508f216.chithead@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-base/xorg-server/xorg-server-9999.ebuild X-VCS-Directories: x11-base/xorg-server/ X-VCS-Committer: chithead X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen X-VCS-Revision: 4461c03d010d8fda2720004930f8c79eb508f216 X-VCS-Branch: master Date: Tue, 25 Dec 2012 12:34:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8637ccc8-b22c-4690-be65-26ca0a998280 X-Archives-Hash: a49e12107e9057c098d06226e596f77d commit: 4461c03d010d8fda2720004930f8c79eb508f216 Author: Chi-Thanh Christopher Nguyen gentoo org> AuthorDate: Tue Dec 25 12:34:27 2012 +0000 Commit: Chi-Thanh Christopher Nguyen cs tu-berlin de> CommitDate: Tue Dec 25 12:34:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4461c03d x11-base/xorg-server: sync with portage for suid flag and libdrm changes, bugs #419485 and #439138. --- x11-base/xorg-server/xorg-server-9999.ebuild | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 6ec145e..62e5f9c 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -12,7 +12,7 @@ DESCRIPTION="X.Org X servers" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" IUSE_SERVERS="dmx kdrive xnest xorg xvfb" -IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev" +IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev" RDEPEND=">=app-admin/eselect-opengl-1.0.8 dev-libs/openssl @@ -21,6 +21,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp + >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 @@ -53,7 +54,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8 >=media-libs/mesa-8[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) - udev? ( >=sys-fs/udev-150 ) + udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )" @@ -94,7 +95,6 @@ DEPEND="${RDEPEND} !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.8 - >=x11-libs/libdrm-2.4.20 )" PDEPEND=" @@ -111,19 +111,20 @@ REQUIRED_USE="!minimal? ( PATCHES=( "${UPSTREAMED_PATCHES[@]}" "${FILESDIR}"/${PN}-1.12-disable-acpi.patch + "${FILESDIR}"/${PN}-1.13.0-exa-track-source-pixmaps.patch + "${FILESDIR}"/${PN}-1.13.0-zaphod-screen-crossing.patch ) pkg_pretend() { # older gcc is not supported [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ - die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." + die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." } src_configure() { # localstatedir is used for the log location; we need to override the default # from ebuild.sh # sysconfdir is used for the xorg.conf location; same applies - # --enable-install-setuid needed because sparcs default off # NOTE: fop is used for doc generating ; and i have no idea if gentoo # package it somewhere XORG_CONFIGURE_OPTIONS=( @@ -133,6 +134,7 @@ src_configure() { $(use_enable kdrive kdrive-kbd) $(use_enable kdrive kdrive-mouse) $(use_enable kdrive kdrive-evdev) + $(use_enable suid install-setuid) $(use_enable tslib) $(use_enable !minimal record) $(use_enable !minimal xfree86-utils) @@ -140,7 +142,6 @@ src_configure() { $(use_enable !minimal dri) $(use_enable !minimal dri2) $(use_enable !minimal glx) - $(use_enable !minimal libdrm) $(use_enable xnest) $(use_enable xorg) $(use_enable xvfb) @@ -148,9 +149,9 @@ src_configure() { $(use_enable udev config-udev) $(use_with doc doxygen) $(use_with doc xmlto) + --enable-libdrm --sysconfdir=/etc/X11 --localstatedir=/var - --enable-install-setuid --with-fontrootdir=/usr/share/fonts --with-xkb-output=/var/lib/xkb --disable-config-hal @@ -200,7 +201,7 @@ pkg_postinst() { if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then elog "You should consider reading upgrade guide for this release:" - elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml" + elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml" echo ewarn "You must rebuild all drivers if upgrading from