Bump to prerelease.

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

3 files changed, 257 insertions, 2 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index fa6bad42fc99..7f20313e072c 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.715 2013/01/04 03:31:21 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.716 2013/01/04 10:35:34 chithanh Exp $
+
+*xorg-server-1.13.1.901 (04 Jan 2013)
+
+  04 Jan 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xorg-server-1.13.1.901.ebuild:
+  Bump to prerelease.
 
 *xorg-server-1.13.99.901 (04 Jan 2013)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index d6d0452328c7..7b8615837e03 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -25,6 +25,7 @@ DIST xorg-server-1.12.2.tar.bz2 5431841 SHA256 ca9f9e22f432f1ccbf8e7a21e746e02be
 DIST xorg-server-1.12.3.tar.bz2 5478028 SHA256 3654b613393734ce0c7c23e81ca4ceb6e8afefb5f0649233ffd105c1220544fe SHA512 8fa3b55a5032ec02f525656f0081aca2d2320a1d9351bae89bc70209883f88da3c264d7b4e688c89f863fb5a3a661adbfc833c1352298e7ef4e39d73177f6b5f WHIRLPOOL 12bec207b79215214a4e9c32ed9ee4bf69659d901887e67bb4b7a3fae6ea11cc3bd18434a9cd249f8429cc92f1ed6c05b83c27c78fbec08d50b937d4502c5cc4
 DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
 DIST xorg-server-1.13.0.tar.bz2 5469168 SHA256 548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a SHA512 840a341f796386156ff4eb599c4b3b96090d3fda9cdbe70c45ff175c8d01b62cb9ba04a6c73ddde90996f8b96be1a3d925c9803a3b629cb4bc317374b7b1e014 WHIRLPOOL f52984556237f7c1dd4537727050e6b8347592ef5cd8e6787c65c3fee9bdcadb9709315929636fdc89a2fb4cdfd30f5224072954ed091eafb10fd8cd64a5ac30
+DIST xorg-server-1.13.1.901.tar.bz2 5481175 SHA256 259ea4ac20d4c36be2811ac726674cba5b081e0fec376b5c50b13a76eec3d909 SHA512 a5073a0809b331969cca3b363466ddc86edf892ebf25c7bf4c5a2cebf02722cd865ddb2f9ae0f2aa904deda5ac6ece767a91193e17daa44730d15aa601005837 WHIRLPOOL fb067ab057def95275293c919b122f96c3c9649f4cba14f0fa98e798cc8710c7835703f8f0dc0f922ebf1c24c222f0db8b00e8d621bbb4706ad78534c98f2a1e
 DIST xorg-server-1.13.1.tar.bz2 5479530 SHA256 c93540e2799df4655c6f1b67dc7d8d6db96df4f08ef1702fffbc5df843a43d00 SHA512 8732be86efdf430bfefe3fea02892042da214d0eb018f12496329b20d7282697d4d92cfb59e35ecabe6a6ca9b034cb12c02e67f44ab4538917c470064719fa45 WHIRLPOOL ba61134f0b14b908dc99c5bd1b349f2307897d8d7905c04af2a377dbb578d615c9a594998b54b8765fca305669fa240e98a98b2155efea85a1c4d84659d46ed5
 DIST xorg-server-1.13.99.901.tar.bz2 5486869 SHA256 eaaa2547301c42bcd939e0da05db09aa599a63104b57ee6ada88533a83f9a40b SHA512 feee621a53aab8bb4e121ec0b17b4b6029b447d3cf3c0659e0773274ce6ff2aa23f2ef421a62ce34eae4f8fc17ef1440a43a2577ba588a47bc82e8b32da539a5 WHIRLPOOL 980015300223bfc2eeeef93337fc968bf8611a2425f8826704753208d7489d992c63f219c78f1dbb6ef39deba6a64a9a7a87fb90bad9ca1005aceb2cc9c7eab5
 DIST xorg-server-1.9.5.tar.bz2 5172054 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc SHA512 f17baa6e871c7df4dc61330e32e235906d9e4c842a70226b0833d2b64ab62811131b960eb942f4dc9359ea828676ce60afd82802aa7cffc711d27c4946c32345 WHIRLPOOL a8ede9d5e4ae80713e2b363042a80fe7ac9a03f8623dbf058b241a4237edd2397b437dda5ea56076ec1da71b946dc5b936adfd4afd436893b5c8350996ba169e
