bump to 0.1.4, remove old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

4 files changed, 18 insertions, 60 deletions

diff --git a/app-text/pdfsandwich/ChangeLog b/app-text/pdfsandwich/ChangeLog
index e09ef748337b..07e0d87c6449 100644
--- a/app-text/pdfsandwich/ChangeLog
+++ b/app-text/pdfsandwich/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/pdfsandwich
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdfsandwich/ChangeLog,v 1.10 2015/06/09 12:34:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdfsandwich/ChangeLog,v 1.11 2015/07/31 07:46:01 tomka Exp $
+
+*pdfsandwich-0.1.4 (31 Jul 2015)
+
+  31 Jul 2015; Thomas Kahle <tomka@gentoo.org> +pdfsandwich-0.1.4.ebuild,
+  -pdfsandwich-0.1.2-r1.ebuild, -pdfsandwich-0.1.2.ebuild:
+  bump to 0.1.4, remove old
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/app-text/pdfsandwich/Manifest b/app-text/pdfsandwich/Manifest
index 84bf1486abab..a068549e8f2b 100644
--- a/app-text/pdfsandwich/Manifest
+++ b/app-text/pdfsandwich/Manifest
@@ -1,27 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST pdfsandwich-0.1.2.tar.bz2 14393 SHA256 db34e184e31fd6978e3021b1d4867491e6d1722515b5ab5b12f096fc58c3cbee SHA512 8e10db274180dad20551b2ad235b01a1ef37ffd8b69f27056fff3b12ab809bf2cba75c3c87645a6a846f68cf3923123b22d7678759310943fb99aa63a5253def WHIRLPOOL 9d60eac993ff048804e6547cee3f968406075520a8a4bcf2cb9599fb8a1d64b72e52f4b2d620075dda693e45807fd58c0dd9e9293a4e9aa3289e4b994c274ff2
-EBUILD pdfsandwich-0.1.2-r1.ebuild 1087 SHA256 5d1b1c147ee2e0d0e02d20eb6b8e4b9eed0133d0396a7f4d638cef45184d4061 SHA512 8c7ef7c66177816febb628875896ac1072498181ea2bb9a01b3795b1d72c514b513393a957835bbe1dabbd0ea061f71ddaaf2e6e9c4d415bf9c45207b2938349 WHIRLPOOL 92c040afb31c2a04a2e9582fd9dc14f495a6a674f099e65841c9897ede712e6204aa0de73125432463cf2176de8c7112564b8d2ed01e2d87233fdaf09546634f
-EBUILD pdfsandwich-0.1.2.ebuild 1005 SHA256 260179e27fd3d7fa8dd42e5601c0b0112d063f7f3091ce997643fa63ed41aa72 SHA512 40fa67b836ad52dc5858f9f0b0af9585dc6c10960a41c56b18faebb9a8a5d74bec865b8f1ce0f4936653ff5bc499ca68de3caca0c69da3c151fbb4898cc5d8b8 WHIRLPOOL 6e008516ad3357f586638cc440022d41551b0de69008646ffb57fb190fd00142a5d588d4440fe0e662d9691bf9b824381ed9cf10084afe1ca5b4f6026e09142c
-MISC ChangeLog 1682 SHA256 8787def979aae9e3b33eb221fe5ee559ad99dcb5295d87434698a50ca55de9e6 SHA512 45c9cd30e8c6b159bff712f732dcd2815f0f0ec9c66f7c7c488e8d2a0fcbc87530893b50214674c599639f021723a687a531d3f9a36172baf5e34df3a67e5eef WHIRLPOOL 0ba6122da1039f0aa92e3e4aeb09dca5de4963bff524d8ef18e8a38a7d4dfb8f36218d9bb5e0b50925aae0dbfe9d2a87c390d827ad838bff2d19cd02ca8fa14a
+DIST pdfsandwich-0.1.4.tar.bz2 16401 SHA256 8b82f3ae08000c5cae1ff5a0f6537b0b563befef928e5198255b743a46714af3 SHA512 ee03aea13c72cc5a02136b5d16d2425f685f0b7a9d6fa6cff6c792bd24e6316720dff321b5e8237b949c98c713f39cb8b08b855b76e2a77350927b1ee7943171 WHIRLPOOL d8eb5fd281b1eb3f9e371ee71c486b8e839048f3ab569f8b62644e21ad921692283b2d35dfeb07111f86cf52eeb926da4152fcf58124cca2f96aa05116e8e115
+EBUILD pdfsandwich-0.1.4.ebuild 1132 SHA256 cbb3e11a30ff44fde7be01909e96189fdea8e957e2ee5d1174c3bfcb9be8b4b0 SHA512 439f79db0ac640c7b6e4aedc9d541314647e8beca0dbf239bd4351bbfa0c686460ddc47dd275c99bc5262f9c51659b46aae8fad3a8d13ff17ecfb9fe90944ca5 WHIRLPOOL d5eda913ddc28b219b3b248b9e5ac75ee5f87fe80cf5d40434d8ef95a225306418a9c5a96071a6fb251464fc165991f4136c82eb5f3b5aa1a0379d826bcaa252
+MISC ChangeLog 1879 SHA256 8dc86c03230b063d2eb0d87006c6b0d263fe12e7583b4b810a61abb9d855dc04 SHA512 2badcf204953484ae85ba0ede7dd65008c95d8e1279ccf75260aa0550819213beeb00787709604e38fae4ccba4188f46009670fe3340c16e74aeca881b187ff8 WHIRLPOOL 0e4519e1c97c056c118bc05b683641da069cd8bf32b53e60ef5118a1383fb06b271e3dccc0fef11abd555abe404e74113b2ec0e3db69e7bb93953bfa0f1a3bff
 MISC metadata.xml 972 SHA256 241fb4e188b4822ddbbe68357d60278740683cf899e7d30af896b67905a9fef8 SHA512 38eeba2f15bb6eeb48ef3b9a9e2f81e552e95aaeaa74e83a693ab1f7b8b42fca4ce0b209fcbf8f472834363c8ddd79c976b340f071280d8f85dfde5fd70ca691 WHIRLPOOL 7c3fa157a70d16a35da53e35989993e7b16418118d3281307ac874e9dfd5338d5bf1fb23a0e563db32509c717125ee2a61b95ec6073ab797f390eb62eadeeb6d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdt1HXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizdUQAJAXOI9AZbEdVyhxf+YldNGl
