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

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

7 files changed, 87 insertions, 76 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/Manifest b/app-text/unpaper/Manifest
index 1e4842060566..881017bf6f5d 100644
--- a/app-text/unpaper/Manifest
+++ b/app-text/unpaper/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST unpaper-0.4.2.tar.xz 2855372 SHA256 93743a7c9c85463dceed2520b3f5a6cc3f94a289a670cde753bba0ec8035d453 SHA512 a64c5c5ba437e9718120fee66b9a63cb59558a9c09047ce6ab88b38d6a34ff62e37ffa6670c5c2fd491351092f775cd01668c8b8cd353fac80db6b2dfacdc79c WHIRLPOOL fcc5adb53fc0cd1f2032d6d5373c2723ea1c87adfd655c1d3cc0a1cdd96ea26182d6f026792c72f5cf02ba397ebcd31d09419750fe0fc02f860f0882592b1d13
 DIST unpaper-5.1.tar.xz 2861432 SHA256 5380417efb5a766d132b496000ad9772a5338b87e37abfa3f10255e9f59ee7c1 SHA512 5ccd90c4c92774085df6cee5552d72d538d3ee553f95ca3d2bea850975ac6e728be97aa7dca194ba44ef8156c26c19d61d051c4581100f8c553998d9a86cefdf WHIRLPOOL 75006b03908c6086236744cdff51d1dc66b80a94e9f7e3630444af149ce235c7b0c54af2954e7f093ecc23f6e86d1478333d991db8ae223e212ebc0a92c6dfee
