gscan2pdf-1.2.7

3 files changed, 87 insertions, 61 deletions

diff --git a/app-office/gscan2pdf/Manifest b/app-office/gscan2pdf/Manifest
index ca5f72d..e6bd313 100644
--- a/app-office/gscan2pdf/Manifest
+++ b/app-office/gscan2pdf/Manifest
@@ -1,6 +1,3 @@
-DIST gscan2pdf-1.1.2.tar.gz 604576 SHA256 c8c7e6e4225e9088e92a48abe6f15b86f65920f4c01109285e6eda01a237bc4b SHA512 f64d7a9e2e024f6c5149e4a8acac2690df3efd7c23167b879f28f4acdb5c481ace3d9677f1b55b985fbd97ebc2ec929cb6d2b35c50c62a710d36b8b0e007da50 WHIRLPOOL 7ad21e7a213af17d4944edcac685633009747bd61259f9d3ff6579992e0aaa0f4bbfab08c7a7cb8d592b23f51439b1a5dd151676f73e495adcdfcc18d1d8aa5f
-EBUILD gscan2pdf-1.1.2-r1.ebuild 1463 SHA256 3c43220c0fd228611fe894be2c4ff8f1cc7a0e30526efc99ae001985651a6670 SHA512 4c2345f69b39901165eb77c1164a5f3bd41860512d8e818b492e9b9f975eb56c38770f837b3724451bcc9154b86fb8ca9f5bd6da2ecb6f6eefe9d3bee9df8010 WHIRLPOOL 1fcb9fa4cf4a3e676572f9319ad2df49f46ace0b5a1bf37ef64edf85c83c00c995f7d07e30fa55943defc289b69c10330e6b09278da8ec82f0cf862d0d20baa0
-<<<<<<< HEAD
-=======
+DIST gscan2pdf-1.2.7.tar.gz 667971 SHA256 1fc2cc697b75c6fd0be153d1df26a1fccccbae32f55659d34197faf5a536aedc SHA512 fb048b8b9100351e8998b86e74e5d3d11a3c024f41365789701f9d8b5c35ff0f19ba9de9fe83e66d45f8a9baf9c60449840a6d25f10ad8a61b390d945a6a92de WHIRLPOOL 1951dec8a501a695fb6120c4ea148fc8e4cf85f686397294ab08127161aa4c167237aeb37b3bac1aea0c8d5d0dc27deca2a0646c8bbebfce82a226e22072f7f2
+EBUILD gscan2pdf-1.2.7.ebuild 2097 SHA256 496cc6bc5467d5652aeb8e4e8081b590e75aee2de6ca3bac756612c659bf3fab SHA512 8e98cfb551817d9befe709ffa3eade73d519d18d3c4ea03a4b06b9a55ebbd0d83751ff92b17c0ab39c4b3a6d8cc9d414bf69d67172c44bccd16ec9c4b42b28ec WHIRLPOOL a8c7454795ca85635bfd7639fe89f0401c232838f66d07c186471a96d5b4295b1856773693271414897ee5610e7f14cc50be4b4f1f4f7ba66d10f598c27edca9
 MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
