multimarkdown, revbump to rename scripts, mtools, remove conflict for multimarkdown (#9594)

app-text/multimarkdown/multimarkdown-6.7.0.recipe

@@ -13,7 +13,7 @@ COPYRIGHT="2016-2018 Fletcher T. Penney
 LICENSE="BSD (3-clause)
 	MIT
 	Zlib"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/fletcher/MultiMarkdown-6/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="aa386f54631dbc4e0beeb6b9cf9eb769db95a3f505a69b663140a80008cf0595"
 SOURCE_FILENAME="multimarkdown-$portVersion.tar.gz"
@@ -27,15 +27,15 @@ fi
 
 PROVIDES="
 	multimarkdown$secondaryArchSuffix = $portVersion
-	cmd:markdown = $portVersion
-	cmd:mmd = $portVersion
-	cmd:mmd2all = $portVersion
-	cmd:mmd2epub = $portVersion
-	cmd:mmd2fodt = $portVersion
-	cmd:mmd2odt = $portVersion
-	cmd:mmd2opml = $portVersion
-	cmd:mmd2pdf = $portVersion
-	cmd:mmd2tex = $portVersion
+	cmd:markdown.sh = $portVersion
+	cmd:mmd.sh = $portVersion
+	cmd:mmd2all.sh = $portVersion
+	cmd:mmd2epub.sh = $portVersion
+	cmd:mmd2fodt.sh = $portVersion
+	cmd:mmd2odt.sh = $portVersion
+	cmd:mmd2opml.sh = $portVersion
+	cmd:mmd2pdf.sh = $portVersion
+	cmd:mmd2tex.sh = $portVersion
 	cmd:multimarkdown = $portVersion
 	"
 REQUIRES="
@@ -70,6 +70,10 @@ BUILD()
 INSTALL()
 {
 	make -C build install
+
+	for f in markdown mmd mmd2all mmd2epub mmd2fodt mmd2odt mmd2opml mmd2pdf mmd2tex; do
+		mv $prefix/bin/$f $prefix/bin/$f.sh
+	done
 }
 
 TEST()

app-text/multimarkdown/patches/multimarkdown-6.7.0.patchset

@@ -21,7 +21,7 @@ index f51d94c..512b908 100644
  		# Install LaTeX support files
  		install (FILES ${latex}
 -			DESTINATION share/texmf/tex/latex/mmd6
-+			DESTINATION ${CMAKE_INSTALL_DATADIR}/texmf/tex/latex/mmd6
++			DESTINATION ${CMAKE_INSTALL_DATADIR}/texlive/texmf-dist/tex/latex/mmd6
  			COMPONENT latex
  			PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
  		)

sys-fs/mtools/mtools-4.0.43.recipe

@@ -9,7 +9,7 @@ maintenance, access to remote floppy drives, Iomega ZIP disk protection, \
 HOMEPAGE="https://www.gnu.org/software/mtools/"
 COPYRIGHT="1997-2018 Alain Knaff"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://ftpmirror.gnu.org/mtools/mtools-$portVersion.tar.lz
 	https://ftp.gnu.org/gnu/mtools/mtools-$portVersion.tar.lz"
 CHECKSUM_SHA256="997ffe4125a19de1fd433ed63f128f7d54bc1a5915f3cdb36da6491ef917f217"
@@ -59,9 +59,6 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
-CONFLICTS="
-	multimarkdown
-	"
 
 BUILD_REQUIRES="
 	haiku_devel