gentoo resync : 11.02.2018

3 files changed, 9 insertions, 67 deletions

diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest
index f28d4b4a5cee..b03c057458f0 100644
--- a/app-text/pdf2djvu/Manifest
+++ b/app-text/pdf2djvu/Manifest
@@ -1,5 +1,3 @@
-DIST pdf2djvu-0.9.3.tar.xz 239492 BLAKE2B e231f833075739e19a3dfe469eaa9f5eabf8b096473e9ea4d0dbbb296c33767cb612976f69548fd97966084cffeacc7f24230c789c6fbe5f1efed09988221b84 SHA512 388b76642c354480674b6eee4961792c4ef483313ffd25a6248d1d6302985ac5adfb558ae9241062893a419463c9626d8dac9d08297d66b68a98cebbcc4dc193
-DIST pdf2djvu-0.9.4.tar.xz 250332 BLAKE2B 529c871216cb4ddc55560875b5c4d5a9aeb680140821c6d6d5ab71853a09f3661cfbf28ac4602d6d782afb682a14af8241d70cb82ca617f28a0752f45c852df7 SHA512 6b97d0577ee6e623d8c877393f551dd2a5e19508e5cd6dc5bb2d3ae1a2b71c2f0ffc7020d85507bc52a25da09a301dd5ddf45ab2628928477e0846707ea57322
-EBUILD pdf2djvu-0.9.3.ebuild 1153 BLAKE2B 97072216eab1a4a228097a14934ecb30d56b0ae6419ee8b982bce07903ffb5fa701d5e867c8d62fa2ee801c9645ea3a2a9597d793d930668cadb67bcf235d5bc SHA512 5524e8d7423c0ab0052a4800bbbfde3092743fc35cc0a9479508ae91c9255b398cada18cd391a62e50ac930e6a854661a61b9794f99ade9b826fbcffdfc7ff7e
-EBUILD pdf2djvu-0.9.4.ebuild 1267 BLAKE2B a0278ee417403f2c4ab309b2b2f3f9f58f6ae90a0e3b593e107ae57dd1707d59eb601728f02a9fb4d8e394c7cbc0da7d1c00ea4e4c1930035fbcdd2c9c44c7de SHA512 558acd5d80cf329db929f3a47d054d7f083db867bc5e375e3b3e545c320d10e1512550c8f6c6ca42428670ac686f0af1d644f09ae43b54555f0ca6b0e6a1bd57
+DIST pdf2djvu-0.9.8.tar.xz 268976 BLAKE2B 318ef4fd5677056d2404d769bf54911c9474d6f0f839ef472e121375ee268db31ddaaad2b8ed791ef093d6cb1c665f6431619918ee852e479b4a11a3d7ae0e23 SHA512 5f5330d3d15808b5b6233a15a984d0ebf28619cfb50807a20c8992fed68d17f73d1edd62b1ad7cd3a09d526f6c9f0827e2c5e03d6d7c8ad92c1f106755025f5e
+EBUILD pdf2djvu-0.9.8.ebuild 1251 BLAKE2B 6a3487ef4e2195daf5c78447960874a504bcb4a2f5187b49e058df35ed7482f820058aec8d719a52aca3a558ce86cef5705c006d422ef516db9de69632767404 SHA512 b2a2ed2d2f9ebe91f15f2da833b5e5a638bc9a82b7a2562eb4548909bfca18d519f9d76f5f2e843115e73af8c7a232ad4b5f5de419ac08371114762ef2d42013
 MISC metadata.xml 351 BLAKE2B 68816123c075f603535faa42307dfc58066cc7c9db272b1f6004a9e0bba5d71d0a798b5b2fed9d4af704ed5145264b400f406c5b1185e3b759c97c0ccccc05d1 SHA512 98cfb584785e967dfd11dc82da694ccde0031609c28faca492d2384d6257020ebf8ac264dcb512129f5a681455ce3228b9f443aa2aa99197134ed7957901eb06
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.3.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.3.ebuild
deleted file mode 100644
index af5fbd00e708..000000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.9.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://bitbucket.org/jwilk/${PN}/downloads/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-
-RDEPEND="
-	>=app-text/djvu-3.5.21:=
-	>=app-text/poppler-0.16.7:=
-	dev-libs/libxml2:=
-	dev-libs/libxslt:=
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/pstreams
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-REQUIRED_USE="test? ( graphicsmagick ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local openmp=--disable-openmp
-	use openmp && tc-has-openmp && openmp=--enable-openmp
-
-	econf \
-		${openmp} \
-		$(use_enable nls) \
-		$(use_with graphicsmagick)
-}
-
-src_install() {
-	default
-	dodoc doc/{changelog,{cjk,credits,djvudigital}.txt}
-}
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.4.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
index d046e0746aa2..d59dccb4f538 100644
--- a/app-text/pdf2djvu/pdf2djvu-0.9.4.ebuild
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -9,7 +9,7 @@ inherit python-any-r1 toolchain-funcs flag-o-matic
 
 DESCRIPTION="A tool to create DjVu files from PDF files"
 HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://bitbucket.org/jwilk/${PN}/downloads/${P}.tar.xz"
+SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="test? ( graphicsmagick ${PYTHON_REQUIRED_USE} )"
 
+DOCS=(
+	doc/{changelog,credits,djvudigital,README}
+)
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
@@ -54,8 +58,3 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_with graphicsmagick)
 }
-
-src_install() {
-	default
-	dodoc doc/{changelog,{cjk,credits,djvudigital}.txt}
-}