Added a fix to run with mplayer cvs thanks to Alexis Ballier <alexis.ballier@gmail.com>.

Package-Manager: portage-2.1_pre6-r7

5 files changed, 137 insertions, 7 deletions

diff --git a/media-video/ogmrip/ChangeLog b/media-video/ogmrip/ChangeLog
index 0a959fbf1810..e5c6853505cc 100644
--- a/media-video/ogmrip/ChangeLog
+++ b/media-video/ogmrip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/ogmrip
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.2 2005/09/17 16:32:31 swegener Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.3 2006/03/25 18:45:02 metalgod Exp $
+
+*ogmrip-0.9.0-r1 (25 Mar 2006)
+
+  25 Mar 2006; Luis Medinas <metalgod@gentoo.org>
+  +files/ogmrip-0.9.0-mplayercvs.patch, +ogmrip-0.9.0-r1.ebuild:
+  Added a fix to run with mplayer cvs thanks to Alexis Ballier
+  <alexis.ballier@gmail.com>.
 
   17 Sep 2005; Luis Medinas <metalgod@gentoo.org>
   +files/ogmrip-0.9.0-gcc4.patch, +files/ogmrip-0.9.0-lang.patch,
diff --git a/media-video/ogmrip/Manifest b/media-video/ogmrip/Manifest
index 4a176b55b6ef..798faf6679a8 100644
--- a/media-video/ogmrip/Manifest
+++ b/media-video/ogmrip/Manifest
@@ -1,20 +1,49 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0204dd3ce4791c1f566b8c5529d18c06 ChangeLog 1364
+MD5 16cbed83ad864ff1ce0ecf5f547ca466 ChangeLog 1605
+RMD160 83d32d78360704a38412373d094fda57a858524d ChangeLog 1605
+SHA256 80d4a49a6bead49b5f74c3f589705635887c831858a60bc149d86938accea4d5 ChangeLog 1605
 MD5 aa7f34882cf21f05139524a800cb1ccb files/digest-ogmrip-0.6.2 64
+RMD160 8b4b2dfdcc56cfe856bd9445ba2f4c9bbf01db78 files/digest-ogmrip-0.6.2 64
+SHA256 94849e0cfcbf8140b0e880531dc7af06baf6b57f9c39f830a96b6531e16a0ce4 files/digest-ogmrip-0.6.2 64
 MD5 605be9978689669c27e4a0d5fbcd57d9 files/digest-ogmrip-0.8.2 64
+RMD160 5f9d20368bf8d8cd4ea1d5f9c173fac52fe0f101 files/digest-ogmrip-0.8.2 64
+SHA256 db84d39ffc11eaa302b9a2b0d49b4cab36829c8100b924bf9e05e88ab0110bd2 files/digest-ogmrip-0.8.2 64
 MD5 87e11fb2b44c544d59834a678e353021 files/digest-ogmrip-0.9.0 64
+RMD160 4f9fa1820afac494769490754805f1c5ba4fd56a files/digest-ogmrip-0.9.0 64
+SHA256 267c273de78d9b789426fb91da8c31cc55b39512c092aabaad98112f60bbe8bc files/digest-ogmrip-0.9.0 64
+MD5 58c52a07bd9cf54de41cee72fdecc33c files/digest-ogmrip-0.9.0-r1 238
+RMD160 439aeaef1abd8a3f22e8f1d2fa15b135d6498085 files/digest-ogmrip-0.9.0-r1 238
+SHA256 1b6a9bbe95cff33dbf4b77fbf5cf3e8ce09aae77882b9197487de06d27a16f9b files/digest-ogmrip-0.9.0-r1 238
 MD5 0b8ceac327eb68f927a2fbb841bfb53a files/ogmrip-0.9.0-gcc4.patch 5279
+RMD160 092ed7eadab3a8a56f26f0a2b47fc5121db04f20 files/ogmrip-0.9.0-gcc4.patch 5279
+SHA256 7165a632039d2df3cdd2677e82a1fdcd6fefc9ac3c4dc33896c03afb36269792 files/ogmrip-0.9.0-gcc4.patch 5279
 MD5 d3c45dfbfd5046c58d6a1e774471e280 files/ogmrip-0.9.0-lang.patch 450
+RMD160 df73b14cce05835e6fe8b570c80a4d54f3f39ed2 files/ogmrip-0.9.0-lang.patch 450
+SHA256 256d22d224548dd63824e6c78ce7250536d39bf53a105b2e0cb4f7b6e4de51c4 files/ogmrip-0.9.0-lang.patch 450
+MD5 3457036780fd123b29fc2ac6c1ff4a64 files/ogmrip-0.9.0-mplayercvs.patch 1681
+RMD160 67d32a1c28ac7ee79a5e25913726881663ed0901 files/ogmrip-0.9.0-mplayercvs.patch 1681
+SHA256 73fb2d14c5ed10ab7517aaef0305be55f870e2c1061a7708b8d28fdcc4d0dd4f files/ogmrip-0.9.0-mplayercvs.patch 1681
 MD5 f6ae03147b33c97f5bb09d5de8690601 metadata.xml 227
