gentoo resync : 26.12.2017

5 files changed, 18 insertions, 107 deletions

diff --git a/app-text/unpaper/Manifest b/app-text/unpaper/Manifest
index 15584022dcfc..491977063db9 100644
--- a/app-text/unpaper/Manifest
+++ b/app-text/unpaper/Manifest
@@ -1,7 +1,4 @@
-DIST unpaper-5.1.tar.xz 2861432 BLAKE2B 4f07af2ff86181f6941f924cb0a06c8268c5b50fbff3a25faea5ae9657b965277f9d33ff7fbcff29cff7c799fe9861c50dc3a7f583a1620ee6e92fdf42410165 SHA512 5ccd90c4c92774085df6cee5552d72d538d3ee553f95ca3d2bea850975ac6e728be97aa7dca194ba44ef8156c26c19d61d051c4581100f8c553998d9a86cefdf
 DIST unpaper-6.1.tar.xz 2655724 BLAKE2B df16261d37d5d493aa640cd940b63f55e90ba091e6028dc11dd0c685ec880a7be202d4056756ef0fa54b48b89f1845b9cf23aceeb87945a1b6a25eec4b7c0915 SHA512 afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c
-EBUILD unpaper-5.1.ebuild 753 BLAKE2B d3fe1ce1596a23782b1a35e15e85f1fdfdf359cee4f5ff72b82f39ce6048cb6553f3c261a3b9062cf55bc25bb23c070f7b233a1468288c792c490434441436d0 SHA512 4c5169cfaec2ad853cd9591a73cc87c24750b8dda1d58784348048a634d471992ce5dbf23db4e518e4c6b3bdbbcf5ae0a84ae901b7fc166a690190d0d5f5f3b6
-EBUILD unpaper-6.1-r1.ebuild 943 BLAKE2B 5ed691cf3ea38299f1983c16708f7d196f9892b82921483f8a548921ecee2cc2620c8f68775649c480a1864ce0393613f28c7fcb319bb663cff464506c6c3111 SHA512 cbf3e72d0c6cfa4924e78e6da5970b6a1cbe906ea4e32b725389888d2b609028d4b4c55773971269a1e5bc10e7c6c991bcee179595d62c9fd693491df94dd953
-EBUILD unpaper-6.1.ebuild 912 BLAKE2B bfcdddadcdd239959491dbea20ea4c61c4e539436333f6189f3db7173dce5e762c896368e8568dd2ac011e7e38f2ffd10ac3df6dfb46dcf3d6da2c8b05a0007f SHA512 e70fe61488b1fd2f48f41e6ca075ba1c46e5202e95ff150ba7adccf803d469949dcb4c3d1986ce62f523ae46fe277429216bf8f767fcab70202281e61cf1d352
-EBUILD unpaper-9999.ebuild 943 BLAKE2B 5ed691cf3ea38299f1983c16708f7d196f9892b82921483f8a548921ecee2cc2620c8f68775649c480a1864ce0393613f28c7fcb319bb663cff464506c6c3111 SHA512 cbf3e72d0c6cfa4924e78e6da5970b6a1cbe906ea4e32b725389888d2b609028d4b4c55773971269a1e5bc10e7c6c991bcee179595d62c9fd693491df94dd953
+EBUILD unpaper-6.1-r1.ebuild 887 BLAKE2B 2e03001a8f2f169b862f825b8c044974b061fd72f760b7fd40dcadf64d2d93b10b86a71dda21b70cc00ca4abe6c86173d3a6e27425d6b7ab4fbb99002e808ac0 SHA512 ddf900c742cb27a56e61647d55ba6f16a5167c69cd4ef934934a3c1b3900df82d019d84b434894e970e91164aad77b0c2d92d8c1a861108169fb618d61ee328b
+EBUILD unpaper-9999.ebuild 887 BLAKE2B 2e03001a8f2f169b862f825b8c044974b061fd72f760b7fd40dcadf64d2d93b10b86a71dda21b70cc00ca4abe6c86173d3a6e27425d6b7ab4fbb99002e808ac0 SHA512 ddf900c742cb27a56e61647d55ba6f16a5167c69cd4ef934934a3c1b3900df82d019d84b434894e970e91164aad77b0c2d92d8c1a861108169fb618d61ee328b
 MISC metadata.xml 292 BLAKE2B 5a4427170ed656c135d0cd81f46c3d472e306760c322c95f85e6183eeac77be6036d154791c2ce04ac28473c77974ebd2f26b302e5fa825a6c1db2437b1e6ee0 SHA512 67a23847327391a27c4acbb895e63063fa541de6fdf062887b1aa25a731bf2096e26f26c6cd62720bdc84fcbde256dbe6c9cc44687a7931d5e1a657ea684348a
