media-video/aegisub: Cosmetics and make stuff work as expected

svn path=/sunrise/; revision=5893

diff --git a/media-video/aegisub/ChangeLog b/media-video/aegisub/ChangeLog
index 09ff3b10ae58dbda666df5c4a61fd8420b42ca4d..8bbedf866f2eef7c543a579595b8c6846639f19c 100644 (file)
--- a/media-video/aegisub/ChangeLog
+++ b/media-video/aegisub/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Mar 2008; Markus Ullmann <jokey@gentoo.org> aegisub-2.1_pre1981,
+  aegisub-9999:
+  Cosmetics and make stuff work as expected
+
   17 Mar 2008; Jakub Moc <jakub@gentoo.org> aegisub-2.1_pre1981.ebuild,
   aegisub-9999.ebuild:
   Fix wxGTK handling

diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 8314d8d9af45b37b79cd6205d005544b969ea944..2c78fbf40ae883251400234af15b7db0ed5a9f7e 100644 (file)
--- 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 1546 RMD160 a091b8ea777085ff5a36206a1620b70d3826ba2f SHA1 bef5e078fac5beb35a2956386cf78c7712e3863c SHA256 2f434c2a7349e9ce5747ca6acc3a9a6318994dc020fa2b985bc780d9c6faf776
-EBUILD aegisub-9999.ebuild 1830 RMD160 55a5247ff54ca33891212e41bd63753603f17ce3 SHA1 ab5e1bbe9c1acefcb7c5aa140c2256feb7f3b5e9 SHA256 4f5168ddff6ebe83839d28a021cd638dfa687540050a5474c01105fae59e9d94
-MISC ChangeLog 421 RMD160 7134430882be24f5da3194c0d15f76120c125d0e SHA1 387f7b70914fb5776a4863be6ae7f81ff57fc088 SHA256 6cbcc731cd7acf6775193af75ee1c3ab18c2f753957bbe32e0c424d425c3c589
+EBUILD aegisub-2.1_pre1981.ebuild 1498 RMD160 134d38ec0823b659a54c920e8968f8376729aea1 SHA1 511032d6ee4280b0a873a7f20f5e1e7e06234c74 SHA256 b132f8394ea22dd9f978edf73c172033981d6e7c0f882556fab0cde7de3a83a6
+EBUILD aegisub-9999.ebuild 1703 RMD160 51aa6f11151e85c9bf9c40245055b581cfe4b560 SHA1 b0ace33b790b7ca6f0943a7ff23f83e4bf29a51e SHA256 864c780a7ca6c262be67a87fd6c10ad65d5a10c113d64f9012776615c7955d84
+MISC ChangeLog 552 RMD160 44eb600e118aed535803050d60d7ab1601f6f355 SHA1 eabac7fe20bfe53f807db20da1156b768558402c SHA256 584cd815b4970fedcf8c2bf16cab6b0499cabb7514c226ebcd3f4f54466a0a5b
 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 86a1f0066665460c72b258e35854c6e280454023..1823a689bab7ddd97fdb0aa013b727db82f6b6d2 100644 (file)
--- a/media-video/aegisub/aegisub-2.1_pre1981.ebuild
+++ b/media-video/aegisub/aegisub-2.1_pre1981.ebuild
@@ -7,7 +7,6 @@ inherit eutils wxwidgets
 
 MY_PV="${PV/_pre/-dev-r}"
 MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Advanced SSA/ASS subtitle editor"
 HOMEPAGE="http://malakith.net/aegiwiki/Main_Page"
@@ -35,28 +34,26 @@ RDEPEND="=x11-libs/wxGTK-2.8*
        spell? ( app-text/hunspell )
        ffmpeg? ( media-video/ffmpeg )"
 
-
 DEPEND="${RDEPEND}
        dev-util/pkgconfig
        media-gfx/imagemagick
        dev-libs/glib"
 
+S="${WORKDIR}/${MY_P}"
+
 pkg_setup() {
        check_wxuse opengl
 }
 
 src_compile() {
        econf "--with-libass --prefix=/usr" \
-       # Audio drivers 
        $(use_with alsa) \
        $(use_with portaudio) \
        $(use_with pulseaudio) \
        $(use_with openal) \
-       # Automation
        $(use_with lua) \
        $(use_with ruby) \
        $(use_with perl) \
-       # Other stuff
        $(use_with ffmpeg) \
        $(use_with spell hunspell) \
        $(use_enable debug)
@@ -68,4 +65,3 @@ src_install() {
        doicon "${FILESDIR}"/${PN}.png
        make_desktop_entry "${PN}" "Aegisub" "${PN}" "AudioVideo;Video;"
 }
-

diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index cf130ec9ef040eff9d06b542d80d211c765fcfdc..d56afa56b26e9b1006b6e7c8c5b8741c7831186e 100644 (file)
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -34,7 +34,6 @@ RDEPEND="=x11-libs/wxGTK-2.8*
        spell? ( app-text/hunspell )
        ffmpeg? ( media-video/ffmpeg )"
 
-
 DEPEND="${RDEPEND}
        dev-util/pkgconfig
        media-gfx/imagemagick
@@ -45,28 +44,20 @@ pkg_setup() {
 }
 
 src_compile() {
-       local myconf
-       myconf="--with-libass --prefix=/usr"
-       # Audio drivers 
-       myconf="${myconf}
-       $(use_with alsa) \
-       $(use_with portaudio) \
-       $(use_with pulseaudio) \
-       $(use_with openal)"
-       # Automation
-       myconf="${myconf}
-       $(use_with lua) \
-       $(use_with ruby) \
-       $(use_with perl)"
-       # Other stuff
-       myconf="${myconf}
-       $(use_with ffmpeg) \
-       $(use_with spell hunspell)
-       $(use_enable debug)"
        # 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 ${myconf} || die "configure failed"
+       ./autogen.sh --with-libass --prefix=/usr
+               $(use_with alsa) \
+               $(use_with portaudio) \
+               $(use_with pulseaudio) \
+               $(use_with openal) \
+               $(use_with lua) \
+               $(use_with ruby) \
+               $(use_with perl) \
+               $(use_with ffmpeg) \
+               $(use_with spell hunspell) \
+               $(use_enable debug) || die "configure failed"
        emake || die "emake failed"
 }
 
@@ -75,4 +66,3 @@ src_install() {
        doicon "${FILESDIR}"/${PN}.png
        make_desktop_entry "${PN}" "Aegisub" "${PN}" "AudioVideo;Video;"
 }
-