+RMD160 206c730a3be9fde1ae2c98cd70e6a6b2ee28e799 metadata.xml 227
+SHA256 79f9813a9c3d402b218c93c05af4fff6c87335240d334357476a6ef711a7114f metadata.xml 227
 MD5 7a59f2d062b22745c800381e382c118b ogmrip-0.6.2.ebuild 1770
+RMD160 4ec4afcf602e8c1d369316d2dcd32dd7f4b07ffc ogmrip-0.6.2.ebuild 1770
+SHA256 3c326e112111c4bd023c4b4ae6a7ea0f32c009046fde7903b16118b6b3e580f6 ogmrip-0.6.2.ebuild 1770
 MD5 2dc95dfe1db0913608eb8b4b100b5957 ogmrip-0.8.2.ebuild 1859
+RMD160 b00c0e931dbb44c15e029d4e9d7cd828815d87a8 ogmrip-0.8.2.ebuild 1859
+SHA256 0a267677f68c379cac7be4c2ffdfa2d5b3338e4bce54600c5d91ed4d14fd4b0b ogmrip-0.8.2.ebuild 1859
+MD5 943ee5641ba75317a22aa6e184c07232 ogmrip-0.9.0-r1.ebuild 2037
+RMD160 3647cb46cf518ab39480903d4da9ffce89e2e1c1 ogmrip-0.9.0-r1.ebuild 2037
+SHA256 475510284018528436a7e36b041eb8aaf9fb42a3dc817faa958ff57f6e6aadd7 ogmrip-0.9.0-r1.ebuild 2037
 MD5 d5df55549fb701989c1c159b2c7696d8 ogmrip-0.9.0.ebuild 1969
+RMD160 cb278c2214bfd0df7b87dae67f0a99a08c65054c ogmrip-0.9.0.ebuild 1969
+SHA256 d7f2031d7fe6937dc628cd9f0019a40aa67e13150b4e0aeb48381afaef4d42a0 ogmrip-0.9.0.ebuild 1969
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFDLEU2I1lqEGTUzyQRAqOmAJ9OopK4aidQluM8oW92Zj7vEcLEkwCfTJl1
-ujWLQEuzb9ZE88AQqhBLwog=
-=X6JJ
+iD8DBQFEJY+NwUpWvClEHQoRAnkpAJ99SReWkbfWs3prlpU3jdCX+jlV/ACfXafX
+1qqlyHywSQWw10mF81Jt0MU=
+=sPLu
 -----END PGP SIGNATURE-----
