use dobin instead of exeinto /usr/bin/ && doexe; drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/app-portage/cfg-update/ChangeLog b/app-portage/cfg-update/ChangeLog
index fb9b41d93bb151fa7ab8824ae08816071a1241c4..0d74c7223b0cc23d102bbffecd98519af3170972 100644 (file)
--- a/app-portage/cfg-update/ChangeLog
+++ b/app-portage/cfg-update/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/cfg-update
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/ChangeLog,v 1.42 2015/03/02 09:31:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/ChangeLog,v 1.43 2015/03/21 08:34:55 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> -cfg-update-1.8.7.ebuild,
+  cfg-update-1.8.9.ebuild, metadata.xml:
+  use dobin instead of exeinto /usr/bin/ && doexe; drop old
 
   02 Mar 2015; Agostino Sarubbo <ago@gentoo.org> cfg-update-1.8.9.ebuild:
   Stable for ppc, wrt bug #524616

diff --git a/app-portage/cfg-update/Manifest b/app-portage/cfg-update/Manifest
index c057ea0c12a2dbc6dbd1fa10d46c8dd2c896b86e..6679bdd0e2f18343ad53ebf646d025b68140c9cc 100644 (file)
--- a/app-portage/cfg-update/Manifest
+++ b/app-portage/cfg-update/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX cfg-update-1.8.2-bashrc.patch 3725 SHA256 9f56c60ffa58a12ad5e1bdda9356e7e46ac823c9b22189ef6ee95d0fecd6ceae SHA512 cee869d9545ce388105b7796942266feae7e0c2bdc9139e052c229ffb631175c59362ae7b5b69ac21e1d16e64be00f7d5bf2dd58e6d58b7323bc534d676f2cb9 WHIRLPOOL 1a4791930c34694cf60d268f14a47c052dd70727f94926c6ac8b3994af519b35efcb52f95ad07263c54e7028aed5d0cec6180f8e991f0ab54dc25bbbb99cc8d2
 AUX cfg-update-1.8.2-xxdiff-to-beediff.patch 2644 SHA256 e588a3ac4223f3f4f94deb0819076e21ed61691fc6c3fc7a61ef44160b746c2e SHA512 a4b25c4bb51747f92eb49f33e3740ff2975229ed0ce4a03daef83e772c2275f7482c2e5fc0704786c5820f170a9f3a74397a70db4028f2d0c2ca5a07cdc5a373 WHIRLPOOL 96958097cffed89fb73ff8c69373b7cf59e591880d3fbad2e38e75fb8d22f648c0162c93ada3378a77d8dffda9cbc5ed818da77c9565dca349c4cfd63a5b9758
-DIST cfg-update-1.8.7.tgz 163212 SHA256 94cdb032a187e6e9e5998852afa5999d6746d7b30ae9cae7c1b68c435fe19a7d SHA512 3f6d21918b46590b740898570337f2ae16881a1fef9ff3bc0e2064797e9385a088566788dcf8dc1962973bd2ccbaa725028640d4e65c714bb026389005c92c11 WHIRLPOOL f4aa24753ba8bc2c2c0a85ee474bc09c08379e852f468665e49416d646db455b2952327ae5e18f43f75c3c2e2ca456c33b2a9ae393332d682bfb9df58adbeadd
 DIST cfg-update-1.8.9.tgz 162356 SHA256 82d14b3cd7b1c144d7d77836919689471cd31c69cefba9b8714580e6cf1e495e SHA512 2c2d4d5cddaf1c5c8233bfde29b488d682e723da3e267756e203b4ea3c97f2f88615530002975ff07fb466eebed603e4ce227591a1b1e09ef3aca8c2eb17fcb9 WHIRLPOOL d17b179bc4589cc650178e981c0d5a6e336023f3128a9b76c1a4a19e0fe347982ff75d2337ed972e040fec1b93097b4336818b748f2af20eccb2e82f332417af
