Bump to new prerelease.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64

3 files changed, 256 insertions, 2 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index ac30797c904e..85694dd29e43 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.746 2013/06/25 18:10:00 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.747 2013/08/02 20:17:26 chithanh Exp $
+
+*xorg-server-1.14.2.901 (02 Aug 2013)
+
+  02 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xorg-server-1.14.2.901.ebuild:
+  Bump to new prerelease.
 
 *xorg-server-1.14.2 (25 Jun 2013)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index e43709df3599..45af791b0674 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -19,6 +19,7 @@ DIST xorg-server-1.11.4.tar.bz2 4900810 SHA256 3e2935bc400612df58d5b5e6840829e2c
 DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
 DIST xorg-server-1.13.4.tar.bz2 5506293 SHA256 a2c969887f3c7b0f3f7d31e2ee8e91fa73ce81ba3c16d82da9150ffa302c98cf SHA512 600fe0fc77a9d6c242ec264f74624cddf5e3dd0e2eacaa65d475be638e2b4d9497bc555d753b43b24845bd6f446a811e387446f94fa98d3e75f664063a7a3d3d WHIRLPOOL 68ca7d6f121496d3a371fb4242c4e9c8fa77eae5c79a13dfec2cdbfd8f0ed82b9a97aa607923674f2e17f3380ec9a8c82d3aab9b2d8b829457a29b8330970f54
 DIST xorg-server-1.14.1.tar.bz2 5509219 SHA256 a5adb02571efb7d7459dde83286a3adb77dfd1a52a7348e75d2dc72d6f8d28aa SHA512 43558eb561161f85e43a4d80c1e4e8b410a4afe5f83509b73ad9c9370705f074ec1bdbb9e4b7c994996dc245086110fa4731bba293ecd32a1e20de733dd4a686 WHIRLPOOL 3c1f71738a6310b082087f34c709da8d09b6cc6edee9dbfc671126c52f87a83bf0c271b401f64ecfb10ca8f3714d4b4720b0b62d7d82172f8ca88be7aab0d15b
+DIST xorg-server-1.14.2.901.tar.bz2 5499168 SHA256 773d2abe205e94601888efe3c2734eec3092d1abae88507f64a4e849350409f1 SHA512 765caa798924136efc5edbbcabf80cd9fa907df91ca556af1c2b81265f9ff87a312938243e2fc606343fbcc3d74193f58fe674e45cc7cca9e505358ecdccb2ec WHIRLPOOL e80190c0bfe852986f8e6c38c9cb98243cfcfb55415f15df7cc9c799fe944de78a9c21618c3cf1f8b4162f0c6616af460ccd7b814f0a70c5dc20eb55be46d0af
 DIST xorg-server-1.14.2.tar.bz2 5490488 SHA256 f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b SHA512 5a8caf61039b1605a85da9cba36ff525ccf9deda2f52be2b3f6360171d058b929a3a49e97db24b0587c4933009b2c479514f31d364eba54918a20a7e26a9060c WHIRLPOOL e20b6f60a806065184bb51d718eb50cad5b2809b7e0fe322f865ad5db3ed53cd3e9c7e6f8b577becde9c0cbec171435370087d1a19f496ed8645d4f93e2bac50
 DIST xorg-server-1.9.5.tar.bz2 5172054 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc SHA512 f17baa6e871c7df4dc61330e32e235906d9e4c842a70226b0833d2b64ab62811131b960eb942f4dc9359ea828676ce60afd82802aa7cffc711d27c4946c32345 WHIRLPOOL a8ede9d5e4ae80713e2b363042a80fe7ac9a03f8623dbf058b241a4237edd2397b437dda5ea56076ec1da71b946dc5b936adfd4afd436893b5c8350996ba169e
 EBUILD xorg-server-1.10.6-r2.ebuild 7202 SHA256 9c2246cb0d6bd068a99af82af47b5945e53215542089347a0e9f3e88a2233490 SHA512 d495863b139d3a8a2535caddb54a98ed9195b663ecd7b2ca432517e6b75a213368fc845fec650794b61ca5f207c7bd14b96e3a6c10ccd853a574077739b4aa5f WHIRLPOOL bb8a4fb46c1c9f1c28e04e921e697ad5f540828f7916ed456c6dcbfe31c2bf16e57a268545115f1f16635355f019b40c47acadfc1def6cc7346ee1c2acfc62bb
