Version bump

(Portage version: 2.1-r1)
 (Signed Manifest commit)

3 files changed, 39 insertions, 153 deletions

diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index ec6e6f1899cf..7c3bc40a9f97 100644
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -1,20 +1,49 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 73f55e154ed6eb2cd7f8b1aaaeac1f19 ChangeLog 6328
-MD5 f66eabf6e140aef8962a75cf06d15df0 files/digest-mpeg4ip-1.4.1 66
-MD5 f66eabf6e140aef8962a75cf06d15df0 files/digest-mpeg4ip-1.4.1-r1 66
-MD5 ad9863188af26572c12950453a42d2f3 files/digest-mpeg4ip-1.5 64
+AUX mpeg4ip-1.4.1-disable-faac-test.patch 1149 RMD160 fabfac7262e34ad8ba0aea08938fa61ca9f2c389 SHA1 a84ae2a263374edbe104c682fd2db385ff1145ca SHA256 cbe9093e82530731e4dc53973c62e3879b7297199f52f25b7d0317cfe4c0d2ba
 MD5 22a76c68f55b131dfc602a61ededb699 files/mpeg4ip-1.4.1-disable-faac-test.patch 1149
+RMD160 fabfac7262e34ad8ba0aea08938fa61ca9f2c389 files/mpeg4ip-1.4.1-disable-faac-test.patch 1149
+SHA256 cbe9093e82530731e4dc53973c62e3879b7297199f52f25b7d0317cfe4c0d2ba files/mpeg4ip-1.4.1-disable-faac-test.patch 1149
+AUX mpeg4ip-1.4.1-gcc41.patch 5332 RMD160 c23b8af9f13f6fdb5e65d20276a6632464c51416 SHA1 a8556b08254feaf7d24b79fc4fc00c3646f41a6e SHA256 a4ce2cfd0448c03cec335d46099fdca7b3aed7ea75395dce8b97e38f816a5219
 MD5 75ef8fbc1d49d5a13a8f6ece3b8fff78 files/mpeg4ip-1.4.1-gcc41.patch 5332
-MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
+RMD160 c23b8af9f13f6fdb5e65d20276a6632464c51416 files/mpeg4ip-1.4.1-gcc41.patch 5332
+SHA256 a4ce2cfd0448c03cec335d46099fdca7b3aed7ea75395dce8b97e38f816a5219 files/mpeg4ip-1.4.1-gcc41.patch 5332
+DIST mpeg4ip-1.4.1.tar.gz 4791075
+DIST mpeg4ip-1.5.0.1.tar.gz 4826180 RMD160 fee5c21c17a470e6de349e07d233a1eb46b2064a SHA1 1271de695ed65284d9c39aa91bf26c5494603fd3 SHA256 23535dd818898ec75ffa0df22d9f27189e77361ce8a500d58328073ee247bcb6
+EBUILD mpeg4ip-1.4.1-r1.ebuild 3419 RMD160 087ec6573917f3ad8834d9a84adfa0e3d2f0eb34 SHA1 f8513d5c96783a72e2dcd252139653687b5b4e93 SHA256 85cf4d3b512d4523cf0d5eaa2ffea9b09871b0b292a2d38578e3930940c3f50f
 MD5 ac5ee1c7dec7c93da1ea83ecc30adcb1 mpeg4ip-1.4.1-r1.ebuild 3419
+RMD160 087ec6573917f3ad8834d9a84adfa0e3d2f0eb34 mpeg4ip-1.4.1-r1.ebuild 3419
+SHA256 85cf4d3b512d4523cf0d5eaa2ffea9b09871b0b292a2d38578e3930940c3f50f mpeg4ip-1.4.1-r1.ebuild 3419
+EBUILD mpeg4ip-1.4.1.ebuild 3290 RMD160 5a36deeb19122c7bf0b6665cc723a89da5ed317e SHA1 43e4ae36de7d173239e69bab6224eafdf3fa6e4b SHA256 9aec5a494c6c8814b454edba30594f9b6caf2792d1149dfd0cf0d836b2e5d92c
 MD5 e86adcb30597d5e1f53a703da6ee4174 mpeg4ip-1.4.1.ebuild 3290
