Introduce USE=libav to control the preferred implementation. Add subslot op to force rebuilds on ABI change.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 75 insertions, 15 deletions

diff --git a/app-text/unpaper/ChangeLog b/app-text/unpaper/ChangeLog
index 19dd25d6b2ee..df6f39e01195 100644
--- a/app-text/unpaper/ChangeLog
+++ b/app-text/unpaper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/unpaper
-# 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 $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/unpaper/ChangeLog,v 1.14 2015/02/01 22:44:15 mgorny Exp $
+
+*unpaper-6.1-r1 (01 Feb 2015)
+
+  01 Feb 2015; Michał Górny <mgorny@gentoo.org> +unpaper-6.1-r1.ebuild,
+  unpaper-9999.ebuild:
+  Introduce USE=libav to control the preferred implementation. Add subslot op to
+  force rebuilds on ABI change.
 
 *unpaper-6.1 (26 Oct 2014)
 
diff --git a/app-text/unpaper/Manifest b/app-text/unpaper/Manifest
index 881017bf6f5d..aff9d00e24fb 100644
--- a/app-text/unpaper/Manifest
+++ b/app-text/unpaper/Manifest
@@ -4,18 +4,27 @@ Hash: SHA256
 DIST unpaper-5.1.tar.xz 2861432 SHA256 5380417efb5a766d132b496000ad9772a5338b87e37abfa3f10255e9f59ee7c1 SHA512 5ccd90c4c92774085df6cee5552d72d538d3ee553f95ca3d2bea850975ac6e728be97aa7dca194ba44ef8156c26c19d61d051c4581100f8c553998d9a86cefdf WHIRLPOOL 75006b03908c6086236744cdff51d1dc66b80a94e9f7e3630444af149ce235c7b0c54af2954e7f093ecc23f6e86d1478333d991db8ae223e212ebc0a92c6dfee
 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-r1.ebuild 1056 SHA256 acc53f67fbb7ac5184872fb550cc6c092a203fcaf9aaabc8569e36953673e915 SHA512 9c4a19f0deb796ec150368332176c9b0144a5c339113bc55e8f7432a419016757f680e92cd80eccc26ac22528d759f0061c283b7b56eff66b54e33d5f1b7e46e WHIRLPOOL af76aa5942ef7f44923de2fb6f048b8d1d245005faee1ea6128ad7c251519ab87d119f215d5f2549aa5463211511e608480ddf3ab97229c3d021fdca4ce1fe39
 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
