Install the manpages correctly

(Portage version: 2.2.0_alpha12/cvs/Linux x86_64)

3 files changed, 26 insertions, 22 deletions

diff --git a/app-misc/mmv/ChangeLog b/app-misc/mmv/ChangeLog
index dd856bc7656e..f3a747f52bbc 100644
--- a/app-misc/mmv/ChangeLog
+++ b/app-misc/mmv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/mmv
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mmv/ChangeLog,v 1.25 2010/10/27 12:46:19 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mmv/ChangeLog,v 1.26 2011/01/05 16:19:01 jlec Exp $
+
+  05 Jan 2011; Justin Lecher <jlec@gentoo.org> mmv-1.01b_p14.ebuild,
+  mmv-1.01b_p15.ebuild:
+  Install the manpages correctly
 
   27 Oct 2010; Christian Faulhammer <fauli@gentoo.org> mmv-1.01b_p15.ebuild:
   stable x86, bug 341945
diff --git a/app-misc/mmv/mmv-1.01b_p14.ebuild b/app-misc/mmv/mmv-1.01b_p14.ebuild
index 76d4d3ed9b55..90e8162536b8 100644
--- a/app-misc/mmv/mmv-1.01b_p14.ebuild
+++ b/app-misc/mmv/mmv-1.01b_p14.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mmv/mmv-1.01b_p14.ebuild,v 1.4 2008/02/20 23:06:53 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mmv/mmv-1.01b_p14.ebuild,v 1.5 2011/01/05 16:19:01 jlec Exp $
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="Move/copy/append/link multiple files according to a set of wildcard patterns."
-HOMEPAGE="http://packages.debian.org/unstable/utils/mmv"
-
 DEB_PATCH_VER=${PV#*_p}
 MY_VER=${PV%_p*}
 
-SRC_URI="mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}.orig.tar.gz
+DESCRIPTION="Move/copy/append/link multiple files according to a set of wildcard patterns."
+HOMEPAGE="http://packages.debian.org/unstable/utils/mmv"
+SRC_URI="
+	mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}.orig.tar.gz
 	mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}-${DEB_PATCH_VER}.diff.gz"
 
 LICENSE="freedist"
@@ -31,15 +31,15 @@ src_compile() {
 }
 
 src_install() {
-	dobin mmv
-	dosym /usr/bin/mmv /usr/bin/mcp
-	dosym /usr/bin/mmv /usr/bin/mln
-	dosym /usr/bin/mmv /usr/bin/mad
+	dobin mmv || die
+	dosym mmv /usr/bin/mcp || die
+	dosym mmv /usr/bin/mln || die
+	dosym mmv /usr/bin/mad || die
 
-	doman mmv.1
-	dosym mmv.1.gz /usr/share/man/man1/mcp.1.gz
-	dosym mmv.1.gz /usr/share/man/man1/mln.1.gz
-	dosym mmv.1.gz /usr/share/man/man1/mad.1.gz
+	doman mmv.1 || die
+	newman mmv.1 mcp.1 || die
+	newman mmv.1 mln.1 || die
+	newman mmv.1 mad.1 || die
 
-	dodoc ANNOUNCE debian/{changelog,control,copyright}
+	dodoc ANNOUNCE debian/{changelog,control} || die
 }
diff --git a/app-misc/mmv/mmv-1.01b_p15.ebuild b/app-misc/mmv/mmv-1.01b_p15.ebuild
index d9a2b52f2189..38369e6ccb15 100644
--- a/app-misc/mmv/mmv-1.01b_p15.ebuild
+++ b/app-misc/mmv/mmv-1.01b_p15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mmv/mmv-1.01b_p15.ebuild,v 1.4 2010/10/27 12:46:19 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mmv/mmv-1.01b_p15.ebuild,v 1.5 2011/01/05 16:19:01 jlec Exp $
 
 EAPI="3"
 
@@ -42,9 +42,9 @@ src_install() {
 	dosym mmv /usr/bin/mad || die
 
 	doman mmv.1 || die
-	dosym mmv.1.gz /usr/share/man/man1/mcp.1.gz || die
-	dosym mmv.1.gz /usr/share/man/man1/mln.1.gz || die
-	dosym mmv.1.gz /usr/share/man/man1/mad.1.gz || die
+	newman mmv.1 mcp.1 || die
+	newman mmv.1 mln.1 || die
+	newman mmv.1 mad.1 || die
 
 	dodoc ANNOUNCE debian/{changelog,control} || die
 }