gentoo resync : 29.06.2020

3 files changed, 3 insertions, 73 deletions

diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index fd9efc3b6c2e..9d249528470d 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,6 +1,4 @@
 AUX fix-CVE-2019-18804.patch 1130 BLAKE2B d83e7f74fca659d58731cb051aface930f1f3d0ffc737056e59323d436bfbad9b43aba5fb2c353b368a4fdbe9c257ca34ba53769e8aa2f0a42ebbd0a8d48181f SHA512 587aa61a9f9f7f845f1f0a23f59503efa7247862074096c707368316ad91aee40025d48c76a7351dc09ec1687c3902198fdbd6aa8623c4f1d8654d0c549ec4e7
 DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
-DIST djvulibre-3.5.27.tar.gz 3648522 BLAKE2B e1907b4b64c48304ceb24360cfd451e4690d38803f22231d4e136dbe754715527fa0300c623bb709fa05bba206348257137b2a755651bb51ca26259680e142d0 SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee
-EBUILD djvu-3.5.27-r1.ebuild 1574 BLAKE2B aa47ac7501b211d0f56a90cd4d82f33d287cb575216c78f27603d7d81a7b585637ee02ba81c5e9a918421dabac9d23f338a60bec5377821ed35f750140568481 SHA512 9bcc71de91a7cb092b635fb9b6456966faa03ef25154f145307da888fb219c419e6907517280c0dc85673de5b9d7914829d3ebf505f2333156e859ac9a0bbeb1
-EBUILD djvu-3.5.27-r2.ebuild 1698 BLAKE2B a774bee0b263b3f166f98dc5b22ebcdbd37746d67ec33fc23e5172d89003be0c9d18e69f4fdab137a3b2e3c2f77b03ffe51acc18840225dde58bbd2671120b6e SHA512 d627b593fa6cf288b4fb89eb16230cf09fe6b44fc8a4d2d83c43d5250d4e4c40a35af379b3045aedc8c8ea3bc44f1eaac4ef8d20f7ecf345b5cf55907725a395
+EBUILD djvu-3.5.27-r2.ebuild 1656 BLAKE2B 1543bc005f55a9ecf74f95295a29aed25100f056da963b5ed75fcde148928ef10e4fa05830b6ad8c17d2e8bc07a0daef3baa1fddc4bc085fb343b667a8edb33a SHA512 30dbaf5409bdf414fcc53246882f6dda413dc25d1689bd489e383a05a39699b2efcaa5eb3d24ec3fc8949a169f51a3642a8552911579e34c8f4970b12c56d945
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.27-r1.ebuild b/app-text/djvu/djvu-3.5.27-r1.ebuild
deleted file mode 100644
index 607b51c18958..000000000000
--- a/app-text/djvu/djvu-3.5.27-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils flag-o-matic xdg-utils
-
-MY_P="${PN}libre-${PV#*_p}"
-
-DESCRIPTION="DjVu viewers, encoders and utilities"
-HOMEPAGE="http://djvu.sourceforge.net/"
-SRC_URI="http://downloads.sourceforge.net/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug doc jpeg tiff xml"
-
-PATCHES=( "${FILESDIR}"/fix-CVE-2019-18804.patch )
-
-RDEPEND="jpeg? ( virtual/jpeg:0 )
-	tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}
-	|| ( gnome-base/librsvg media-gfx/inkscape )"
-
-S=${WORKDIR}/${MY_P%%.3}
-
-src_configure() {
-	use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
-
-	# We install all desktop files by hand.
-	econf \
-		$(use_enable xml xmltools) \
-		$(use_with jpeg) \
-		$(use_with tiff) \
-		--disable-desktopfiles
-}
-
-DOCS=( NEWS README )
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	use doc && dodoc -r doc
-
-	# Install desktop files.
-	cd desktopfiles
-	for i in {22,32,48,64}; do
-		insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
-		newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
-	done
-	insinto /usr/share/mime/packages
-	doins djvulibre-mime.xml
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	has_version app-text/djview || \
-		optfeature "For djviewer or browser plugin" app-text/djview
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/djvu/djvu-3.5.27-r2.ebuild b/app-text/djvu/djvu-3.5.27-r2.ebuild
index ed3eea609053..e5debec50dbb 100644
--- a/app-text/djvu/djvu-3.5.27-r2.ebuild
+++ b/app-text/djvu/djvu-3.5.27-r2.ebuild
@@ -10,11 +10,11 @@ MY_P="${PN}-${PN}libre-git-${COMMIT}"
 
 DESCRIPTION="DjVu viewers, encoders and utilities"
 HOMEPAGE="http://djvu.sourceforge.net/"
-SRC_URI="https://sourceforge.net/code-snapshots/git/d/dj/djvu/djvulibre-git.git/${MY_P}.zip -> ${P}.zip"
+SRC_URI="https://ajakk.github.io/${P}-${COMMIT}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug doc jpeg tiff xml"
 
 RDEPEND="jpeg? ( virtual/jpeg:0 )