gentoo auto-resync : 06:07:2023 - 22:15:01

6 files changed, 2 insertions, 166 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index af3b56083813..11097673b255 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/auto-multiple-choice/Manifest b/app-office/auto-multiple-choice/Manifest
index 2d05442705ca..6b45257973ad 100644
--- a/app-office/auto-multiple-choice/Manifest
+++ b/app-office/auto-multiple-choice/Manifest
@@ -1,8 +1,4 @@
-AUX auto-multiple-choice-1.3.0-conf.patch 1889 BLAKE2B aa39f1525f6067e8025094b3c7437f72c11eec7cb5b0fcbbe68388b80c1ff01050f2fc224671e1a6901f52d51e761f2702d17ce0e75f5ca67ffc8d721ef37cb6 SHA512 6c7cce8383dbbb23646b96785b69dd75f6d3e842d6712b3b5741a5151f7dde5a9ee05bd35e3dee374641f453128e8008304cc6001d9a1db707528ecb7b1ba496
-AUX auto-multiple-choice-1.3.0-desktop.patch 637 BLAKE2B bf06b2761d35b669b88a0915a273022045e169e09dd76ca4ae40723d44d57fabb518dec83f811124421cfc82a53cd1435c60c6763b534d6a3ae4449b2bc00de6 SHA512 b1eec21b2f640bfdf7a4d7d956a71b2fa9889a6d5428cc7eedc1352e845477c3a81607d0c1502b4f57967264384aff5dcc2162bb552544b962c383dc7f978ffa
 AUX auto-multiple-choice-1.5.2-conf.patch 1992 BLAKE2B b33a5a02ad559e50e3630f4da97ae140d803b11a1685d1d3334ade350b9bbc0c0ab47c582b1cc2e3e7700577fe01b24342b91f12e8174a6f6158361462237921 SHA512 ea51318a700a8d1e0b5c54d8d34ee19dedeac300d7c373fae56b9c7de0441b60a3de1f905be5a9e0ca605457c16c47ed59dcbb2dc6092023fffb95723802e16d
-DIST auto-multiple-choice_1.3.0_sources.tar.gz 4328255 BLAKE2B 7c6337cfa0a12d8dcd9fa640e636c300234ba7e7a34e95a523c5f9836f934da336f6ce792932fffb97b28ae02c577166a3d4d3ea4fd6959786a5c60510b454a2 SHA512 fcfacd071072f5773556c706b6fa0aea4ff3f3752f3a1f40c9e6de7ec870e939adc57e6bd4c90cac80241cc798e02a71c9fc80d9ccf25ad3a10752f937d06da5
 DIST auto-multiple-choice_1.6.0_sources.tar.gz 9597797 BLAKE2B 2ce5162223802a7e9d6025e0a324b507e218389cff63ca863846bd2be36fc7a3a0d6aede3b2d85da4c37b9c25cadaa544c8b9d79458a0936d8c1b9fce244a5da SHA512 b6640ae1bbea9438de38f55b4e0cb6fa93de3598ecf75bce5a6891f8db568bff7aa7ca286bfb07646fd5bed6625d434093e3b574b96711a65fbd10f9ddadcf74
-EBUILD auto-multiple-choice-1.3.0-r1.ebuild 2509 BLAKE2B d4dac8835d7bc1ef817eba331c67663047d148d83c522a7554c48f4086d992c78319dca59ad781d0ec60f59774bf53084de792454818fccfa125cb1bc0a2a361 SHA512 243f2d8b9af8f020d5f25bbe55a5c48a5d87cafb50e103cbc18c9fb42c00ec2f0ec7d19bdffcafa6e3aa76b45486945983622dd8907b5100ad83c2ee2acebacc
-EBUILD auto-multiple-choice-1.6.0.ebuild 2495 BLAKE2B f4eff54af687d6832b2961ca63d6466782185f85b1ecde33c3faf3a0b3cb56078c8dd1e39fdbdd906fa0dcf0e11835166035572c5c1408b8c5eb5f121bddc988 SHA512 95572f16012dc1455ebe5089e2053d8383349aae2ebd8311f262cfa5db08f7596590ad81091605f7fa2d7c727feb5c401544200ed7fcaef5c15f29507c8ce8ab
+EBUILD auto-multiple-choice-1.6.0.ebuild 2500 BLAKE2B af5a340f21f78f338fc35d4dab2501855e763962f0c1f28e0ce07e19fb03257f1bd159f12bf2f39132fcd8b4b5a66704382f529dfaed26822a4b295480b9de6f SHA512 8cd6eacf8f0b6a73f5e7ca034771651eda902e174c4310af9f0e62d2a2755c9abc6458a0b359ce849991c9d4ca4906b26ce325635f9e58b7c5f0aeb188c98a1e
 MISC metadata.xml 358 BLAKE2B 7c3c139e20fd94f68a50cb1891e52d927a8f58510f00f4cfbb4369dfa196543c851f47daafa3450a6fc78b5a15b00bd7ae9e6a7d604230297dda29b87f52fc8a SHA512 0ec3cd3515e30df19d52b83ad5f11a26e09126fab075a72ca31013b7a4d691f4147bda50c3ce644ed93e87ea8da191907c7bcf468669aac7b0ae682a4115aa14
