eapi4 clean latest ebuild. Remove older that still depends on media-video/ffmpeg.

Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64

5 files changed, 29 insertions, 105 deletions

diff --git a/media-plugins/mediastreamer-x264/ChangeLog b/media-plugins/mediastreamer-x264/ChangeLog
index 5ab7fca7bae0..3133532e5f68 100644
--- a/media-plugins/mediastreamer-x264/ChangeLog
+++ b/media-plugins/mediastreamer-x264/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/mediastreamer-x264
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-x264/ChangeLog,v 1.18 2012/04/24 10:13:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-x264/ChangeLog,v 1.19 2012/05/16 12:18:30 scarabeus Exp $
+
+  16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -mediastreamer-x264-1.1.7.ebuild, -mediastreamer-x264-1.3.3.ebuild,
+  mediastreamer-x264-1.4.1.ebuild:
+  eapi4 clean latest ebuild. Remove older that still depends on media-
+  video/ffmpeg.
 
   24 Apr 2012; Michał Górny <mgorny@gentoo.org>
   mediastreamer-x264-1.3.3.ebuild, mediastreamer-x264-1.4.1.ebuild:
diff --git a/media-plugins/mediastreamer-x264/Manifest b/media-plugins/mediastreamer-x264/Manifest
index febc7a9cc89c..641bb1f6e599 100644
--- a/media-plugins/mediastreamer-x264/Manifest
+++ b/media-plugins/mediastreamer-x264/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-DIST msx264-1.1.7.tar.gz 328644 RMD160 d0b287484b2054e746a26ebb404c8798abc1ee0c SHA1 42d7c8178afa1b1a3620debfad23257f26b69238 SHA256 b2c628d046076c3a8533abc18d8a483aa83eceda2052e5de1684a13178569bab
-DIST msx264-1.3.3.tar.gz 297907 RMD160 729e03ad67f86e9d7e0ae6ce0f33a0a3083ce4bf SHA1 d368473cfa0eb3db12a672c4da18529135be790d SHA256 0fb1aa0d997bea1c1b99b671ee5a2ee4e38650ad04c6189e5d85cde9939b03cd
 DIST msx264-1.4.1.tar.gz 291662 RMD160 b68536b88b3ada79fcd66071b356f9a2d2fd0c62 SHA1 1651fc7278e2c26f22d80ad1c551bba6c8e488ca SHA256 3427168e0936d1d46b58e2e3da606e51ba463b1e6d6586e9ff6c2d1f2a539b75
