Rather base of live ebuild for this snapshot so it does not throw qa warning anymore.

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

3 files changed, 27 insertions, 36 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 1cd827b29f26..ba7059996358 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # 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.583 2011/05/07 15:08:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.584 2011/05/08 11:52:53 scarabeus Exp $
+
+  08 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  xorg-server-1.10.1.901.ebuild:
+  Rather base of live ebuild for this snapshot so it does not throw qa warning
+  anymore.
 
 *xorg-server-1.10.1.901 (07 May 2011)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 343717c95c23..fe35d679eb88 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -13,16 +13,16 @@ DIST xorg-server-1.10.1.901.tar.bz2 5333795 RMD160 a20397a1cbdae631ed0235b1a1576
 DIST xorg-server-1.10.1.tar.bz2 5344169 RMD160 f0333f67f8226c21bfad395bb3ee72e6d10784f6 SHA1 59ada4c9a59f7f1eb4b68c359e9cd58272aa4809 SHA256 143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d
 DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458
 DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc
-EBUILD xorg-server-1.10.1.901.ebuild 7255 RMD160 3e090b41f8ac7eeab815ded7c5992a266cb7ba3b SHA1 c3aedee9e759d895b70248ca5950af93a980c72f SHA256 4d0effb75f0542f135697032f0290caffc11b98539524316d9985bb5dc3953d9
+EBUILD xorg-server-1.10.1.901.ebuild 6900 RMD160 b4f62191405ebcd309e0599b22c462aa86e6fc46 SHA1 f6ca63fca42e07964649fbd343c9c1c6ec413c29 SHA256 24ad3170a6ce5f14c10a0519335b5c0c9bbfa1c105d9b17b8b8951ac56aedafc
 EBUILD xorg-server-1.10.1.ebuild 7285 RMD160 be4ef109bc4283fc1eb95fddfb91470c7cca3a16 SHA1 5c1e089c125930a977f78bb9510ec8522e421f05 SHA256 d359e216185b19e56de4338b5ae2b7bd5d5936dac594f035694f3b95a122a287
 EBUILD xorg-server-1.9.4.ebuild 7804 RMD160 be63938727e77f858c9de4ed6892809b21abadd3 SHA1 d5d35ea11f5840459af5e001a1a86701f4ca7192 SHA256 bab747527e1ec78239d0894c08d49178739ea75ffc5afb29b9b4daf07adaf295
 EBUILD xorg-server-1.9.5.ebuild 7811 RMD160 2e7eced2901473f2b6b2550b05ea2c7afa888b79 SHA1 4f6079d3463712cc194c0d5366d02874b8583fb0 SHA256 3d2d6a78ae5a394dc4308e11ff13034a1361a3ecb5d5a08b3a779ebcbf26decd
-MISC ChangeLog 126181 RMD160 071b17ba611e8ac5f7e3ff50f5b8a289843c949d SHA1 6fcc1dd91bd834a6f2f2effcd325d062e81d0cd6 SHA256 9b8a8fd2de258d62be440be393684b25ca6c14d249e7c8c153ee1563300b25b3
+MISC ChangeLog 126360 RMD160 5426914ead6027ca80c23e8aeaedeaf41a7de4c8 SHA1 e0bf4a9c5a30bc87359010edf53f313cb9b1f27d SHA256 8ccd57dc850be29f56bdf16e9db91adc036c7c37589ff399b5cb1c1bb5db1464
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3FYIYACgkQHB6c3gNBRYeTGgCgv97k7g/lS6gGuvidLAeKRHwU
-5+YAn09AhGOESYzlk4uvnDzCFG37e9p7
-=dzvc
+iEYEARECAAYFAk3GhA0ACgkQHB6c3gNBRYc3+ACfb9XlbqgppahyML8pViPqKQx1
+vWcAnRuvV9wv3ClL+KYH+eGq6dUMVFRL
+=uT7U
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.10.1.901.ebuild b/x11-base/xorg-server/xorg-server-1.10.1.901.ebuild
index a15a9165f1d3..2a5ca8e9d65f 100644
--- a/x11-base/xorg-server/xorg-server-1.10.1.901.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.10.1.901.ebuild
@@ -1,6 +1,6 @@
 # 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.1.901.ebuild,v 1.1 2011/05/07 15:08:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.1.901.ebuild,v 1.2 2011/05/08 11:52:53 scarabeus Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	>=x11-libs/libXdmcp-1.0.2
 	>=x11-libs/libXfont-1.4.2
 	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/pixman-0.15.20
+	>=x11-libs/pixman-0.21.8
 	>=x11-libs/xtrans-1.2.2
 	>=x11-misc/xbitmaps-1.0.1
 	>=x11-misc/xkeyboard-config-1.4
@@ -101,7 +101,13 @@ 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
@@ -112,7 +118,7 @@ pkg_setup() {
 	#	--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
-	CONFIGURE_OPTIONS="
+	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 		$(use_enable dmx)
 		$(use_enable kdrive)
@@ -143,11 +149,10 @@ pkg_setup() {
 		--without-dtrace
 		--without-fop
 		--with-os-vendor=Gentoo
-	"
+	)
 
 	# Xorg-server requires includes from OS mesa which are not visible for
 	# users of binary drivers.
-	# Due to the limitations of CONFIGURE_OPTIONS, we have to export this
 	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
@@ -156,25 +161,6 @@ pkg_setup() {
 		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"
-
-	# Incompatible with GCC 3.x SSP on x86, bug #244352
-	if use x86 ; then
-		if [[ $(gcc-major-version) -lt 4 ]]; then
-			filter-flags -fstack-protector
-		fi
-	fi
-
-	# Incompatible with GCC 3.x CPP, bug #314615
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
-		ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
-	fi
-
-	# detect if we should inform user about ebuild breakage
-	if ! has_version "x11-base/xorg-server" ||
-			has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
-		INFO="yes"
-	fi
 }
 
 src_install() {
@@ -202,7 +188,7 @@ pkg_postinst() {
 	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
 	eselect opengl set xorg-x11 --use-old
 
-	if [[ ${INFO} = yes ]]; then
+	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(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_version_component_range 1-2)-upgrade-guide.xml"
 		echo
@@ -214,15 +200,15 @@ pkg_postinst() {
 		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 ! has_version x11-base/xorg-server; then
-		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
-		fi
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
 	fi
 }