Version bump.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

3 files changed, 250 insertions, 22 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 2530a25f8f04..46123f37fda7 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -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.623 2011/11/01 22:53:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.624 2011/11/05 12:50:15 chithanh Exp $
+
+*xorg-server-1.11.2 (05 Nov 2011)
+
+  05 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xorg-server-1.11.2.ebuild:
+  Version bump.
 
   01 Nov 2011; Markos Chandras <hwoarang@gentoo.org> files/xdm.initd-3:
   add support for lightdm. bug #389039 thanks to Tobias Wallura
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index d396fb0028b7..b3a5a458b601 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
 AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce
@@ -12,26 +9,11 @@ AUX xorg-server-glapi_c.patch 2215 RMD160 2df0b6ef296744b0c6951f4ba76bfeeb09196d
 AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
 DIST xorg-server-1.10.4.tar.bz2 5386174 RMD160 13eeaf7497e63ecddba46010c075d27121e18aae SHA1 857d6377025c77851a3cc5f8ec2ce84164a2fdc6 SHA256 fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
 DIST xorg-server-1.11.1.tar.bz2 4933664 RMD160 a26efea8fae4f52d0eae22a18b392f5eab836aa7 SHA1 ed0358b61294f1283aad42cf1e609752ceeffafd SHA256 c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6
+DIST xorg-server-1.11.2.tar.bz2 4945939 RMD160 cc69cfd86a5a870d1433262dd1445a8603a9266a SHA1 b4de5c599c90bd08d3122866ba68152cd59a880e SHA256 fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2
 DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc
 EBUILD xorg-server-1.10.4-r1.ebuild 7127 RMD160 8175211bb28ac4559c8f229c947ffbf0a716e886 SHA1 dec56fcce06846cd3eeb1836a0bc0d4f90810380 SHA256 f3e3e1e78106b8f9f2333d74e5e531b9c6a2daaf8ee8634644f8088d5b7f5957
 EBUILD xorg-server-1.11.1-r1.ebuild 6769 RMD160 fe1d31a37742ecd6d354d8318492cbef3f5eb5f2 SHA1 5dd87a9d1717435bbd2252a043078372dfbf6ccb SHA256 52b4276ee9615abc44b7fe93fc43a7daf13f7a916ca75b4e0020273f9d725de3
+EBUILD xorg-server-1.11.2.ebuild 6721 RMD160 f491789a4e81229480d5dfe35a6fecae0321f37b SHA1 663cdb46e4b613606e99fb520b0f5a92ee7a6a07 SHA256 24023a01bb224d85d3eb34d7e690d12a16ba8bb75f3a5edd7a195c301c82104e
 EBUILD xorg-server-1.9.5-r1.ebuild 7850 RMD160 e2c14bf529edbafa9452855ca893a45e510d8625 SHA1 c52c0d51c61452fb83ea92cf20978cc2374ab23e SHA256 270f6563b0cf3b96b86e94a5d428ebf1b20be22bfe2a33b76a4463c79c6120c3
-MISC ChangeLog 132313 RMD160 4218df8141bd8d3ece6fdc7e292ccce9a381ad49 SHA1 b73acb36aa807c0779514fbc4377c2be58dd88b9 SHA256 de3b471308203eeeee065b64eedc95d8e11c98d7a65ba639b5fa0e6f79c0d74a
+MISC ChangeLog 132464 RMD160 ae18b6d53fc4b8346319593450df00e903c3f9ce SHA1 b577979e60384e7b62d6bdbbbba2dc9e66b25e03 SHA256 97bca2bd3f2525c20ad07f9183f24e34c6a82fd90d08901cbafea6a41cadb26b
 MISC metadata.xml 537 RMD160 36f5ed1e9869e06c50c882193aad04d9553fbab9 SHA1 505782abd459abe3ba35969cc190675e00c65408 SHA256 38cd6ed34cf5447cbc3e0a9c4a9e24d5af12e2a12b80b106821bb19e69d2281f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOsHhbAAoJEPqDWhW0r/LCAq0P+wX4vGxcIJ6NEplQCA0sxAb8
-UAeUgRW48DnmKn8BwpZCGIs1xsHxggfSGQ7THRy+MvQQzHOlnT4mEuGgXGSYkdRz
-D5V5YclH7+yH3/77QphFsdzJVfPTxmOVKDY9ZmKCsc4bAZJTXmsflsn9H0CquUly
-EYF6jVN1oIAa9ZATEKxZSzj6IEY5ifWVjCwHeSMWFkJZ9+6d1dVffQ3Npnz6r3JT
-8gQ8LhbzfbZPIkDBHLJ/1ffMSjWnjs+ns3S8xIx/xPHml7PsMzUxgtzsDOlYxc87
-PAi5G8GZPJxEqQjVX1NAtRKlUCCRM8G3nDdJEpv4Sslu9jef96MjNNdcNA38i4nK
-qVFR56iXnixcMunLYron32OewFH468AaIxl30gEp6hhm/tIsfa/xGdl9yXZnrM0M
-altzybf0Vh9nFT9G+brXXx71E4WC7pIKoJXZojoyulaMwn/xd2R8PHE9IoShjJTZ
-jQJQmLRiHDAjqfguHJNZops0xsuJzdxFfb+KByBTI+yP0SwxYFWJDJ7tO54cVbrO
-ChjINWvgyQWwp5m8lriA4tj5OzIZt/Kb3ANI0t+GpHWknjNjK7MKM7bTQ8zQDOo8
-alyVXdFw6XlKq2+oeNDX7Ns48YUD6PSm0G/aNHvLfPQxCNQj+7y3BfaDQGab5zXp
-PT73xnr2xSHwsg5TTsNk
-=ITSF
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.11.2.ebuild b/x11-base/xorg-server/xorg-server-1.11.2.ebuild
new file mode 100644
index 000000000000..7f25e53949fd
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.11.2.ebuild
@@ -0,0 +1,240 @@
+# 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.11.2.ebuild,v 1.1 2011/11/05 12:50:15 chithanh Exp $
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev"
+
+RDEPEND=">=app-admin/eselect-opengl-1.0.8
+	dev-libs/openssl
+	media-libs/freetype
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libpciaccess-0.10.3
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont-1.4.2
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/pixman-0.21.8
+	>=x11-libs/xtrans-1.2.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-1.4
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-7.8_rc[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 )
+	udev? ( >=sys-fs/udev-150 )
+	>=x11-apps/xinit-1.3"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/fixesproto-5.0
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/glproto-1.4.14
+	>=x11-proto/inputproto-1.9.99.902
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/randrproto-1.2.99.3
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.0.2
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/xextproto-7.1.99
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/xproto-7.0.22
+	dmx? (
+		>=x11-proto/dmxproto-2.2.99.1
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.6
+		>=x11-libs/libdrm-2.4.20
+	)"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)"
+
+#UPSTREAMED_PATCHES=(
+#	"${WORKDIR}/patches/"
+#)
+
+PATCHES=(
+	"${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 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=(
+		$(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 !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=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-fontrootdir=/usr/share/fonts
+		--with-xkb-output=/var/lib/xkb
+		--disable-config-hal
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+	)
+
+	# 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}/mesa-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} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
+		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+		ewarn "because the ABI changed. If you cannot start X because"
+		ewarn "of module version mismatch errors, this is your problem."
+
+		echo
+		ewarn "You can generate a list of all installed packages in the x11-drivers"
+		ewarn "category using this command:"
+		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
+		ewarn "or using sets from portage-2.2:"
+		ewarn "	emerge @x11-module-rebuild"
+	fi
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
+		local x=""
+		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
+	fi
+}