From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QugYo-0004P8-MG for garchives@archives.gentoo.org; Sat, 20 Aug 2011 08:05:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A70C321C02C; Sat, 20 Aug 2011 08:05:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4736421C02C for ; Sat, 20 Aug 2011 08:05:35 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C5A81B400A for ; Sat, 20 Aug 2011 08:05:34 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2265) id 28AA02004C; Sat, 20 Aug 2011 08:05:32 +0000 (UTC) From: "Chi-Thanh Christopher Nguyen (chithanh)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, chithanh@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: xorg-server-1.10.4.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: xorg-server-1.10.4.ebuild ChangeLog X-VCS-Directories: x11-base/xorg-server X-VCS-Committer: chithanh X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen Content-Type: text/plain; charset=utf8 Message-Id: <20110820080532.28AA02004C@flycatcher.gentoo.org> Date: Sat, 20 Aug 2011 08:05:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c5bf01d1e74014a8a110098f55394cb4 chithanh 11/08/20 08:05:32 Modified: ChangeLog Added: xorg-server-1.10.4.ebuild Log: Version bump. =20 (Portage version: 2.2.0_alpha51/cvs/Linux x86_64) Revision Changes Path 1.605 x11-base/xorg-server/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-serv= er/ChangeLog?rev=3D1.605&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-serv= er/ChangeLog?rev=3D1.605&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-serv= er/ChangeLog?r1=3D1.604&r2=3D1.605 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v retrieving revision 1.604 retrieving revision 1.605 diff -u -r1.604 -r1.605 --- ChangeLog 16 Aug 2011 23:53:59 -0000 1.604 +++ ChangeLog 20 Aug 2011 08:05:32 -0000 1.605 @@ -1,6 +1,12 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.60= 4 2011/08/16 23:53:59 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.60= 5 2011/08/20 08:05:32 chithanh Exp $ + +*xorg-server-1.10.4 (20 Aug 2011) + + 20 Aug 2011; Ch=C3=AD-Thanh Christopher Nguy=E1=BB=85n + +xorg-server-1.10.4.ebuild: + Version bump. =20 16 Aug 2011; Matt Turner xorg-server-1.10.99.901.ebuild, xorg-server-1.10.99.902.ebuild: 1.1 x11-base/xorg-server/xorg-server-1.10.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-serv= er/xorg-server-1.10.4.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-serv= er/xorg-server-1.10.4.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: xorg-server-1.10.4.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2011 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.10.= 4.ebuild,v 1.1 2011/08/20 08:05:32 chithanh Exp $ EAPI=3D4 XORG_DOC=3Ddoc inherit xorg-2 multilib versionator EGIT_REPO_URI=3D"git://anongit.freedesktop.org/git/xorg/xserver" DESCRIPTION=3D"X.Org X servers" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~= x86 ~x86-fbsd" IUSE_SERVERS=3D"dmx kdrive xnest xorg xvfb" IUSE=3D"${IUSE_SERVERS} ipv6 minimal nptl tslib +udev" RDEPEND=3D">=3Dapp-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=3Dx11-apps/iceauth-1.0.2 >=3Dx11-apps/rgb-1.0.3 >=3Dx11-apps/xauth-1.0.3 x11-apps/xkbcomp >=3Dx11-libs/libpciaccess-0.10.3 >=3Dx11-libs/libXau-1.0.4 >=3Dx11-libs/libXdmcp-1.0.2 >=3Dx11-libs/libXfont-1.4.2 >=3Dx11-libs/libxkbfile-1.0.4 >=3Dx11-libs/pixman-0.21.8 >=3Dx11-libs/xtrans-1.2.2 >=3Dx11-misc/xbitmaps-1.0.1 >=3Dx11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=3Dx11-libs/libdmx-1.0.99.1 >=3Dx11-libs/libX11-1.1.5 >=3Dx11-libs/libXaw-1.0.4 >=3Dx11-libs/libXext-1.0.99.4 >=3Dx11-libs/libXfixes-4.0.3 >=3Dx11-libs/libXi-1.2.99.1 >=3Dx11-libs/libXmu-1.0.3 >=3Dx11-libs/libXres-1.0.3 >=3Dx11-libs/libXtst-1.0.99.2 ) kdrive? ( >=3Dx11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=3Dx11-libs/libX11-1.1.5 >=3Dx11-libs/libXext-1.0.5 >=3Dmedia-libs/mesa-7.8_rc[nptl=3D] ) tslib? ( >=3Dx11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=3Dsys-fs/udev-150 ) >=3Dx11-apps/xinit-1.3" # dmx+doc DEPEND is a hack, a proper solution needs to be implemented in = the # xorg-2.eclass for next release DEPEND=3D"${RDEPEND} sys-devel/flex >=3Dx11-proto/bigreqsproto-1.1.0 >=3Dx11-proto/compositeproto-0.4 >=3Dx11-proto/damageproto-1.1 >=3Dx11-proto/fixesproto-4.1 >=3Dx11-proto/fontsproto-2.0.2 >=3Dx11-proto/glproto-1.4.11 >=3Dx11-proto/inputproto-1.9.99.902 >=3Dx11-proto/kbproto-1.0.3 >=3Dx11-proto/randrproto-1.2.99.3 >=3Dx11-proto/recordproto-1.13.99.1 >=3Dx11-proto/renderproto-0.11 >=3Dx11-proto/resourceproto-1.0.2 >=3Dx11-proto/scrnsaverproto-1.1 >=3Dx11-proto/trapproto-3.4.3 >=3Dx11-proto/videoproto-2.2.2 >=3Dx11-proto/xcmiscproto-1.2.0 >=3Dx11-proto/xextproto-7.1.99 >=3Dx11-proto/xf86dgaproto-2.0.99.1 >=3Dx11-proto/xf86rushproto-1.1.2 >=3Dx11-proto/xf86vidmodeproto-2.2.99.1 >=3Dx11-proto/xineramaproto-1.1.3 >=3Dx11-proto/xproto-7.0.17 dmx? ( >=3Dx11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=3Dx11-proto/xf86driproto-2.1.0 >=3Dx11-proto/dri2proto-2.3 >=3Dx11-libs/libdrm-2.4.20 )" PDEPEND=3D" xorg? ( >=3Dx11-base/xorg-drivers-$(get_version_component_range 1-2) )" REQUIRED_USE=3D"!minimal? ( || ( ${IUSE_SERVERS} ) )" #UPSTREAMED_PATCHES=3D( # "${WORKDIR}/patches/" #) PATCHES=3D( "${UPSTREAMED_PATCHES[@]}" "${FILESDIR}"/${PN}-disable-acpi.patch "${FILESDIR}"/${PN}-1.9-nouveau-default.patch ) pkg_pretend() { # older gcc is not supported [[ $(gcc-major-version) -lt 4 ]] && \ die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." } pkg_setup() { xorg-2_pkg_setup # localstatedir is used for the log location; we need to override the de= fault # 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=3D( $(use_enable ipv6) $(use_enable dmx) $(use_enable kdrive) $(use_enable kdrive kdrive-kbd) $(use_enable kdrive kdrive-mouse) $(use_enable kdrive kdrive-evdev) $(use_enable tslib) $(use_enable tslib xcalibrate) $(use_enable !minimal record) $(use_enable !minimal xfree86-utils) $(use_enable !minimal install-libxf86config) $(use_enable !minimal dri) $(use_enable !minimal dri2) $(use_enable !minimal glx) $(use_enable xnest) $(use_enable xorg) $(use_enable xvfb) $(use_enable nptl glx-tls) $(use_enable udev config-udev) $(use_with doc doxygen) $(use_with doc xmlto) --sysconfdir=3D/etc/X11 --localstatedir=3D/var --enable-install-setuid --with-fontrootdir=3D/usr/share/fonts --with-xkb-output=3D/var/lib/xkb --disable-config-hal --without-dtrace --without-fop --with-os-vendor=3DGentoo ) # Xorg-server requires includes from OS mesa which are not visible for # users of binary drivers. mkdir -p "${T}/mesa-symlinks/GL" for i in gl glx glxmd glxproto glxtokens; do ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/me= sa-symlinks/GL/$i.h" || die done for i in glext glxext; do ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa= -symlinks/GL/$i.h" || die done append-cppflags "-I${T}/mesa-symlinks" } src_install() { xorg-2_src_install dynamic_libgl_install server_based_install if ! use minimal && use xorg; then # Install xorg.conf.example into docs dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example fi newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup newinitd "${FILESDIR}"/xdm.initd-3 xdm newconfd "${FILESDIR}"/xdm.confd-3 xdm # install the @x11-module-rebuild set for Portage insinto /usr/share/portage/config/sets newins "${FILESDIR}"/xorg-sets.conf xorg.conf } pkg_postinst() { # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) eselect opengl set xorg-x11 --use-old if [[ ${PV} !=3D 9999 && $(get_version_component_range 2 ${REPLACING_VER= SIONS}) !=3D $(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_ve= rsion_component_range 1-2)-upgrade-guide.xml" echo ewarn "You must rebuild all drivers if upgrading from