Version bump to unpaper-6.2, which uses libav/ffmpeg. Also update live ebuild for the new deps. Use autotools-utils for kicks.

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

6 files changed, 73 insertions, 62 deletions

diff --git a/app-text/unpaper/ChangeLog b/app-text/unpaper/ChangeLog
index 5dba00221574..19dd25d6b2ee 100644
--- a/app-text/unpaper/ChangeLog
+++ b/app-text/unpaper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/unpaper
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unpaper/ChangeLog,v 1.12 2013/07/08 09:20:43 flameeyes Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/unpaper/ChangeLog,v 1.13 2014/10/26 23:07:48 flameeyes Exp $
+
+*unpaper-6.1 (26 Oct 2014)
+
+  26 Oct 2014; Diego E. Pettenò <flameeyes@gentoo.org> +unpaper-6.1.ebuild,
+  -unpaper-0.4.2.ebuild, metadata.xml, unpaper-5.1.ebuild, unpaper-9999.ebuild:
+  Version bump to unpaper-6.2, which uses libav/ffmpeg. Also update live ebuild
+  for the new deps. Use autotools-utils for kicks.
 
 *unpaper-5.1 (08 Jul 2013)
 
diff --git a/app-text/unpaper/metadata.xml b/app-text/unpaper/metadata.xml
index 63ac5653603a..ed58eb5dac66 100644
--- a/app-text/unpaper/metadata.xml
+++ b/app-text/unpaper/metadata.xml
@@ -4,4 +4,8 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">Flameeyes/unpaper</remote-id>
+    <bugs-to>https://github.com/Flameeyes/unpaper/issues</bugs-to>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/unpaper/unpaper-0.4.2.ebuild b/app-text/unpaper/unpaper-0.4.2.ebuild
deleted file mode 100644
index 36d18a157be1..000000000000
--- a/app-text/unpaper/unpaper-0.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unpaper/unpaper-0.4.2.ebuild,v 1.1 2012/06/22 21:30:51 flameeyes Exp $
-
-EAPI=4
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/Flameeyes/unpaper.git"
-	inherit git-2 autotools
-else
-	SRC_URI="http://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Post-processor for scanned and photocopied book pages"
-HOMEPAGE="http://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
-}
-
-src_test() {
-	emake check
-}
diff --git a/app-text/unpaper/unpaper-5.1.ebuild b/app-text/unpaper/unpaper-5.1.ebuild
index 7de39cb55539..c16478477500 100644
--- a/app-text/unpaper/unpaper-5.1.ebuild
+++ b/app-text/unpaper/unpaper-5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unpaper/unpaper-5.1.ebuild,v 1.1 2013/07/08 09:20:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/unpaper/unpaper-5.1.ebuild,v 1.2 2014/10/26 23:07:48 flameeyes Exp $
 
 EAPI=5
 
@@ -8,12 +8,12 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
 	inherit git-2 autotools
 else
-	SRC_URI="http://www.flameeyes.eu/files/${P}.tar.xz"
+	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Post-processor for scanned and photocopied book pages"
-HOMEPAGE="http://www.flameeyes.eu/projects/unpaper"
+HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
 
 LICENSE="GPL-2"
 
diff --git a/app-text/unpaper/unpaper-6.1.ebuild b/app-text/unpaper/unpaper-6.1.ebuild
new file mode 100644
index 000000000000..a4f282263dc9
--- /dev/null
+++ b/app-text/unpaper/unpaper-6.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/unpaper/unpaper-6.1.ebuild,v 1.1 2014/10/26 23:07:48 flameeyes Exp $
+
+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 8d5e61d12456..8789805d3e7e 100644
--- a/app-text/unpaper/unpaper-9999.ebuild
+++ b/app-text/unpaper/unpaper-9999.ebuild
@@ -1,38 +1,40 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unpaper/unpaper-9999.ebuild,v 1.5 2013/06/28 16:32:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/unpaper/unpaper-9999.ebuild,v 1.6 2014/10/26 23:07:48 flameeyes Exp $
 
 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="http://www.flameeyes.eu/files/${P}.tar.xz"
+	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Post-processor for scanned and photocopied book pages"
-HOMEPAGE="http://www.flameeyes.eu/projects/unpaper"
+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=""
+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
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html
-}