From f0e220bdac65a7c6132cd53e0c6769a6fb8fc780 Mon Sep 17 00:00:00 2001 From: Richard Freeman Date: Sat, 12 Nov 2011 20:11:38 +0000 Subject: [PATCH] Bump - fix for bug involving early file replacement. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- app-portage/cfg-update/ChangeLog | 7 +- app-portage/cfg-update/Manifest | 10 +- .../cfg-update/cfg-update-1.8.7.ebuild | 106 ++++++++++++++++++ 3 files changed, 118 insertions(+), 5 deletions(-) create mode 100644 app-portage/cfg-update/cfg-update-1.8.7.ebuild diff --git a/app-portage/cfg-update/ChangeLog b/app-portage/cfg-update/ChangeLog index 644600e952ea..b6fbf8037cc4 100644 --- a/app-portage/cfg-update/ChangeLog +++ b/app-portage/cfg-update/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-portage/cfg-update # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/ChangeLog,v 1.29 2011/10/29 12:24:01 rich0 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/ChangeLog,v 1.30 2011/11/12 20:11:38 rich0 Exp $ + +*cfg-update-1.8.7 (12 Nov 2011) + + 12 Nov 2011; Richard Freeman +cfg-update-1.8.7.ebuild: + Bump - fix for bug involving early file replacement. *cfg-update-1.8.6 (29 Oct 2011) diff --git a/app-portage/cfg-update/Manifest b/app-portage/cfg-update/Manifest index 9677395356d4..7793054bb308 100644 --- a/app-portage/cfg-update/Manifest +++ b/app-portage/cfg-update/Manifest @@ -8,18 +8,20 @@ DIST cfg-update-1.8.2-r1.tar.gz 164899 RMD160 d1271c5803460894246fecf0d067d81937 DIST cfg-update-1.8.4.tgz 164558 RMD160 d905dc77da628cf89b347198eb5243a0cde481a9 SHA1 bcfe44a120db84353078394e62ec38eb20511cca SHA256 cf0017043a3ebb51cea0e8958def7a5587f8f42c30c710ca3e12605d817992e1 DIST cfg-update-1.8.5.tgz 164597 RMD160 9cbc66a2f717b66afa4058876c347e06af2b2053 SHA1 5209e57712767f5657e11f44b796a20f509bca21 SHA256 568d405817ecad358c8225cb680d183664351368e80b780f2191e50457b17b8f DIST cfg-update-1.8.6.tgz 163205 RMD160 79166b523a5da6ff77aad710c87887afe0439873 SHA1 692f24eb954cf44a6b6cdc179aeb29be357dcd24 SHA256 4d973e9ac00a845b8696e0bcf2d003ac8dc1c715ac36dc7c57b8f10223c44760 +DIST cfg-update-1.8.7.tgz 163212 RMD160 2cbc70df83535dd59a4baf87205546516d97af0a SHA1 14292a0a6bb30869465a5c5e937c3c97bdf642ef SHA256 94cdb032a187e6e9e5998852afa5999d6746d7b30ae9cae7c1b68c435fe19a7d EBUILD cfg-update-1.8.0-r6.ebuild 2294 RMD160 6348670bb741ab6bee40003c935b8203070677d1 SHA1 7777c7f24eafb25c6ef13128418d94251f1b0f21 SHA256 fb809155b2a08797fc19baf16e531dcf19988cd53a9947a6be15767d88cad585 EBUILD cfg-update-1.8.2-r1.ebuild 3507 RMD160 31a2e71bd16c2ee6a4b0bd1a2ab46f29e47a4a97 SHA1 293c84eda0b4adef3e57f70ec61202f59f92b655 SHA256 9b780f6944c2a62ffdc7fe07cbdaa28766e4c0846d73bccad6aa86157caf4ed6 EBUILD cfg-update-1.8.2-r2.ebuild 3634 RMD160 4a7260620c7adccbac6724e8bf47a4910569380b SHA1 d1cf49a9019a818382068502081c4df99453b87d SHA256 9bec8aa73b9de0a79e4196c7c36b1ffc3f9c1d687382ada5a1645f033a6816c8 EBUILD cfg-update-1.8.4.ebuild 3305 RMD160 f06b3972f54d18c0ed72e9893072d40c3fedad55 SHA1 9187f2716d4e10c8185131804856977c084fd54b SHA256 4a2a345ee229c0bd58ad3725a081b939ffa7b4e49d6c6169aed9cd5cda94292c EBUILD cfg-update-1.8.5.ebuild 3305 RMD160 b4f849abb42a16ae8d602798c7dbc8685b0ad913 SHA1 f1dafd51d722f05f9307d1874bdc9796fb1b09ed SHA256 882ecc806f083e6db98c1787b1e7a15625173670e2d4aa3d98d951faabe04e41 EBUILD cfg-update-1.8.6.ebuild 3305 RMD160 095d16888887a0bc3a9b7444aabea88c33718284 SHA1 25cad2aeabc43eb38574935ea9c059d354639a5d SHA256 49f813f4b7ad6c0fda3543ad705b041b3f837c65882dd30f53d980c5785b63e1 -MISC ChangeLog 4312 RMD160 245691ba7f1da8884c1c59a7620061ae665700f7 SHA1 3fb1900d31753e1ff6fc2bbcd065a0f43ac5f6e0 SHA256 5aea93c1669f931ac2ab1e9a64a29b0f7e878e12adc2598a5dc13030a6364188 +EBUILD cfg-update-1.8.7.ebuild 3305 RMD160 260f609f8e9a4a5b03084a7f007d9c20d69269dc SHA1 6f4d16fc98057390e688ae26c2d5e4d2834f1660 SHA256 1713bda6e9fbacd98e1a3c09c42b555a718c75d821e45de64e3d6c48da02d696 +MISC ChangeLog 4477 RMD160 e23dece5771d3938d3e46a14df5fac5b2eecc94f SHA1 22ce7b0e31693a1a180e604e454bcef9c7af5b63 SHA256 8d56b302009b9952b153cef227b4ea276391cad1a20d20e139869a1d45025945 MISC metadata.xml 198 RMD160 1dea3859337cfb629db52cc59ebaeb0048fea573 SHA1 08125f466a0fbc8caa0ae3345ead6151fd3dd036 SHA256 51987068e1215c73a592a4dea6221f8ec1a36296d87f20c7fc6a46e0a272b04c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk6r8GYACgkQCMFw3lXsEjoIiwD+MvsM2RFfo3HJtRwTofWEZyeq -Il2yIhk1UQymNpMFdmwA/jvuwsQJtv9xshuAQ9kPphBasANcFEuV1lwTRH0iFX1L -=NZz8 +iF4EAREIAAYFAk6+0wAACgkQCMFw3lXsEjoVzAD/Wzc04+ciUX9wHOyQ4hLCQZVz +U2x9qslkjLCniLM+D04BAI0fHliDxxbGFDMLpbJULOmGRIuFuYqXnrJaHAlgI7Ec +=QNDJ -----END PGP SIGNATURE----- diff --git a/app-portage/cfg-update/cfg-update-1.8.7.ebuild b/app-portage/cfg-update/cfg-update-1.8.7.ebuild new file mode 100644 index 000000000000..f6761824a4d2 --- /dev/null +++ b/app-portage/cfg-update/cfg-update-1.8.7.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.7.ebuild,v 1.1 2011/11/12 20:11:38 rich0 Exp $ + +EAPI=2 +inherit eutils + +DESCRIPTION="Easy to use GUI & CLI alternative for etc-update with safe automatic updating functionality" +HOMEPAGE="https://github.com/rich0/cfg-update" +SRC_URI="https://github.com/rich0/cfg-update/tarball/${PV} -> ${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" +IUSE="X" + +RDEPEND="X? ( >=x11-misc/sux-1.0 + x11-apps/xhost )" + +S="${WORKDIR}/rich0-cfg-update-b29e34d" + +src_unpack() { + unpack ${A} + cd "${S}" +} + +pkg_prerm() { + if [[ ${ROOT} == / ]] + then + ebegin "Disabling portage hook" + cfg-update --ebuild --disable-portage-hook + eend $? + ebegin "Disabling paludis hook" + cfg-update --ebuild --disable-paludis-hook + eend $? + fi +} + +pkg_postrm() { + ewarn + ewarn "If you want to permanently remove cfg-update from your system" + ewarn "you should manually remove the alias for emerge from /root/.bashrc" + ewarn "followed by running: unalias emerge" + ewarn "and remove the index file /var/lib/cfg-update/checksum.index" + ewarn +} + +src_install() { + exeinto /usr/bin + doexe cfg-update emerge_with_indexing_for_cfg-update emerge_with_indexing_for_cfg-update_phphelper cfg-update_phphelper emerge_with_indexing_for_cfg-update_bashhelper + insinto /usr/lib/cfg-update + doins cfg-update cfg-update_indexing .bashrc test.tgz + dodoc ChangeLog + doman *.8 + insinto /etc + doins cfg-update.conf + doins cfg-update.hosts + keepdir /var/lib/cfg-update +} + +pkg_postinst() { + if [[ ! -e "${ROOT}"/var/lib/cfg-update/checksum.index \ + && -e "${ROOT}"/var/lib/cfg-update/checksum.index ]] + then + ebegin "Moving checksum.index from /usr/lib/cfg-update to /var/lib/cfg-update" + mv "${ROOT}"/usr/lib/cfg-update/checksum.index \ + "${ROOT}"/var/lib/cfg-update/checksum.index + eend $? + fi + + if [[ -e "${ROOT}"/usr/bin/paludis ]] + then + ewarn + ewarn "If you have used Paludis version <0.20.0 on your system, chances are" + ewarn "that you have some corrupted CONTENTS files on your system..." + ewarn + ewarn "Please run: cfg-update --check-packages" + ewarn + ewarn "The above command will check all packages installed with Paludis and" + ewarn "will output a list of packages that need to be re-installed with" + ewarn "Paludis 0.20.0 or higher. If you do not re-install these packages" + ewarn "you risk losing your custom settings when updating configuration" + ewarn "files, that belong to these packages, with cfg-update!" + ewarn + fi + + if [[ ${ROOT} == / ]] + then + ebegin "Moving backups to /var/lib/cfg-update/backups" + /usr/bin/cfg-update --ebuild --move-backups + eend $? + fi + + einfo + einfo "If this is a first time install, please check the configuration" + einfo "in /etc/cfg-update.conf before using cfg-update:" + einfo + einfo "If your system does not have an X-server installed you need to" + einfo "change the MERGE_TOOL to sdiff, imediff2 or vimdiff." + einfo "If you have X installed, set MERGE_TOOL to your favorite GUI tool:" + einfo "xxdiff, beediff, kdiff3, meld (default), gtkdiff, gvimdiff, tkdiff" + einfo + einfo "TIP: to maximize the chances of future automatic updates, run:" + einfo "cfg-update --optimize-backups" + einfo +} -- 2.26.2