Add prefix support, bug #447340.

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

3 files changed, 20 insertions, 16 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 5be45eebf9bb..7ba4004855b1 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # 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.701 2012/12/25 16:19:13 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.702 2012/12/25 16:27:06 chithanh Exp $
+
+  25 Dec 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xorg-server-1.13.1.ebuild:
+  Add prefix support, bug #447340.
 
 *xorg-server-1.13.1 (25 Dec 2012)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index dfbd889fef00..5bd262924603 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -34,8 +34,8 @@ EBUILD xorg-server-1.12.3.ebuild 7004 SHA256 4b7efe23c76990ec9666226110589360822
 EBUILD xorg-server-1.12.4.ebuild 6997 SHA256 ab1496e0d24a1834fc7cca6ed0466bcbcb012b78583802fb3823d4413a5c745b SHA512 115b38b000a26afa5f0ff8b60d8a1dd29179b4bfcf7d9d4ac0ce5f43296d825ca46c501755540b67f3918572c75fbf29e8e1a3b3a5cfdb1c053da3db4162ea80 WHIRLPOOL 726b82a0ef7409e3e751cfa3124a024943f7962fc4ef174c7dc883c7bdf647115f1dfc925bd5577c11c17bbf0b0390dba33824de1444d193947d069a83c2b69e
 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.ebuild 7012 SHA256 bbccef7298baf915fc2a4df55856f2a729def85b29113c4245a0427a30300904 SHA512 1f830b77447d95daa28e3ea84a4cb27a519768e20795e16218dafbf9274c804591b62d952306a550a953b01cd04f50267ef3caabea46c91ad9eade9fe7c93ce2 WHIRLPOOL 5b6f4b6e0e20fee40eaebdeb8b62777b1fce4bad26fabeeade89fe2132c6879658f1b765269e58b55e248bdb5893db8e66790420ceaeb9357f4f3c225d89a303
+EBUILD xorg-server-1.13.1.ebuild 7068 SHA256 9d57477dcb7cf036ffbb69fd7ae341c606d69f17a7f37ff5d6d5f16e7b9c73ef SHA512 d38e21cfe5ad0ba18768a91b012c80f8029fa6c4532ee8a88e75f730b4e1cae2273c07b17f4bd350425f0687b59e3fc79bb62f36328db8e462cda343dcc2538c WHIRLPOOL aee3992a2814def3bcf48666984b90cf7a31181bb3c88ed67206f6626f8608c7849f741ceeed6cbad2b8f97f0658acce48999a5d4fe2118a06250d7ab10358d8
 EBUILD xorg-server-1.9.5-r1.ebuild 7865 SHA256 4e75f287de81b0e5ac59841964d55e3479e51c6fa7bf3882e665f25e3ed9c62e SHA512 56a0418baab28f111bec6a4c7377b50a7320c6af69793132c791b01988863c6da3bf3239f10651cfa2893f53075185cc403d925d280307b5b8113e54477a4f50 WHIRLPOOL 83d8ab8b50edf55ab6603d9424aebafc7fc15b3a71e62df0032c64a057f28ed15877683b8c8bfa2fcd8df4f48e2306c965dd4cfc3b4e30f5d24537dfd7866634
-MISC ChangeLog 37171 SHA256 bae9995a4761d51aecd09e5007433326fe48e3e9ba40c8620071bf04581f6fb0 SHA512 b9b1edfbd78229bbc844746d2142d30b42a5ae92b13a8d931c64d89192e178be64005cde9f6578b79d3dc0972172857271f561769a1c9b436159f1cab68c1c49 WHIRLPOOL 5ef6041f4a3902845d9f69d1f80c23ea1dd01a87d10a3562c01d211ad13f17101d85ae60425d0919e3acaf3d6f07777bcc7dc64f785fcf89f44e8bbc7949e27b
+MISC ChangeLog 37305 SHA256 b405d321e1c6acc5a19ef20f7ca087a30576e34e65157ec0c960d62d3e6f4160 SHA512 e2755ca0dba2133956a844571189bcadfa92f89ca4f1c349a5960d22b8c941d8aca3c5d76c659d69fd1424ffff4971be4cb21f3ab31c35475cd2edf14d69efec WHIRLPOOL 88852a020c55d3dd23bab75ba38ec23ea154ae6d04f41d6c234562ca6a5a7d2e015f820487410df35beb417de625ecca99dbe53171d3a38ac2bdd8412fd81c18
 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.ebuild b/x11-base/xorg-server/xorg-server-1.13.1.ebuild
index 3dfa9245cb4a..44c663eee21c 100644
--- a/x11-base/xorg-server/xorg-server-1.13.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.13.1.ebuild
@@ -1,6 +1,6 @@
 # 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.13.1.ebuild,v 1.1 2012/12/25 16:19:13 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.13.1.ebuild,v 1.2 2012/12/25 16:27:06 chithanh Exp $
 
 EAPI=4
 
@@ -149,10 +149,10 @@ src_configure() {
 		$(use_with doc doxygen)
 		$(use_with doc xmlto)
 		--enable-libdrm
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--with-fontrootdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
+		--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
@@ -219,8 +219,8 @@ pkg_postinst() {
 
 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
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
 	fi
 }
 
@@ -229,9 +229,9 @@ dynamic_libgl_install() {
 	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
+		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} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
+				mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
 			fi
 		done
 	eend 0
@@ -239,9 +239,9 @@ dynamic_libgl_install() {
 
 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
+		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
 }