Fixing DEPEND issues. Fixes bug 210435.

Package-Manager: portage-2.1.5_rc2

4 files changed, 59 insertions, 7 deletions

diff --git a/media-video/subtitleripper/ChangeLog b/media-video/subtitleripper/ChangeLog
index f97e5ea0a37c..1ba663174a23 100644
--- a/media-video/subtitleripper/ChangeLog
+++ b/media-video/subtitleripper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/subtitleripper
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/ChangeLog,v 1.12 2006/11/29 09:36:45 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/ChangeLog,v 1.13 2008/04/11 15:48:50 yngwin Exp $
+
+*subtitleripper-0.3.4-r3 (11 Apr 2008)
+
+  11 Apr 2008; Ben de Groot <yngwin@gentoo.org>
+  subtitleripper-0.3.4-r2.ebuild, +subtitleripper-0.3.4-r3.ebuild:
+  Fixing DEPEND. >=netpbm-0.41.0 changed header locations. Fixes bug 210435.
 
 *subtitleripper-0.3.4-r2 (29 Nov 2006)
 
diff --git a/media-video/subtitleripper/Manifest b/media-video/subtitleripper/Manifest
index 7d0554e0adf5..c346871e3fd4 100644
--- a/media-video/subtitleripper/Manifest
+++ b/media-video/subtitleripper/Manifest
@@ -1,6 +1,7 @@
 DIST subtitleripper-0.3-4.tgz 47299 RMD160 141355960773ab2dfe3782522858273d197cf797 SHA1 d93ff3578dd5f722c8f4ef16bc0903eec5781a0d SHA256 8af6c2ebe55361900871c731ea1098b1a03efa723cd29ee1d471435bd21f3ac4
 EBUILD subtitleripper-0.3.4-r1.ebuild 1285 RMD160 09540b8be67f161ea0c4f0b5f8e85d8c84c8d745 SHA1 f7e7e92d35e83b9d68cd873ab233e175701403e6 SHA256 19ccdde392801a907df312fb5686b6f27d5fb2b409ca95a7b19ef66c3080e957
-EBUILD subtitleripper-0.3.4-r2.ebuild 1497 RMD160 2f4cdc224370b8aaf2cae3b309087b9abd856ab3 SHA1 612026e9831053c9d7974ae71ee9bc2010fc851b SHA256 cb7021ab0b543d949476566f4f1207f3459731d1a499254f928c0d42e65d1b39
+EBUILD subtitleripper-0.3.4-r2.ebuild 1508 RMD160 55fa1829b2fc20b43bf349dbfb7056f37d35c514 SHA1 9af0cc72c31609d0e81fb0c7b254be4c24ac38b6 SHA256 14ee0a32f563f22a91ee3164dba187fc4069b7e45027493353bf6dde22d89f8c
+EBUILD subtitleripper-0.3.4-r3.ebuild 1209 RMD160 4ddf3e0a196585c420ff31d733d3b723b3b60066 SHA1 e03629bd933cd5c90d915a32dbfb31e9efb4bc35 SHA256 237fbf1e10f3cd172e10e2e31d8e870cb99a79b908e4001ea3ef0a0231ce2191
 EBUILD subtitleripper-0.3.4.ebuild 763 RMD160 ebba558a9d10904f74a3d971bccbe2db3b072b5e SHA1 e555573b59d45ab9a15e381e7c89e9b4c287e6dc SHA256 753ba1a270ef21f641092b64202ce9c2ddbf0df128895cb80145b0bae34512d4
-MISC ChangeLog 1958 RMD160 31a96d6c0abeb8063eb41a4b80b87e79a35e3fb5 SHA1 0c94734c2fab027f83a2e1c1faa2ca31a9a3921f SHA256 5642c6523b41f6d9962a4e42fc7d5d659e5fe2e2c96f00df0ea1fc799e574414
+MISC ChangeLog 2193 RMD160 6a00b59477b0fb93c45c82d5c06f4987874757af SHA1 aac97ddcdb3e7a5b231d79948ddcd44886cf0c1f SHA256 8da1e587929b4e102d92d3ca708dd50968b763f3151bfb6d5c8dcf32331b28e0
 MISC metadata.xml 228 RMD160 f46510d126d427224df28e4140e05412ad589db5 SHA1 c8d8cbd730e5661e6570d70a2b5f57e945241834 SHA256 6f5a94dbd7a65c9076fc1378c6ae86969579e11d1b8cd1ed5de3cb8fbd9fc83c
diff --git a/media-video/subtitleripper/subtitleripper-0.3.4-r2.ebuild b/media-video/subtitleripper/subtitleripper-0.3.4-r2.ebuild
index 0ba228f540f4..08ddcc305d76 100644
--- a/media-video/subtitleripper/subtitleripper-0.3.4-r2.ebuild
+++ b/media-video/subtitleripper/subtitleripper-0.3.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/subtitleripper-0.3.4-r2.ebuild,v 1.1 2006/11/29 09:36:45 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/subtitleripper-0.3.4-r2.ebuild,v 1.2 2008/04/11 15:48:50 yngwin Exp $
 
 inherit versionator
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tgz"
 SLOT="0"
 IUSE="zlib png"
 
-DEPEND="media-libs/netpbm
+DEPEND="<media-libs/netpbm-10.41.0
 		media-libs/libpng
 		sys-libs/zlib
 		png? ( >=media-libs/libpng-1.2.8 )
diff --git a/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild b/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild
new file mode 100644
index 000000000000..c513c4fb15bf
--- /dev/null
+++ b/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild,v 1.1 2008/04/11 15:48:50 yngwin Exp $
+
+inherit versionator
+
+MY_PV="$(replace_version_separator 2 "-")"
+
+DESCRIPTION="DVD Subtitle Ripper for Linux"
+HOMEPAGE="http://subtitleripper.sourceforge.net/"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tgz"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=media-libs/netpbm-10.41.0
+		media-libs/libpng
+		sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	>=app-text/gocr-0.39"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	# PPM library is libnetppm
+	sed -i -e "s:ppm:netpbm:g" Makefile
+	# fix for bug 210435
+	sed -i -e "s:#include <ppm.h>:#include <netpbm/ppm.h>:g" spudec.c subtitle2pgm.c
+	# we will install the gocrfilters into /usr/share/subtitleripper
+	sed -i -e 's:~/sourceforge/subtitleripper/src/:/usr/share/subtitleripper:' pgm2txt
+
+	emake || die
+}
+
+src_install () {
+	exeinto /usr/bin
+	doexe pgm2txt srttool subtitle2pgm subtitle2vobsub vobsub2pgm
+
+	insinto /usr/share/subtitleripper
+	doins gocrfilter_*.sed
+
+	dodoc ChangeLog README*
+}