->>>>>>> 128e0df7d8d45773efea3a26acb5d1a762b7a8d2
diff --git a/app-office/gscan2pdf/gscan2pdf-1.1.2-r1.ebuild b/app-office/gscan2pdf/gscan2pdf-1.1.2-r1.ebuild
deleted file mode 100644
index d6fa6c2..0000000
--- a/app-office/gscan2pdf/gscan2pdf-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-inherit perl-app
-
-DESCRIPTION="GUI to produce PDF or DjVu files from scanned documents"
-HOMEPAGE="http://gscan2pdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-# https://bugs.gentoo.org/show_bug.cgi?id=254704
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# test only: dev-perl/Test-Perl-Critic
-DEPEND="sys-devel/gettext"
-
-RDEPEND="dev-lang/perl[ithreads]
-	>=dev-perl/config-general-2.40
-	>=dev-perl/glib-perl-1.100-r1
-	dev-perl/Goo-Canvas
-	dev-perl/Gtk2-Ex-Simple-List
-	dev-perl/Gtk2-ImageView
-	>=dev-perl/gtk2-perl-1.043.1
-	dev-perl/HTML-Parser
-	>=dev-perl/Locale-gettext-1.50
-	dev-perl/Log-Log4perl
-	dev-perl/PDF-API2
-	dev-perl/Proc-ProcessTable
-	dev-perl/Readonly-XS
-	dev-perl/Sane
-	dev-perl/Set-IntSpan
-	dev-perl/Try-Tiny
-	virtual/perl-Archive-Tar
-	media-gfx/imagemagick[perl]
-	media-gfx/sane-backends
-	media-libs/tiff"
-
-src_install() {
-	perl-module_src_install
-	dodoc History
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "app-text/cuneiform, app-text/gocr, app-text/tesseract" \
-		"(or OCRopus, not in Portage) - for OCR"
-	elog "app-text/unpaper - image post processing utility"
-	elog "dev-perl/Gtk2-Ex-PodViewer - for displaying help"
-	elog "app-text/djvu - DjVu support"
-	elog "media-gfx/sane-frontends - for ADF scanners"
-	elog "x11-misc/xdg-utils - required for email as PDF"
-}
diff --git a/app-office/gscan2pdf/gscan2pdf-1.2.7.ebuild b/app-office/gscan2pdf/gscan2pdf-1.2.7.ebuild
new file mode 100644
index 0000000..43e471f
--- /dev/null
+++ b/app-office/gscan2pdf/gscan2pdf-1.2.7.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Petr Pisar, https://bugs.gentoo.org/show_bug.cgi?id=254704
+
+EAPI="5"
+
+inherit perl-app
+
+DESCRIPTION="GUI to produce PDF or DjVu files from scanned documents"
+HOMEPAGE="http://gscan2pdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="adf djvu email help cuneiform gocr +tesseract tiff +unpaper"
+
+RDEPEND=">=dev-perl/gtk2-perl-1.90.0
+	>=dev-perl/glib-perl-1.220
+	dev-perl/Gtk2-Ex-Simple-List
+	dev-perl/Gtk2-ImageView
+	media-gfx/imagemagick[perl]
+	>=dev-perl/Locale-gettext-1.05
+	dev-perl/Config-General
+	dev-perl/PDF-API2
+	dev-perl/Sane
+	dev-perl/Set-IntSpan
+	dev-perl/Goo-Canvas
+	dev-perl/HTML-Parser
+	dev-perl/Readonly
+	dev-perl/Log-Log4perl
+	dev-perl/Try-Tiny
+	dev-perl/List-MoreUtils
+	dev-perl/Proc-ProcessTable
+	virtual/perl-Archive-Tar
+	virtual/perl-threads
+	virtual/perl-threads-shared
+	virtual/perl-Getopt-Long
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-File-Temp
+	adf? ( media-gfx/sane-frontends )
+	djvu? ( app-text/djvu )
+	email? ( x11-misc/xdg-utils )
+	help? ( dev-perl/Gtk2-Ex-PodViewer )
+	cuneiform? ( app-text/cuneiform )
+	gocr? ( app-text/gocr )
+	tesseract? ( app-text/tesseract )
+	tiff? ( media-libs/tiff )
+	unpaper? ( app-text/unpaper )"
+DEPEND="${RDEPEND}
+	media-gfx/sane-backends"
+
+src_install() {
+	perl-module_src_install
+	dodoc History
+}
+
+optfeature() {
+	local desc=$1
+	shift
+	while (( $# )); do
+		if has_version "$1"; then
+			elog "  [I] $1 to ${desc}"
+		else
+			elog "  [ ] $1 to ${desc}"
+		fi
+		shift
+	done
+}
+
+pkg_postinst() {
+	optfeature "Send to mail" x11-misc/xdg-utils
+	optfeature "Scanning via ADF" media-gfx/sane-frontends
+	optfeature "OCR support" \
+		app-text/gocr \
+		app-text/tesseract \
+		app-text/ocropus \
+		app-text/cuneiform
+	optfeature "Convert/scan to DJVU" app-text/djvu
+	optfeature "Post-process scans with unpaper" app-text/unpaper
+	optfeature "Convert/scan to TIFF" media-libs/tiff
+	optfeature "Display help" dev-perl/Gtk2-Ex-PodViewer
+}