bump

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 103 insertions, 76 deletions

diff --git a/media-video/ogmrip/ChangeLog b/media-video/ogmrip/ChangeLog
index 81a6a98b5b5b..27754de9fc7c 100644
--- a/media-video/ogmrip/ChangeLog
+++ b/media-video/ogmrip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ogmrip
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.35 2009/03/22 13:19:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.36 2009/07/21 20:36:08 ssuominen Exp $
+
+*ogmrip-0.13.0 (21 Jul 2009)
+
+  21 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> +ogmrip-0.13.0.ebuild,
+  +files/ogmrip-0.13.0-libdvdread.patch:
+  Version bump wrt #278019, thanks to Olivier Rolland.
 
   22 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
   +files/ogmrip-werror.patch, ogmrip-0.12.3.ebuild:
diff --git a/media-video/ogmrip/files/ogmrip-0.13.0-libdvdread.patch b/media-video/ogmrip/files/ogmrip-0.13.0-libdvdread.patch
new file mode 100644
index 000000000000..f42f3e5d9d82
--- /dev/null
+++ b/media-video/ogmrip/files/ogmrip-0.13.0-libdvdread.patch
@@ -0,0 +1,22 @@
+--- configure.in	2009-07-14 19:48:33.000000000 +0200
++++ configure.in	2009-07-18 12:40:39.000000000 +0200
+@@ -201,7 +201,9 @@
+ 
+ AC_LANG(C)
+ 
+-AC_COMPILE_IFELSE([
++LIBS="-ldvdread"
++
++AC_LINK_IFELSE([
+ #include <stdio.h>
+ #include <inttypes.h>
+ #include <dvdread/dvd_reader.h>
+@@ -212,7 +214,7 @@
+   AC_DEFINE(HAVE_DVD_FILE_STAT, 1, [Define to 1 if DVDFileStat is available.])
+ fi
+ 
+-AC_COMPILE_IFELSE([
++AC_LINK_IFELSE([
+ #include <stdio.h>
+ #include <inttypes.h>
+ #include <dvdread/dvd_reader.h>
diff --git a/media-video/ogmrip/ogmrip-0.12.2.ebuild b/media-video/ogmrip/ogmrip-0.12.2.ebuild
deleted file mode 100644
index d4635f1f3452..000000000000
--- a/media-video/ogmrip/ogmrip-0.12.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.12.2.ebuild,v 1.2 2008/12/03 14:10:05 beandog Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
-HOMEPAGE="http://ogmrip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aac debug doc dts gtk hal libnotify matroska mp3 mp4 ogm png spell srt theora vorbis x264 xvid"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=app-i18n/enca-1.0
-	>=media-libs/libdvdread-0.9.7
-	>=media-video/mplayer-1.0_pre4[dvd,encode,xvid?,dts?,x264?]
-	virtual/eject
-	aac? ( >=media-libs/faac-1.24 )
-	gtk? ( >=x11-libs/gtk+-2.6
-		>=gnome-base/gconf-2.6
-		>=gnome-base/libglade-2.5
-		libnotify? ( >=x11-libs/gtk+-2.10
-			>=x11-libs/libnotify-0.4.3 )
-		media-video/mplayer[jpeg] )
-	hal? ( >=sys-apps/hal-0.4.2 )
-	matroska? ( >=media-video/mkvtoolnix-0.9 )
-	mp3? ( >=media-sound/lame-3.96 )
-	mp4? ( >=media-video/gpac-0.4.2 )
-	ogm? ( >=media-sound/ogmtools-1.4 )
-	png? ( media-libs/libpng )
-	spell? ( >=app-text/enchant-1.1 )
-	srt? ( || ( ( >=app-text/tesseract-2.00 media-libs/tiff )
-		>=app-text/gocr-0.39
-		>=app-text/ocrad-0.15 ) )
-	theora? ( >=media-libs/libtheora-1.0_alpha6 )
-	vorbis? ( >=media-sound/vorbis-tools-1.0 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1.4-r1
-		 >=dev-libs/libxslt-1.1.20-r1 )"
-
-DOCS="AUTHORS ChangeLog README NEWS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable aac aac-support)
-		$(use_enable debug maintainer-mode)
-		$(use_enable gtk gtk-support)
-		$(use_enable hal hal-support)
-		$(use_enable libnotify libnotify-support)
-		$(use_enable matroska mkv-support)
-		$(use_enable mp3 mp3-support)
-		$(use_enable ogm ogm-support)
-		$(use_enable spell enchant-support)
-		$(use_enable srt srt-support)
-		$(use_enable theora theora-support)
-		$(use_enable vorbis vorbis-support)
-		$(use_enable x264 x264-support)
-		$(use_enable xvid xvid-support)"
-}
-
-src_configure() {
-	gnome2_src_configure
-}
-
-src_compile(){
-	emake || die "emake failed"
-}
diff --git a/media-video/ogmrip/ogmrip-0.13.0.ebuild b/media-video/ogmrip/ogmrip-0.13.0.ebuild
new file mode 100644
index 000000000000..f51529b770f4
--- /dev/null
+++ b/media-video/ogmrip/ogmrip-0.13.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.0.ebuild,v 1.1 2009/07/21 20:36:08 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils gnome2
+
+DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
+HOMEPAGE="http://ogmrip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz
+	mirror://gentoo/gnome-mplayer-0.9.6-gconf-2.m4.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="aac debug doc dts gtk hal libnotify matroska mp3 mp4 nls ogm spell srt theora vorbis x264 xvid"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=dev-libs/glib-2.14
+	>=app-i18n/enca-1
+	>=media-libs/libdvdread-0.9.6
+	>=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?]
+	virtual/eject
+	aac? ( >=media-libs/faac-1.26 )
+	gtk? ( >=x11-libs/gtk+-2.12
+		>=gnome-base/gconf-2.24
+		>=gnome-base/libglade-2.6.3
+		libnotify? ( >=x11-libs/libnotify-0.4.4 )
+		media-video/mplayer[jpeg] )
+	hal? ( >=sys-apps/hal-0.5.9 )
+	matroska? ( >=media-video/mkvtoolnix-2.4 )
+	mp3? ( >=media-sound/lame-3.98 )
+	mp4? ( >=media-video/gpac-0.4.4 )
+	ogm? ( >=media-sound/ogmtools-1.3 )
+	spell? ( >=app-text/enchant-1.2 )
+	srt? ( media-libs/libpng
+		|| ( ( >=app-text/tesseract-2 media-libs/tiff )
+		>=app-text/gocr-0.45 >=app-text/ocrad-0.15 ) )
+	theora? ( >=media-libs/libtheora-1 )
+	vorbis? ( >=media-sound/vorbis-tools-1.2 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext
+		>=dev-util/intltool-0.35 )
+	dev-util/gtk-doc-am
+	>=dev-util/pkgconfig-0.12
+	doc? ( >=dev-libs/libxslt-1.1.24 )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog README TODO"
+
+	G2CONF="${G2CONF}
+		$(use_enable aac aac-support)
+		$(use_enable debug maintainer-mode)
+		$(use_enable gtk gtk-support)
+		$(use_enable hal hal-support)
+		$(use_enable libnotify libnotify-support)
+		$(use_enable matroska mkv-support)
+		$(use_enable mp3 mp3-support)
+		$(use_enable mp4 mp4-support)
+		$(use_enable ogm ogm-support)
+		$(use_enable spell enchant-support)
+		$(use_enable srt srt-support)
+		$(use_enable theora theora-support)
+		$(use_enable vorbis vorbis-support)
+		$(use_enable x264 x264-support)
+		$(use_enable xvid xvid-support)
+		$(use_enable nls)
+		--disable-gtk-doc"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	epatch "${FILESDIR}"/${P}-libdvdread.patch
+	AT_M4DIR=${WORKDIR} eautoreconf
+}