[gentoo-commits] gentoo-x86 commit in media-video/mjpegtools: ChangeLog mjpegtools-2.0.0.ebuild mjpegtools-2.0.0_rc1.ebuild

[Daniel Pielmeier (billie)]

billie      11/05/30 17:09:21

  Modified:             ChangeLog mjpegtools-2.0.0.ebuild
  Removed:              mjpegtools-2.0.0_rc1.ebuild
  Log:
  Check for linux-headers instead of the current kernel version. Thanks to Jory A. Pratt by mail. Remove old.
  
  (Portage version: 2.1.9.42/cvs/Linux i686)

Revision  Changes    Path
1.155                media-video/mjpegtools/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/ChangeLog?rev=1.155&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/ChangeLog?rev=1.155&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/ChangeLog?r1=1.154&r2=1.155

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- ChangeLog	23 May 2011 20:58:40 -0000	1.154
+++ ChangeLog	30 May 2011 17:09:21 -0000	1.155
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.154 2011/05/23 20:58:40 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.155 2011/05/30 17:09:21 billie Exp $
+
+  30 May 2011; Daniel Pielmeier <billie@g.o>
+  -mjpegtools-2.0.0_rc1.ebuild, mjpegtools-2.0.0.ebuild,
+  -files/mjpegtools-2.0.0_rc1-X11.patch,
+  -files/mjpegtools-2.0.0_rc1-amd-k8.patch,
+  -files/mjpegtools-2.0.0_rc1-dga-gtk-sdl-automagic.patch,
+  -files/mjpegtools-2.0.0_rc1-libpng-1.5.patch,
+  -files/mjpegtools-2.0.0_rc1-v4l-automagic.patch:
+  Check for linux-headers instead of the current kernel version. Thanks to Jory
+  A. Pratt by mail. Remove old.
 
 *mjpegtools-2.0.0 (23 May 2011)
 



1.2                  media-video/mjpegtools/mjpegtools-2.0.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/mjpegtools-2.0.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/mjpegtools-2.0.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/mjpegtools-2.0.0.ebuild?r1=1.1&r2=1.2

Index: mjpegtools-2.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.0.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mjpegtools-2.0.0.ebuild	23 May 2011 20:58:40 -0000	1.1
+++ mjpegtools-2.0.0.ebuild	30 May 2011 17:09:21 -0000	1.2
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.0.0.ebuild,v 1.1 2011/05/23 20:58:40 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.0.0.ebuild,v 1.2 2011/05/30 17:09:21 billie Exp $
 
 EAPI=4
 
-inherit flag-o-matic linux-info toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 MY_P=${P/_/}
 
@@ -39,7 +39,7 @@
 S="${WORKDIR}/${P/_rc*}"
 
 pkg_pretend() {
-	if kernel_is ge 2 6 38 && use v4l; then
+	if has_version ">=sys-kernel/linux-headers-2.6.38" && use v4l; then
 		ewarn "Current versions of mjpegtools only support V4L1 which is not available"
 		ewarn "for kernels versions 2.6.38 and above. V4L1 will be disabled."
 	fi