Update patch to be same as in fedora. Inherit eutils.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 49 insertions, 38 deletions

diff --git a/media-video/recordmydesktop/ChangeLog b/media-video/recordmydesktop/ChangeLog
index 96ef351a7ab6..940aaeddf491 100644
--- a/media-video/recordmydesktop/ChangeLog
+++ b/media-video/recordmydesktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/recordmydesktop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/recordmydesktop/ChangeLog,v 1.30 2010/03/25 12:29:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/recordmydesktop/ChangeLog,v 1.31 2010/03/25 12:54:23 scarabeus Exp $
+
+  25 Mar 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  files/0.3.8.1-fix_new_theora.patch, recordmydesktop-0.3.8.1-r2.ebuild:
+  Update patch to be same as in fedora. Inherit eutils.
 
 *recordmydesktop-0.3.8.1-r2 (25 Mar 2010)
 
diff --git a/media-video/recordmydesktop/Manifest b/media-video/recordmydesktop/Manifest
index 50a65a125991..2228fc8f9497 100644
--- a/media-video/recordmydesktop/Manifest
+++ b/media-video/recordmydesktop/Manifest
@@ -1,7 +1,7 @@
-AUX 0.3.8.1-fix_new_theora.patch 1779 RMD160 84e2196a47e00d5837ef9891ab59b70a017bae46 SHA1 bcdf77e6c38b230f3587f76e9ac6a7047ff28fcb SHA256 f3d2ce95ca88d20e15bf1d4e77ab9b7e3c73c5c97b052575757b3905bbcb5fb5
+AUX 0.3.8.1-fix_new_theora.patch 2212 RMD160 85179afd1570131982bd023cbedac84bab4ff732 SHA1 39b35788e52e0b5d9f396a77eb13022deef3f4e8 SHA256 8df5f6cce5e9fdd4f000f70a1da7a2762255bd627287b42d779285fee667cad4
 DIST recordmydesktop-0.3.8.1.tar.gz 198732 RMD160 a942e16ab9714861010a34a921f8b2127792bd29 SHA1 4be18baa70da88a7f228591057f2e7ff51b31de4 SHA256 33a2e208186ae78e2db2a27b0f5047b50fb7819c47fe15483b0765200b9d738c
 EBUILD recordmydesktop-0.3.8.1-r1.ebuild 1197 RMD160 44ac78eaecd85bcbcc36f00cd92a60de7dcee97c SHA1 1555c6736a5023a3726d22579b9d331b7276d3db SHA256 d2a7f24f925af5d422b93f2361f0d6acfb6a2f792b77f77069bb646393ffa201
-EBUILD recordmydesktop-0.3.8.1-r2.ebuild 1293 RMD160 b597db4bed71bee7e2c20ad0b6019b012b7ba546 SHA1 8f3c7fc647dd3cd03f84db9991f10cd5ed3b2ff6 SHA256 514d6a2355b18c39e7fdb139a7346b2ef9717cb6879e30804a29c55e7c3712f8
+EBUILD recordmydesktop-0.3.8.1-r2.ebuild 1309 RMD160 893cda2f210975050e1a8b916b2c40790515b25b SHA1 bbf28a290aabff1a9945bbde8e7d31d4a23e8a8f SHA256 d91933b2209c558df37c8aebee604cc8505197bf86aed2144708337bc34427fa
 EBUILD recordmydesktop-0.3.8.1.ebuild 948 RMD160 29f44db561679ab91013361d2cc47968f6016785 SHA1 5fda2b66febdddfa784cf9f4d14fbd69f521cb69 SHA256 e155276e5c2d6a287c17362a69d99d7d5247155cae207a2f0a67ff5bdcec3f1e
-MISC ChangeLog 4755 RMD160 45980a32f8882ee9ea3adb603fdb661df70ded9c SHA1 96044016e3fc40c8d458b82b7a89354eea8feb85 SHA256 30f3fecd192c34bc5abe857bc29e0cca32b2b0c7fe7842d086212bdfc850aeac
+MISC ChangeLog 4940 RMD160 bb334419212dc79748a5fd8304fbdbe309c96152 SHA1 6c27224735403285c24aee5e9e191ab855620164 SHA256 9c49612a4f1cad8356a9bb422ce54900d5b69be21036b70c51ccd9613a92890d
 MISC metadata.xml 226 RMD160 9acecdf92471eb50a25bc1aaf0d5179959d6d211 SHA1 f66369c7e7900801781a598bf5a7e6e49803a801 SHA256 b159adc5c7076105f4bc05f02d3c1e12bcad82faedf5df5ba4888077732ebf64
