Remove unnecessary XORG_AUTORECONF. Remove link to nonexistant upgrade guide, bug 496618.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x974CA72A

3 files changed, 21 insertions, 21 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 666703642906..29d5d69c5890 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.779 2013/12/30 19:59:17 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.780 2013/12/31 22:36:41 mattst88 Exp $
+
+  31 Dec 2013; Matt Turner <mattst88@gentoo.org> xorg-server-1.15.0.ebuild:
+  Remove unnecessary XORG_AUTORECONF. Remove link to nonexistant upgrade guide,
+  bug 496618.
 
 *xorg-server-1.15.0 (30 Dec 2013)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index b2a3f633fe36..6e108fe8ca2a 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -38,25 +38,25 @@ EBUILD xorg-server-1.13.4-r1.ebuild 7044 SHA256 b48f1d67a28c352e44eb44d75dbc2d57
 EBUILD xorg-server-1.14.3-r2.ebuild 7165 SHA256 49d86ddaf2aed6ce6dbb165d7ae20e46dc661ad9f82e33cee8fb38d661c466e9 SHA512 7d0766afff2c6cb1373a3066626e35056bb47f8beeecbcb2a876ee948dec6edbe6b19f72461e07897ca07b28e6c6818a54d96818707627827ec53caea4ba0c60 WHIRLPOOL 58eebeae8f8927579f6bf7eb6bb636764f0435fe654280949deb59c1d4072b05757526f9903e6f149c8f2d9f3370bfe57bd1667f6d4333d20c64261590c5e808
 EBUILD xorg-server-1.14.4.ebuild 7129 SHA256 3f6840af8a0cbf9e36b9b91c7a5879839b6acaebf0306f6f16bb0706f79bea32 SHA512 96c7f8e49458189ed1d441890c2038f38551097b9f7b782243cbb960e02c2cfed69c43b90ffb36d4cb113e751b16f7d30f9f0e5adc022c19328d9c315df1d55d WHIRLPOOL a99be785d898e429858cc63edf4362a81feb3e354a636c265bcc02f0133d097e794c950f9ce0af68c0d2a49dce482c168c7c9ba37bba2e4b182bfe691489b8c8
 EBUILD xorg-server-1.14.5.ebuild 7129 SHA256 fd72fb2500894cfaddb9c172e910d555972f840a2bd0ad52561b96caa72c96cd SHA512 01a15f10086074af8c4149db598192fe49ec39fe87cf2290677ac25fb813e4d199b0233d568e98a449997e362e8488a565754501e93fef4f318457a645cc20c2 WHIRLPOOL 33221b42def9a6e53ab3e07b0b0894517539ea8d94d9a6bfca1b9e657265c5e0d71a39ce493518afabc2ceb27f28b6f9cf9fc470596bec07ff398dd104954f93
-EBUILD xorg-server-1.15.0.ebuild 7360 SHA256 ec3326d0e93b26de9675957c1e089b97c553f5feb97c5d2238e8ab3d1a91b860 SHA512 b35fb4edb9e4564a0d918cf2883afee84869e96d76c5a845b306e8160fe8d6b82c5065dd0a74b5ca5f282f2586c8ddf64c68b52989f0fcdd716ce39a164d55a9 WHIRLPOOL fccf9c3fcdeae765a2db71156bbdaf78e5e673ccae904547dbb6fda81d5b042e6a864a464651301418a0cdc90ccf66293b58b32521b9fb82d1dff03481a23e9a
+EBUILD xorg-server-1.15.0.ebuild 7143 SHA256 e5b810301a05d5566f5a0f6e647147c34cbf04f0f73a8c11f6fb53c5b017fcb1 SHA512 4456b13b093588f7956fb58771b294cd1f8b55b63cff8340237224e1340174fc597ef3e628cb308be61580777242dddac32f61ff009be0d542d0c64bbcb62e7a WHIRLPOOL 1d6692e5d9a3c3ab959c98301de7c1eea98478e9ebbc5e5a5423a2a39466f4a24ef26fcdc56a9227d4f04b0f6e2ddb2ea0bf03d8075b242d88f28df33b1ae5aa
 EBUILD xorg-server-1.9.5-r3.ebuild 7967 SHA256 74e6a536de6c99f4c3081ca6f4b65c653e6b54d72ba17963b2186be0b031a3a6 SHA512 bb5b4f17f6fbd07cc1501019464b7b944599256e5ca0021d5481e6c194fd19fdb0e5029351b999b1efa621c61c1c7256970d431f99b3c31a659859649a09a63d WHIRLPOOL 4ff73d879f6a8c3c69d2f8f7414eb08d873187e3cbd6b4f1453d53398a3b13a93da4e3847a62c87e6b26f30fffb2fb7153b2e3da3a8bd0eaffc4eeb870701cb8
