Fixing DEPEND issues. Fixes bug 210435.

(Portage version: 2.1.5_rc2)

3 files changed, 56 insertions, 5 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/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*
+}