diff --git a/media-video/recordmydesktop/files/0.3.8.1-fix_new_theora.patch b/media-video/recordmydesktop/files/0.3.8.1-fix_new_theora.patch
index f543f4676a34..dfa829778963 100644
--- a/media-video/recordmydesktop/files/0.3.8.1-fix_new_theora.patch
+++ b/media-video/recordmydesktop/files/0.3.8.1-fix_new_theora.patch
@@ -1,14 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_new_theora.dpatch by  <root@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix recording with newest libtheora versions
-
-@DPATCH@
-
---- recordmydesktop-0.3.8.1+svn602.orig/src/rmd_initialize_data.c	2010-02-08 18:30:42.000000000 +0100
-+++ recordmydesktop-0.3.8.1+svn602.bueno/src/rmd_initialize_data.c	2010-02-08 19:12:36.000000000 +0100
-@@ -223,7 +223,7 @@
+--- recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c	2009-11-25 10:05:58.708779029 -0500
++++ recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c	2009-11-25 09:28:07.629507987 -0500
+@@ -224,7 +224,7 @@ 
      args->channels             = 1;
      args->frequency            = 22050;
      args->buffsize             = 4096;
@@ -17,27 +9,40 @@
      args->v_quality            = 63;
      args->s_quality            = 10;
  
-@DPATCH@
-
---- recordmydesktop-0.3.8.1+svn602.orig/src/rmd_parseargs.c	2010-02-08 18:30:42.000000000 +0100
-+++ recordmydesktop-0.3.8.1+svn602.bueno/src/rmd_parseargs.c	2010-02-08 19:15:01.000000000 +0100
-@@ -215,7 +215,7 @@
+--- recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c	2009-11-25 10:06:07.409777969 -0500
++++ recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c	2009-11-25 09:39:32.786757292 -0500
+@@ -104,10 +104,10 @@ 
+     "Encoding Options\n"
+     "\t--on-the-fly-encoding\tEncode the audio-video data, while recording.\n"
+     "\t--v_quality n\t\tA number from 0 to 63 for"
+-    " desired encoded video quality(default 63).\n"
++    " desired encoded video quality(default 63).\n\t               (set quality to zero for bitrate controlled usage)\n"
  
-         { "v_bitrate", '\0',
-           POPT_ARG_INT, &arg_return->v_bitrate, 0,
--          "A number from 45000 to 2000000 for desired encoded video bitrate(default 45000).",
-+          "A number from 0 to 2000000 for desired encoded video bitrate(default 0).",
-           "n" },
+-    "\t--v_bitrate n\t\tA number from 45000 to 2000000"
+-    " for desired encoded video bitrate(default 45000).\n"
++    "\t--v_bitrate n\t\tA number from 0 to 200000000"
++    " for desired encoded video bitrate(default 0 = not rate controlled).\n"
  
-         { "s_quality", '\0',
-@@ -460,8 +460,8 @@
-         fprintf(stdout, "--v_quality must be within the inclusive range [0-63].\n");
-         success = FALSE;
-     }
--    if (args->v_bitrate < 45000 || args->v_quality > 2000000) {
--        fprintf(stdout, "--v_bitrate must be within the inclusive range [45000-2000000].\n");
-+    if (args->v_bitrate < 0 || args->v_quality > 2000000) {
-+        fprintf(stdout, "--v_bitrate must be within the inclusive range [0-2000000].\n");
-         success = FALSE;
-     }
-     if (args->frequency <= 0) {
+     "\t--s_quality n\t\tDesired audio quality(-1 to 10).\n\n"
+ 
+@@ -327,17 +327,17 @@ 
+                  strcmp(argv[i], "-v_bitrate")  == 0) {
+             if(i+1<argc){
+                 int num=atoi(argv[i+1]);
+-                if((num>=45000)&&(num<=2000000))
++                if((num>=0)&&(num<=200000000))
+                     arg_return->v_bitrate=num;
+                 else{
+                     fprintf(stderr,"Argument Usage:"
+-                                   " --v_bitrate n(number 45000-2000000)\n");
++                                   " --v_bitrate n(number 0-200000000)\n");
+                     return FALSE;
+                 }
+             }
+             else{
+                 fprintf(stderr,"Argument Usage:"
+-                               " --v_bitrate n(number 45000-2000000)\n");
++                               " --v_bitrate n(number 0-200000000)\n");
+                 return FALSE;
+             }
+             i++;
diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r2.ebuild b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r2.ebuild
index 83613fae77ac..cc15d94a786c 100644
--- a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r2.ebuild
+++ b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r2.ebuild,v 1.1 2010/03/25 12:29:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r2.ebuild,v 1.2 2010/03/25 12:54:23 scarabeus Exp $
 
 EAPI=2
 
+inherit eutils
+
 DESCRIPTION="A desktop session recorder producing Ogg video/audio files"
 HOMEPAGE="http://recordmydesktop.sourceforge.net/"
 SRC_URI="mirror://sourceforge/recordmydesktop/${P}.tar.gz"