-MD5 22b0d0ae1b675eb9f473fac7815e629c mpeg4ip-1.5.ebuild 3368
+RMD160 5a36deeb19122c7bf0b6665cc723a89da5ed317e mpeg4ip-1.4.1.ebuild 3290
+SHA256 9aec5a494c6c8814b454edba30594f9b6caf2792d1149dfd0cf0d836b2e5d92c mpeg4ip-1.4.1.ebuild 3290
+EBUILD mpeg4ip-1.5.0.1.ebuild 3374 RMD160 3c04943aa29b4d4ccf1e7cdaba19f1ac5f780234 SHA1 2d97d3fb773b9abe1e71f9e6f7fff4d4d6987c00 SHA256 649a28875a500638ec130ca2163d613545e9218149d5e6e6d6a280dcb3e51840
+MD5 bf7570c0ecda749f3f6ccbec88c5638f mpeg4ip-1.5.0.1.ebuild 3374
+RMD160 3c04943aa29b4d4ccf1e7cdaba19f1ac5f780234 mpeg4ip-1.5.0.1.ebuild 3374
+SHA256 649a28875a500638ec130ca2163d613545e9218149d5e6e6d6a280dcb3e51840 mpeg4ip-1.5.0.1.ebuild 3374
+MISC ChangeLog 6474 RMD160 c7af7f35d2c79f9b0c5170d391c2324879da4eea SHA1 fafcc26f136c0a784b7eaaec7f50a9e9e3d377ca SHA256 3a6f974ed1680d8bfa20792ad59fdf2bfa8fc853b527414a53def90bcece681d
+MD5 bbc055529b7008a069c093ece0c77857 ChangeLog 6474
+RMD160 c7af7f35d2c79f9b0c5170d391c2324879da4eea ChangeLog 6474
+SHA256 3a6f974ed1680d8bfa20792ad59fdf2bfa8fc853b527414a53def90bcece681d ChangeLog 6474
+MISC metadata.xml 255 RMD160 5270d78482f975182f91bf12c1c35f02f1724b80 SHA1 ab610963bd3bcba3a951090a167f9fd5755b6cde SHA256 1711781f9f166223d7d8e3bda1083ed9e144627c3ccc3bbdbafbb59db0bfce1f
+MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
+RMD160 5270d78482f975182f91bf12c1c35f02f1724b80 metadata.xml 255
+SHA256 1711781f9f166223d7d8e3bda1083ed9e144627c3ccc3bbdbafbb59db0bfce1f metadata.xml 255
+MD5 f66eabf6e140aef8962a75cf06d15df0 files/digest-mpeg4ip-1.4.1 66
+RMD160 d98012e2e2e0093e740a3aafad87800306ce3946 files/digest-mpeg4ip-1.4.1 66
+SHA256 2df79bfb440f5a39465171237843e13d6fe713c32bed32c0401dc69078dd06f3 files/digest-mpeg4ip-1.4.1 66
+MD5 f66eabf6e140aef8962a75cf06d15df0 files/digest-mpeg4ip-1.4.1-r1 66
+RMD160 d98012e2e2e0093e740a3aafad87800306ce3946 files/digest-mpeg4ip-1.4.1-r1 66
+SHA256 2df79bfb440f5a39465171237843e13d6fe713c32bed32c0401dc69078dd06f3 files/digest-mpeg4ip-1.4.1-r1 66
+MD5 e2f664c0648cfd656f71ec99f49c8a32 files/digest-mpeg4ip-1.5.0.1 250
+RMD160 92cd3b3759cc48d6714f344756350b6d045478db files/digest-mpeg4ip-1.5.0.1 250
+SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/digest-mpeg4ip-1.5.0.1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEdk8YoGcCqvCmTSIRAq7FAJoD7A60b2v86BiI3N3nsVPI3NbstgCgjwtF
-2rDPOOIRKsa19hEdCKUhvoE=
-=5q2/
+iD8DBQFEoSgsoGcCqvCmTSIRAnriAKDJyqd317pPJNGJaxqWvnmO6LGlMwCfRNsF
+HyJva58vVUxNvCmOSOFrJRk=
+=oiRW
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpeg4ip/files/digest-mpeg4ip-1.5 b/media-video/mpeg4ip/files/digest-mpeg4ip-1.5
deleted file mode 100644
index 6557bd5e6ec4..000000000000
--- a/media-video/mpeg4ip/files/digest-mpeg4ip-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 738d638fe82ab2ef37d347e9203c4bba mpeg4ip-1.5.tar.gz 4825367
diff --git a/media-video/mpeg4ip/mpeg4ip-1.5.ebuild b/media-video/mpeg4ip/mpeg4ip-1.5.ebuild
deleted file mode 100644
index 7720d5cc30b4..000000000000
--- a/media-video/mpeg4ip/mpeg4ip-1.5.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.5.ebuild,v 1.1 2006/05/12 00:10:45 tester Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="MPEG 4 implementation library"
-
-HOMEPAGE="http://www.mpeg4ip.net/"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-1.1 LGPL-2 GPL-2 LGPL-2.1 BSD UCL MPEG4"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="ipv6 mmx v4l2 xvid nas alsa esd arts ffmpeg a52 mpeg2 lame aac id3 player mp4live x264"
-
-RDEPEND=" media-libs/libsdl
-	player? (
-		>=x11-libs/gtk+-2
-		ffmpeg? ( >=media-video/ffmpeg-0.4.7 )
-		mpeg2? ( media-libs/libmpeg2 )
-		id3? ( media-libs/libid3tag )
-		a52? ( media-libs/a52dec )
-	)
-	xvid? ( >=media-libs/xvid-0.9.8 )
-	mp4live? (
-		>=x11-libs/gtk+-2
-		lame? ( >=media-sound/lame-3.92 )
-		aac? ( >=media-libs/faac-1.24-r1 )
-		ffmpeg? ( >=media-video/ffmpeg-0.4.7 )
-		x264? ( media-libs/x264-svn )
-	)
-	nas? ( media-libs/nas || ( x11-libs/libXt virtual/x11 ) )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	esd? ( media-sound/esound )
-	=media-libs/libmp4v2-${PV}
-	!<media-libs/faad2-2.0-r9 "
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	sys-devel/autoconf
-	sys-devel/automake
-	player? ( x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) ) )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/mpeg4ip-1.4.1-disable-faac-test.patch
-}
-
-src_compile() {
-	cd ${S}
-
-	local myconf
-	myconf=" --datadir=/usr/share/mpeg4ip
-			$(use_enable ipv6)
-			$(use_enable ppc)
-			$(use_enable player)
-			$(use_enable mp4live)
-			$(use_enable xvid)
-			$(use_enable nas)
-			$(use_enable esd)
-			$(use_enable alsa)
-			$(use_enable arts)
-			--disable-srtp" # need ot add libsrtp to portage
-
-
-	# Those are possible for both player and mp4live
-	if use player || use mp4live ; then
-		myconf="${myconf} --enable-gtk-glib
-			$(use_enable ffmpeg)"
-	fi
-
-	# Those are only relevant for the player
-	use player && myconf="${myconf}
-			$(use_enable mmx)
-			$(use_enable a52 a52dec)
-			$(use_enable mpeg2 mpeg2dec)
-			$(use_enable id3 id3tags)"
-	use player || myconf="${myconf}
-			--disable-a52
-			--disable-mmx
-			--disable-mpeg2dec
-			--disable-id3tags"
-
-
-	# those can only be used for mp4live
-	use mp4live && myconf="${myconf}
-			$(use_enable v4l2)
-			$(use_enable lame mp3lame)
-			$(use_enable aac faac)
-			$(use_enable x264)"
-			# $(use_enable alsa mp4live-alsa)
-	use mp4live || myconf="${myconf}
-			--disable-v4l2
-			--disable-mp3lame
-			--disable-faac
-			--disable-mp4live-alsa
-			--disable-x264"
-
-	./bootstrap --prefix=/usr \
-		--host=${CHOST} \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var/lib \
-		--disable-warns-as-err \
-		--enable-server \
-		${EXTRA_ECONF} \
-		${myconf} || die "configure failed"
-
-	sed -i -e 's:-Werror::' common/video/iso-mpeg4/src/Makefile || die "sed failed"
-
-	emake || die "make failed"
-}
-
-src_install () {
-	cd ${S}
-	make install DESTDIR="${D}" || die "make install failed"
-
-	rm -f ${D}/usr/include/mp4.h
-	rm -f ${D}/usr/lib/libmp4v2*
-
-	dodoc doc/MPEG4IP_Guide.pdf doc/*txt AUTHORS TODO
-
-	dohtml doc/*.html FEATURES.html || die
-
-	docinto ietf
-	dodoc doc/ietf/*.txt || die
-
-	docinto mcast
-	dodoc doc/mcast/mcast.txt doc/mcast/mcast_example doc/mcast/playlist_example || die
-
-}