diff --git a/media-video/ogmrip/files/digest-ogmrip-0.9.0-r1 b/media-video/ogmrip/files/digest-ogmrip-0.9.0-r1
new file mode 100644
index 000000000000..d45d421faaf2
--- /dev/null
+++ b/media-video/ogmrip/files/digest-ogmrip-0.9.0-r1
@@ -0,0 +1,3 @@
+MD5 4884da2f0011c9da86306b19b2d7d310 ogmrip-0.9.0.tar.gz 565778
+RMD160 c5c905a37845a32d0836011aa989188651e0c984 ogmrip-0.9.0.tar.gz 565778
+SHA256 2c6a39c4a54cf8c3cdb8b31df8efa002b2e955efb1890608d25b980af86d378a ogmrip-0.9.0.tar.gz 565778
diff --git a/media-video/ogmrip/files/ogmrip-0.9.0-mplayercvs.patch b/media-video/ogmrip/files/ogmrip-0.9.0-mplayercvs.patch
new file mode 100644
index 000000000000..f4efbfe119f0
--- /dev/null
+++ b/media-video/ogmrip/files/ogmrip-0.9.0-mplayercvs.patch
@@ -0,0 +1,32 @@
+diff -N -u -r ogmrip-0.9.0/configure.in ogmrip-0.9.0-new/configure.in
+--- ogmrip-0.9.0/configure.in	2005-06-28 13:55:47.000000000 +0200
++++ ogmrip-0.9.0-new/configure.in	2006-03-14 13:46:34.740041528 +0100
+@@ -153,17 +153,19 @@
+ fi
+ 
+ if $MPLAYER_PROG | grep -q "MPlayer dev-CVS"; then
+-  AC_MSG_ERROR(OGMRip does support CVS versions of mplayer. You need an official release. Find it on http://www.mplayerhq.hu)
+-fi
++  AC_DEFINE_UNQUOTED(MPLAYER_PRE, 1, [Mplayer pre version number])
++  AC_DEFINE_UNQUOTED(MPLAYER_PRE, 7, [Mplayer pre version number])
++else
+ 
+-MPLAYER_MAJOR=`$MPLAYER_PROG | head -n 1 | $SED_PROG -e 's%MPlayer \([[0-1]]\).*%\1%'`
+-AC_DEFINE_UNQUOTED(MPLAYER_MAJOR, $MPLAYER_MAJOR, [Mplayer major version number])
++  MPLAYER_MAJOR=`$MPLAYER_PROG | head -n 1 | $SED_PROG -e 's%MPlayer \([[0-1]]\).*%\1%'`
++  AC_DEFINE_UNQUOTED(MPLAYER_MAJOR, $MPLAYER_MAJOR, [Mplayer major version number])
+ 
+-if $MPLAYER_PROG | grep -q "MPlayer [[0-1]]\.[[0-9]]\+pre[[0-9]]\+.*"; then
+-  MPLAYER_PRE=`$MPLAYER_PROG | head -n 1 | $SED_PROG -e 's%MPlayer [[0-1]]\.[[0-9]]\+pre\([[0-9]]\+\).*%\1%'`
+-  AC_DEFINE_UNQUOTED(MPLAYER_PRE, $MPLAYER_PRE, [Mplayer pre version number])
+-else
+-  AC_DEFINE_UNQUOTED(MPLAYER_PRE, 0, [Mplayer pre version number])
++  if $MPLAYER_PROG | grep -q "MPlayer [[0-1]]\.[[0-9]]\+pre[[0-9]]\+.*"; then
++    MPLAYER_PRE=`$MPLAYER_PROG | head -n 1 | $SED_PROG -e 's%MPlayer [[0-1]]\.[[0-9]]\+pre\([[0-9]]\+\).*%\1%'`
++    AC_DEFINE_UNQUOTED(MPLAYER_PRE, $MPLAYER_PRE, [Mplayer pre version number])
++  else
++    AC_DEFINE_UNQUOTED(MPLAYER_PRE, 0, [Mplayer pre version number])
++  fi
+ fi
+ 
+ dnl **************************************************************
diff --git a/media-video/ogmrip/ogmrip-0.9.0-r1.ebuild b/media-video/ogmrip/ogmrip-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..e9e3fe28d5ec
--- /dev/null
+++ b/media-video/ogmrip/ogmrip-0.9.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.9.0-r1.ebuild,v 1.1 2006/03/25 18:45:04 metalgod Exp $
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Application and libraries for encoding DVDs into AVI/OGM files"
+HOMEPAGE="http://ogmrip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+
+SLOT="0"
+IUSE="debug gnome hal matroska subp"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=dev-libs/glib-2.6
+	>=media-libs/libdvdread-0.9.4
+	>=media-sound/ogmtools-1.4
+	>=media-sound/vorbis-tools-1.0
+	>=media-sound/lame-3.96
+	>=media-video/mplayer-1.0_pre4
+	matroska? ( >=media-video/mkvtoolnix-0.9 )
+	gnome? ( >=x11-libs/gtk+-2.6
+		>=gnome-base/gconf-2.6
+		>=gnome-base/libgnomeui-2.6
+		>=gnome-base/libglade-2.5 )
+	subp? ( >=app-text/gocr-0.39
+		>=app-text/enchant-1.1 )
+	hal? ( >=sys-apps/hal-0.4.2 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.12.0"
+
+G2CONF="${G2CONF} $(use_enable gnome gnome-support) $(use_enable debug maintainer-mode) $(use_enable subp enchant-support) $(use_enable hal hal-support)"
+
+DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
+
+pkg_setup() {
+	if ! which mencoder > /dev/null 2>&1; then
+		eerror "Unable to find mencoder in the PATH. You need mencoder to use OGMRip."
+		eerror "Please, add encode to your USE flags and emerge mplayer again."
+		die "Unable to find mencoder in the PATH. You need mencoder to use OGMRip."
+	fi
+	if ! mencoder -ovc help 2> /dev/null | grep -q "^ *xvid *- .*$"; then
+		echo
+		eerror "Mplayer is not build with XviD support. OGMRip requires XviD support in mplayer."
+		eerror "Please, add xvid to your USE flags and emerge mplayer again."
+		die "Mplayer is not build with XviD support. OGMRip requires XviD support in mplayer."
+	fi
+}
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-lang.patch
+	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch ${FILESDIR}/${P}-mplayercvs.patch
+	eautoreconf
+}