-EBUILD cfg-update-1.8.7.ebuild 3297 SHA256 09713eaa80452c816adc3fb9d328efd9e3764c3bcedf339d8dea16083977b54c SHA512 a1b3fb0f705d181c6c6c9703f11ecf0e07b2680cce5c87126af2b4cdbadeeffbc51d35643024dd56d81a33f0e7cd5e5c2dec26bb7cce70b74100f13054172bdf WHIRLPOOL 78fe7a6895610a91dae95a0ce081fd950bcc355a9074d96fcbce6e13c36dfe3a02b4279ced39c69240eeb080395ad8a06f350e175eb5151034030a73783cf008
-EBUILD cfg-update-1.8.9.ebuild 3193 SHA256 586f471fd21f042955a19eb16840dde0af7f87cb57027e630112683d0c2b83f8 SHA512 d8c21dc5250306e8a1bffbfe492eec13f314729f4e2a05bdd0ac5cb85c3ca14ba4e2543d10ae9008fa5c122e526d70db413c5b85c4bbc204dc46b98f1fbc881c WHIRLPOOL 7382f0a9e66a5065cd8377553ea0fc5d119fa5ffa5f5c2a851a356f588c0c4a5924f636d198cf715c6ed754c971e4e0d70a930569f64f8caabc7c694a7f39276
-MISC ChangeLog 6126 SHA256 f3b62d1d6345ddb0279b77e51e233be2aed9213968312d2ec9c7783b1b44a108 SHA512 637e2766e9393101e3795c4c91cc392eb7e305592297f91588c1a80a7309e513faa59f257fe8ef3a8d078b41abe64acd0b88b1ad31b6d10f1cd899081e922768 WHIRLPOOL 9aa1c0df7495893741ea0713024c4e0306d0de62eeb4d0d5282dab56d537c6145ca63b20de38bb4a37a043563efb8af981c916db2685c2395df2725d530fb600
-MISC metadata.xml 198 SHA256 51987068e1215c73a592a4dea6221f8ec1a36296d87f20c7fc6a46e0a272b04c SHA512 87318ce38f656dc4ca5b2090cf4b8d563d691c8a1c786a33e3ae6b2bca8daea41b10e154d8eeca8a3095f534245685a6078e6599064c6fe09f7d30de7e7fba3c WHIRLPOOL edfc641f9c1d10efe190bc306ed5f24e59d7e77cc6b1055b77e132c317f59d168543e4b8d535c0159dcf9c5f3b0ac827a7d1847d3eafa3e9c44f73106874482a
+EBUILD cfg-update-1.8.9.ebuild 3137 SHA256 d7340429df58c981f5647814f89eaca9fae7fd76bcdfcaa7a6f46068e92bbc05 SHA512 fee54976509f9a948350c386f7a04cba1875de2d5666087f14a3e918f49d438947f6ed35035b6d77fa6e6b888655f3286d601b00e51946c8ff6425dec09eb38e WHIRLPOOL d865782a6a8c2394d1f19c1d4c5e3ff04bcec8f3957eb5ebf62569ee904ac6b494cce0b68559920cabec068a5338078f59e444518abc5372df1627dd8b807645
+MISC ChangeLog 6302 SHA256 862f7dca16447077d541a79d115dcd4b46f42daae2513993ca04e56f39a039a1 SHA512 e750eadf52153bf93af15cfb3b6b2104deadd32d9a9cd65fffad8886392caea8a01aeea04b2ac655b17893b53407dcdede07f1714d0e8f957af7c12292b8a09d WHIRLPOOL 6747a69e3b50cef82f2341b2e776760a95f1d6bc45333e71aec47a4b3cad567f4bcd4c6452bcbb151451ac8babe7c245325606eca161351ab285a31b11014532
+MISC metadata.xml 206 SHA256 fc4fa93c67b26faaf7f0721c2b5459338f15a70edc5c2c72c097e2dc3561dd59 SHA512 8e62c95260b5827f2e53c414ef2b62b7353c5c6c4ada760af986f3b0d146a7530747ea8e028c73a86f1f329351d76c3420991b53dc2e6e3550568c9a8cc31cbc WHIRLPOOL 4294c3a32535aaa25f2eec67138d40619f12a6bef46b1050c1750b3bd19d14ed2b01fec74b0e57e05663c90e59079570fd52d59aafcebd9a56f490910f45481e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU9C4DAAoJELp701BxlEWflusQAJvDWC3JsfSU0JfYAw8vL492
-Ic3XtWZ+/+C9PQU/99dvgWZU0hiK1qgTXhzdlfpOY8qBLA1z1t6KepgK0l/drq2z
-jU0VjI5vLyUyhpCAZTrtdd0jLq+aYiYE2bzx1l6b+Qg7uMArgh9C+ItAHjhz0BzR
-3NZZt7GFcVPhCB14igIEaEA8jrAAWN5PKlsbuzpsd7fkahc6a9ODAoeHdLE7DvYD
-9fZEclYAW0rUn4sqHuUsKgJYlq4v6CO0cwe9YW2rxy/Y7cBiETgsMiLxuc7CNcfK
-ye3OdKNxNeMLyqk+jnCCPT3FvBRJoozl6CfwiWB+CXFNpuMK/wcx4KnSStn1JvSJ
-zlteqpqoQ23hnsZLcU0z0Wp6wkklir+RKWrBiJI2D1Q4BqcPeV8M9/+qYobzGiq0
-h4trpoEJ2xZk7Bnt1EaYEKQO8ykhXi6DeSFhoDCoHHELG7/mTnf46MSZAQmL006o
-bLcuK6LVWgzH9Lsv047O4DyJWdIRa32tPqxIlkUDEwZlZ4hoSifuZ55Qw+joi6r+
-yG41hfvAdzjBLu6++Kl1hAYxaMAhtHuJZxM15J6TtkrD1+i/CEXqSth8xwXgIjrE
-DG+vW+PcctttQalqX4Mnq4zItKMQ5XmIWNMwnMUTWmfAiNY1WbSc92AwNfRj0kk1
-EnoAl5Uc45puQ45FI0ZP
-=ZvVY
+iQJ8BAEBCgBmBQJVDS0wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirxG4P/3ATt2/4NnPdm4MQtmN2d8nO
+7G9HikdgJhqsGm2Ou6jkDXPgSDWfqK9qf0CgY1XEVdmXgwj0HD86HBjbafXjKNFk
+G5rzAgXHTy6K6z6DYW7exOb6nIIbGwU882POW1KyplGimdjpMEtkd0QcSxQDOHse
+3OaRwvqHk9R5VK4/KxylGQvEgq96RGXWJsmwO6xL2yOXBQeZuMYfiTpVvZZN45hi
+fuXz+uizM+aqKbDppY5N05yuw8GzeMJklU5c+t/WSZ7tbEI6Nwr26T9NsOi2ZLfy
+G5oqcM7HxUupmojc4ZoddjB9adM2vaC09o2sveTs/x4HjWcJLi2uH0QGkyItCgfJ
+xGuC/dfqBajsnxywH/E8ng9HdtZ8xfPbsayxGm4i44T0Sj9T485355YpXfU02EHM
+NSdjrQl6gRDqjly8II6qH4VkQdb0rKWQlg4lV40aldzuCl5RjUiK4TSo4XGZAF1E
+pTkKDqxAPJLTFPiTTM7uWDIDZT+9XbyPN1/i4Ya9Ud4WyZ3cBqiLZYWGaqG0H4r2
+68W1dQilihAWHRlDbJe5uYLmqbXgA6U0R+D0H9yhBGiQKQQCigUadeg2jwyznT6G
+D0biMvzq2XzwphgYk0V7EEn7kM+6r81AeZY0YOF6wz9pZacfE4D1WTKDQGlW+L4V
+gzPrc5lQRiC/gnl+cw29
+=Na1o
 -----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
