gentoo resync : 10.04.2018

5 files changed, 87 insertions, 445 deletions

diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index 120bb03beb88..a981cf9e50db 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1,5 +1,4 @@
-AUX mup-5.6-fltk-fixes.patch 811 BLAKE2B 8eb4fd8796f4462cc1080d78a150739b448abc240c54d09d301253473a5caf006c0cdce005d05b05578031571badd2b47e4c5c03337c124a0e854cc3aeab08c0 SHA512 a63e6ce5a5a91430a9a2f602e8eb14852a66b64bf696fc3eafd3b7c4ee298320116692febcbef0fb4985f1c0a8cc16f4675902c953cc950ca8e614f3adc9d5f8
-AUX mup-5.7-Makefile.patch 10945 BLAKE2B 7b1e53111833c3e35adc1d85425597e3ab13a3f1c1356e7086a85c2934cd029a2713c81815558c0c8529aa23c5b1f6938065486202c2f77c6ea16ac6fca488e7 SHA512 6e87882f8e6fe1e625caf5fe500a551829d5b2bcf7b01af48347afa0c8335d1236da0221dbe21930521190d77df7e5b5dfe719bc7158e46c6fcbfc0bc6bea5c6
-DIST mup57src.tar.gz 2178380 BLAKE2B 03f4da751e841d77f1a481da98c801501b481b0cda1ac2a19c7b45ff362cc6f14b882d4a5954f4fc0a4b05a5b249ee79ff0ba23378c0b3bff3e29ea445f21673 SHA512 19085f15ce2654f23349e304599f920ca601735b2430e7b4b54927a861c598cd9227a273b4444a1582d491c1e3dbaaf7f12001e4fade57191e10c0f7815ac629
-EBUILD mup-5.7.ebuild 951 BLAKE2B 6d0baca61b023c1c5ebe2d9397387f85037efb59bf86848e1d7b1f7787617031c3ea0619896ed2c491bd6741ed9617a998ee3d363108d61dd0711a7e8cc1a883 SHA512 442ec73345c0b38c5d9190c1cb5daa1605f8b2899888fcdb4781ab2a9d5fcb19f9852d0815fe08418a48a2137c0c53bca110a522ca659e965b17f34c1708e538
+AUX mup-6.6-makefile.patch 2563 BLAKE2B 32f32af677b83ef0889c073d0cde368c3119ef7b654531cf407a6d8796c374d78979e56095d7ce3f68ee037e0a3b3205147366b12909bac70a8d64a5c6b04ec8 SHA512 d6609bc8ee5d327bb1252d5d536b9bd5f67e58add6552fbc63456a9773eeff6c5fff2029ad754b48cc8539a001fdd6bffd74368e8e1e7085e83ea7247eb87251
+DIST mup66src.tar.gz 2514430 BLAKE2B d2747a0fc46f055b370456305b1c56bd1e35827c10686650804801826a945d7a60a25095a3d789fbec0abf2a0aab6cb2e1a8b87eadd2858674f54cbfca377dfb SHA512 3239be85eb9e52adf941a3c927e200a3232d697ee081b359ee63d8aac7a8748af09cc66eef33b6145ccdfeb548a1f93130beb99960ed858d695fcc286c61bd35
+EBUILD mup-6.6.ebuild 902 BLAKE2B f364d62ab4d9058c7fe1da69dcbdd3fef7f8ef5e8904f8633831e216e9d93915fb97dacec518f41f5a0e3fd06da5b8193693a6a373ecb1998d1eec0ba58430f1 SHA512 c39de5f32cbe018e3bea77f61d120e43ed64184f075c3479c919cca0c2b2cb2afc6cd33744e364c4f763ab717b1377e3173e4abc0b33867b30d8cda05869775b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mup/files/mup-5.6-fltk-fixes.patch b/media-sound/mup/files/mup-5.6-fltk-fixes.patch
deleted file mode 100644
index e4429c3679bf..000000000000
--- a/media-sound/mup/files/mup-5.6-fltk-fixes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- mup-5.6.orig/mupmate/Config.C
-+++ mup-5.6/mupmate/Config.C
-@@ -264,7 +264,7 @@
- //-----------------------------------------------------------------
- 
- // List of standard FLTK fonts, and info to map name to menu entry.
--static struct Font {
-+static struct FlFont {
- 	const char * name;
- 	Fl_Font	value;
- 	int menu_offset;
---- mup-5.6.orig/mupmate/Edit.C
-+++ mup-5.6/mupmate/Edit.C
-@@ -201,8 +201,7 @@
- 	// a previous Replace/Find Next
- 	int start, end, isRect, rectStart, rectEnd;
- 	bool at_pattern = false;
--	if (editor_p->buffer()->highlight_position(&start, &end, &isRect,
--						&rectStart, &rectEnd)) {
-+	if (editor_p->buffer()->highlight_position(&start, &end)) {
- 		int place = editor_p->insert_position();
- 		if (place == end && (end - start == pattern_p->size())) {
- 			if (casematch_p->value()) {
diff --git a/media-sound/mup/files/mup-5.7-Makefile.patch b/media-sound/mup/files/mup-5.7-Makefile.patch
deleted file mode 100644
index a36a0042ca24..000000000000
--- a/media-sound/mup/files/mup-5.7-Makefile.patch
+++ /dev/null
@@ -1,405 +0,0 @@
---- mup-5.7.orig/makefile
-+++ mup-5.7/makefile
-@@ -1,252 +0,0 @@
--
--# Makefile for Mup (and auxiliary programs mupdisp, mkmupfnt, and mupmate).
--# This is not an optimal makefile; instead it tries to be very simple,
--# and easy to understand, so it can be easily modified, if needed.
--
--# On most Linux/Unix type systems, just doing
--#	make install
--# as root will probably work.
--# (You really only need to be root to copy the products into
--# the system directories. If you change PREFIX
--# to point to some other writeable area, you wouldn't need to be root.)
--# For Apple Mac OX X, see the notes for what to change (CFLAGS and X_LIBS)
--# If you only want the Mup program itself, you can do
--#	make mup/mup
--# The other programs are optional:
--# - mupdisp runs Mup and then runs GhostScript on the result.
--#   You can run Mup directly, and use gv, GSview, ghostview or any other
--#   PostScript viewer on the Mup output, as an alternative to mupdisp.
--# - mkmupfnt is only needed if you want to use fonts beyond the basic
--#   standard PostScript fonts.
--# - mupmate is a graphical user interface front end for Mup.
--#   It is not needed if you intend to only use Mup via command line interface.
--
--# The mupdisp and mupmate programs require X libraries and headers (www.x.org).
--# The mupmate program requires FLTK libraries and headers (www.fltk.org).
--
--# If you want mupdisp to support Linux console mode, make sure you have
--# the svgalib package installed, then find the two commented-out lines below
--# related to Linux console support, and uncomment them.
--
--# If you are building on a system that does not support make,
--# you can look at what this makefile does for how to build.
--# Mup itself is generally easy to build.
--# You just go to the mup directory and run your C compiler on
--# all the .c files in directory, and link with the math library,
--# Typically this is done using a command something like:
--#	cc *.c -lm
--# For more information on building Mup, see:
--#	http://www.arkkra.com/doc/dosbld.html
--#	http://www.arkkra.com/doc/otherbld.html
--#	http://www.arkkra.com/doc/unixbld.html
--
--# Lines you might conceivably want to change have comments by them,
--# explaining how you might want to change them.
--# Any line without any comment by it is very unlikely to ever need changing.
--
--#-----------------------------------------------------------------------
--
--# These define where to put the Mup products.
--# You could change this to /usr/local or your own space if you like.
--PREFIX = /usr
--BINDIR = $(PREFIX)/bin
--MANDIR = $(PREFIX)/man/man1
--DOCDIR = $(PREFIX)/share/doc/packages/mup
--
--# This is the name of your C compiler.
--# cc would be another common choice.
--CCOMPILER = gcc
--
--# This is the name of your C++ compiler.
--# CC would be another common choice.
--CPPCOMPILER = g++
--
--# -O option turns on optimization for most C compilers.
--# You can add other options, if you like, as appropriate for your C compiler.
--# Another common addition would be -g to get debugging information.
--# For Mac OS X, you should probably add
--#	-Dunix
--# and if you want universal binaries, add
--#	-arch i386 -arch ppc
--# and if you want backward compatibility to older versions, add something like
--#	-mmacosx-version-min=10.1
--# Or in other words:
--# CFLAGS = -O -Dunix -arch i386 -arch ppc -mmacosx-version-min=10.1
--CFLAGS = -O
--
--# You can change this if your X libraries and headers are somewhere else
--# (like /usr/X11R6).
--X_LOCATION = /usr/X11
--
--# If you installed fltk somewhere other than $(X_LOCATION)/lib
--# set this to find them, as in
--# FLTK_LIB_LOCATION = -L/usr/local/lib
--FLTK_LIB_LOCATION =
--
--# The X libraries to link with Mupmate.
--X_LIBS = -lXext -lX11 -lXpm
--# On Mac OS X replace that with
--# X_LIBS = -framework Carbon
--
--# The FLTK header files are under $(FLTK_INCLUDE)/FL
--FLTK_INCLUDE = $(X_LOCATION)/include
--
--# You can use fltk_jpeg or jpeg library, whichever you have
--JPEGLIB = fltk_jpeg
--
--# You can use fltk_png or png library, whichever you have
--PNGLIB = fltk_png
--
--# You can use fltk_z or z library, whichever you have
--ZLIB = fltk_z
--
--#-----------------------------------------------------------------------
--
--MUP_SRC =  \
--	mup/abshorz.c \
--	mup/absvert.c \
--	mup/assign.c \
--	mup/beaming.c \
--	mup/beamstem.c \
--	mup/brac.c \
--	mup/charinfo.c \
--	mup/check.c \
--	mup/debug.c \
--	mup/errors.c \
--	mup/font.c \
--	mup/fontdata.c \
--	mup/globals.c \
--	mup/grpsyl.c \
--	mup/ifgram.c \
--	mup/lex.c \
--	mup/locvar.c \
--	mup/lyrics.c \
--	mup/macros.c \
--	mup/main.c \
--	mup/mainlist.c \
--	mup/map.c \
--	mup/midi.c \
--	mup/midiutil.c \
--	mup/mkchords.c \
--	mup/musfont.c \
--	mup/nxtstrch.c \
--	mup/parstssv.c \
--	mup/parstuff.c \
--	mup/phrase.c \
--	mup/plutils.c \
--	mup/print.c \
--	mup/prntdata.c \
--	mup/prntmisc.c \
--	mup/prnttab.c \
--	mup/prolog.c \
--	mup/range.c \
--	mup/rational.c \
--	mup/relvert.c \
--	mup/restsyl.c \
--	mup/roll.c \
--	mup/setgrps.c \
--	mup/setnotes.c \
--	mup/ssv.c \
--	mup/stuff.c \
--	mup/symtbl.c \
--	mup/tie.c \
--	mup/trantab.c \
--	mup/trnspose.c \
--	mup/undrscre.c \
--	mup/utils.c \
--	mup/ytab.c
--
--MUP_HDRS = \
--	mup/defines.h \
--	mup/extchar.h \
--	mup/globals.h \
--	mup/muschar.h \
--	mup/rational.h \
--	mup/ssvused.h \
--	mup/structs.h \
--	mup/ytab.h
--
--MUPDISP_SRC = \
--	mupdisp/at386.c \
--	mupdisp/do_cmd.c \
--	mupdisp/dos.c \
--	mupdisp/genfile.c \
--	mupdisp/init.c \
--	mupdisp/linvga.c \
--	mupdisp/mupdisp.c \
--	mupdisp/xterm.c
--
--MUPDISP_HDRS = mupdisp/dispttyp.h mupdisp/mupdisp.h
--
--MUPDISP_BITMAPS = mupdisp/help.bm mupdisp/waitmsg.bm
--
--MKMUPFNT_SRC = mkmupfnt/mkmupfnt.c
--
--MUPMATE_SRC = \
--	mupmate/Config.C \
--	mupmate/Edit.C \
--	mupmate/File.C \
--	mupmate/Help.C \
--	mupmate/Main.C \
--	mupmate/Preferences.C \
--	mupmate/Run.C \
--	mupmate/utils.C \
--	mupmate/license.C \
--	mupmate/regform.C \
--	mupmate/template.C
--
--MUPMATE_HDRS = \
--	mup/defines.h \
--	mupmate/Config.H \
--	mupmate/Edit.H \
--	mupmate/File.H \
--	mupmate/Help.H \
--	mupmate/Main.H \
--	mupmate/Preferences.H \
--	mupmate/Run.H \
--	mupmate/utils.H \
--	mupmate/globals.H \
--	mupmate/resource.h
--
--MUPMATE_OTHER_FILES = \
--	mupmate/mup32.xpm
--#---------------------------------------------------------------
--
--all: mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate
--
--mup/mup: $(MUP_HDRS) $(MUP_SRC)
--	$(CCOMPILER) $(CFLAGS) -o $@ $(MUP_SRC) -lm
--
--mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC)
--	$(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
--	# For Linux console mode support, comment out the previous line
--	# and uncomment the following line
--	# $(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ $(MUPDISP_SRC) -lvga -lX11 -lm
--
--mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC)
--	$(CCOMPILER) $(CFLAGS) -o $@ $(MKMUPFNT_SRC)
--
--mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
--	$(CPPCOMPILER) $(CFLAGS) -o $@ $(MUPMATE_SRC) \
--	-I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
--	$(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
--	-l$(JPEGLIB) -l$(PNGLIB) -l$(ZLIB) -lm
--
--install:	all
--	mkdir -p $(BINDIR) $(MANDIR) $(DOCDIR)/uguide
--	cp mup/mup $(BINDIR)/mup
--	cp mkmupfnt/mkmupfnt $(BINDIR)/mkmupfnt
--	cp mupdisp/mupdisp $(BINDIR)/mupdisp
--	# For Linux console mode support, uncomment the following line
--	# chown root $(BINDIR)/mupdisp ; chmod 4755 $(BINDIR)/mupdisp
--	cp mupmate/mupmate $(BINDIR)/mupmate
--	cp mupprnt $(BINDIR)/mupprnt
--	cp docs/*.1 $(MANDIR)
--	cp docs/README* docs/*.txt docs/*.ps docs/*.mup $(DOCDIR)
--	cp docs/uguide/* $(DOCDIR)/uguide
--
--clean:
--	rm -f mup/*.o mupdisp/*.o mkmupfnt/*.o mupmate/*.o
--
--clobber:	clean
--	rm -f mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate
---- mup-5.7.orig/Makefile
-+++ mup-5.7/Makefile
-@@ -0,0 +1,147 @@
-+PREFIX = /usr
-+BINDIR = $(PREFIX)/bin
-+MANDIR = $(PREFIX)/share/man/man1
-+CC = gcc
-+CXX = g++
-+CFLAGS = -O2 -pipe
-+CXXFLAGS = -O2 -pipe
-+X_LOCATION = /usr
-+FLTK_LIB_LOCATION = -L/usr/lib/fltk-1
-+X_LIBS = -lXext -lX11 -lXpm
-+FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1
-+JPEGLIB = jpeg
-+PNGLIB = png
-+ZLIB = z
-+
-+MUP_SRC =  \
-+	mup/abshorz.c \
-+	mup/absvert.c \
-+	mup/assign.c \
-+	mup/beaming.c \
-+	mup/beamstem.c \
-+	mup/brac.c \
-+	mup/charinfo.c \
-+	mup/check.c \
-+	mup/debug.c \
-+	mup/errors.c \
-+	mup/font.c \
-+	mup/fontdata.c \
-+	mup/globals.c \
-+	mup/grpsyl.c \
-+	mup/ifgram.c \
-+	mup/lex.c \
-+	mup/locvar.c \
-+	mup/lyrics.c \
-+	mup/macros.c \
-+	mup/main.c \
-+	mup/mainlist.c \
-+	mup/map.c \
-+	mup/midi.c \
-+	mup/midiutil.c \
-+	mup/mkchords.c \
-+	mup/musfont.c \
-+	mup/nxtstrch.c \
-+	mup/parstssv.c \
-+	mup/parstuff.c \
-+	mup/phrase.c \
-+	mup/plutils.c \
-+	mup/print.c \
-+	mup/prntdata.c \
-+	mup/prntmisc.c \
-+	mup/prnttab.c \
-+	mup/prolog.c \
-+	mup/range.c \
-+	mup/rational.c \
-+	mup/relvert.c \
-+	mup/restsyl.c \
-+	mup/roll.c \
-+	mup/setgrps.c \
-+	mup/setnotes.c \
-+	mup/ssv.c \
-+	mup/stuff.c \
-+	mup/symtbl.c \
-+	mup/tie.c \
-+	mup/trantab.c \
-+	mup/trnspose.c \
-+	mup/undrscre.c \
-+	mup/utils.c \
-+	mup/ytab.c
-+
-+MUP_HDRS = \
-+	mup/defines.h \
-+	mup/extchar.h \
-+	mup/globals.h \
-+	mup/muschar.h \
-+	mup/rational.h \
-+	mup/ssvused.h \
-+	mup/structs.h \
-+	mup/ytab.h
-+
-+MUPDISP_SRC = \
-+	mupdisp/at386.c \
-+	mupdisp/do_cmd.c \
-+	mupdisp/dos.c \
-+	mupdisp/genfile.c \
-+	mupdisp/init.c \
-+	mupdisp/linvga.c \
-+	mupdisp/mupdisp.c \
-+	mupdisp/xterm.c
-+
-+MUPDISP_HDRS = mupdisp/dispttyp.h mupdisp/mupdisp.h
-+MUPDISP_BITMAPS = mupdisp/help.bm mupdisp/waitmsg.bm
-+MKMUPFNT_SRC = mkmupfnt/mkmupfnt.c
-+
-+MUPMATE_SRC = \
-+	mupmate/Config.C \
-+	mupmate/Edit.C \
-+	mupmate/File.C \
-+	mupmate/Help.C \
-+	mupmate/Main.C \
-+	mupmate/Preferences.C \
-+	mupmate/Run.C \
-+	mupmate/utils.C \
-+	mupmate/license.C \
-+	mupmate/regform.C \
-+	mupmate/template.C
-+
-+MUPMATE_HDRS = \
-+	mup/defines.h \
-+	mupmate/Config.H \
-+	mupmate/Edit.H \
-+	mupmate/File.H \
-+	mupmate/Help.H \
-+	mupmate/Main.H \
-+	mupmate/Preferences.H \
-+	mupmate/Run.H \
-+	mupmate/utils.H \
-+	mupmate/globals.H \
-+	mupmate/resource.h
-+
-+MUPMATE_OTHER_FILES = \
-+	mupmate/mup32.xpm
-+
-+all: mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate
-+
-+mup/mup: $(MUP_HDRS) $(MUP_SRC)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MUP_SRC) -lm
-+
-+mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
-+
-+mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MKMUPFNT_SRC)
-+
-+mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \
-+	-I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
-+	$(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
-+	-l$(JPEGLIB) -l$(PNGLIB) -l$(ZLIB) -lm
-+
-+install:	all
-+	mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)
-+	cp mup/mup $(DESTDIR)$(BINDIR)/mup
-+	cp mkmupfnt/mkmupfnt $(DESTDIR)$(BINDIR)/mkmupfnt
-+	cp mupdisp/mupdisp $(DESTDIR)$(BINDIR)/mupdisp
-+	cp mupmate/mupmate $(DESTDIR)$(BINDIR)/mupmate
-+	cp mupprnt $(DESTDIR)$(BINDIR)/mupprnt
-+	cp docs/*.1 $(DESTDIR)$(MANDIR)
diff --git a/media-sound/mup/files/mup-6.6-makefile.patch b/media-sound/mup/files/mup-6.6-makefile.patch
new file mode 100644
index 000000000000..0350a6e80447
--- /dev/null
+++ b/media-sound/mup/files/mup-6.6-makefile.patch
@@ -0,0 +1,69 @@
+Fix header/library locations for fltk, respect LDFLAGS, and allow the ebuild to
+handle docs install.
+
+--- mup-6.6/makefile
++++ mup-6.6/makefile
+@@ -80,12 +80,12 @@
+ 
+ # You can change this if your X libraries and headers are somewhere else
+ # (like /usr/X11R6).
+-X_LOCATION = /usr/X11
++X_LOCATION = /usr
+ 
+ # If you installed fltk somewhere other than $(X_LOCATION)/lib
+ # set this to find them, as in
+ # FLTK_LIB_LOCATION = -L/usr/local/lib
+-FLTK_LIB_LOCATION =
++FLTK_LIB_LOCATION = -L/usr/lib/fltk
+ 
+ # The X libraries to link with Mupmate.
+ # Depending on how fltk was compiled, you may be able to omit
+@@ -99,7 +99,7 @@
+ #FLTK_VERSION=FLTK_1_1
+ 
+ # The FLTK header files are under $(FLTK_INCLUDE)/FL
+-FLTK_INCLUDE = $(X_LOCATION)/include
++FLTK_INCLUDE = $(X_LOCATION)/include/fltk
+ 
+ # You can use fltk_jpeg or jpeg library, whichever you have
+ # or depending on how fltk was compiled, you may not need it at all
+@@ -251,25 +251,25 @@
+ 	flex -t extras/lex.l > mup/lex.c
+ 
+ mup/mup: $(MUP_HDRS) $(MUP_SRC)
+-	$(CCOMPILER) $(CFLAGS) -o $@ $(MUP_SRC) -lm
++	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -o $@ $(MUP_SRC) -lm
+ 
+ mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC)
+-	$(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
++	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
+ 	# For Linux console mode support, comment out the previous line
+ 	# and uncomment the following line
+ 	# $(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ $(MUPDISP_SRC) -lvga -lX11 -lm
+ 
+ mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC)
+-	$(CCOMPILER) $(CFLAGS) -o $@ $(MKMUPFNT_SRC)
++	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -o $@ $(MKMUPFNT_SRC)
+ 
+ mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
+-	$(CPPCOMPILER) $(CFLAGS) -o $@ $(MUPMATE_SRC) \
++	$(CPPCOMPILER) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \
+ 	$(FLTK_VERSION) -I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
+ 	$(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
+ 	$(JPEGLIB) $(PNGLIB) $(ZLIB) -lm
+ 
+ install:	all
+-	mkdir -p $(BINDIR) $(MANDIR) $(DOCDIR)/uguide $(ICONDIR) $(LIBDIR)
++	mkdir -p $(BINDIR) $(MANDIR) $(ICONDIR) $(LIBDIR)
+ 	cp mup/mup $(BINDIR)/mup
+ 	cp mkmupfnt/mkmupfnt $(BINDIR)/mkmupfnt
+ 	cp mupdisp/mupdisp $(BINDIR)/mupdisp
+@@ -278,8 +278,6 @@
+ 	cp mupmate/mupmate $(BINDIR)/mupmate
+ 	cp mupprnt $(BINDIR)/mupprnt
+ 	cp docs/*.1 $(MANDIR)
+-	cp docs/README* docs/*.txt docs/*.ps docs/*.mup $(DOCDIR)
+-	cp docs/uguide/* $(DOCDIR)/uguide
+ 	cp $(MUPMATE_OTHER_FILES) $(ICONDIR)
+ 	cp $(MUP_LIB_FILES) $(LIBDIR)
+ 
diff --git a/media-sound/mup/mup-5.7.ebuild b/media-sound/mup/mup-6.6.ebuild
index 0624047a5fe2..19665203aa80 100644
--- a/media-sound/mup/mup-5.7.ebuild
+++ b/media-sound/mup/mup-6.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils multilib toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
 DESCRIPTION="Program for printing music scores"
 HOMEPAGE="http://www.arkkra.com/"
@@ -10,33 +11,34 @@ SRC_URI="ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz"
 
 LICENSE="Arkkra"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/fltk:1
+	>=x11-libs/fltk-1.3:1
 	x11-libs/libXpm
-	virtual/jpeg
-	media-libs/libpng"
+	virtual/jpeg:0
+	media-libs/libpng:0="
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	epatch "${FILESDIR}"/${PN}-5.6-fltk-fixes.patch
-	sed -i -e "s:/lib:/$(get_libdir):g" Makefile || die "sed failed"
+	default
+	sed -i -e "s:/lib:/$(get_libdir):g" makefile || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \
-		CFLAGS="${CFLAGS}"
+	emake CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc docs/{*.txt,README0}
-	dohtml docs/{*.html,uguide/*}
+	docinto html
+	dodoc docs/{*.html,uguide/*}
 	docinto sample
 	dodoc docs/{*.mup,*.ps}
 }