diff --git a/app-office/auto-multiple-choice/Manifest b/app-office/auto-multiple-choice/Manifest
index dd319b7..f9f1872 100644
--- a/app-office/auto-multiple-choice/Manifest
+++ b/app-office/auto-multiple-choice/Manifest
@@ -1,5 +1,5 @@
 AUX auto-multiple-choice-1.2-desktop.patch 633 BLAKE2B 4fe447de8c03cacb56df67a627b7dc3aec1d3553f84d68ce5496d236f0218e663f6938e7ffb1eb11dca5f013eec74cccf733f28b5d2526d6ddfc77c6a3ede85b SHA512 26d59593d8267788a25457e203a50c2ed647aae5a12f6f7fd5f3c14c58993141494b38c961dac60ea8779f8bfb4a1a18d21e1556a4c130dd85437ebf70866cb8
 AUX auto-multiple-choice-1.2-makefiles.patch 1405 BLAKE2B 105b669939884e68a1d104a5ee5d99b82c7a86552084922322dfcf05bb8d93749b717478e93aa13f4b16bbe236728f87947bcd746100f87081b073ce7aa68b5a SHA512 c148cdf737c155b8f91ee358a40abd7a03c7b4717984c13ccd7e6859f4cc39e109a6ea03ba79ba49264ecc59e0401352ed5f66c177967cbaca6036f2b81817f6
 DIST auto-multiple-choice_1.3.0_sources.tar.gz 4328255 BLAKE2B 7c6337cfa0a12d8dcd9fa640e636c300234ba7e7a34e95a523c5f9836f934da336f6ce792932fffb97b28ae02c577166a3d4d3ea4fd6959786a5c60510b454a2 SHA512 fcfacd071072f5773556c706b6fa0aea4ff3f3752f3a1f40c9e6de7ec870e939adc57e6bd4c90cac80241cc798e02a71c9fc80d9ccf25ad3a10752f937d06da5
-EBUILD auto-multiple-choice-1.3.0-r2.ebuild 2432 BLAKE2B c3dc6acb8d411443113db76953f2e8e7b13913ede718bafc2a4135248dfcddc1a94158cdf2f794c17b62b0a5c49dceef112c2190a32d1c6234cd49244d4130b2 SHA512 106e77bf62fa668f37dd813305c71174c2f694bb8c15ddd5906fd1aac9a3aff95fa3cc5e2b7169188e32822bd6bad4ee43616d764fe8a2b78d0d6c89f23f183c
+EBUILD auto-multiple-choice-1.3.0-r2.ebuild 2432 BLAKE2B c05a0647bc9fe8d59aeedeabbfc7cea3775aa3735753af817855eb3879d1427802235012c2b2c7370179c2c24efe60aa4a50ab5f0a5c406a4ac6bc15705ec175 SHA512 55ef54c209116c458c52a9c9da4a79becfacd5189dd055dcf3cbc037d2c7917e78ac1617de77b2fc042a2636fe171c13d761183cb47f7b886204110bf65b034c
 EBUILD auto-multiple-choice-1.5.2.ebuild 3094 BLAKE2B 8429e8013043750be4b74e17c334d98d673634ef957ad1b546e0bc406774247c74719ff38d6f6b1ced167648bb2b3ac8ce0a39175011a7ed4215d3f8b81a7dbe SHA512 3f1b93c46c8c1d494f4cff2c3cea10d4b9b7e58f1de91568010280b2e921a46ba4513e2264210a0d0d87227b5b63f52da5b508745c01dd0776cc8b5ebd1ca156
diff --git a/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r2.ebuild b/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r2.ebuild
index 199f359..80a3b47 100644
--- a/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r2.ebuild
+++ b/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r2.ebuild
@@ -1,83 +1,83 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="5"
+EAPI="7"
 
 PYTHON_COMPAT=( python2_7 )
 
 inherit eutils toolchain-funcs
 
 SLOT="0"
 
 DESCRIPTION="Create and manage multiple choice questionnaries (MCQ), including automated marking."
 HOMEPAGE="http://project.auto-multiple-choice.net/projects/auto-multiple-choice/"
 SRC_URI="http://download.gna.org/auto-qcm/${PN}_${PV}_sources.tar.gz"
 LICENSE="GPL-2+"
 KEYWORDS="~x86 ~amd64"
 IUSE="msmtp"
 
 DEPEND="virtual/tex-base
 		virtual/latex-base
 		media-fonts/dejavu
 		media-fonts/ipaex
 		app-text/texlive[cjk,dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,omega,publishers]
 		app-text/poppler[cairo]
 		media-libs/netpbm
 		app-text/dblatex
 		app-text/docbook-xml-simple-dtd
 		app-text/docbook-xsl-stylesheets
 		media-libs/opencv
 		app-text/pdftk"
 
 RDEPEND="${DEPEND}
 		>=dev-lang/perl-5
 		dev-perl/Gtk2
 		dev-perl/Gtk2-Notify
 		media-gfx/imagemagick
 		dev-perl/XML-Simple
 		dev-perl/XML-Writer
 		dev-perl/Archive-Zip
 		dev-perl/DBI
 		dev-perl/Text-CSV
 		dev-perl/DBD-SQLite
 		dev-perl/Net-CUPS
 		dev-perl/Email-Address
 		dev-perl/Email-MIME
 		dev-perl/Email-Sender
 		dev-perl/Glib-Object-Introspection
 		msmtp? ( mail-mta/msmtp )"
 
 src_prepare() {
 	# Apply patch on desktop file
 	# epatch "${FILESDIR}/${PN}-1.2-desktop.patch"
 
 	# Patch Makefile.conf with a valid local PERLDIR
 	PERL_LOCAL_DIR=$(perl -e 'print "$_\n" for @INC' | grep '/local/' | sort | head -n1)
 	sed -i s?'^PERLDIR=.*$'?'PERLDIR='${PERL_LOCAL_DIR}?g Makefile.conf
 
 	# Patch Makefile.conf with a valid local TEXDIR (for texlive-2014)
 	sed -i s?'^TEXDIR=.*$'?'TEXDIR=/usr/share/texmf-site/tex/latex/AMC'?g Makefile.conf
 
 	# Patch doc/Makefile with proper TEXINPUTS
 	sed -i s~'export TEXINPUTS=./img_pdf/:'~'export TEXINPUTS=./img_pdf/:./sty/:$(TEXINPUTS):'~ doc/Makefile
 
 	#emake version_files
 }
 
 src_compile() {
 	export TEXINPUTS=".:/usr/share/dblatex/latex/style/:/usr/share/dblatex/latex/misc/:/usr/share/dblatex/latex/graphics/:./sty/:$TEXINPUTS"
 	emake -j1 GCC_NETPBM="-I/usr/include/netpbm/ -lnetpbm" GCC="$(tc-getCC)" GCC_PP="$(tc-getCXX)"
 }
 
 pkg_postinst()
 {
 	elog "Running 'texhash' to add 'automultiplechoice.sty'."
 	texhash || die 'An error occured while running texhash'
 }
 
 pkg_postrm()
 {
 	elog "Running 'texhash' to remove 'automultiplechoice.sty'."
 	texhash || die 'An error occured while running texhash'
 }