summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Pielmeier <billie@gentoo.org>2013-04-06 09:58:44 +0000
committerDaniel Pielmeier <billie@gentoo.org>2013-04-06 09:58:44 +0000
commit4002907f87d741825bbaf5c09591e264abd18df7 (patch)
tree16c53ea14ee3970a7c75691ea9fd35d68c41e163 /media-video
parentInitial import. (diff)
downloadgentoo-2-4002907f87d741825bbaf5c09591e264abd18df7.tar.gz
gentoo-2-4002907f87d741825bbaf5c09591e264abd18df7.tar.bz2
gentoo-2-4002907f87d741825bbaf5c09591e264abd18df7.zip
Add slot deps for libpng. Switch to EAPI 5 where necessary.
(Portage version: 2.1.11.55/cvs/Linux i686, signed Manifest commit with key 215AD14D)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mjpegtools/ChangeLog8
-rw-r--r--media-video/mjpegtools/mjpegtools-2.0.0-r3.ebuild10
-rw-r--r--media-video/mjpegtools/mjpegtools-2.0.1_rc1-r1.ebuild (renamed from media-video/mjpegtools/mjpegtools-2.0.1_rc1.ebuild)4
3 files changed, 14 insertions, 8 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 35732d616051..f115307a6883 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-video/mjpegtools
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.194 2013/03/04 19:23:34 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.195 2013/04/06 09:58:44 billie Exp $
+
+*mjpegtools-2.0.1_rc1-r1 (06 Apr 2013)
+
+ 06 Apr 2013; Daniel Pielmeier <billie@gentoo.org> mjpegtools-2.0.0-r3.ebuild,
+ -mjpegtools-2.0.1_rc1.ebuild, +mjpegtools-2.0.1_rc1-r1.ebuild:
+ Add slot deps for libpng. Switch to EAPI 5 where necessary.
04 Mar 2013; Daniel Pielmeier <billie@gentoo.org>
mjpegtools-2.0.1_rc1.ebuild:
diff --git a/media-video/mjpegtools/mjpegtools-2.0.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-2.0.0-r3.ebuild
index 53c0c7d128ce..26b0834015a9 100644
--- a/media-video/mjpegtools/mjpegtools-2.0.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.0.0-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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-r3.ebuild,v 1.8 2012/12/16 19:54:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.0.0-r3.ebuild,v 1.9 2013/04/06 09:58:44 billie Exp $
-EAPI=4
+EAPI=5
inherit autotools eutils flag-o-matic toolchain-funcs
@@ -21,7 +21,7 @@ REQUIRED_USE="sdlgfx? ( sdl )"
RDEPEND="virtual/jpeg
quicktime? ( media-libs/libquicktime )
dv? ( >=media-libs/libdv-0.99 )
- png? ( media-libs/libpng )
+ png? ( media-libs/libpng:0= )
dga? ( x11-libs/libXxf86dga )
gtk? ( x11-libs/gtk+:2 )
sdl? ( >=media-libs/libsdl-1.2.7-r3
@@ -33,7 +33,7 @@ RDEPEND="virtual/jpeg
DEPEND="${RDEPEND}
mmx? ( dev-lang/nasm )
>=sys-apps/sed-4
- sys-apps/gawk
+ virtual/awk
virtual/pkgconfig"
S="${WORKDIR}/${P/_rc*}"
diff --git a/media-video/mjpegtools/mjpegtools-2.0.1_rc1.ebuild b/media-video/mjpegtools/mjpegtools-2.0.1_rc1-r1.ebuild
index b7f618569bfb..b4e041402bc7 100644
--- a/media-video/mjpegtools/mjpegtools-2.0.1_rc1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.0.1_rc1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.0.1_rc1.ebuild,v 1.5 2013/03/04 19:23:34 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.0.1_rc1-r1.ebuild,v 1.1 2013/04/06 09:58:44 billie Exp $
EAPI=5
@@ -21,7 +21,7 @@ REQUIRED_USE="sdlgfx? ( sdl )"
RDEPEND="virtual/jpeg
quicktime? ( media-libs/libquicktime )
dv? ( >=media-libs/libdv-0.99 )
- png? ( media-libs/libpng )
+ png? ( media-libs/libpng:0= )
dga? ( x11-libs/libXxf86dga )
gtk? ( x11-libs/gtk+:2 )
sdl? ( >=media-libs/libsdl-1.2.7-r3