Use gentoo.org as HOMEPAGE and SRC_URI wrt #416169. Revert keywording back to ~arch to reflect current status wrt eg. bug #220121

Package-Manager: portage-2.2.0_alpha168/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 31 insertions, 32 deletions

diff --git a/x11-misc/mkxf86config/ChangeLog b/x11-misc/mkxf86config/ChangeLog
index 16eb122b3fbc..a17d5b9e0e7d 100644
--- a/x11-misc/mkxf86config/ChangeLog
+++ b/x11-misc/mkxf86config/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/mkxf86config
-# Copyright 2000-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/ChangeLog,v 1.42 2013/01/31 01:11:03 zerochaos Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/ChangeLog,v 1.43 2013/03/22 10:26:47 ssuominen Exp $
+
+  22 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
+  mkxf86config-0.9.10.ebuild:
+  Use gentoo.org as HOMEPAGE and SRC_URI wrt #416169. Revert keywording back to
+  ~arch to reflect current status wrt eg. bug #220121
 
   31 Jan 2013; Rick Farina <zerochaos@gentoo.org> metadata.xml:
   I am taking maintainership of mkxf86config
diff --git a/x11-misc/mkxf86config/Manifest b/x11-misc/mkxf86config/Manifest
index f2653b089040..a74f2d0fc9f9 100644
--- a/x11-misc/mkxf86config/Manifest
+++ b/x11-misc/mkxf86config/Manifest
@@ -1,25 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX mkxf86config.initd 145 SHA256 471e7800547c76faae8c96b8e84343e67ea763db3eeab0850edb7675e231ff51 SHA512 45f6a30eed1e2a72504d452a8de6f518b6b41be5d4c14183aa8252a2744393f3447e6a0213638a99e22db4606e1d2fc274447ed4725d312c6dcf452a7381fb9f WHIRLPOOL 02d3f94d706ed49f902367dacb90d24f7f2b6c3f9c7b390777fc65192075d363d8a47ed5407aa887f58fd892e042046175e09b6399ea7b79d64a651468894a74
-DIST mkxf86config-0.9.10.tar.bz2 6461 SHA256 82c9c66081588865e719942092fb69233f72fdb423eb285b3775123b2de45829
-EBUILD mkxf86config-0.9.10.ebuild 960 SHA256 820abd49cdc718932bddba39db115ff301409ffcb09478f6a77012f6d8a32cf1 SHA512 b053772af9398e8dce3449e4a989481507032214d5371a39c86f5a2fe416768dcb1df897c983db310eafe8b53f90fdbd35fed773f2a00d4d060615d60f08a2a4 WHIRLPOOL 179facafc18232d2af921e84b7e753aefb2b855673c78cece38632daf96736cbd3d047624948c0600d5239d32870d9c84fbed1223178430d8cbc9667088aa998
-MISC ChangeLog 7975 SHA256 5a68774c46edbbec93773515489b0e09be03d72a2cd7c271fdd858de85c0e5f3 SHA512 e329ad5a24ac208bdec849bc0cc5bfbafd51916ec8e94561c94a0fdfde425e5c6a9d627ddec725f35e4a616307bdef7ea814e2afa648f0ea1223579dd81a73b5 WHIRLPOOL a63ea1938c7f4a59217f892e1edfb78dcc1cb04847df23af0bd9f3374e449a9178df50dd689ab2c38d3f635210fd05b5e53b2691886e2dcd74ec3be046603e76
+DIST mkxf86config-0.9.10.tar.bz2 6461 SHA256 82c9c66081588865e719942092fb69233f72fdb423eb285b3775123b2de45829 SHA512 1afadf8d73b55853203afd64f2f6eaea0d29a2e440d8360996885a3d3043673e5018c77584aaf5242866b0dd9606d08606610824cf82d29189e7fc1493c27ab2 WHIRLPOOL 8ae4dfeeecfd64a270345810aabfd59cb38634e8a43fb611ace4f316481c43d8b834e3c544f2add7433c2280ac49de7df4125e9b67cb5baed1d3fbb31b647b5d
+EBUILD mkxf86config-0.9.10.ebuild 901 SHA256 03b38fb7eb5798525ae5ede1050c46bced1122a4dc6bc931393a004ab592064d SHA512 5efbca8fb7daf18efd2dcb474a0df373ae4f5e2099b70bcd6d70033dc5d8c605a167a55f3e4d9fa28462e0fb7b54496c1fe0c154eac3809d9ee3e1ae62e6a4a3 WHIRLPOOL ab8dcdcf1dc56f113b10824247a3754e3ab069e0f4b42714e41e41c1f1726bd19cd05ce83ca4f6d207b7f3bbd421a8beae7ffcf2492663dfcabd82ee3e459804
+MISC ChangeLog 8194 SHA256 3c9e7a523d771a27cedb8b8455327b418b2e36d0f3a3f7b022c01f1699113c23 SHA512 de0f591700ecff7ddcea97ecad4527fe9ada66fd8c5ca8bb2c7b554ced5d880a90d1d1a501b28d0cee3b40682f4fc150e1298f896dd7b94fc13bdb3d92728359 WHIRLPOOL faf47521a5bea1205305d1ed2431339a91fe05599e4912c4f405a074af9a079468fac4dbbe03706dfe9184c1f97fdd1f289bef9b3bdf2884faa43c904f6a73b2
 MISC metadata.xml 295 SHA256 20cd2ccc6716d99044853f6cd9cb18ca8a96303fbfc9df1ab9dd3ddb4b1e1df3 SHA512 66962d37a340d63d0d4cdbe148e791cc697de828971b1f2497d03b7d2f84e6bdc2b33e8038212a0ab17e0f293ad9b10d640a2b6fd2783ce90b438980bb53e4db WHIRLPOOL ad97c89d5dc192a6792d7eda62e5a70f886712360664e1fe442eec8c66f84c5ae298eea11f19ff59b9e436d5440e7514f0bca4fa767b90ffcec6bed1006eca90
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRCcUVAAoJEKXdFCfdEflKXtkP/jsulOG76gGR1kcTH1NfGmiX
-gvfjdpl8/Te6Zd5v41IcuJDoF5vxk5qTjaNzfS0vXEGKu2yodaBFTX6SGpTsZYrQ
-tMZ5EuAMHFWg+R/in7zKj5ERPaTME1K21Gl3EhICLRfu9YZj+jaEOiw22f8JJYwA
-3ot7uOi38NJBdniwsyyNsyyK97X71v93gceMrvnHxQi2JqXqQzUTtP6+InWkm19+
-oU/yFGrfbG+zrkOh/nqiWWsA0leh9IPqEFEIjNqhl9+P6Vcwi1qWu6Cl5cZpQKbi
-SJ2OMar8SZHLygObfgEp6YkErkHAQYvxYoObTZz5NTnkIDSkfFjLZl+iopwFMGoj
-PJkgjffIPXuVCN8m+wdsiL349hVGNNMLyv95Mpw3qdz/5Ej+47TuzAAQlHLMFwol
-J6eISWOv3AZ9XEPWc+urlKscigwcCuZmnCwBVY2kedANce0ykxoqZG76VL5RN+TM
-95td5vS+KkAXZrkgg8UyXMMoG1q8td23I0xI8VzjYtFv+h7SabUxqx6brekwSPFF
-wNbMi0t0rOdpgEBII+XKu9aGrSJFPMp7of4UIhyurxhafb8VrkuORnzZ3e+su5to
-F/LrPnBe/TAWJxdD27TDeeB2bIzWWDSXyeHJxQZkF23IHvHui9dBBAlVvKgFMaS2
-liErW60WAQeGUEaojg4v
-=EnZH
+iQEcBAEBCAAGBQJRTDG4AAoJEEdUh39IaPFNjZUH/R7nNCXZ6XEOErce4nLwSJ/t
+OzaqUDn1lxVnXqksAb+EUJ4eQsWFhL/skux7IQyXEGNQxCzmGHN3UkWm4jg7l066
+ankUza6QTWBTZQZe4s1ZjbYrN32SXRT2g+osBo4KV+DA4vrbNA8tkzEW2pvPCQ7u
+FzX0ONHdlAtn7ki94E0XdTPrBiDgqQ9zWP/S0RmO1W8pkbaDzrL/pKO6qSzHeVN3
+VLvFn+iAQQju8BpFaeeO4qctMd7XeOeJPyS4OEaqKllR1pJ9HziUYAq7w8Zcsp0b
+4gYC++dLBd7UovaK9Z7wnLTsgNC44pvEkzko9XRmuUVlUJ1SAV1nJjPI5jcSPyw=
+=ZlIc
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/mkxf86config/mkxf86config-0.9.10.ebuild b/x11-misc/mkxf86config/mkxf86config-0.9.10.ebuild
index a0be1c4d68f9..3886ff1f3a12 100644
--- a/x11-misc/mkxf86config/mkxf86config-0.9.10.ebuild
+++ b/x11-misc/mkxf86config/mkxf86config-0.9.10.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/mkxf86config-0.9.10.ebuild,v 1.4 2008/09/04 12:53:08 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/mkxf86config-0.9.10.ebuild,v 1.5 2013/03/22 10:26:47 ssuominen Exp $
 
-inherit eutils
+EAPI=5
 
-DESCRIPTION="xorg-x11 configuration builder - used only on LiveCD"
-HOMEPAGE="http://wolf31o2.org"
-SRC_URI="http://wolf31o2.org/sources/${PN}/${P}.tar.bz2"
+DESCRIPTION="X.org (X11) configuration builder for LiveCDs"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ~mips ppc x86"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~x86"
 IUSE=""
 
 RDEPEND="!mips? ( sys-apps/hwsetup )"
@@ -22,14 +22,14 @@ pkg_setup() {
 }
 
 src_install() {
+	dosbin ${PN}.sh
+
 	insinto /etc/X11
-	if use mips
-	then
+	if use mips; then
 		doins xorg.conf.impact xorg.conf.newport xorg.conf.o2-fbdev
 	else
 		doins xorg.conf.in
 	fi
-	exeinto /usr/sbin
-	doexe mkxf86config.sh
-	newinitd "${FILESDIR}"/mkxf86config.initd mkxf86config
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 }