Use prefix of “discount-” instead of “mkd” for overly-generic binary names to match the prefix chosen in fedora.

(Portage version: 2.2.0_alpha177-r1/cvs/Linux x86_64, signed Manifest commit with key 743A52E86BA81050)

2 files changed, 13 insertions, 6 deletions

diff --git a/app-text/discount/ChangeLog b/app-text/discount/ChangeLog
index 24a3f2fc562b..3768dcf310ca 100644
--- a/app-text/discount/ChangeLog
+++ b/app-text/discount/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/discount
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/discount/ChangeLog,v 1.1 2013/07/29 04:55:01 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/discount/ChangeLog,v 1.2 2013/07/31 04:00:20 binki Exp $
+
+*discount-2.1.6-r1 (31 Jul 2013)
+
+  31 Jul 2013; Nathan Phillip Brink <binki@gentoo.org>
+  +discount-2.1.6-r1.ebuild, -discount-2.1.6.ebuild:
+  Use prefix of “discount-” instead of “mkd” for overly-generic binary names to
+  match the prefix chosen in fedora.
 
 *discount-2.1.6 (29 Jul 2013)
 
diff --git a/app-text/discount/discount-2.1.6.ebuild b/app-text/discount/discount-2.1.6-r1.ebuild
index b53e4a9a9b9f..85aaa4d31af6 100644
--- a/app-text/discount/discount-2.1.6.ebuild
+++ b/app-text/discount/discount-2.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/discount/discount-2.1.6.ebuild,v 1.1 2013/07/29 04:55:00 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/discount/discount-2.1.6-r1.ebuild,v 1.1 2013/07/31 04:00:20 binki Exp $
 
 EAPI=5
 
@@ -51,10 +51,10 @@ src_install() {
 	DISCOUNT_EBUILD_RENAMED_BINARIES=()
 	local bin
 	for bin in "${ED}"usr/bin/*; do
-		[[ ${bin} = */markdown || ${bin} = */mkd* ]] && continue
+		[[ ${bin} = */markdown || ${bin} =~ ${PN}[^/]*$ ]] && continue
 		DISCOUNT_EBUILD_RENAMED_BINARIES+=(${bin##*/})
-		mv "${bin}" "${bin%/*}/mkd${bin##*/}" || die
-		mv "${ED}"usr/share/man/man1/{,mkd}${bin##*/}.1 || die
+		mv "${bin}" "${bin%/*}/${PN}-${bin##*/}" || die
+		mv "${ED}"usr/share/man/man1/{,${PN}-}${bin##*/}.1 || die
 	done
 }
 
@@ -65,7 +65,7 @@ pkg_postinst() {
 		elog "prefixed. Please see"
 		elog "https://github.com/Orc/discount/issues/81 for discussion."
 		for bin in "${DISCOUNT_EBUILD_RENAMED_BINARIES[@]}"; do
-			elog "  Renamed '${bin}' to 'mkd${bin}'."
+			elog "  Renamed '${bin}' to '${PN}-${bin}'."
 		done
 	fi
 }