@@ -26,8 +27,9 @@ EBUILD xorg-server-1.11.4-r2.ebuild 7391 SHA256 ae064266bea347c773d9fc4349e59629
 EBUILD xorg-server-1.12.4-r1.ebuild 7058 SHA256 3b0d0059dbf959df79a5d28c4e87b56d1513e9ffd490019299a9a90b56e416b5 SHA512 c5aedb627c1e3c55d6cd5ecc6b39e5d2a4a939e0dac53f4a49b7be7bb6f858063fee5fe74159d13876aece106cacc753c6a790ab5fb4a1f137c71f7a1f1c472f WHIRLPOOL 35a4037bed8ed9c37f6b508007abbe64e5c978e18256de77efff55bc50b6cce26ccb44984105dc265d49fd3a72b39a7a438513d586a5a60189b58eade6c003d4
 EBUILD xorg-server-1.13.4.ebuild 6998 SHA256 90ad778a2b3c5fdcc18d1b774d0b6a35b81ba6b98b60ddbcd8ba4cd2d6d86832 SHA512 ef957d8c7ce1d6367d3f83517738ff48924b2ef9210b27759a24cb3e06e1ba977194a64994811a0a7e9256ec4b4e32d2d4369078a6789484dbe0db68a9b3cabe WHIRLPOOL 3610f774d94e7b3e828c936730b2f8dcac828358a1f971eed3031e7d65202feb9b51cda8d41645aa54dc1663e0001e456fd3e35596a12957a6449f97540dfec4
 EBUILD xorg-server-1.14.1.ebuild 6993 SHA256 f9d64cea7d8e2cea0f99433cb56bbd607881ffaa300f70a73cda6fb9bb2be3ec SHA512 1aa2f2655cccaa4fffd52e274ef97bf4916d4161937cb7134fc7c8b8105ac4b1bf8cecb21efe41e230dcd7180e138f7edf3ad56aba1cc3336a41ad7a37389ebf WHIRLPOOL 9f1e6d70cfd1bcc37bf6a3b1806219c0d584930fa9f9a49daff8a2b5a3582c4d5031f6fc6ecdf6b5376b8024417d4034672f242bdab986985fbc65e3dbf02a2c
+EBUILD xorg-server-1.14.2.901.ebuild 6997 SHA256 d7d1949cdddd97a024c6b8dcf090c3ec7f0f2c9a5ab087bebdd8bd9174711fae SHA512 bd964d767c6298ed5e036e03c01f47d2321729c9e8f31bcc210589243aaed9a4927a67eab210e1cd43461fd5413778f9dad0f5015fd14ca0db0d92598c8569d2 WHIRLPOOL 49e29e715fa54a9c2764586b077f5ecf4a22af129d3bf931e4f37c7670900b44495c514e08dc4f9c2486ed0b390602b66eeb90ec598a3c2167612dfa5cf1065c
 EBUILD xorg-server-1.14.2.ebuild 6993 SHA256 c02f70f7e2ce2931f763328012bf45a3c2f8c79530a9855751855376deb32abf SHA512 9d19036f61216c80bbd60ea777fbe27807e385a9e050c6ee9babcf13e647d4629b306f4c8778247ab029e4a5b97d49cf27ff583cbe86243202d84cecbd00c371 WHIRLPOOL 469d6c9eea480b10f9e255f0786cb4198b297599ccf08cb59d05e9006079e0ec4890500ffcd4de9730f46ec9e5cf95aa5722c34cf2eb675d661a251f2cd98d2f
 EBUILD xorg-server-1.9.5-r2.ebuild 7925 SHA256 07bf78aab6229019bd88f1778564fe32ee9802eef200d61e96e55bccd5048800 SHA512 9b204a74d70deee2b4b7093c27d3faaecbb3f479e19f7d17d59a6ffb1116bbcaaafde5eddcc9f2e01789e43ebf59f3d82e3d94ebae04177534480de876cc5fe0 WHIRLPOOL ded655272aa87d651f6370836effa6588457196e8bd269bc7faeec87f606b6d81902d241bcb0b792b18992b885bdb861e244bab460d2eae29ca4e44c9a9f8e75