-DAunnt88r0MeBCsaRuiYehxbZ2IqngczgX0LPzqDUbpH4tFFN5A+39XFGU/r/Ri8
-EVXdgpr/tDPdMYe9hHlcZ8fB4kLesPtxgs/PgJbxjCACHZx4X1e+Icq98bgrdvN/
-MtF1Z2v5Xh+sOd+bZcinHKqU0l/6mXVm8beda195mUrrdmHqcQea4Kwmr53XPoPg
-YhIHEdFzEZHHDNyUxBB4E/7KHm9GGyhWRjgFGtyisCndPT1YQIXyZ5uf5rBlvpw0
-Se4AAa+7fkSOyrXG/JqFnOP9nKi71OvFzaZlHL+RlAq4nLlmgwiTI+uQgE2pf90h
-9dWYRavql2gUqc6rsTSoqDZdj2d4VYzybF9gpAsnLO1LC1c8L7Jb550iZs/QbEdd
-xkzhKyNQ75FAf6CB79zs5WueYzJvnFdLdNbXf+ZbsihrKsDe8KtGji6mFH5lmOPI
-iujZrldWIY9iul8EKPQpg9Uo40cfaExR+FTWuueZekaXJy6+jLuTBE9qfraKfKbu
-MpoKiwtP8DHirmFWieKYpOHl6v7GtSQFYjtxemGcEqRYL76g/DUY6J8kYOYtvOtt
-pOGd3dA/ZPpKXi0mmVdOWI7AlRFXrmpUHiOF1XLuNQXnFPRhFwdP0lsj8ZbqPiLE
-cWTXddfpQ9BjS1t+WxaY
-=21Sr
+iF4EAREIAAYFAlW7J70ACgkQid6yGVZcMrxlfwD8DquqJ9lUmBFvLcsYz6FcDkRK
+JsAziuRibaO1RHFPPSsA/RC/VZJEUgSZEbUBQUnUySntDYYkRf62MuRE2DRK2wIk
+=6OQP
 -----END PGP SIGNATURE-----
diff --git a/app-text/pdfsandwich/pdfsandwich-0.1.2.ebuild b/app-text/pdfsandwich/pdfsandwich-0.1.2.ebuild
deleted file mode 100644
index a4fe952993cc..000000000000
--- a/app-text/pdfsandwich/pdfsandwich-0.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdfsandwich/pdfsandwich-0.1.2.ebuild,v 1.1 2014/07/29 13:19:03 tomka Exp $
-
-EAPI=4
-
-DESCRIPTION="generator of sandwich OCR pdf files"
-HOMEPAGE="http://www.tobias-elze.de/pdfsandwich"
-SRC_URI="mirror://sourceforge/pdfsandwich/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-text/tesseract-3.00
-	media-gfx/exact-image
-	app-text/unpaper
-	app-text/ghostscript-gpl"
-DEPEND="sys-apps/gawk
-	>=dev-lang/ocaml-3.10[ocamlopt]"
-
-src_prepare() {
-	sed -i "/^OCAMLOPTFLAGS/s/$/ -ccopt \"\$(CFLAGS) \$(LDFLAGS)\"/" Makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	elog "pdfsandwich relies on the tesseract library for OCR."
-	elog "Consequently language support is determined by tesseract's"
-	elog "language support which in turn is controlled via the LINGUAS"
-	elog "variable in make.conf."
-}
diff --git a/app-text/pdfsandwich/pdfsandwich-0.1.2-r1.ebuild b/app-text/pdfsandwich/pdfsandwich-0.1.4.ebuild
index 4bb1820f9c3a..f465fb413fed 100644
--- a/app-text/pdfsandwich/pdfsandwich-0.1.2-r1.ebuild
+++ b/app-text/pdfsandwich/pdfsandwich-0.1.4.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/pdfsandwich/pdfsandwich-0.1.2-r1.ebuild,v 1.1 2014/08/07 11:19:37 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdfsandwich/pdfsandwich-0.1.4.ebuild,v 1.1 2015/07/31 07:46:01 tomka Exp $
 
 EAPI=5
 
@@ -26,6 +26,7 @@ DEPEND="sys-apps/gawk
 
 src_prepare() {
 	sed -i "/^OCAMLOPTFLAGS/s/$/ -ccopt \"\$(CFLAGS) \$(LDFLAGS)\"/" Makefile || die
+	sed -i "s/install -s/install/" Makefile || die
 }
 
 src_install() {