+EBUILD unpaper-9999.ebuild 1054 SHA256 71850ac067164d70f3ef7b5dedc0aeeceb59e31f96767ee52af483c6b8854d0c SHA512 9d00482948389d2a9b4da648fe782ec2bfaf291b6655cb0c58c9a54539932450479ea2998aac9fe12f8250ff219e33d8f39b5a7444b10a99c785db1db2201db2 WHIRLPOOL 57978da4b4a11fe1feaf6a3f444040d18dbfb56b85e1563ef543ae0968f2e84c98e5ac105a89916bb8c1ca4395a83671cbe564514de6ea2c2cfd790522b6b9d6
+MISC ChangeLog 2755 SHA256 3f532dc2cddaf85aad75e2f42d20f715dd726a88e89f9034cb38ff8d1fec3127 SHA512 3f12434446d9cc416af72fd1aa86e96a0cefb6266dc0011853d8bec9efd0b3115181b52a5536885ce3fceb795c137d502f5540d709845bdb10c5ba396b9a2cc5 WHIRLPOOL 48c93a0017922212027d06b25070de29a7b5dada6a4530bd9d2ef3c708e44ae507eda1ff58ffd78278c522e824e3c92e5c7930f1b026e765fc57822caac75cdb
 MISC metadata.xml 363 SHA256 274960f6ae8fffefe6d9b596e8514d9ca024f75140d9620b8a7da32978bffde5 SHA512 ced597c8204620d861a84fd322cbf5c29069342ab5c2df21fcf6f83c9aba2cefb0e4a26986d805fac061cdb7aa88fe77c2b3c4ae2b5ba4f236a0281f571adfef WHIRLPOOL 5d85ca066ff38dfd4769e30d69db19c890e51df8fa20247a4d9cb89a293f3cb773c2f7afc424578cf4c36814a89c0d2dfb4d94f6fee200c265ed33fe01540d27
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUTX7OAAoJEBzRPIrUMBNCwQkH/jgEQ5veJ0kbn1Rk/CC7D12p
-4clDb9O7Exef90/LTnC8Im356ttWXEuB8+hqfGBg+xfk/tkAXK1ltxyE8nw2D+aL
-GDceDYMUivCeininFAqKIc1SS8w7g8RFVcSSjosHE4+yCHIyHN3viaEL0uhO0Jg2
-/3EjreKWokc9j5DkP4rI5UtkgGl3rRnP2omWfkyMe0KFxQUe9iU6xGx9eiMIpC7T
-tMV2W4De+UXy3H3qYi4DIVsdoNwQHmS548nQNmzz4uDpZGo3pmi6l/XjtgAcAaYE
-vG7h//Hj7RHXRb8pGi70rqnygrU/g+tRj9pAE6zFRgaO1pfKAPR9QJX+XrpKjgg=
-=QQCp
+iQJ8BAEBCABmBQJUzqxAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOf7gQALtf8nnw0zaA7+1Su8uXKYqq
+4DHkz/1BuaabI3sj6Pk8LQBm6tVCjIvCFkSnPjW7vnQ5iEX+4FZLD/GZVkKm2OSn
+4VX1FxrDXvbCTgjcOZWOeZDXInqT7qCuRHgxKdZd39U1BS8CCn6nJmsc8M5SK92x
+5YQwzgFwkg2q0sFzKDezVVnTgg25plFd7PckIRZ4TuFxlqapzpErO4YSBs/PUtG2
+khuxe+gHgNXJqCdD/YGSwmFO52XaGwlZcQ/9xi+51ovoVEV4aJJzy8L699V6XxoJ
+DgRkjOL/snTTzUGDInxlw70DhMZPe8PQi9IEl8BYnpdVV/dZ0WDAeviB4RLIqNii
+uP/Lc+ncMsqN3bXCSLonWXwtTY9Qeap6jTrAJOp6blzhOmE/oRyH0im0VRhAchvw
+ZlOp4qfrfYY84ae/pY0qN/R8+0SWJKB3cAaTFRVpfGTK+uMo55bj6R+6fAFvv/Tc
+pXuCZ757HuymydsNQYjUl1QxpJ69//+Q1aWxZTMLysaGWt1dIZ1PkfI7aQ/d3Osm
+xle10qjXlpEFpQDSkTcILk9y8hRHmsbJKI0GqVL2nDiXHYu9FImJzntLxa4ecVIN
+r4Jq/Crq76E5pi97Zv/PQc8DpbAQ4g6th1hV9iegNiz/KtdNLcGUwTLx7WKzfWau
+CIJDeJWfRdZ2LtsltAiS
+=C8sV
 -----END PGP SIGNATURE-----
diff --git a/app-text/unpaper/unpaper-6.1-r1.ebuild b/app-text/unpaper/unpaper-6.1-r1.ebuild
new file mode 100644
index 000000000000..40683305876a
--- /dev/null
+++ b/app-text/unpaper/unpaper-6.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/unpaper/unpaper-6.1-r1.ebuild,v 1.1 2015/02/01 22:44:15 mgorny 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="libav test"
+
+RDEPEND="
+	libav? ( >=media-video/libav-10:0=[encode] )
+	!libav? ( >=media-video/ffmpeg-2:0=[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 8789805d3e7e..d75b4b245292 100644
--- a/app-text/unpaper/unpaper-9999.ebuild
+++ b/app-text/unpaper/unpaper-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.6 2014/10/26 23:07:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/unpaper/unpaper-9999.ebuild,v 1.7 2015/02/01 22:44:15 mgorny Exp $
 
 EAPI=5
 
@@ -20,9 +20,11 @@ HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="test"
+IUSE="libav test"
 
-RDEPEND="|| ( >=media-video/libav-10[encode] >=media-video/ffmpeg-2[encode] )"
+RDEPEND="
+	libav? ( >=media-video/libav-10:0=[encode] )
+	!libav? ( >=media-video/ffmpeg-2:0=[encode] )"
 DEPEND="dev-libs/libxslt
 	app-text/docbook-xsl-ns-stylesheets
 	virtual/pkgconfig