From 171620fad660de67d7838ee451b7666e9b171ef1 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Tue, 27 Jan 2015 01:39:10 +0000 Subject: [PATCH] Fix SRC_URI, sbin script move Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x65E309F2189DB0B8 --- app-portage/etc-proposals/ChangeLog | 5 ++- app-portage/etc-proposals/Manifest | 33 +++++++++---------- .../etc-proposals-1.4.3-r3.ebuild | 11 ++++--- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/app-portage/etc-proposals/ChangeLog b/app-portage/etc-proposals/ChangeLog index a40ec5016c9b..4d7b5b433b7b 100644 --- a/app-portage/etc-proposals/ChangeLog +++ b/app-portage/etc-proposals/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-portage/etc-proposals # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/etc-proposals/ChangeLog,v 1.19 2015/01/26 07:40:55 dolsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/etc-proposals/ChangeLog,v 1.20 2015/01/27 01:39:05 dolsen Exp $ + + 27 Jan 2015; Brian Dolbec etc-proposals-1.4.3-r3.ebuild: + Fix SRC_URI and the sbin script move. *etc-proposals-1.4.3-r3 (26 Jan 2015) diff --git a/app-portage/etc-proposals/Manifest b/app-portage/etc-proposals/Manifest index f97f2cae3c85..7356f60b6a84 100644 --- a/app-portage/etc-proposals/Manifest +++ b/app-portage/etc-proposals/Manifest @@ -1,28 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST download 53696 SHA256 42c2b117e141d0e69a8717e98e9ddc9dffd2ed27533c6296e87e810c631e71c7 SHA512 9de117b96908bbde87e8ee9c326525961547ba779ae571071c57571d039f3e01f9d0ec6be5eefc1ea40abdfe73631b4c750964dc94dbb6348119b83afbc556a1 WHIRLPOOL 6fb095554bc8a98cf51d1426252ed3afe620c1cb9308e66315d1456f6a99d1e75fbd4513ce947cd5ab4aa1cc1d9dd680f29fb7fada06ef93dc28fbb5800fe539 DIST etc-proposals-1.4.3.tar.gz 53696 SHA256 42c2b117e141d0e69a8717e98e9ddc9dffd2ed27533c6296e87e810c631e71c7 SHA512 9de117b96908bbde87e8ee9c326525961547ba779ae571071c57571d039f3e01f9d0ec6be5eefc1ea40abdfe73631b4c750964dc94dbb6348119b83afbc556a1 WHIRLPOOL 6fb095554bc8a98cf51d1426252ed3afe620c1cb9308e66315d1456f6a99d1e75fbd4513ce947cd5ab4aa1cc1d9dd680f29fb7fada06ef93dc28fbb5800fe539 EBUILD etc-proposals-1.4.3-r2.ebuild 1497 SHA256 865381f8421aea5cfb192842c130c4c726df359586cec7d95687614b2ffdc2f1 SHA512 cf33e74ede9560a3d6584e62172baf90c7989a65d86c1f33400bf9aba3d74573b90f35dbc5f6a6022bf03207d0da0e0da86bde33f20f43be32a609d771dd6841 WHIRLPOOL 9bfd1b98030735d54896fa5999f8fa1e6324bf7e85abbd0265ff93ce285d91018568242c0813eec4c5f4d298f6a76acafa871e300465f8cd317f126291518022 -EBUILD etc-proposals-1.4.3-r3.ebuild 1448 SHA256 f6b38b61a395e31da7e1103f251336d7c6968fe0664a927147303dfb1fae7daf SHA512 4d0318077479db38d4ecb097644e4e61ccb140c8d1a38feed828f6b324afda39ec4853317980b24e19afcdc1a7180c6efcf14e249a58c9b61cee558121e36631 WHIRLPOOL 80974f5def769441a316f51125faff5ba545930a7dadf574358230c880633d452f8ca3760ca1c65fb9dee30351d40f790fbfe8db183abd745b711d15eddce24a -MISC ChangeLog 3020 SHA256 a9be104c6f045000f0d0082759e7d9da5153c015a7757351f3a0add2df147ab1 SHA512 81f7a64ca41e99ece670e0fb978207ad07f8b6f7f1e4ed25a3c2246b02e800bae654b7edaa5a9aa0bb63cb92338ca6c376082cc86e50d8cfe35fba270b18516c WHIRLPOOL 19c26f82c7cc0445f950eccf44a016cdcbed8dcca6f62d8410910d397a32f56375fac6b7cff1218a2eed499be9976a16cf8811fdd46df4faf463f80fc66cd40a +EBUILD etc-proposals-1.4.3-r3.ebuild 1554 SHA256 c518661e86e5904186c2c89a64a1683cfe6c2c4add60e0c49d7a4a47b6ca0af7 SHA512 1919ad36406fc97512ba536c84ed6f32e3417374f73dc5ce843f37f6944c4edf7ca12173d4083393abd97ebd8e7dfe2fb215fb9327aa23d92347025a897bd010 WHIRLPOOL b04b9c336b7c4a7cc6c878c63fa235bb18450de17c9920aefce4a4337e710b97c88edc53ff03191439281747975d8b018a141a0d6c21fe804f245795236d5844 +MISC ChangeLog 3140 SHA256 82c5cc305fa58f79a8bb46ff3a66777a3d2222041416688054e6b7f3e9f851d4 SHA512 611420957be44ce6815f6fc9bc440053115073d6aa22bb7d9e282c85fa24107ea8ad501083067ef430b95329ae7893de831fadff7975c44c0a870426b8a1c2ab WHIRLPOOL 82548af82f36a2fa3bc04677276c8269c7ef6b233336fa73156481265f46a03770b989d33ce50e9e0d61856896b012e273e375fb6409b6cfc4b903d28c8710df MISC metadata.xml 259 SHA256 4ce274c1249d9b32b6753512fc6b3a10185b9f15eb3034cb8b854bb5b0b4c44b SHA512 47e5f08fadf112df0200996ff60488202a5cbc6acd1bb08d36e8133b4a96ce7e2290e9b4bdb80fcd14473a3b5585cb5e65d88eef800964028aa0e00af732e788 WHIRLPOOL 622fabeb96aa935f7c24383f2e967fdc5068d11bf8207b846a9858f30f616d186cb3b2d5f7c9a1056352a3c2bc810a781b3b8942455028243ab22dde9f30ad58 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUxe56XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJUxuw6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2OUZEQTI0MjY5QzhCNUE3RTlFMjMxRTkw -MTg2ODIyMzFCOTI2RTRGAAoJEAGGgiMbkm5PgG0P/3mY+0eoF59nBEo3ti6M+Nrz -3zltvB+O0LcP2yjw8A0A98LthmjH6WHKwK8QfE2qEp67a8uAqZlifDeDMyjbFWQz -CQFRrD3CQm1YwN74qs7Thl4T8idhf7jb0hj4eOfvWUUvO6LNk/5J7ZG6QQiI3HBN -svadAoE3+kJpz59YfMPiNeJ9D9Ibn2oEuV9kFFZpUedcn/zwObqTxIgCTIN+arlo -3iSJp5KSst/iSqoKoaoe7jQ0H9vhdtR9ECTaZR1kRmvgXi0XoP1/Gu2e7UszwAn7 -LsKbTGBGcQx9cEqwg2CFLIBXSfXnS/6yof+ct4hUv3wux4V/jdcoornddfLb/b8z -vudlWQvPmaH/E4ehqLHrb3Y6OHOIpJr6A+WVSRC1FrJ9gZBgm0HSC0V87GIdJLLm -8u2JO/98QLs/bKFtrD7xRvGoeUjMY9fXhKcUhAEW2T5fOtIDNGbNt3Yz13cina3p -Z9ZP7qsX9jDcaeJOHSJmfQoLzShfamvMyhPZYGookDkI0kPKseQWSk4J3Fe3sDVC -5xDgO7BqFcB/BZoA0cazo7HqJeon6ER8mZ99QdMMuqN0GS69wajk2XnZicjj7Oa3 -+cMNa1QtneD6+38BpecsHkALMpZjYRPE5JKv8Ro/4quLCDkBuJUDyuXU6GfyWNzx -nmeDZKfPH3RTQ0stZdlL -=PG2b +MTg2ODIyMzFCOTI2RTRGAAoJEAGGgiMbkm5PaHkQAJgne+kkfrg2DqEz5bE8CChL +bxh57VpMufvIVRAfJjERH/hT5LOGeYZTuNwBY6H0eduVY8xjYi5E158w/+rxyYZk +2qdEoYu7oda/xe0kyhA8DKjAbVJqkxzr7HlbBdQMzet8xjoAQIZkh5lo+DebQqa3 +I43t+DOBQM8VlD8556yzGRPjB0ULMbS1JuwnUXsI8I4PxZUln1bMhVRj0FkQPbY/ +G86yco44Ljw9ERh+VMDrICB2QWKRdhmuVX/hM2of/Kb0DJQWnpkZCakCESACskAC +3dMJz53BudBN5vImrfP0Bn0z4xSNcLZA5zUStIuJLW9FHwfhU15bsTUsBhdKi8bH +8df8zN4TlbayhNtQTBN/6UVzNtkkHGyVLV5061IWtdTo5COTTine1jYC631884ys +GTh/o3hR205KsIGuh9Q80dfpis5xarW4wKHpL2q/As/3bmmRjKtr6xsGlQ2IvOKl +2qt1chvp5J+6V3NDwQEeIhY+i9FvdKx2fm7SXdYuHqszxLb0X0A6w3UGXW1aBww6 +pM+RGIu6w6n0euU1CYxUyTWQu05B+mxmb+iP8BcU/jG08iH2fvkOTFoydvOxoIRc +YtnRthQmq0rqNuNW0FGKuOCGLqt7pmvAo6X46waaJx8rs8c3s0hbNX0M5V7rdXyy +C1AymxlmAKf/K0AyjQtM +=0BcR -----END PGP SIGNATURE----- diff --git a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild b/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild index 8a7ea08d96fb..c55aa97e9c47 100644 --- a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild +++ b/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild,v 1.1 2015/01/26 07:40:55 dolsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild,v 1.2 2015/01/27 01:39:05 dolsen Exp $ EAPI="5" PYTHON_COMPAT=(python2_7) @@ -9,7 +9,7 @@ inherit distutils-r1 DESCRIPTION="a set of tools for updating gentoo config files" HOMEPAGE="http://sourceforge.net/projects/etc-proposals.berlios/" -SRC_URI="http://sourceforge.net/projects/${PN}.berlios/files/${P}.tar.gz/download" +SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz" IUSE="gtk qt4" LICENSE="GPL-2" @@ -22,8 +22,11 @@ RDEPEND="${DEPEND}" python_install_all() { distutils-r1_python_install_all - dosbin "${D}"/usr/bin/etc-proposals - rm -rf "${D}"/usr/bin + + dodir /usr/sbin + einfo "Moving /usr/bin/etc-proposals to /usr/sbin/etc-proposals" + mv "${ED%/}/usr/bin/etc-proposals" "${ED%/}/usr/sbin/etc-proposals" || die + rmdir "${ED%/}/usr/bin" || die # Bug 308725: Filter out the "PreferedFrontends" based on USE Flags: use qt4 || sed -i -e '/^PreferedFrontends=/ s/qt4,//' "${D}"/etc/etc-proposals.conf -- 2.26.2