-MISC ChangeLog 53330 SHA256 6c641b98962a231b33033258d1f14249993428cafb4562acac1212eb84a7cab1 SHA512 50b36ff53c145bf22ca1ca7454cc41a5735333f9e44cd97f52fb8d2832d8e4d8d6997957866781cd87b56afbb82bf985fa957cba3dc48e708bea48739f5ced19 WHIRLPOOL 586a2762bddc666d381ebcb24bc7ac01e1d25d6eb73e136b8aeb02f87ca66e70c1a74709900edb29d9abd284893df54af6b719de0b323e7b8faf188db6685116
+MISC ChangeLog 53501 SHA256 fd26a916519b0cca6dcba2ccc6fe8162b23387a756c67fc6c788c9f874b7a618 SHA512 1c3712bfca8a2d4b8fdef39d871cd0e08491517c00949874cd9ac11f9820c11546686c3b79d133bd9583e80530c8c76d5d571097aa867c621bf08427fbfb73ec WHIRLPOOL 33a58ab5f171cb41510e2f9305f2b20b9e3fc7d5dd24134cbc54fd697cdfef8e09ead2cbf720da9a874601f9ad1c8ca49f4001a09ef073ee114187f8bdbc41e4
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 620 SHA256 3fc2f9ce825d48cf91810542f8aa57a0bafbdd24cdd62fcdaf55958a46c1a9b7 SHA512 fc7832f2fc242cc2d8e078ac8593c3e1d2d62b26dab129fd62cd63b984abc2b14dcdfecd19388978d1af4a5c0ff4c42b0b79102fa344a421e0a848e1b321e23d WHIRLPOOL e5d9b64bd5bbe57d0de24ecf7d40ee115aa93646ad031b78ebe69b88f2d1dfabde596f99ec90209d6bdeafaeecbe6e0f080d85febb0e931adda0c04e2680c0c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSwdCiAAoJEA/daC2XTKcq+V4P+wTJOsYpHUFpyoJnHJUIilFs
-1iztsgeBnRo9P2gCU6I6QOki2p/0+lv3e2nV/x+6W616FmsOBOXiaZzx6/un/QH4
-OpnodSd9Pzv383UZROSQ5Jy/Cnni7sm1j+PNPWjjKj94CnmhhSW7UFEvImw9Oky8
-6cF6QwEbwn73BM4sIdk2TRD3NoeE54cQ06zlnArFTpf+kzfxa7bLPY5zBdLkMuCv
-UXO7DPvr9VWrC4eS9m9DJUd8VdJlUTiMTJx3zShfqeNG1q8W8cWYz5n06OWiXSKJ
-nWzXmsdgI1Ei+OvA2bc5CcdpEGBHr6gvrXThv4j/QyazFgn1xmmoDt+G6q/fUTPW
-CF+QuQI6iMjoZbyHkLvYwXdsWH9jN1whCmcoOQh+N/aGWLcA8eFCioIzdTqVhenk
-ab/cM7syVo/zWbg+0iI3zGuU0421y9iZ8kxftQBHUCVZtRLsv0yd3XguLqSMjMDX
-n4T/tmMYdhXPiE7KnwZE7IFXsOesAZVENOh6YnXbnUwipqJC62Lb754kPWlp/sTj
-afekmM+W++W2dHTjCs6n7YZaXKarmTAf2uiYhGqJ4Dp9bbN6jAy7fZqSxvnXGmSn
-a/ioM67dv+L3AmNFQXRJbGlmGgIDSLJ3ItVP97bDPmjPcw3cGgoGWyAuqhtnE9cF
-3trtr1Ct7yf7fUtp5qGd
-=OpT+
+iQIcBAEBCAAGBQJSw0cKAAoJEA/daC2XTKcqnlwQAIdGYJ1emyqpIW2GWKNKcDtt
+Vfsdyswcs6vxPmYe3JAq4oPgZEssbWdQaagk2az+r8t5rUcaOMFsCUXyzleInvxD
+/cwQjvwhTpUuOz9rwvxKS3fKZi4pj8/JAkMmGY7Ju9A+h3POgR1uWrLB9QPcjKe8
+NdGBawCLgXA/+BrrhH76Q2bSWMVII3t0M3DLmUXdgOVU9uRNGzLnx6qG8025zQUS
+ZuTJYR+rQFVi/ZlrqBbpp7uxVE3hMy/uX/m+ixkpruMI3UsDBdrMqr1EJKGabwdp
+n1si32qWICjVrUslcuIb0eFfRF7mZhXuMHu9q9ioAK9/v3x0axx+GBFs+DU2Y+Cf
+nfLrw3wdHPKSbUi4JUARR3QJVlUy4C1JdufIhSWL5eDkfpwS0r8fAst3e3vi686g
+fkzAjMKcX+OXt5jyXQO4fzvNPw+3wGf85gbHP75NLaiSq5V4C2IDbSydmTgFNhaY
+0K9FdfweflByXuRG85lRKb2/NEz0prv5hhcUlnJ3MWv0wgqs8pvUV37xaD4RQ68g
+OrH42L1snDup8TYdIEj65SdYzBJOVlm82CBxI5A4EwTc2MzhbczdPu1tZHmqaU/u
+BauQiZdx8bJSzG44JS30o4Up9wigauIWSEYeojSWINEKK9RFc7R+NXkntYrm8KUm
+lHsgWhpw/yJrp2IDh2BP
+=FXL2
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.15.0.ebuild b/x11-base/xorg-server/xorg-server-1.15.0.ebuild
index e403369a0d2b..dc8005595398 100644
--- a/x11-base/xorg-server/xorg-server-1.15.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.15.0.ebuild
@@ -1,10 +1,9 @@
 # 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.15.0.ebuild,v 1.1 2013/12/30 19:59:17 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.0.ebuild,v 1.2 2013/12/31 22:36:41 mattst88 Exp $
 
 EAPI=5
 
-XORG_EAUTORECONF=yes
 XORG_DOC=doc
 inherit xorg-2 multilib versionator flag-o-matic
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
@@ -205,9 +204,6 @@ pkg_postinst() {
 	eselect opengl set xorg-x11 --use-old
 
 	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
 		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."