Version bump.

Package-Manager: portage-2.2.0_alpha123/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 6051e956da78..c264893afe87 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.682 2012/09/01 12:50:31 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.683 2012/09/01 17:01:45 chithanh Exp $
+
+*xorg-server-1.12.4 (01 Sep 2012)
+
+  01 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xorg-server-1.12.4.ebuild:
+  Version bump.
 
   01 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   xorg-server-1.12.99.905.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 849191795b45..35e40f6f3e37 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -19,14 +19,16 @@ DIST xorg-server-1.10.6.tar.bz2 5406712 SHA256 c4da5a97b6986688efe74bc9bff6a3879
 DIST xorg-server-1.11.4.tar.bz2 4900810 SHA256 3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc SHA512 29013ffd51ff1b6a2b5679580c490d68dc5feaebdc9201a2812a410761200f5468de76c8791ab089950504be649e61f2cccb705587fde66eef1bcd3461f537ed WHIRLPOOL f1a5db2396cf1b490542c65177e047b37b636706b2d7e2bc15ef1ba527d2c7afd58669b99b83e7c2d2b7c1994f8603ebfe63419d2d924a75f4032afbe6806f26
 DIST xorg-server-1.12.2.tar.bz2 5431841 SHA256 ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5 SHA512 28cc392b9183d0586cac40d349a8390bc90a240fceac689bd6a00a315c9d3ab115c37d3b283c892652f53106190707d1d74bacf256a1543741f555310a7c1ca1 WHIRLPOOL b22cf671d1dd55ff2c2c5713cdceb02cbd7a611dcd9ed63a0a80e5e0ab7677295ed73177034059422c79e5891516546c501ea54108637ef00d9bb977f2f75716
 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.12.99.905.tar.bz2 5463407 SHA256 6949c4978aa6ba051955a20f0af27b0765e04a39346af29672547b26097784e3 SHA512 315a0fc8ebe3f371e092edad22d5eddaf24f3c35384c149d015006c156bb5e927706f70fcf0660d52280fa1c03ebb94e234e38827c0cc596431728699b3ce57b WHIRLPOOL b73005c802162e449b79eee821596322c03305cfeccf5848e884443d4244a2cb8a2eabd5dde745a4558a072c853b456da42c83e13f9264137a6af9f3148ed721
 DIST xorg-server-1.9.5.tar.bz2 5172054 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc SHA512 f17baa6e871c7df4dc61330e32e235906d9e4c842a70226b0833d2b64ab62811131b960eb942f4dc9359ea828676ce60afd82802aa7cffc711d27c4946c32345 WHIRLPOOL a8ede9d5e4ae80713e2b363042a80fe7ac9a03f8623dbf058b241a4237edd2397b437dda5ea56076ec1da71b946dc5b936adfd4afd436893b5c8350996ba169e
 EBUILD xorg-server-1.10.6-r1.ebuild 7135 SHA256 dcfdcb562ca3ebadb5767797f6382079ccdfa6d5c46bcbfd102c82ae90b8e0e8 SHA512 b2d6b4f00dbb6b31aa958cb0bd4db43b9666fff98008de390c97e461ec4b89681dd0f33394c4fb492fe6b43f8162498fe6c11a5e823138dc926b3362bcb4c635 WHIRLPOOL 778eb0929538fc1dfbe2770d52c660fc070067eba36708324d6946e95a1bc012f3156039a3648b485163a9648c51d6e16aef04984a1528338dca4730c53e17e3
 EBUILD xorg-server-1.11.4-r1.ebuild 7327 SHA256 30bc70e87963b3d77d8afbd601e5b484a6ea98c00c6ffd83e7173153c4b698ac SHA512 67d2cb5e6f188a8afe7cf3930d0f4bb0818b43c9354dbc115eda2dc96120d9eb359c3f4fb9dc9f3fbbe67fc5ea8da8fd3a64f2397ec4be88d58595bc5b9b70c0 WHIRLPOOL 530ec3e160f0d937523e62f54ef9be27ba05e683cdd3fcb589b58f8acd12d104c503c42b2273b46bf492e70ec0764fa91e24fefd4f0118711f09c93cb9494e50
 EBUILD xorg-server-1.12.2.ebuild 7041 SHA256 ada60fc7b00e3b01b5feada0f1747655db8b69c6c51c8521031ada65d574d85a SHA512 145ea8acda707d48f667e2c41de42c0da448d97d8db3be02be864f1890f73992d438fb96bc7a3e9a7affde044b891a2b7ccb9444a0fd3461ba9d573482128e94 WHIRLPOOL 6969f2ca0e1d2080ae952b19ceafe74aa981816ee87ae2ad368717090f516c51399053d921dc1ad1307beaacf2c3b0b4d02e54e093791a44e54c02bd4854cfa6
 EBUILD xorg-server-1.12.3.ebuild 7000 SHA256 b94249687067305cf8f23c23ba408eefec0d6d22a5626a134878b7c53682f3d3 SHA512 278ed71b622b90632c2925df13a8696ac4066acc289eb08cfa7a4dd77d8ba403e42249880902cb837071b784a8e0d731d156e674ace62188e6de6e6f5543b3cd WHIRLPOOL ad71f4dc35a08f14c35083ae8e643308936acfdd9e8adff8fade2f189602ab5a64ccff424c7c297650eb106c80cc50a6fde22f74ac895d0e899fb33c11b7ff8b