-EBUILD unpaper-0.4.2.ebuild 893 SHA256 3de50e630d77b1e48ae839f4eeb294287534b84dca9ff597994a4ed8318610c0 SHA512 eb8ab35b69362ecc8e3e78f5589fb0919db7c6a84070d097a51b649ed52810c80fc7d93dd826920bfe04d9062147abd8fad81939ea3cd02b0d088acffb497384 WHIRLPOOL 385f52c71c1cb8a9bea19c889e7071d4e62abfb1d902b751ad992df609330ff5780427d45dc298378967c32b4a379840fff2adbc3c72de9cb1a610f4a4aa8bb2
-EBUILD unpaper-5.1.ebuild 864 SHA256 acffb6864a36613934005a9196854eca1f99e9d919fbb757eed3de60c2cd111d SHA512 f0d5a63b4427da46d74f55b2797d5b9b9278c4d9abe1a18f56bdc4dd5051d7ee0b42e9b0acf2f513299e92df80d797dc85ff68dd9b58a56c38810308baff285e WHIRLPOOL 1c349676e5c4450f32c227241e9d382504fd42f4a6776cc2acc31f0f760ca9918a615134e9410411dc0327fb9bf207facf55190a19b553ae6ed323e093825702
-EBUILD unpaper-9999.ebuild 865 SHA256 51885f198ec6ad53a70a92b5d8c50c9cd36a90efe07aebbb7a6588b6e7a65f06 SHA512 7dfbd0bc12ab56360c41347ac8aa612130b5fe52453293d57c52c7c485ab9017348c786bd40a05eb4409e7457ec9820c82ba4d2e004fc3c85c0688f5f2637023 WHIRLPOOL 6eaec01c9755a2873c66317e80262b1a0b509c66b40461271c81ef589f46e57431294256562d244043f83fcc4cc597605fd829817224bd93d27cf857781d383e
-MISC ChangeLog 2199 SHA256 c5b1343beddd667c5d037e1bde350a1fb032bfd2e76e89336579581dc96ceea7 SHA512 e09822cf107aa41edbc8a5fbd152cf71fdbe755e5a439419c39e78479819e91ff67dacf8bd3d5672a38d0524bd54956698831f56f79651f6c5c83d4a50095f1a WHIRLPOOL fc92a5af76ffc12a55932ba22510011eb2edebd4bd1e3d6c501b7258d435497a9a77e918a43f7ca8e1fe425fb8e078f18970e103e5c5825d5024394b6333e83e
-MISC metadata.xml 210 SHA256 033e97715bc19256fb7c105f739eeb5d7e58c4556fdb08face36c7270ce0c82a SHA512 e75fe043a3cde9b1ada5b898aea2b39f952dd8075f8cc158c2177a5d088e98731401482bfca552bd25a9e5b0ed995c9a8afcea783b62ca6b61ed22b3d287ab2b WHIRLPOOL 1d9f183be62d7aa946de6c01ab2bd0ea3e61fce56430f0fa72ee57f38c61c60e9d14531c19252005bfb773cf773fc1380984ae52e2d6233f883c8205fbd47976
+DIST unpaper-6.1.tar.xz 2655724 SHA256 237c84f5da544b3f7709827f9f12c37c346cdf029b1128fb4633f9bafa5cb930 SHA512 afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c WHIRLPOOL e88a296f1b0718a593d70b769e4ed122b4ca92fb802d3a8e74da49dbf756cac2782cbe754ed7a6c0cf73adf73b7aa970ef6154ee2c8ce5f42da127ccee2d8936
+EBUILD unpaper-5.1.ebuild 866 SHA256 6672d0c97fd9f283b4f8e5da5f85274d6273c2dae1701c0937f223b499ad421c SHA512 07a094fdfe7d30a833ed250480a3c7721d67ddd36d7f183171c3b5155628da7e51f629ca1a8ed012e2fe6b44d3b329b7274908ae1d8f12f7ec405b5d2d9ad194 WHIRLPOOL 08b10330f54783201e8adba5a29747c5e1011634792cf14538f648da15c1e150348102c5ba6a54f186ac32e903bf06282c09f5f72c01df2230b4c8c2ba3d09a9
+EBUILD unpaper-6.1.ebuild 1025 SHA256 c9283f1474c37c7eb0999d60ee7793f3d7cb4701fd877a8e51b5816fc30ca9f5 SHA512 26f59a78feb6f63755a66e2734ea83d46e5ca5d7852599e07d9704a4315c4258dcd0d748fa287594b2240a597c47ddb53b180bb7189b5273cc4d34c900e3c306 WHIRLPOOL 3b16b723e9d6bf770a747b6392960546d3cd18af01ca8875672f5a5bbd69d8630a2a12f66fe4b663c4feb1ac160ae4361037040a7de4b0662f5fdf07423e3332
+EBUILD unpaper-9999.ebuild 1026 SHA256 fbe9a7b39661d3a088619a6a475dd5e7d8c6b6fa28a94c8191ed488aeccc011b SHA512 ea9e5bf8a3c4bce8f6b2e3a579822bb50887860b31dbb0b96ed9660d7750838abfc568dd691ba46f54d971e120cbef02c7d1a32fe3a5b46d8c30b5510dd263f0 WHIRLPOOL ed4ba90bee2666d2a96bd749f8887eea9ce8743c1e553566865e8287259b91be4e6105b151b0705c2ee052628f18c3051dd456303f9737042b7e8844d52d6929
+MISC ChangeLog 2516 SHA256 54e18ade6ae9610d814ce248fac5e5ffa244c7f24651ffc253a6bd39dc741489 SHA512 b80f0d28e617ae1cdbdd9355556a0a460be825b3fb80e35c78c4544b2d4d421a97e6b608b40835d28e0c1d3f1c50944756656218d86edafb8e727981406ab438 WHIRLPOOL e17936b784a919543a233760b2ad1f528d6d03ec7dc680729548f3ff1a7ea718f28df96746355e90819ce6b6c09c049119e326eee6c675778d6e2ebf636e5550
+MISC metadata.xml 363 SHA256 274960f6ae8fffefe6d9b596e8514d9ca024f75140d9620b8a7da32978bffde5 SHA512 ced597c8204620d861a84fd322cbf5c29069342ab5c2df21fcf6f83c9aba2cefb0e4a26986d805fac061cdb7aa88fe77c2b3c4ae2b5ba4f236a0281f571adfef WHIRLPOOL 5d85ca066ff38dfd4769e30d69db19c890e51df8fa20247a4d9cb89a293f3cb773c2f7afc424578cf4c36814a89c0d2dfb4d94f6fee200c265ed33fe01540d27
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJR2oSGAAoJEBzRPIrUMBNCqRkIAJ2DZ7LIVPWN3sywiC2AVIYP
-4WKbb9GSarc95HyAp9kGmy7SkfhBU2KSkxKQiXsINy4uxk5aV4uVPznXbqmYnV5U
-Y9KEqDPZ7ZxUjaIkG4mQYrPBbH+lEGPoGFOyvv4zCshVIl/XqtfZ0I8e8eL++e1R
-daOuhIiZ+rdAutgYeYyV0jENYgUENZHK5Nr20FhHdWI8p5qLX7mW04Dww03aSyxb
-m7zmSXigHekgeVr6s+DWvgIBMyYVMTq4cYLBuAZC6SCiCV4dPoTKrofggLA5FXyA
-Mwz8Pochy6XTmlNA/Mo4wQFSl0oIpmoAGLFJcgpMoOmxJwWq0HazO4yjPl8SU6s=
-=idCI
+iQEcBAEBCAAGBQJUTX7OAAoJEBzRPIrUMBNCwQkH/jgEQ5veJ0kbn1Rk/CC7D12p
+4clDb9O7Exef90/LTnC8Im356ttWXEuB8+hqfGBg+xfk/tkAXK1ltxyE8nw2D+aL
+GDceDYMUivCeininFAqKIc1SS8w7g8RFVcSSjosHE4+yCHIyHN3viaEL0uhO0Jg2
+/3EjreKWokc9j5DkP4rI5UtkgGl3rRnP2omWfkyMe0KFxQUe9iU6xGx9eiMIpC7T
+tMV2W4De+UXy3H3qYi4DIVsdoNwQHmS548nQNmzz4uDpZGo3pmi6l/XjtgAcAaYE
+vG7h//Hj7RHXRb8pGi70rqnygrU/g+tRj9pAE6zFRgaO1pfKAPR9QJX+XrpKjgg=
+=QQCp
 -----END PGP SIGNATURE-----
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
-}