gentoo resync : 14.07.2018

2 files changed, 64 insertions, 0 deletions

diff --git a/app-office/auto-multiple-choice/files/auto-multiple-choice-1.3.0-conf.patch b/app-office/auto-multiple-choice/files/auto-multiple-choice-1.3.0-conf.patch
new file mode 100644
index 000000000000..2e5e0cdd58c0
--- /dev/null
+++ b/app-office/auto-multiple-choice/files/auto-multiple-choice-1.3.0-conf.patch
@@ -0,0 +1,54 @@
+diff -ruN auto-multiple-choice-1.3.0.orig/Makefile.conf auto-multiple-choice-1.3.0/Makefile.conf
+--- auto-multiple-choice-1.3.0.orig/Makefile.conf	2016-03-09 20:17:01.000000000 +0100
++++ auto-multiple-choice-1.3.0/Makefile.conf	2017-01-21 21:55:32.649670839 +0100
+@@ -33,13 +33,13 @@
+ # directory for executable
+ BINDIR=/usr/bin
+ # directory for perl modules
+-PERLDIR=/usr/share/perl5
++PERLDIR=$(VENDOR_LIB)
+ # directory for some AMC executables, not to be used by end-user
+ MODSDIR=/usr/lib/AMC
+ # directory for LaTeX style file
+-TEXDIR=/usr/share/texmf/tex/latex/AMC
++TEXDIR=/usr/share/texmf-site/tex/latex/AMC
+ # directory for LaTeX doc
+-TEXDOCDIR=/usr/share/doc/texmf/AMC/
++TEXDOCDIR=/usr/share/texmf-site/doc/AMC/
+ # directory for man (1) files
+ MAN1DIR=/usr/share/man/man1
+ # directory for desktop file 
+@@ -54,7 +54,7 @@
+ # directory for AMC packaged models
+ MODELSDIR=/usr/share/auto-multiple-choice/models
+ # directory for documentation (will use html/auto-multiple-choice.* subdirs for HTML docs)
+-DOCDIR=/usr/share/doc/auto-multiple-choice-doc
++DOCDIR=/usr/share/doc/$(PVR)
+ 
+ # directory for Shared MIME-info Database
+ SHARED_MIMEINFO_DIR=/usr/share/mime/packages
+@@ -91,8 +91,8 @@
+ 
+ # INSTALL USER AND GROUP
+ 
+-ifneq ($(SYSTEM_TYPE),rpm)
+-INSTALL_USER=root
+-INSTALL_GROUP=root
+-endif
++#ifneq ($(SYSTEM_TYPE),rpm)
++#INSTALL_USER=root
++#INSTALL_GROUP=root
++#endif
+ 
+diff -ruN auto-multiple-choice-1.3.0.orig/doc/Makefile auto-multiple-choice-1.3.0/doc/Makefile
+--- auto-multiple-choice-1.3.0.orig/doc/Makefile	2016-03-14 19:40:45.000000000 +0100
++++ auto-multiple-choice-1.3.0/doc/Makefile	2017-01-21 21:28:29.438603307 +0100
+@@ -64,7 +64,7 @@
+ 	 esac
+ 
+ %.pdf: %.tex $(BLOCK_IMAGES:.svg=.pdf)
+-	export TEXINPUTS=./img_pdf/: ; case $< in \
++	export TEXINPUTS=$(TEXINPUTS):./img_pdf/: ; case $< in \
+ 	  *.ja.tex) \
+             sed -i -e '/setuplocale/a\
+ \\usepackage{xeCJK}\
diff --git a/app-office/auto-multiple-choice/files/auto-multiple-choice-1.3.0-desktop.patch b/app-office/auto-multiple-choice/files/auto-multiple-choice-1.3.0-desktop.patch
new file mode 100644
index 000000000000..3c6225dcc054
--- /dev/null
+++ b/app-office/auto-multiple-choice/files/auto-multiple-choice-1.3.0-desktop.patch
@@ -0,0 +1,10 @@
+--- a/auto-multiple-choice.desktop.in-old	2014-02-11 20:25:42.995456713 +0100
++++ b/auto-multiple-choice.desktop.in	2014-02-11 20:25:54.972456566 +0100
+@@ -10,5 +10,5 @@
+ GenericName[fr]=QCM automatique
+ Comment=Manage multiple choice questionnaires, with automatic marking from papers' scans
+ Comment[fr]=Conception et correction automatique de QCM en LaTeX
+-Keywords=multiple;choice;questionnaire;exam;grading;marking;MCQ;AMC
+-Keywords[fr]=questionnaire;choix;multiple;examen;correction;QCM;AMC
++Keywords=multiple;choice;questionnaire;exam;grading;marking;MCQ;AMC;
++Keywords[fr]=questionnaire;choix;multiple;examen;correction;QCM;AMC;