@@ -35,9 +36,10 @@ EBUILD xorg-server-1.12.3.ebuild 7004 SHA256 4b7efe23c76990ec9666226110589360822
 EBUILD xorg-server-1.12.4.ebuild 6994 SHA256 fa489bdb2e2ee7f61985ea5823b9b740087a069c416777bad01c23a98961315b SHA512 e18ed3f7e44c7b1b3ffd0dcd3a68315eb94c4a236a74b8b7814030c868a2ed661570b8afd82b4d8a42cf327a6b85fd29d603580dc55505763e6568ab286780db WHIRLPOOL 915c18c6279071283a6e40a6688f9f22e041bf8af66616d34ef69ef43aaad087af43335e9e7a8567d0bf91a53a1bf8efde3e236ea19ca0cae0eee62a1aadd04a
 EBUILD xorg-server-1.13.0-r1.ebuild 7084 SHA256 027ad3142d5ee3eb9a035855dca044c99798b9100d2a452edbc0a6a77c155c63 SHA512 bdd6156489758b86e213591120ffd6a3e63ba69ed2fd7ad087fc2d5d1ce5e16a29d0fb9e7f2e8fc6abe0d80d0f20696720554ea7fdb77ffd6424dac1b3688f6d WHIRLPOOL 080c9615d73237fe4bbc0b7001558a2c35a86c2b8c60699faefdea9b89ea7acea479acc5116254776ccee54ed64743dda3f777f2d9168a536e2e14ed9eaaa2bf
 EBUILD xorg-server-1.13.0.ebuild 7027 SHA256 eac7dae27dca9f0c1d19c1841ecc18a1ed77c64a3ba9ff9dae4773cbe90c6ec7 SHA512 b35e4c55e4b9731bde44057623653585287745d653be6b003071c6a03ab444688434f08b7c5ebe45a6b042b07c42e2dbd573cdc59bdf8bd990bb7ec3e8beba18 WHIRLPOOL 3aeba2635a102a4d2cb93ac47e76708ebad82a5dfb6ac618b2c378f31acd4cf4545103fd36388e72d1d2a015e6b58fa568f0b49b2648844807df2225e6073aba
