Version bump.

Package-Manager: portage-2.1.9.42/cvs/Linux i686

3 files changed, 88 insertions, 12 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 2fc8411a9c30..ba297b6b665e 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,11 @@
 # 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.153 2011/05/12 18:31:45 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.154 2011/05/23 20:58:40 billie Exp $
+
+*mjpegtools-2.0.0 (23 May 2011)
+
+  23 May 2011; Daniel Pielmeier <billie@gentoo.org> +mjpegtools-2.0.0.ebuild:
+  Version bump.
 
 *mjpegtools-2.0.0_rc1 (12 May 2011)
 
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 322f050faba2..91e3a0004ca7 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mjpegtools-1.9.0-glibc-2.10.patch 429 RMD160 ef7f706aeda7ebfa04dbd43b70a5e3e6faf24610 SHA1 3029f0e835e693b144298ed9f8143c9566be26f3 SHA256 0a76b418df4daa1603c827001ede6a1b3da4457b5d3aefeda0a656cd88ad446b
 AUX mjpegtools-1.9.0-jpeg-7.patch 774 RMD160 22c50dd28617159eaa89aefb4647e21d4d9972e7 SHA1 2bdb1b3b8591cede11d4a133a758e8ead35db4dd SHA256 2c9b90a283e8e6d95bd9573cd16310107c654d0d701a7dff7e47ee1a773da7cf
 AUX mjpegtools-2.0.0_rc1-X11.patch 867 RMD160 453443cdcd2a2a1a657401a9719240e3ec5b948e SHA1 affdc0643d80ba7ba192e58e572b55e058d37aea SHA256 ec7ada2cbde2a2ef4ad401e8e8cf57b8bc547b0fd4d40f90a2cec4cb52e154a0
@@ -9,15 +6,10 @@ AUX mjpegtools-2.0.0_rc1-dga-gtk-sdl-automagic.patch 2774 RMD160 bbf1ccb2505090b
 AUX mjpegtools-2.0.0_rc1-libpng-1.5.patch 17209 RMD160 3a373ae1134cfc609a4a981dfec2e84ebd1f12cb SHA1 c7b3ac68d4171b7331f9feeac31e351cf8a9121a SHA256 4173cf6701f542dd00ef362916a46f3bfa656478d246484eb6da63e158210801
 AUX mjpegtools-2.0.0_rc1-v4l-automagic.patch 1116 RMD160 545b449956840edb487399eca31e02627681b81d SHA1 ce5005328b4b14f083757fc0c837ddd58690eeed SHA256 cee64c74ff2ffd27325843fc8660b0c28e1d7d4d4cffba1112fd31450529aefe
 DIST mjpegtools-1.9.0.tar.gz 1718063 RMD160 79e0eb4bce468bb8f12da336e29abe8fab390a5f SHA1 1701233354c7ea86b5b7808c4dd5d03a71118e48 SHA256 a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711
+DIST mjpegtools-2.0.0.tar.gz 1749671 RMD160 454e23bedb2bd592912a546d0621b5c3662c3bb2 SHA1 f411e8573d446711dbe8455a6ae9257e1afe1e70 SHA256 bf3541593e71602f7b440c2e7d81b433f53d0511e74642f35bea9b3feded7a97
 DIST mjpegtools-2.0.0rc1.tar.gz 3110286 RMD160 42d14ec10cb14453d471ababea598eade5033d40 SHA1 5d6a82baa166f12e89ea6dd82e31d62dde6c95c9 SHA256 fe2d59fd56631f077859c6b38c5027e38fc641b40ada3ddf39d85b924887b1ff
 EBUILD mjpegtools-1.9.0-r1.ebuild 2078 RMD160 d288a60f43f79ea5298fd860bd4e0e988c48478f SHA1 07fbcca44b05d371e7619f40b59a2ea8705e31f6 SHA256 7d303fea4b4eb8c278e07c0e1662dd9860e4b9ef5836322d5bc8d76112b947f7
