Install mailcap manpage into category 4 to prevent file collision with net-mail/metamail. See #70412.

4 files changed, 48 insertions, 6 deletions

diff --git a/app-misc/run-mailcap/ChangeLog b/app-misc/run-mailcap/ChangeLog
index daff103037a4..698b9043ee6c 100644
--- a/app-misc/run-mailcap/ChangeLog
+++ b/app-misc/run-mailcap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/run-mailcap
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/run-mailcap/ChangeLog,v 1.25 2004/12/23 22:08:27 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/run-mailcap/ChangeLog,v 1.26 2004/12/24 14:32:54 ticho Exp $
+
+*run-mailcap-3.28_p1-r1 (24 Dec 2004)
+
+  24 Dec 2004; Andrej Kacian <ticho@gentoo.org>
+  +run-mailcap-3.28_p1-r1.ebuild:
+  Install mailcap manpage as mailcap.4 instead of default mailcap.5, to
+  prevent file collision with net-mail/metamail. Closes #70412, reported by
+  Alexander Skwar <askwar@digitalprojects.com>. Keeping stable keywords.
 
   23 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
   run-mailcap-3.28_p1.ebuild:
diff --git a/app-misc/run-mailcap/Manifest b/app-misc/run-mailcap/Manifest
index 472f6ecbd972..4aabc6c47703 100644
--- a/app-misc/run-mailcap/Manifest
+++ b/app-misc/run-mailcap/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8429c58913fe6ed3b22f96edf8d868c6 ChangeLog 2929
-MD5 907e72bc76901248ec571634fb3c8735 run-mailcap-3.26_p1.ebuild 1040
+MD5 a251072279f3a004de7741cdf2b7ec09 ChangeLog 3271
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 6f6eda30507a956ce715ab0c036d0419 run-mailcap-3.28_p1.ebuild 1040
+MD5 907e72bc76901248ec571634fb3c8735 run-mailcap-3.26_p1.ebuild 1040
+MD5 9aed2e3c50cb86948a00abe7bd5d0d68 run-mailcap-3.28_p1-r1.ebuild 1019
 MD5 0c15db34fcdaa0b84d2df607d75542fa files/digest-run-mailcap-3.26_p1 70
 MD5 319537083b6740e7f97520fa740a4154 files/digest-run-mailcap-3.28_p1 70
+MD5 319537083b6740e7f97520fa740a4154 files/digest-run-mailcap-3.28_p1-r1 70
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD4DBQFBy0JaugEuf3OQ0akRApDdAJUSgWlBP9TWyZmZGi9fJteAeKy2AJ0RIMMR
-5znNK8ook47yit5YS/SZ2Q==
-=PLVk
+iD8DBQFBzCifQlM6RnzZP+IRAm5dAJ43G9YI50bNceKr3mHX4GqdGVUhHQCgjTEN
+NRFo208aaM97HfIqG9Av7Eg=
+=EFCV
 -----END PGP SIGNATURE-----
diff --git a/app-misc/run-mailcap/files/digest-run-mailcap-3.28_p1-r1 b/app-misc/run-mailcap/files/digest-run-mailcap-3.28_p1-r1
new file mode 100644
index 000000000000..6cd905a984db
--- /dev/null
+++ b/app-misc/run-mailcap/files/digest-run-mailcap-3.28_p1-r1
@@ -0,0 +1 @@
+MD5 d779a0b8f58776c28296ae62f253784e mime-support_3.28-1.tar.gz 34855
diff --git a/app-misc/run-mailcap/run-mailcap-3.28_p1-r1.ebuild b/app-misc/run-mailcap/run-mailcap-3.28_p1-r1.ebuild
new file mode 100644
index 000000000000..2af698833614
--- /dev/null
+++ b/app-misc/run-mailcap/run-mailcap-3.28_p1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/run-mailcap/run-mailcap-3.28_p1-r1.ebuild,v 1.1 2004/12/24 14:32:54 ticho Exp $
+
+MY_PV="${PV/_p/-}"
+DESCRIPTION="Execute programs via entries in the mailcap file"
+HOMEPAGE="http://packages.debian.org/unstable/net/mime-support.html"
+SRC_URI="mirror://debian/pool/main/m/mime-support/mime-support_${MY_PV}.tar.gz"
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~mips alpha hppa ~amd64"
+IUSE=""
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5.6*
+	app-misc/mime-types"
+
+S=${WORKDIR}/mime-support
+
+src_compile() {
+	sed -i run-mailcap -e 's:^\(\$xtermprgrm=\)"/usr/bin/x-terminal-emulator":\1$ENV{XTERMCMD} || "xterm":'
+}
+
+src_install() {
+	dobin run-mailcap
+	newman run-mailcap.man run-mailcap.1
+	newman mailcap.man mailcap.4
+	for i in compose edit see print; do
+		( cd ${D}/usr/bin && ln -s run-mailcap $i )
+		( cd ${D}/usr/share/man/man1 && ln -s run-mailcap.1 $i.1 )
+	done
+}