+EBUILD xorg-server-1.13.1.901.ebuild 7072 SHA256 11e3e2dcf620e8461b392a11b4af5708b4411c5cbd7fcd4ce8401eaea4cb5daf SHA512 e81ce6c495a50f67a41e416119cf79e1853ca68c254f7a801da4f7eb110d898dcc7b2981372a14015136f2e4da9f338b7de06555cfb4fe58d3ad35846e22c2a4 WHIRLPOOL 11f51671d275d1d7d83fa5e4a109b40b97475c0afc55a107d7343397c7691a72a782fd20592a560e0c026dbe8ba21126b58ecb7dafa202aee6332160798407fe
 EBUILD xorg-server-1.13.1.ebuild 7060 SHA256 695c2e3a346079ffc2110cea4e01ce78584aa66027827e4a84ef8431047aa024 SHA512 08925e72f8591d4ccdc99b0dcfe021022e9ac620b8a9bf0d3c79bdb8562b392f3bc7b546ea3ae500876694801854e7b9950173224dd656410a3dbb1ba543cbe3 WHIRLPOOL 209a10bdd824c27f40ccbe0806e00423482a8d43ed3122d97da8e10dae893f83cd3ea0ff3b807c34009ff618059f242d91f08d200685fe705d45ea79877c5432
 EBUILD xorg-server-1.13.99.901.ebuild 7094 SHA256 c486109fdb72a5d592e38abd95c974428c00540401c27327c778c7d50276ee94 SHA512 69a442bd6d38080e8e1937da0711af38700e5eebe38b4a24d92f376e351773b88ab7ba26cf7cc8215ad6bbbbe5bc6d5b038ec876039e9d0ad26e4f79188e04c4 WHIRLPOOL c422dc82928d39c4f92b4c9df1d66ccf542eba0c6a950dc922794d9bbd0c8628093c901b51a184ac38fcd1ac9a7b2d8f9d1ea335785c57ca282d5985684dfa5c
 EBUILD xorg-server-1.9.5-r1.ebuild 7865 SHA256 4e75f287de81b0e5ac59841964d55e3479e51c6fa7bf3882e665f25e3ed9c62e SHA512 56a0418baab28f111bec6a4c7377b50a7320c6af69793132c791b01988863c6da3bf3239f10651cfa2893f53075185cc403d925d280307b5b8113e54477a4f50 WHIRLPOOL 83d8ab8b50edf55ab6603d9424aebafc7fc15b3a71e62df0032c64a057f28ed15877683b8c8bfa2fcd8df4f48e2306c965dd4cfc3b4e30f5d24537dfd7866634
-MISC ChangeLog 38796 SHA256 070337d6bf7b3d302a74609eba2492648b523e72561ca32ab8471402acbb5cc2 SHA512 5b5f73ec780b7c402847cabea7fb86473825a65fb4ae47958ff3b63fdb255188a4cb9b22f05da4215f1cd8d7fd924a45727527a427536ff8190666f19848b307 WHIRLPOOL d43f73401fc69f4a8d9a78a3090f559ecc4fc1b63ed5f150ec57709bbd7bc154d08bedbbda08524d4813f0d74e0346de84ba0b3f8b06d9320318888614ac6baa
+MISC ChangeLog 38961 SHA256 fbe5d6647b6a69984c51c8cb912039667615241e1f89f181c3b1459eda7ae25c SHA512 369fb2acdb64dbd565a23edbf072bc3b4c00172cdb55ff33c9f3c6293865bf7cd4f1895db09be3e06be94cc533517d44df6e27ecf6e1e767966d1ce88962fe75 WHIRLPOOL 6867554e90d6c7e15cac845d253fb3657b6d16c66ab9041d94d0b5c06d9dfc446da5bd803cde323856712cb166c9d3821a366da65f744416e1c958b34e858452
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 537 SHA256 38cd6ed34cf5447cbc3e0a9c4a9e24d5af12e2a12b80b106821bb19e69d2281f SHA512 6b66fd87c679bd696c5b6f7c32026a2bdaf827f3ea375eb908965352c259354dc242321199cebfab72a8d7854e459798ee851feedc18fa36496aec965ca28676 WHIRLPOOL 751bb9c7446f7bfd44674256bee09d05252b03686be445538a1026c2075533660a3895a8d68f4b77cd3575f4cf589df2bcf9a6e1e493c13f169895f413ea6c78
diff --git a/x11-base/xorg-server/xorg-server-1.13.1.901.ebuild b/x11-base/xorg-server/xorg-server-1.13.1.901.ebuild
new file mode 100644
index 000000000000..5343d36f8941
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.13.1.901.ebuild
@@ -0,0 +1,247 @@
+# 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.13.1.901.ebuild,v 1.1 2013/01/04 10:35:34 chithanh Exp $
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+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 ~amd64-fbsd ~x86-fbsd"
+
+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.21.8
+	>=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.1.99.3
+	>=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.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.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
+	"${FILESDIR}"/${PN}-1.13-ia64-asm.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 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
+
+	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
+}