deleted file mode 100644 (file)
index 59792fb..0000000
--- a/app-portage/cfg-update/cfg-update-1.8.7.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 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.5 2012/03/18 15:13:25 armin76 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 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
-}

diff --git a/app-portage/cfg-update/cfg-update-1.8.9.ebuild b/app-portage/cfg-update/cfg-update-1.8.9.ebuild
index 0e800e8f2316e3509d90cf28932b07d648ebf726..a7348ca34e2eff02824a0a5579735e3bd1c87b9a 100644 (file)
--- a/app-portage/cfg-update/cfg-update-1.8.9.ebuild
+++ b/app-portage/cfg-update/cfg-update-1.8.9.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2015 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.9.ebuild,v 1.4 2015/03/02 09:31:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.9.ebuild,v 1.5 2015/03/21 08:34:55 jlec Exp $
 
 EAPI=5
+
 inherit eutils
 
 DESCRIPTION="Easy to use GUI & CLI alternative for etc-update with safe automatic updating functionality"
@@ -14,17 +15,15 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ppc x86"
 IUSE="X"
 
-RDEPEND="X? ( >=x11-misc/sux-1.0
-       x11-apps/xhost )
-       dev-perl/TermReadKey"
+RDEPEND="
+       dev-perl/TermReadKey
+       X? (
+               >=x11-misc/sux-1.0
+               x11-apps/xhost
+               )"
 
 S="${WORKDIR}/rich0-cfg-update-2f10786"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-}
-
 pkg_prerm() {
        if [[ ${ROOT} == / ]]
        then
@@ -38,22 +37,23 @@ pkg_prerm() {
 }
 
 pkg_postrm() {
-       ewarn
+       echo
        ewarn "If you want to permanently remove cfg-update from your system"
        ewarn "you should remove the index file /var/lib/cfg-update/checksum.index"
-       ewarn
+       echo
 }
 
 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
+       dobin \
+               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 test.tgz
        dodoc ChangeLog
        doman *.8
        insinto /etc
-       doins cfg-update.conf
-       doins cfg-update.hosts
+       doins cfg-update.conf cfg-update.hosts
        keepdir /var/lib/cfg-update
 }
 
@@ -69,18 +69,18 @@ pkg_postinst() {
 
        if [[ -e "${ROOT}"/usr/bin/paludis ]]
        then
-               ewarn
+               echo
                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
+               echo
                ewarn "Please run: cfg-update --check-packages"
-               ewarn
+               echo
                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
+               echo
        fi
 
        if [[ ${ROOT} == / ]]
@@ -90,16 +90,16 @@ pkg_postinst() {
                eend $?
        fi
 
-       einfo
+       echo
        einfo "If this is a first time install, please check the configuration"
        einfo "in /etc/cfg-update.conf before using cfg-update:"
-       einfo
+       echo
        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
+       echo
        einfo "TIP: to maximize the chances of future automatic updates, run:"
        einfo "cfg-update --optimize-backups"
-       einfo
+       echo
 }

diff --git a/app-portage/cfg-update/metadata.xml b/app-portage/cfg-update/metadata.xml
index 318c43612b0332e432e05a0493b1497727552a21..a1a7d661f1e99ae3e5bbfe39a84f2d30b5118854 100644 (file)
--- a/app-portage/cfg-update/metadata.xml
+++ b/app-portage/cfg-update/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>rich0@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>rich0@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>