Don't install mbox.5 or mmdf.5 to avoid conflict with mutt #82647

(Portage version: 2.0.51-r15)

5 files changed, 34 insertions, 14 deletions

diff --git a/net-nntp/tin/ChangeLog b/net-nntp/tin/ChangeLog
index 4908197173b6..df7cd0a854cd 100644
--- a/net-nntp/tin/ChangeLog
+++ b/net-nntp/tin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nntp/tin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/ChangeLog,v 1.3 2005/02/17 04:20:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/ChangeLog,v 1.4 2005/02/20 23:16:15 agriffis Exp $
+
+*tin-1.7.7-r1 (20 Feb 2005)
+
+  20 Feb 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/tin-1.7.7-mbox-mmdf.patch, +tin-1.7.7-r1.ebuild, -tin-1.7.7.ebuild:
+  Don't install mbox.5 or mmdf.5 to avoid conflict with mutt #82647
 
 *tin-1.7.7 (17 Feb 2005)
 
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index bfbd650f87a6..49bd438473d2 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ddd081b30e584e8f285a8de681dc9640 tin-1.6.0.ebuild 1020
 MD5 088f3149f4dcd28adc659ebf056490ae tin-1.6.2.ebuild 1073
 MD5 b035aa8763e12c3a42fe7da1d15ece0c ChangeLog 2018
+MD5 513bab282cd8eb23209a2245775101db tin-1.7.7-r1.ebuild 1501
 MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161
-MD5 3f0957c9ca3c9688d791f291378d9e01 tin-1.7.7.ebuild 1399
+MD5 4682cd31a51dcfac4c000ba6e6983198 files/digest-tin-1.7.7-r1 62
 MD5 2475288cb79f81762730eb56c53ba235 files/digest-tin-1.6.0 62
 MD5 d7152552e399cbeb77e775886d1c6506 files/digest-tin-1.6.2 62
-MD5 4682cd31a51dcfac4c000ba6e6983198 files/digest-tin-1.7.7 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCFBucI1lqEGTUzyQRAnEeAJ9pTJdgZDy9k9svvSCo7BI4kQY4IgCfTsQW
-0xZSIy+xdcLjOthiRYUBeXA=
-=Ha5I
------END PGP SIGNATURE-----
+MD5 566eff78de0ea8837186afbea406159e files/tin-1.7.7-mbox-mmdf.patch 1238
diff --git a/net-nntp/tin/files/digest-tin-1.7.7 b/net-nntp/tin/files/digest-tin-1.7.7-r1
index a69b0ce16d0f..a69b0ce16d0f 100644
--- a/net-nntp/tin/files/digest-tin-1.7.7
+++ b/net-nntp/tin/files/digest-tin-1.7.7-r1
diff --git a/net-nntp/tin/files/tin-1.7.7-mbox-mmdf.patch b/net-nntp/tin/files/tin-1.7.7-mbox-mmdf.patch
new file mode 100644
index 000000000000..cc020fc8d230
--- /dev/null
+++ b/net-nntp/tin/files/tin-1.7.7-mbox-mmdf.patch
@@ -0,0 +1,15 @@
+Fixes http://bugs.gentoo.org/show_bug.cgi?id=82647 by refraining from
+installing the same man-pages that mutt installs
+(20 Feb 2005 agriffis)
+
+--- tin-1.7.7/src/Makefile.in.agriffis	2004-11-15 12:44:26.000000000 -0500
++++ tin-1.7.7/src/Makefile.in	2005-02-20 18:05:21.628392044 -0500
+@@ -337,8 +337,6 @@
+ 	@$(INSTALL) -m 444 $(DOCDIR)/tin.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/$(PROJECT).$(INS_MANUAL_EXT)
+ 	@( $(CD) $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) && $(RM) -f r$(PROJECT).$(INS_MANUAL_EXT) && $(LN) $(PROJECT).$(INS_MANUAL_EXT) r$(PROJECT).$(INS_MANUAL_EXT) )
+ 	@$(INSTALL) -m 444 $(DOCDIR)/tin.5 $(DESTDIR)$(INS_MANUAL_DIR)5/$(PROJECT).5
+-	@-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mbox.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; else $(ECHO) "  ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 - file already exists" ; fi
+-	@-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mmdf.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; else $(ECHO) "  ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 - file already exists" ; fi
+ 
+ uninstall_manpage :
+ 	@$(ECHO) "Uninstalling $(PROJECT) manual page in $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) ..."
diff --git a/net-nntp/tin/tin-1.7.7.ebuild b/net-nntp/tin/tin-1.7.7-r1.ebuild
index 9457b09c6edd..baa58ec97fdc 100644
--- a/net-nntp/tin/tin-1.7.7.ebuild
+++ b/net-nntp/tin/tin-1.7.7-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/tin-1.7.7.ebuild,v 1.1 2005/02/17 04:20:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/tin-1.7.7-r1.ebuild,v 1.1 2005/02/20 23:16:15 agriffis Exp $
+
+inherit eutils
 
 DESCRIPTION="A threaded NNTP and spool based UseNet newsreader"
 HOMEPAGE="http://www.tin.org/"
@@ -16,6 +18,12 @@ DEPEND="ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
 	crypt? ( app-crypt/gnupg )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/tin-1.7.7-mbox-mmdf.patch
+}
+
 src_compile() {
 	local myconf=""
 	[ -f ${ROOT}/etc/NNTP_INEWS_DOMAIN ] \