diff --git a/app-text/unpaper/unpaper-5.1.ebuild b/app-text/unpaper/unpaper-5.1.ebuild
deleted file mode 100644
index 945ae6370e42..000000000000
--- a/app-text/unpaper/unpaper-5.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-2 autotools
-else
-	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Post-processor for scanned and photocopied book pages"
-HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? ( media-libs/netpbm[png] )
-	dev-libs/libxslt
-	app-text/docbook-xsl-ns-stylesheets"
-RDEPEND=""
-
-if [[ ${PV} == 9999 ]]; then
-	src_prepare() {
-		eautoreconf
-	}
-fi
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html
-}
diff --git a/app-text/unpaper/unpaper-6.1-r1.ebuild b/app-text/unpaper/unpaper-6.1-r1.ebuild
index aed3c7c6ab3f..e2d4212348de 100644
--- a/app-text/unpaper/unpaper-6.1-r1.ebuild
+++ b/app-text/unpaper/unpaper-6.1-r1.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools-utils
-
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-2 autotools
+	inherit git-r3 autotools
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -17,7 +15,6 @@ DESCRIPTION="Post-processor for scanned and photocopied book pages"
 HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 IUSE="libav test"
 
@@ -33,9 +30,7 @@ DEPEND="dev-libs/libxslt
 # images. Wait until we get a better testsuite.
 RESTRICT="test"
 
-if [[ ${PV} == 9999 ]]; then
-	src_prepare() {
-		eautoreconf
-		autotools-utils_src_prepare
-	}
-fi
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
diff --git a/app-text/unpaper/unpaper-6.1.ebuild b/app-text/unpaper/unpaper-6.1.ebuild
deleted file mode 100644
index 068f014b1ee9..000000000000
--- a/app-text/unpaper/unpaper-6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-2 autotools
-else
-	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Post-processor for scanned and photocopied book pages"
-HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="test"
-
-RDEPEND="|| ( >=media-video/libav-10[encode] >=media-video/ffmpeg-2[encode] )"
-DEPEND="dev-libs/libxslt
-	app-text/docbook-xsl-ns-stylesheets
-	virtual/pkgconfig
-	${RDEPEND}"
-
-# gcc can generate slightly different code that leads to slightly different
-# images. Wait until we get a better testsuite.
-RESTRICT="test"
-
-if [[ ${PV} == 9999 ]]; then
-	src_prepare() {
-		eautoreconf
-		autotools-utils_src_prepare
-	}
-fi
diff --git a/app-text/unpaper/unpaper-9999.ebuild b/app-text/unpaper/unpaper-9999.ebuild
index aed3c7c6ab3f..e2d4212348de 100644
--- a/app-text/unpaper/unpaper-9999.ebuild
+++ b/app-text/unpaper/unpaper-9999.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools-utils
-
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-2 autotools
+	inherit git-r3 autotools
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -17,7 +15,6 @@ DESCRIPTION="Post-processor for scanned and photocopied book pages"
 HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 IUSE="libav test"
 
@@ -33,9 +30,7 @@ DEPEND="dev-libs/libxslt
 # images. Wait until we get a better testsuite.
 RESTRICT="test"
 
-if [[ ${PV} == 9999 ]]; then
-	src_prepare() {
-		eautoreconf
-		autotools-utils_src_prepare
-	}
-fi
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}