media-video/aegisub: Moved media-video/ffmpeg > virtual/ffmpeg, Corrected toplevel domain

svn path=/sunrise/; revision=12004

4 files changed, 22 insertions, 23 deletions

diff --git a/media-video/aegisub/ChangeLog b/media-video/aegisub/ChangeLog
index f878b5e60..f50638c3a 100644
--- a/media-video/aegisub/ChangeLog
+++ b/media-video/aegisub/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for media-video/aegisub
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Apr 2011; Justin Lecher <jlec@gentoo.org> aegisub-2.1.8.ebuild,
+  aegisub-9999.ebuild:
+  Moved media-video/ffmpeg > virtual/ffmpeg, Corrected toplevel domain
+
   13 Jun 2010; Markus Ullmann <jokey@gentoo.org> aegisub-2.1.8.ebuild:
   Fix useflags and do proper EAPI2 handling
 
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 2801b2e3c..1035bf98d 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,7 +1,7 @@
 AUX aegisub-2.1.8-do-not-verify-audiolibs.patch 2673 RMD160 9fe0ffbe1484892d8c38ce3c4426fae8877b2773 SHA1 19fee8597a71b0cef5a03b64f936fc10bd0116c9 SHA256 3176be76afaa906ec847684a350f249c1a02a9eba17b6ed462ca9f3f50907920
 AUX aegisub.png 2442 RMD160 1a601ad300c6f13d1914d539759bb84a7b33f7cd SHA1 bcf048af36e66ef79d883cf3aa4e906724888d0e SHA256 9622ddc8e91149c1e4a23f5ce0081ff8ae18e0b42e6e292fa03b55d5542f76df
 DIST aegisub-2.1.8.tar.gz 2431099 RMD160 d2630f838a9e8720c65d9f18010e80e17fb8183b SHA1 70c51a21c86f73d744fcf1e080e89d98885e557c SHA256 a67356e5c4fa376738d363f1cf5e50aa74e6b69e76a089ed0442bf6d7390d769
-EBUILD aegisub-2.1.8.ebuild 1758 RMD160 81b153b469f89b1114314fa3431600fd8e305e40 SHA1 48c995c1bae3767d586375fe7998a18bdebe16e8 SHA256 dfbc33e4fd4670ee4295d43f2c56eedabf7d4418604450a357969a7a0fe0320b
-EBUILD aegisub-9999.ebuild 1518 RMD160 755f802717cda9ef16ff5aef79df3a7f68550798 SHA1 192a1a239b659bc655bd6b06185ae0197c36b25b SHA256 c2e1ae077404537b422663c5db6fda25634a3720776dbe92bd142c4792e87359
-MISC ChangeLog 1494 RMD160 d2cf6582ed89f67788b7ec62338444494bcebbba SHA1 c2bc3ecedc9ce841a388fa415e3cc8d956452304 SHA256 3de57415f11fb728be9b418c6a2d0d7a35857afec26aa3d05c33bd44bbdb507c
+EBUILD aegisub-2.1.8.ebuild 1656 RMD160 9174bdb31453a2ad92c7834217eb0f32ce83e55d SHA1 98cb5a4fd0580d8e1d30c8722f4203f93d1b1d43 SHA256 74be17c731d5ee3391dd5c05f3890eb68f4eaf74d969e2c65d3039c04c588fb8
+EBUILD aegisub-9999.ebuild 1514 RMD160 fd9da90080305f482f017fd3b3216262b6d18fbc SHA1 5e38d08363422e247a13f694a845ff02bee0aef9 SHA256 960f9e2de26d2bafdb98ef6dd77e424ae11e447da4ac45e248ed41f737f05289
+MISC ChangeLog 1658 RMD160 e6ef27d9e2fb50ef28da1b024586652117075918 SHA1 f1eae0179ec6368f422ee9bdf77bbcbc26d4ec33 SHA256 0dce167fe090c04f6ad17ad155325ecc9be22ee26e88a50c48452c44f23931ed
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/media-video/aegisub/aegisub-2.1.8.ebuild b/media-video/aegisub/aegisub-2.1.8.ebuild
index 7d8ca4002..97bd33841 100644
--- a/media-video/aegisub/aegisub-2.1.8.ebuild
+++ b/media-video/aegisub/aegisub-2.1.8.ebuild
@@ -1,44 +1,43 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=4
 
 WX_GTK_VER="2.8"
+
 inherit autotools eutils wxwidgets
 
 MY_PV="${PV/_pre/-dev-r}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Advanced SSA/ASS subtitle editor"
-HOMEPAGE="http://www.aegisub.net/"
-SRC_URI="http://ftp.aegisub.org/pub/archives/releases/source/${MY_P}.tar.gz
-		 http://ftp2.aegisub.org/pub/archives/releases/source/${MY_P}.tar.gz
-		 http://www.mahou.org/~verm/aegisub/${MY_P}.tar.gz
-		 http://www.mahou.org/~verm/aegisub/archives/${MY_P}.tar.gz"
+HOMEPAGE="http://www.aegisub.org/"
+SRC_URI="
+	http://ftp.aegisub.org/pub/archives/releases/source/${MY_P}.tar.gz
+	http://ftp2.aegisub.org/pub/archives/releases/source/${MY_P}.tar.gz
+	http://www.mahou.org/~verm/aegisub/${MY_P}.tar.gz
+	http://www.mahou.org/~verm/aegisub/archives/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug ffmpeg lua nls openal oss perl portaudio pulseaudio spell ruby"
 
-RDEPEND="=x11-libs/wxGTK-2.8*[X,opengl]
+RDEPEND="
+	x11-libs/wxGTK:2.8[X,opengl]
 	media-libs/libass
 	media-libs/fontconfig
 	media-libs/freetype
-
 	alsa? (	media-libs/alsa-lib )
 	portaudio? ( =media-libs/portaudio-19* )
 	pulseaudio? ( media-sound/pulseaudio )
 	openal? ( media-libs/openal )
-
 	perl? ( dev-lang/perl )
 	ruby? ( dev-lang/ruby )
 	lua? ( dev-lang/lua )
-
 	spell? ( app-text/hunspell )
-	ffmpeg? ( >=media-video/ffmpeg-0.5_p18642 )"
-
+	ffmpeg? ( virtual/ffmpeg )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	media-gfx/imagemagick
@@ -66,7 +65,3 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable nls)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install faild"
-}
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 7d26e80c1..1d1e207ef 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -31,7 +31,7 @@ RDEPEND="=x11-libs/wxGTK-2.8*[opengl]
 	lua? ( dev-lang/lua )
 
 	spell? ( app-text/hunspell )
-	ffmpeg? ( media-video/ffmpeg )"
+	ffmpeg? ( virtual/ffmpeg )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig