Patches merged upstream, beediff support added, default editor changed.

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

diff --git a/app-portage/cfg-update/ChangeLog b/app-portage/cfg-update/ChangeLog
index ce6b6964c80a5996c1da8e72edc646d4b27b51b2..25aace9255ab89d1e35a088377404eb74cf03de0 100644 (file)
--- 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.26 2011/10/02 10:52:50 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/ChangeLog,v 1.27 2011/10/02 11:17:06 rich0 Exp $
+
+*cfg-update-1.8.4 (02 Oct 2011)
+
+  02 Oct 2011; Richard Freeman <rich0@gentoo.org> +cfg-update-1.8.4.ebuild:
+  Patches merged upstream, beediff support added, default editor changed.
 
   02 Oct 2011; Richard Freeman <rich0@gentoo.org> metadata.xml:
   Taking ownership of package.

diff --git a/app-portage/cfg-update/Manifest b/app-portage/cfg-update/Manifest
index 83b105a9b0f44b0184cb679ab07c0e3eec86dc48..2e44f93b427f3f2b72f526df466e7b910b7028d8 100644 (file)
--- a/app-portage/cfg-update/Manifest
+++ b/app-portage/cfg-update/Manifest
@@ -5,15 +5,17 @@ AUX cfg-update-1.8.2-bashrc.patch 3725 RMD160 00c8e2688df202454503407782b7d3f8b4
 AUX cfg-update-1.8.2-xxdiff-to-beediff.patch 2644 RMD160 47258fb6bd82abcd741dd39e220fb8b0d3fa6c1c SHA1 b1bdf09f49b086a18801f7fa9f8da38f429e9bbf SHA256 e588a3ac4223f3f4f94deb0819076e21ed61691fc6c3fc7a61ef44160b746c2e
 DIST cfg-update-1.8.0-r6.tar.gz 36273 RMD160 32d2ff4c78ac296b1fe671c899210ff339cfd356 SHA1 9b0ae2829cd78965d0d089d8c03505a76ad1a236 SHA256 3ddf61c9720f201422747f7d19b709f115cc39ad9ca2672fe52d9eb0abc83c0e
 DIST cfg-update-1.8.2-r1.tar.gz 164899 RMD160 d1271c5803460894246fecf0d067d819372c29f1 SHA1 61f3667a310d423b8343ecb37fd3c666adb233bd SHA256 8798a6009f7459e3c6cc3e71282389b16054f208ab8de0dd65eb4e853631a094
+DIST cfg-update-1.8.4.tgz 164558 RMD160 d905dc77da628cf89b347198eb5243a0cde481a9 SHA1 bcfe44a120db84353078394e62ec38eb20511cca SHA256 cf0017043a3ebb51cea0e8958def7a5587f8f42c30c710ca3e12605d817992e1
 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
-MISC ChangeLog 3851 RMD160 d12ade2fd28e12b674a1a66efa742d9122065e68 SHA1 65b77149796c051266ac1d2f54794e91a2a96d7f SHA256 a72281e02265e31dc84fa8263394fd5d66e099f7f7d827df737c2e598c59fbe8
+EBUILD cfg-update-1.8.4.ebuild 3305 RMD160 f06b3972f54d18c0ed72e9893072d40c3fedad55 SHA1 9187f2716d4e10c8185131804856977c084fd54b SHA256 4a2a345ee229c0bd58ad3725a081b939ffa7b4e49d6c6169aed9cd5cda94292c
+MISC ChangeLog 4035 RMD160 932b8c4315a86241cf656dfde012fc49c272b46a SHA1 b478d74195f550ba83c07ab740a9a53dda8348fb SHA256 5578a0273e92d63fac3ee77c16e67ca946fc87764f05b4491e1218b697ed721b
 MISC metadata.xml 198 RMD160 1dea3859337cfb629db52cc59ebaeb0048fea573 SHA1 08125f466a0fbc8caa0ae3345ead6151fd3dd036 SHA256 51987068e1215c73a592a4dea6221f8ec1a36296d87f20c7fc6a46e0a272b04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6IQo8ACgkQCMFw3lXsEjpi1AD/RlIcD1JMEnxIfpl2khkv54st
-JF6Ofz0bpLMwGzfzurwA/jXYbvJSUFf1I0aErMGqGEfD7ZvmKQJDCsd0u9ngHO0M
-=Uh/0
+iF4EAREIAAYFAk6ISDcACgkQCMFw3lXsEjoYNQD/W521LBsRdM366V3euSFpi6ox
+E1K5PiVEy8Ej1vJExHIA/1iUQuL2oIotPD6URVTyJ8ZAhazhkxOUw1eQ4dWoSMBj
+=5R4p
 -----END PGP SIGNATURE-----

diff --git a/app-portage/cfg-update/cfg-update-1.8.4.ebuild b/app-portage/cfg-update/cfg-update-1.8.4.ebuild
new file mode 100644 (file)
index 0000000..5db7392
--- /dev/null
+++ b/app-portage/cfg-update/cfg-update-1.8.4.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.4.ebuild,v 1.1 2011/10/02 11:17:06 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-dced21c"
+
+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
+}