update cuneiform dep, remove old, thanks Halcy0n

Package-Manager: portage-2.1.10.15/cvs/Linux i686

4 files changed, 16 insertions, 45 deletions

diff --git a/app-text/pdfsandwich/ChangeLog b/app-text/pdfsandwich/ChangeLog
index 9dc0ad458c1e..802acc868fee 100644
--- a/app-text/pdfsandwich/ChangeLog
+++ b/app-text/pdfsandwich/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/pdfsandwich
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdfsandwich/ChangeLog,v 1.3 2010/10/27 18:29:09 tomka Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdfsandwich/ChangeLog,v 1.4 2011/09/13 14:37:43 tomka Exp $
+
+  13 Sep 2011; Thomas Kahle <tomka@gentoo.org> -pdfsandwich-0.0.2.ebuild,
+  pdfsandwich-0.0.3.ebuild:
+  update cuneiform dep, remove old, thanks Halcy0n
 
 *pdfsandwich-0.0.3 (27 Oct 2010)
 
diff --git a/app-text/pdfsandwich/Manifest b/app-text/pdfsandwich/Manifest
index 5fded6b6c0b0..b3656035efc9 100644
--- a/app-text/pdfsandwich/Manifest
+++ b/app-text/pdfsandwich/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST pdfsandwich-0.0.2.tar.bz2 10239 RMD160 a4d7c00cfec9db16f52bccd9ecf4b7691bb29aea SHA1 6e9fea89fa9c81f15e177d23ddb4a3e88e59ca0b SHA256 b0bbbd3aa648d0e89cb5f4647f875de6959aacea27fe6a06ba33141f9b87301f
 DIST pdfsandwich-0.0.3.tar.bz2 12088 RMD160 c7edd1314ab809b46ba755e05a770f0185362ea4 SHA1 877831a5f95c69705dd3df82d52d530c034bd3d6 SHA256 358ca5834f029a3c7ea41f755f2998681085885d1f7f72d05e67b793e373175c
-EBUILD pdfsandwich-0.0.2.ebuild 929 RMD160 16fed22bf036d2f80b66f7741508f552394c9aca SHA1 a44f9e3999b383de4f57bbb9a4c39bf8f690f8c0 SHA256 43ea0b295e8ac5bb176bd3796d5cea11949a0ce674764a2e3dbc782018c5011d
-EBUILD pdfsandwich-0.0.3.ebuild 929 RMD160 61bf3ca02100a8b284bafe477915a8023e0f99fa SHA1 342d5abda1e10a59aa4e3bf44ef6526914d89072 SHA256 de6709c5410d131c74272b3d3d568d7cdd3f1e41defd688f2bc5133e09be2f78
-MISC ChangeLog 638 RMD160 68ac174553963ba1a14ca65f73b78724e06edb4e SHA1 3cd208ae935a2b64ff52e05839b52f901024e7dd SHA256 091f981c6f3e65d7fdc91a03b456f78001622126db0eb37948efd4dff2d22c4c
+EBUILD pdfsandwich-0.0.3.ebuild 922 RMD160 c7f19e16fadd82cbbcce260aa64c74ab0cb5372c SHA1 f92ed438df8a164c05bd831ba87b157661461f20 SHA256 98db90a27113aee58cff636ef3333c8e5c12649042b6c447f773dd6a581d18aa
+MISC ChangeLog 792 RMD160 1d1acee9851b6fb6448aebd6c765b70ab77797b1 SHA1 c11c924bcc361f5790ea4d5c6a81afb5023cfe1b SHA256 d1f6096486f2f932b32d94083e44f6b2c6042baa1ff267f439ecd86b02f4ffa1
 MISC metadata.xml 909 RMD160 8e220a5199ebfcd32f65982b0bee8fe7af4cb2d4 SHA1 59c9751743385bdaba9f551dcb1e448843d28929 SHA256 32530d001bfced183f85fa426d8c67f2fd702e069cbe2fe2bcbcd2980ec4f9cc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzIbmoACgkQnZsgo/h8kNYHJwCfVe1qZ4OpabhhLkRvfB/Namy5
-6w8Anjf1BZ1S9jXyHuhdG1dkFz6vdBjM
-=VqPK
+iF4EAREIAAYFAk5vatQACgkQodBTJSDyo66yWAD+MWlI1XPsIUyzxpZiH77hCUDM
+2WBx7+iIPqObSsG9FZcA/RE9Rc275KT2vPmY1weWKaG/M78fSZudD+jYhz2t+wLi
+=avuT
 -----END PGP SIGNATURE-----
diff --git a/app-text/pdfsandwich/pdfsandwich-0.0.2.ebuild b/app-text/pdfsandwich/pdfsandwich-0.0.2.ebuild
deleted file mode 100644
index 50be07a8bae9..000000000000
--- a/app-text/pdfsandwich/pdfsandwich-0.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdfsandwich/pdfsandwich-0.0.2.ebuild,v 1.2 2010/10/22 18:30:00 tomka Exp $
-
-EAPI="2"
-
-DESCRIPTION="generator of sandwich OCR pdf files"
-HOMEPAGE="http://pdfsandwich.origo.ethz.ch/wiki/pdfsandwich"
-SRC_URI="http://download.origo.ethz.ch/pdfsandwich/1809/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-# >=cuneiform-0.9 will break placement of background text with
-# exact-image  This is discussed on upstream's mailing list.
-
-RDEPEND="<app-text/cuneiform-0.9.0[imagemagick]
-	media-gfx/exact-image
-	app-text/ghostscript-gpl"
-DEPEND="sys-apps/gawk
-	>=dev-lang/ocaml-3.08[ocamlopt]"
-
-src_prepare() {
-	sed -i "/^OCAMLOPTFLAGS/s/$/ -ccopt \"\$(CFLAGS) \$(LDFLAGS)\"/" Makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/app-text/pdfsandwich/pdfsandwich-0.0.3.ebuild b/app-text/pdfsandwich/pdfsandwich-0.0.3.ebuild
index 80cf9e0b10f7..8448ce84f81b 100644
--- a/app-text/pdfsandwich/pdfsandwich-0.0.3.ebuild
+++ b/app-text/pdfsandwich/pdfsandwich-0.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdfsandwich/pdfsandwich-0.0.3.ebuild,v 1.1 2010/10/27 18:29:09 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdfsandwich/pdfsandwich-0.0.3.ebuild,v 1.2 2011/09/13 14:37:43 tomka Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ IUSE=""
 # >=cuneiform-0.9 will break placement of background text with
 # exact-image  This is discussed on upstream's mailing list.
 
-RDEPEND="<app-text/cuneiform-0.9.0[imagemagick]
+RDEPEND="app-text/cuneiform[imagemagick]
 	media-gfx/exact-image
 	app-text/ghostscript-gpl"
 DEPEND="sys-apps/gawk