-MISC ChangeLog 45750 SHA256 44e20f5c039d59948df0bd220512e5ea4a1a9a414d6d3db197d0581af0f689f9 SHA512 dcffa9a2f3063351a7d5c5bf8ad0d8ea4fd5967f600e320e26ff2dd04eb75ced1b3ed97fef5c2e6f71ecdf1e7d540f9edb7793d1ea1d9846ce44422a6ffd2369 WHIRLPOOL a1bf974b75dcf2de2be973b0fe586590b35d08f5a9e82d299096db5c7dcdf0b15441122e684e350deba433a7d38fde5354a6002677e2a4c5a7da241e46f301ed
+MISC ChangeLog 45919 SHA256 84d28bbc5eb8e7f28ea826403e0c2775acf4841be47dcbe7f8ce0744a4152a63 SHA512 94315568f4d1e53a1d1cc085a3f42d3da5c7719592e6969c1c0307a05fd0643db0feaa7bceb45874b2cdf4ad3378a4bb27b726e456989446eba659677e3ea2f3 WHIRLPOOL 8a8e5b817da7cce59d4babbacd3b597a0c8b65a56ea8f235833a9966a3eedec5c312f6d55902f8457844421413c31e4b2987c9ffc55c53fa232d6f94aff32072
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 620 SHA256 3fc2f9ce825d48cf91810542f8aa57a0bafbdd24cdd62fcdaf55958a46c1a9b7 SHA512 fc7832f2fc242cc2d8e078ac8593c3e1d2d62b26dab129fd62cd63b984abc2b14dcdfecd19388978d1af4a5c0ff4c42b0b79102fa344a421e0a848e1b321e23d WHIRLPOOL e5d9b64bd5bbe57d0de24ecf7d40ee115aa93646ad031b78ebe69b88f2d1dfabde596f99ec90209d6bdeafaeecbe6e0f080d85febb0e931adda0c04e2680c0c1
diff --git a/x11-base/xorg-server/xorg-server-1.14.2.901.ebuild b/x11-base/xorg-server/xorg-server-1.14.2.901.ebuild
new file mode 100644
index 000000000000..c95600def4ae
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.14.2.901.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2013 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.14.2.901.ebuild,v 1.1 2013/08/02 20:17:26 chithanh Exp $
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_EAUTORECONF=yes
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+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"
+
+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/libdrm-2.4.20
+	>=x11-libs/libpciaccess-0.12.901
+	>=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.27.2
+	>=x11-libs/xtrans-1.2.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	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/libXrender
+		>=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-8[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 )
+	udev? ( >=virtual/udev-150 )
+	>=x11-apps/xinit-1.3
+	selinux? ( sec-policy/selinux-xserver )"
+
+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.16
+	>=x11-proto/inputproto-2.2.99.1
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/randrproto-1.4.0
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.2.0
+	>=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.8
+	)"
+
+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}-1.12-disable-acpi.patch
+)
+
+pkg_pretend() {
+	# older gcc is not supported
+	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+		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
+	# 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 suid install-setuid)
+		$(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)
+		--enable-libdrm
+		--sysconfdir="${EPREFIX}"/etc/X11
+		--localstatedir="${EPREFIX}"/var
+		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+		--with-xkb-output="${EPREFIX}"/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"
+
+	xorg-2_src_configure
+}
+
+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-9 xdm
+	newconfd "${FILESDIR}"/xdm.confd-4 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 rebuild all installed packages in the x11-drivers"
+		ewarn "category using this command:"
+		ewarn "	emerge @x11-module-rebuild"
+	fi
+
+	if use udev && has_version virtual/udev[-keymap]; then
+		ewarn "virtual/udev was built without keymap support. This may cause input device"
+		ewarn "autoconfiguration to fail."
+	fi
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/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 "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x
+	fi
+}