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

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 31 insertions, 133 deletions

diff --git a/app-portage/cfg-update/ChangeLog b/app-portage/cfg-update/ChangeLog
index fb9b41d93bb1..0d74c7223b0c 100644
--- 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/cfg-update-1.8.7.ebuild b/app-portage/cfg-update/cfg-update-1.8.7.ebuild
deleted file mode 100644
index 59792fb8b606..000000000000
--- 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 0e800e8f2316..a7348ca34e2e 100644
--- 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 318c43612b03..a1a7d661f1e9 100644
--- 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>