media-video/aegisub: Fix deps and some other things, still needs some amount of work

svn path=/sunrise/; revision=7609

4 files changed, 25 insertions, 32 deletions

diff --git a/media-video/aegisub/ChangeLog b/media-video/aegisub/ChangeLog
index eb2c30b03..4c151423c 100644
--- a/media-video/aegisub/ChangeLog
+++ b/media-video/aegisub/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for media-video/aegisub
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Jan 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  aegisub-2.1_pre1981.ebuild, aegisub-9999.ebuild:
+  Fix deps and some other things, still needs some amount of work
+
   10 Jul 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   aegisub-9999.ebuild:
   Remove unused autotools.eclass
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index c6919bb4f..1ba3d5d6c 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,6 +1,6 @@
 AUX aegisub.png 2442 RMD160 1a601ad300c6f13d1914d539759bb84a7b33f7cd SHA1 bcf048af36e66ef79d883cf3aa4e906724888d0e SHA256 9622ddc8e91149c1e4a23f5ce0081ff8ae18e0b42e6e292fa03b55d5542f76df
 DIST aegisub-2.1-dev-r1981.tar.gz 1659139 RMD160 c5b028cd73f9b51092ee056eea83a84702bfeba2 SHA1 b1679617760895cc266ba72f167a27ca7f696523 SHA256 e7b7d225c145d4e5e4e5f36243eef496c7c19a52a06f04f778aac58f37de94e9
-EBUILD aegisub-2.1_pre1981.ebuild 1498 RMD160 134d38ec0823b659a54c920e8968f8376729aea1 SHA1 511032d6ee4280b0a873a7f20f5e1e7e06234c74 SHA256 b132f8394ea22dd9f978edf73c172033981d6e7c0f882556fab0cde7de3a83a6
-EBUILD aegisub-9999.ebuild 1693 RMD160 e9595af1587b6f79af8a67df1abb4ba958d1b311 SHA1 2b75379fc4579f8aa0f6df8b6127cbd9628d4995 SHA256 4ab729db035af6c04989643b213f440a6fea0fbb4bd984d71fcd9b74a06b5861
-MISC ChangeLog 668 RMD160 ca1d6ddc76d12228f1da04690172387a18de52aa SHA1 314cc5d3affe680103861c63c4bb2edca3e1647b SHA256 05b447e8b9f4c1af363015145de0fe8a65a8e26f498b1b1aabeafdca90c9e810
+EBUILD aegisub-2.1_pre1981.ebuild 1391 RMD160 c89f42ca935cbd41e6dcca8f34c3574fce0b9c0d SHA1 de7910fe9aad8316fdb2a6396e21c8c36b18db19 SHA256 e0aafedfde3917de84aa988a3dc52487d6c92934cba2a0988788b1662e8e7ff8
+EBUILD aegisub-9999.ebuild 1529 RMD160 e39c08d0ba76cbfdfe30ca6cb2195626fa1d60c7 SHA1 fe22ef9be6070673b04a36a4340d3ea8a9f29e9e SHA256 04120a977fdb299151c48286ae6e8c6066e765fcad20320b84d8895fb1cad03c
+MISC ChangeLog 845 RMD160 e1bcd65e417bb046de2c70da7b62dd688b6b6a2b SHA1 f98c32159e263248ad7a629a7bd338624356b10f SHA256 0d5d384e3804de94cf8ffeb4a6cbff9c17dc4797b08697cb5f0ad9403e0dd3a7
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/media-video/aegisub/aegisub-2.1_pre1981.ebuild b/media-video/aegisub/aegisub-2.1_pre1981.ebuild
index 1823a689b..d341796c8 100644
--- a/media-video/aegisub/aegisub-2.1_pre1981.ebuild
+++ b/media-video/aegisub/aegisub-2.1_pre1981.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
 WX_GTK_VER="2.8"
 inherit eutils wxwidgets
 
@@ -10,20 +11,19 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Advanced SSA/ASS subtitle editor"
 HOMEPAGE="http://malakith.net/aegiwiki/Main_Page"
-SRC_URI="http://www.mahou.org/~verm/aegisub/${MY_P}.tar.gz"
+SRC_URI="http://www.mahou.org/~verm/aegisub/archives/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug ffmpeg lua openal perl portaudio pulseaudio spell ruby"
+IUSE="alsa debug +ffmpeg lua openal perl pulseaudio spell ruby"
 
-RDEPEND="=x11-libs/wxGTK-2.8*
+RDEPEND="=x11-libs/wxGTK-2.8*[opengl]
 	media-libs/libass
 	media-libs/fontconfig
 	media-libs/freetype
 
 	alsa? (	media-libs/alsa-lib )
-	portaudio? ( =media-libs/portaudio-18* )
 	pulseaudio? ( media-sound/pulseaudio )
 	openal? ( media-libs/openal )
 
@@ -41,14 +41,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	check_wxuse opengl
-}
-
-src_compile() {
-	econf "--with-libass --prefix=/usr" \
+src_configure() {
+	econf --with-libass \
 	$(use_with alsa) \
-	$(use_with portaudio) \
+	--without-portaudio \
 	$(use_with pulseaudio) \
 	$(use_with openal) \
 	$(use_with lua) \
@@ -57,7 +53,6 @@ src_compile() {
 	$(use_with ffmpeg) \
 	$(use_with spell hunspell) \
 	$(use_enable debug)
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 607fdea1c..ec76e0211 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
 WX_GTK_VER="2.8"
 inherit eutils subversion wxwidgets
 
@@ -9,21 +10,19 @@ DESCRIPTION="Advanced SSA/ASS subtitle editor"
 HOMEPAGE="http://malakith.net/aegiwiki/Main_Page"
 SRC_URI=""
 
-ESVN_REPO_URI="https://spaceboyz.net/svn/aegisub/trunk"
-ESVN_PROJECT="https://spaceboyz.net/svn/aegisub"
+ESVN_REPO_URI="https://spaceboyz.net/svn/${PN}/trunk/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug ffmpeg lua openal perl portaudio pulseaudio spell ruby"
+IUSE="alsa debug +ffmpeg lua openal perl pulseaudio spell ruby"
 
-RDEPEND="=x11-libs/wxGTK-2.8*
+RDEPEND="=x11-libs/wxGTK-2.8*[opengl]
 	media-libs/libass
 	media-libs/fontconfig
 	media-libs/freetype
 
 	alsa? (	media-libs/alsa-lib )
-	portaudio? ( =media-libs/portaudio-18* )
 	pulseaudio? ( media-sound/pulseaudio )
 	openal? ( media-libs/openal )
 
@@ -39,17 +38,13 @@ DEPEND="${RDEPEND}
 	media-gfx/imagemagick
 	dev-libs/glib"
 
-pkg_setup() {
-	check_wxuse opengl
-}
-
-src_compile() {
+src_configure() {
 	# The provided autogen script executes configure too
 	# I'm using it instead of autotools because it also converts
 	# some image files and do some other stuff.
-	./autogen.sh --with-libass --prefix=/usr
+	./autogen.sh --with-libass \
 		$(use_with alsa) \
-		$(use_with portaudio) \
+		--without-portaudio \
 		$(use_with pulseaudio) \
 		$(use_with openal) \
 		$(use_with lua) \
@@ -57,8 +52,7 @@ src_compile() {
 		$(use_with perl) \
 		$(use_with ffmpeg) \
 		$(use_with spell hunspell) \
-		$(use_enable debug) || die "configure failed"
-	emake || die "emake failed"
+		$(use_enable debug) || die "autogen failed"
 }
 
 src_install() {