-EBUILD mediastreamer-x264-1.1.7.ebuild 1080 RMD160 af3712cfc405409e39542b58e1b42fdbff7c3bba SHA1 7ead486af92846f412f782dfee17743a427e1242 SHA256 11dd7bbea654007c7033c194621b4451609803fbf63524e7da4054e910701f4a
-EBUILD mediastreamer-x264-1.3.3.ebuild 1025 RMD160 1c903b4886c1c2953a16b286f85de117c7269480 SHA1 083bc3af43767cf13ecec351499af481d9bb00a8 SHA256 8c6bba641a58862355445a103365ca9557c3a6f0ba7c4fbb7636aee66bf47119
-EBUILD mediastreamer-x264-1.4.1.ebuild 870 RMD160 9c8482d732bf7aa569aa4c8fe2a04f61625ee795 SHA1 c79cf72b13f8b8f02e1947a58d716849a25446c6 SHA256 4b6b54c7d33cbd49b9ba742b68bb1e036bdfaae19a6043e4cb64dfa5841c4ff6
-MISC ChangeLog 2538 RMD160 3e75b38826173c87e6e993754962621eeae5136f SHA1 48003a72fd7bdcdbd0c59d232650c2314655b533 SHA256 55e9c10b54b101e2b43b4110f2b2a7a4cf7520cfb82c5cf2266d3b659d388383
+EBUILD mediastreamer-x264-1.4.1.ebuild 799 RMD160 0e5317806db0dc48a4db6eae592c25ea84c3c440 SHA1 c9407fbcfaee59616e151127433da158ceb13257 SHA256 102de6e915a56453109f73b427bde9c00558c51f9a876e12e55e362aaecc6f52
+MISC ChangeLog 2789 RMD160 8c9aa3ddeb27238f711bbfb91950b2d449b767e7 SHA1 a1d5cb977c67f4ec376d81a8b976be9da61a024b SHA256 caec3ee622b053678fff7a0c27164867c7398558f3d76a1de8050f7a7521f4b5
 MISC metadata.xml 308 RMD160 3e93b5c6ea97e3288a4fb0f2670cc61f7141a366 SHA1 dd8a58a9e57cfa6471e952062938c3d056d87d21 SHA256 26b3d33ba1e96ed904f064b555a8bc363137648a8d97f48fc68b5a6cb1095579
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk+WfN0ACgkQfXuS5UK5QB3jOAQAi0iwyR/UZuw/cBtlEZapUPsJ
-8QPq9cSQwP6OjuSiMbkesiDNlrPQiVvHjzzMeIXrS9HLS6dIMXnmGoq9GOdWIDbA
-q8QwOvXGPrUTaVzatMxWxvQdkSOce3Hd7Qi0jUrm+iBn7zU4r11/JvPGllqdAHwm
-95q/+GT29eKLQfa1cHo=
-=fao4
+iQIcBAEBAgAGBQJPs5smAAoJEOSiRoyO7jvoA54P/1cdgylD4yn6rLrIMn7wLiMg
+XH9uYN8iXeTGOy7l/i9dKaJGtWSO4VUKdQYOnQeNCwTyPAjnKGE+uQc+EhCvNAkq
+c/Emixw2pvJkl6S8ZebIt7q5JqqWbCLv8BiGzOs/BAnfARpsmkHPhCHfS/MfDfOL
+2+J34iuRyZMMOe29dmgJYln9lrjGCp3xyQ+N8+sLtptoJAD/UlIcIJfWDs4UTXO5
+RvVPmhfJBAhqk7O0G96LjXCHY6h8SiA3oNxKafYLT5TBvss1UEoIv01GDlJfV8V7
+WXYMXScciVbbhM5RzeDZ0Yqdcwf24QhQKDXO9lYEC41MaXjhE8AuDJg0sj0SeLMZ
+CGJtMs0wJYDlYv8JCNcYqWlPmKNhsr2OdoVHBLV61KmxfSVGoD8WAUwUDSbetFPT
+puFnazRzt0mhaxYwh5fU2yeaCKHkSD3Lvg2hKWQ7DNWejkDONIG1USrIWoV3VcFj
+bOPELLMnQfCqgqu6Hz+zVbc/fHhEu1O3FdZmxNShFUUovJ+3if8obAkVZIBSzHCi
+rxqhCxsH1FxzIbKa3B6vn+RNYcuEEZIBoUirr/tpYvYXnnZ64JRD3y/nreXBUXvS
+YPZpKYzECOWBvpXqzsolSHyPBAe3xhy9Mw7w4j8df4EcQXnyFG3j3PEv3ttTMB/A
+fZBQkvQW50DxllvrRiTV
+=6yli
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/mediastreamer-x264/mediastreamer-x264-1.1.7.ebuild b/media-plugins/mediastreamer-x264/mediastreamer-x264-1.1.7.ebuild
deleted file mode 100644
index 7ee06b1f4bc1..000000000000
--- a/media-plugins/mediastreamer-x264/mediastreamer-x264-1.1.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-x264/mediastreamer-x264-1.1.7.ebuild,v 1.7 2010/02/23 06:49:59 josejx Exp $
-
-EAPI="2"
-
-inherit multilib
-
-MY_P="msx264-${PV}"
-
-DESCRIPTION="mediastreamer plugin: add H264 support"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="http://download.savannah.nongnu.org/releases/linphone/plugins/sources/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND=">=media-libs/mediastreamer-2.1.0
-	>=media-libs/x264-0.0.20080819
-	media-video/ffmpeg"
-RDEPEND="${DEPEND}
-	media-libs/mediastreamer[video]"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	# strict: don't want -Werror
-	# hacked-x264: x264 is not patched with multislicing
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--disable-strict \
-		--disable-hacked-x264 \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/media-plugins/mediastreamer-x264/mediastreamer-x264-1.3.3.ebuild b/media-plugins/mediastreamer-x264/mediastreamer-x264-1.3.3.ebuild
deleted file mode 100644
index 6d0531ed0ede..000000000000
--- a/media-plugins/mediastreamer-x264/mediastreamer-x264-1.3.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-x264/mediastreamer-x264-1.3.3.ebuild,v 1.4 2012/04/24 10:13:08 mgorny Exp $
-
-EAPI="2"
-
-inherit multilib
-
-MY_P="msx264-${PV}"
-
-DESCRIPTION="mediastreamer plugin: add H264 support"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/plugins/sources/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND=">=media-libs/mediastreamer-2.1.0
-	>=media-libs/x264-0.0.20100118
-	media-video/ffmpeg"
-RDEPEND="${DEPEND}
-	media-libs/mediastreamer[video]"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	# strict: don't want -Werror
-	# hacked-x264: x264 is not patched with multislicing
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--disable-strict \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.1.ebuild b/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.1.ebuild
index 49fd0d842888..22fa965a1ff5 100644
--- a/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.1.ebuild
+++ b/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.1.ebuild,v 1.5 2012/04/24 10:13:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.1.ebuild,v 1.6 2012/05/16 12:18:30 scarabeus Exp $
 
 EAPI="4"
 
@@ -17,11 +17,12 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE=""
 
-DEPEND=">=media-libs/mediastreamer-2.7.0
+DEPEND=">=media-libs/mediastreamer-2.7.0[video]
 	>=media-libs/x264-0.0.20100118
 	virtual/ffmpeg"
-RDEPEND="${DEPEND}
-	media-libs/mediastreamer[video]"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS NEWS README"
 
 S=${WORKDIR}/${MY_P}
 
@@ -31,8 +32,3 @@ src_configure() {
 		--libdir=/usr/$(get_libdir) \
 		--disable-strict
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README
-}