+EBUILD mjpegtools-2.0.0.ebuild 1906 RMD160 9ebeb557669843cf00aa22a8cab187270499ad6e SHA1 58d94161a7593acfb6a8793e50dd73ac396b4575 SHA256 c68d0c38b567d064217049e8eefe59c18607c9afc74716b050fe7fd45e656297
 EBUILD mjpegtools-2.0.0_rc1.ebuild 2150 RMD160 df81e253a69c232bdabed2eae16a3ee258003db9 SHA1 04767fe54b587791c03a995eb84de9e701119f94 SHA256 825d20a0a45e698e15638204e56858c77fd2f6b1d537a006acc22b136c642283
-MISC ChangeLog 27560 RMD160 74877186b83bb176efd6168330c51fd42a9ef44a SHA1 f998ff2bdc9acc1364bd0e9d4a9b3c4bb5c6bdab SHA256 7687de61947ca13bc6d4c51867cd6277b13589ca81b5479b9f22fc2b4133fd71
+MISC ChangeLog 27688 RMD160 766a8b3a788f1a0968a6da1ef06896a0b1463336 SHA1 256aad19570404f75b2b2678f165d86d3cdba7e4 SHA256 1c92b44565cb133d0b0cfea822fd0e730a8502f0f8abe5bf52bba60ee12632eb
 MISC metadata.xml 363 RMD160 10615c49fe0655333db0f939b2e38c6efd1f887d SHA1 496986a1272e3b16da7360f18327621bd2e532d5 SHA256 51be248768e67ad5fe862f97bfa1b3010ceb85d8ddc08c434ebacc21ee4156a0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk3MJ6EACgkQlcuUeyFa0U0S+gCg797YaCxBDNLkPsLDLuUz38nE
-PfoAn1l0ZGBG4x42EblKZTwbmaRLauoG
-=WwzY
------END PGP SIGNATURE-----
diff --git a/media-video/mjpegtools/mjpegtools-2.0.0.ebuild b/media-video/mjpegtools/mjpegtools-2.0.0.ebuild
new file mode 100644
index 000000000000..ce6ce93c657c
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.0.0.ebuild
@@ -0,0 +1,79 @@
+# 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 $
+
+EAPI=4
+
+inherit flag-o-matic linux-info toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="Tools for MJPEG video"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dga dv gtk mmx png quicktime sdl static-libs v4l X"
+REQUIRED_USE="!X? ( !gtk !sdl )
+	X? ( sdl )"
+
+RDEPEND="virtual/jpeg
+	quicktime? ( media-libs/libquicktime )
+	dv? ( >=media-libs/libdv-0.99 )
+	png? ( media-libs/libpng )
+	dga? ( x11-libs/libXxf86dga )
+	X? ( x11-libs/libX11
+		x11-libs/libXt
+		gtk? ( x11-libs/gtk+:2 )
+		sdl? ( >=media-libs/libsdl-1.2.7-r3 )
+	 )"
+
+DEPEND="${RDEPEND}
+	mmx? ( dev-lang/nasm )
+	>=sys-apps/sed-4
+	sys-apps/gawk
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${P/_rc*}"
+
+pkg_pretend() {
+	if kernel_is ge 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
+}
+
+# Avoid execution of linux-info_pkg_setup()
+pkg_setup() { : ; }
+
+src_prepare() {
+	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+src_configure() {
+	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+
+	econf \
+		--enable-compile-warnings \
+		$(use_enable mmx simd-accel) \
+		$(use_enable static-libs static) \
+		--enable-largefile \
+		$(use_with quicktime libquicktime) \
+		$(use_with dv libdv) \
+		$(use_with png libpng) \
+		$(use_with dga) \
+		$(use_with gtk) \
+		$(use_with sdl libsdl) \
+		$(use_with v4l) \
+		$(use_with X x)
+}
+
+src_install() {
+	default
+
+	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
+
+	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}