Install ChangeLog in the appropriate location, and put the checksum index in /var...

Package-Manager: portage-2.1.2-r12

diff --git a/app-portage/cfg-update/ChangeLog b/app-portage/cfg-update/ChangeLog
index 5c863123fbe37ca7995952aa42773a504d477133..11a8bda1e63bbfcda27c63fb4fc70d53e4e5027d 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/ChangeLog,v 1.12 2007/03/03 12:07:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/ChangeLog,v 1.13 2007/03/03 16:32:15 truedfx Exp $
+
+  03 Mar 2007; Harald van Dijk <truedfx@gentoo.org>
+  cfg-update-1.8.0-r6.ebuild:
+  Install ChangeLog in the appropriate location, and put the checksum index in
+  /var/lib (#166983)
 
   03 Mar 2007; Raúl Porcel <armin76@gentoo.org> cfg-update-1.8.0-r6.ebuild:
   x86 stable wrt bug 166983

diff --git a/app-portage/cfg-update/Manifest b/app-portage/cfg-update/Manifest
index bf7214d7c746a90116e77104aab6c625eb35e3d9..362bcb9bc147b762882a19e8ffdce5328c19aad9 100644 (file)
--- a/app-portage/cfg-update/Manifest
+++ b/app-portage/cfg-update/Manifest
@@ -9,14 +9,14 @@ EBUILD cfg-update-1.8.0-r3.ebuild 1837 RMD160 f48d91c77728b70b61f7f3eae43fb25260
 MD5 43c6052d3289def1d705c73471f737b4 cfg-update-1.8.0-r3.ebuild 1837
 RMD160 f48d91c77728b70b61f7f3eae43fb25260582304 cfg-update-1.8.0-r3.ebuild 1837
 SHA256 475ba2e0dfad588e2cefa5c14cef9c10592c81bba83ed5cd6a2d125387677e0f cfg-update-1.8.0-r3.ebuild 1837
-EBUILD cfg-update-1.8.0-r6.ebuild 1832 RMD160 09166c4c30993696723ff82c6a5cf909a8c5d134 SHA1 5d05ffd35f2d7d146944461f70eacfdb704c879d SHA256 2c54a6ea34d03ecf797e06e194f3e9b44a5a5efc635405b9e54a3f51c0a49e47
-MD5 8fc6ebe3937f92b04afd8c954c757102 cfg-update-1.8.0-r6.ebuild 1832
-RMD160 09166c4c30993696723ff82c6a5cf909a8c5d134 cfg-update-1.8.0-r6.ebuild 1832
-SHA256 2c54a6ea34d03ecf797e06e194f3e9b44a5a5efc635405b9e54a3f51c0a49e47 cfg-update-1.8.0-r6.ebuild 1832
-MISC ChangeLog 1736 RMD160 cc0dc495ed7b9577aabc76dab28330841283551b SHA1 26bb8780917b85aa0c8bd747c59a65876c0427b5 SHA256 2390c6ef36334320f8638d6b5368a696f0a8602c5a81a2a9b5d1f274b0af6272
-MD5 0ef42eaef708537ea3d13bee95e92ee4 ChangeLog 1736
-RMD160 cc0dc495ed7b9577aabc76dab28330841283551b ChangeLog 1736
-SHA256 2390c6ef36334320f8638d6b5368a696f0a8602c5a81a2a9b5d1f274b0af6272 ChangeLog 1736
+EBUILD cfg-update-1.8.0-r6.ebuild 2362 RMD160 756f2f4b407b9b11d8678f8adab9d70b475d9587 SHA1 4e0d132bfacb386170d802c52b960d54de4dc5b7 SHA256 e175cc9cb75370253ed0f56e164dfea8349ecb552f6fa4deafffe7666a8bf1c5
+MD5 4d7f031b537f40d5afd9a325265f3d5b cfg-update-1.8.0-r6.ebuild 2362
+RMD160 756f2f4b407b9b11d8678f8adab9d70b475d9587 cfg-update-1.8.0-r6.ebuild 2362
+SHA256 e175cc9cb75370253ed0f56e164dfea8349ecb552f6fa4deafffe7666a8bf1c5 cfg-update-1.8.0-r6.ebuild 2362
+MISC ChangeLog 1919 RMD160 5399b2b3f8cae7707e1bf4f3ee2231720ed9209d SHA1 4142f857c7e1f3f96f070ff12a50a95b705cd22a SHA256 0a03ba790435d9f69b7e52954707405ccae306ef931df8023184d10f020a9970
+MD5 38e0bc2fb535b92024744b9a2ad02d27 ChangeLog 1919
+RMD160 5399b2b3f8cae7707e1bf4f3ee2231720ed9209d ChangeLog 1919
+SHA256 0a03ba790435d9f69b7e52954707405ccae306ef931df8023184d10f020a9970 ChangeLog 1919
 MISC metadata.xml 229 RMD160 062ecd5166b6dc7b58f6628fbe66726d6e6e9d86 SHA1 e73c39033b0ba91260f9204c2e1671d241ade7f2 SHA256 8a284b9b59c3f0170e57a942a872e0251f6c691e8b8f6076187b0c3228664d79
 MD5 d2f99257546fd32545332a3cce582cd9 metadata.xml 229
 RMD160 062ecd5166b6dc7b58f6628fbe66726d6e6e9d86 metadata.xml 229

diff --git a/app-portage/cfg-update/cfg-update-1.8.0-r6.ebuild b/app-portage/cfg-update/cfg-update-1.8.0-r6.ebuild
index 5a79c990e402cedb49bcc718ed427838a21bce71..5f459c6eafa20e438e421564461fb3cbef2a90a9 100644 (file)
--- a/app-portage/cfg-update/cfg-update-1.8.0-r6.ebuild
+++ b/app-portage/cfg-update/cfg-update-1.8.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.0-r6.ebuild,v 1.3 2007/03/03 12:07:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.0-r6.ebuild,v 1.4 2007/03/03 16:32:15 truedfx Exp $
 
 DESCRIPTION="Easy to use GUI & CLI alternative for etc-update with safe automatic updating functionality"
 HOMEPAGE="http://people.zeelandnet.nl/xentric/"
@@ -23,28 +23,53 @@ pkg_postrm() {
        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 /usr/lib/cfg-update/checksum-index"
+       ewarn "and remove the index file /var/lib/cfg-update/checksum.index"
        ewarn
        ewarn "If you are just updating to a newer version you should read the"
        ewarn "installation instructions on http://people.zeelandnet.nl/xentric"
        ewarn
 }
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       cat >>cfg-update.conf <<-EOF
+
+               INDEXFILE = /var/lib/cfg-update/checksum.index
+       EOF
+}
+
 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 .bashrc ChangeLog cfg-update
+       doins cfg-update .bashrc
+       dodoc ChangeLog
        doman *.8
        insinto /etc
        doins cfg-update.conf
+       keepdir /var/lib/cfg-update
 }
 
 pkg_postinst() {
-       einfo "Converting old backups to new filename format..."
-       cfg-update --convert-old-backups &>/dev/null
-       einfo "Trying to remove old emerge alias from /etc/profile..."
-       cfg-update --remove-old-alias &>/dev/null
-       ewarn "Please read the installation instructions on http://people.zeelandnet.nl/xentric"
-       ewarn "You need to run cfg-update --on after installation!"
+       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 [[ ${ROOT} = / ]]
+       then
+               ebegin "Converting old backups to new filename format"
+               cfg-update --convert-old-backups &>/dev/null
+               eend $?
+               ebegin "Trying to remove old emerge alias from /etc/profile"
+               cfg-update --remove-old-alias &>/dev/null
+               eend $?
+               ewarn "Please read the installation instructions on http://people.zeelandnet.nl/xentric"
+               ewarn "You need to run cfg-update --on after installation!"
+       fi
 }