+EBUILD xorg-server-1.12.4.ebuild 7000 SHA256 58cf0b8a51fef0fab07052b339a5f522f0eb5596e2eb5c13fee7107d079336e3 SHA512 9182d92b9938f1c482723b881bf2115ec3ded3ecdd92e78c6aacdc8bac3bdd0b143f5f5c78326bffa9ad2f364279fed4cc231ddd6de7854de4a63bf21b91dda4 WHIRLPOOL 53b16e482fb2f0cf3e8316bc9ee82f4f0a8fc9ddee9a3f5c9c9f6b377a2832315e80e64d0fb7354d8d9a63e8c5a31f52866b5e29ee98915ab0df745aa05d4a0b
 EBUILD xorg-server-1.12.99.905.ebuild 7034 SHA256 00175a6145dfef1b6ca3e4a90ffef7d23bb36a1b6e5cf9e6c3e3cd76d1456880 SHA512 8c4ae6262cb2dbd0d7a81af320dd4aaaf52a1f03efac298672fb73154c14a3084d4e576601595b7e1d90ae367a903c77ccb46439451a4815ac3deeb285e74c83 WHIRLPOOL a94f66599a1880db435be932dd6d9e6619d891b7e5dc3a9273559d9c538527a87a70c7cabe43ec988dd28fbd69ae7f5e099e3f908ea89087aca71a58266aa247
 EBUILD xorg-server-1.9.5-r1.ebuild 7863 SHA256 92cd8aba95353f41ced9c7f3122583fbfd182d9f1d7e093bb2a68a53b9d10399 SHA512 4ef89d71c28335aa928fc15c5dcab8c97a6e9c6b3aef57df1dabe20606135e2d0a05331789a253d91c5a14cd0ae0c68f14cd21ac75b35db94028bb1cb9e579be WHIRLPOOL dfee9948a59f130f8bde7545e23eebe083e2da8780ad2d10f58cb1b82b9d40bb0f66cc3070ebcf8182de325bf392e5d203e1d3e6054857b1efe9fca264e32f5a
-MISC ChangeLog 34072 SHA256 a5bb81149d3e8aa26a5953b8b6656c40cbebbc0038eee3b36dbefc088b77ecdb SHA512 8ec94967e930482b3d5d2415a408c443cdc6a0331526dbd3e8cf9aede9a2f396da67073a803d0e56a017cd4b2787ecdd7830472aec80d3a0862aba1ba26013b2 WHIRLPOOL fecf5e4a8da1712750c9451d7c4abe4c90df9c115b39a1f65c76f541b3a9eb011414259ea1dcc4a047cec67601bd86b635bd7223668f5162095b894e37e2ed89
+MISC ChangeLog 34223 SHA256 2a4695d73b6a141de798b553ca6f4a543f320fa0997f1c88c6e44bb3c0b1b9b4 SHA512 0ada09590bc9aa9c6de16215b9441b6f13e453fd000a055d0bd0a12a6bbdd0da59de25e20135ab0d5fb6f3da5cee163ae19f63bd21f7361b92be79dbd08b935f WHIRLPOOL 62972f08c59ea0e12559b7bba827458ccba95306bf1f701775365bc5b66d0a5f121e4e2076b368f07ba778b1f5a7b0fce5c6773a7e4727a21b489c8c16a14dec
 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.12.4.ebuild b/x11-base/xorg-server/xorg-server-1.12.4.ebuild
new file mode 100644
index 000000000000..0a86eff89dbe
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.12.4.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2012 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.12.4.ebuild,v 1.1 2012/09/01 17:01:45 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 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.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-7.8_rc[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 )
+	udev? ( >=sys-fs/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.14
+	>=x11-proto/inputproto-2.1.99.3
+	>=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}-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 wont 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=(
+		$(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"
+
+	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-8 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 sys-fs/udev[-keymap]; then
+		ewarn "sys-fs/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 ${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
+}