diff --git a/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild b/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild
deleted file mode 100644
index c33d12be5ccf..000000000000
--- a/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs perl-functions latex-package
-
-DESCRIPTION="Create and manage multiple choice questionnaries, including automated marking"
-HOMEPAGE="http://www.auto-multiple-choice.net/"
-SRC_URI="http://download.auto-multiple-choice.net/${PN}_${PV}_sources.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-LANGS="ar es fr ja"
-# we deliberately always install de and en, since this way we dont get a problem
-# with globs and empty directories...
-#
-for lala in ${LANGS}; do
-	IUSE="${IUSE} l10n_${lala}"
-done
-
-COMMON_DEPEND="
-	app-text/texlive[extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,publishers]
-	app-text/poppler:=
-	dev-perl/XML-LibXML
-	media-libs/netpbm
-	media-libs/opencv
-	l10n_fr? ( app-text/texlive[l10n_fr] )
-	l10n_ja? ( app-text/texlive[l10n_ja] )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/dblatex
-	app-text/docbook-xml-simple-dtd:*
-	app-text/docbook-xsl-stylesheets
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/pdftk
-	dev-lang/perl:=
-	dev-perl/Glib-Object-Introspection
-	dev-perl/Gtk2
-	dev-perl/Gtk2-Notify
-	media-gfx/imagemagick
-	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
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.0-desktop.patch"
-	"${FILESDIR}/${PN}-1.3.0-conf.patch"
-)
-
-src_prepare() {
-	default
-
-	local la
-	for la in ${LANGS} ; do
-		if ! use l10n_${la} ; then
-			# remove languages that we dont want to install. no error on nonexisting files.
-			rm -vf "I18N/lang/${la}.po"
-			rm -vf "doc/auto-multiple-choice.${la}.in.xml" "doc/doc-xhtml-site.${la}.xsl.in"
-			rm -rvf "doc/html/auto-multiple-choice.${la}" "doc/modeles/${la}"
-			sed -e "s: doc/doc-xhtml-site\\.${la}\\.xsl: :g" -i Makefile || die
-		fi
-	done
-}
-
-src_compile() {
-	perl_set_version
-	export VENDOR_LIB PVR
-	export TEXINPUTS="/usr/share/dblatex/latex/style:/usr/share/dblatex/latex/misc:/usr/share/dblatex/latex/graphics:"
-
-	export MAKEOPTS="-j1"
-	# when doing a parallel build, the package is acting decidedly odd
-	# e.g., the build seems to succeed while actually stuff fails
-	# and subsequent error messages do not have any relation to the real problem
-	# So let's keep this also for easier debugging
-
-	emake \
-			GCC_NETPBM="-I/usr/include/netpbm/ -lnetpbm" \
-			GCC="$(tc-getCC)" \
-			GCC_PP="$(tc-getCXX)"
-}
-
-src_install() {
-	default
-}
diff --git a/app-office/auto-multiple-choice/auto-multiple-choice-1.6.0.ebuild b/app-office/auto-multiple-choice/auto-multiple-choice-1.6.0.ebuild
index 60a7e5d8dd22..6cd14ee071e6 100644
--- a/app-office/auto-multiple-choice/auto-multiple-choice-1.6.0.ebuild
+++ b/app-office/auto-multiple-choice/auto-multiple-choice-1.6.0.ebuild
@@ -27,7 +27,7 @@ COMMON_DEPEND="
 	app-text/poppler:=
 	dev-perl/XML-LibXML
 	media-fonts/ipaex
-	media-libs/netpbm
+	media-libs/netpbm[png]
 	media-libs/opencv
 	l10n_fr? ( app-text/texlive[l10n_fr] )
 	l10n_ja? ( app-text/texlive[l10n_ja] )
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
deleted file mode 100644
index 2e5e0cdd58c0..000000000000
--- a/app-office/auto-multiple-choice/files/auto-multiple-choice-1.3.0-conf.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index 3c6225dcc054..000000000000
--- a/app-office/auto-multiple-choice/files/auto-multiple-choice-1.3.0-desktop.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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;