net-p2p/mute: Fix broken wxwidgets handling, add die to configure call, cosmetics

svn path=/sunrise/; revision=2587

diff --git a/net-p2p/mute/ChangeLog b/net-p2p/mute/ChangeLog
index 3e96abe4614dc0774463232c06d05e8d1346f072..855951bf3444d6a7c124d05cd2f9dac7d39af7ff 100644 (file)
--- a/net-p2p/mute/ChangeLog
+++ b/net-p2p/mute/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for net-p2p/mute
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Jan 2007; Jakub Moc <jakub@gentoo.org> mute-0.5.ebuild:
+  Fix broken wxwidgets handling, add die to configure call, cosmetics
+
   06 Sep 2006; Cedric Krier <ced@ced.homedns.org> +mute-0.5.ebuild,
   +files/mute-0.5-configure.patch, +files/mute-0.5-makefile.patch,
   +files/MUTE, +metadata.xml:

diff --git a/net-p2p/mute/Manifest b/net-p2p/mute/Manifest
index a80946c38168c132095e1f7b2b604f8bad077601..5d7ed855712dcce43e6a7c380390c7e70835b814 100644 (file)
--- a/net-p2p/mute/Manifest
+++ b/net-p2p/mute/Manifest
@@ -11,14 +11,14 @@ MD5 f577757db882baaa18663a1723a35f58 files/mute-0.5-makefile.patch 1705
 RMD160 b8e175161cd4946b01d6c8350aa7af7a3cafc35b files/mute-0.5-makefile.patch 1705
 SHA256 1b9e8ef5336ddbae636175dd3fa75e77ad27c64b1b211b3d49ca1a7c59e15112 files/mute-0.5-makefile.patch 1705
 DIST MUTE_fileSharing-0.5_UnixSource.tar.gz 717833 RMD160 5c0f534d80c1c38551d715597a2b76602552563e SHA1 4c7b3c74622601a0f7e1955aff86ad4ecd83db27 SHA256 13091fb3899549f5f4fd7cc2382c53b6560762025b25df858aca37e96b2646b3
-EBUILD mute-0.5.ebuild 2083 RMD160 d7860e6c7b987a3a4a4a47b17ecfb174f1b5ccd2 SHA1 e76c3f200eb34eab342016bf287320b8c9e0fc52 SHA256 aa0b647a1d9e5f8e4954a6944bf55ab6e88a4fdbd3bc62b4e5cd2b45df202961
-MD5 320fdb0866dd59284628aeb48c42d77f mute-0.5.ebuild 2083
-RMD160 d7860e6c7b987a3a4a4a47b17ecfb174f1b5ccd2 mute-0.5.ebuild 2083
-SHA256 aa0b647a1d9e5f8e4954a6944bf55ab6e88a4fdbd3bc62b4e5cd2b45df202961 mute-0.5.ebuild 2083
-MISC ChangeLog 337 RMD160 fa3039486b4e88d08afd630fa267254931dcf780 SHA1 74ee70037a395939542d17588ff669c4f537b322 SHA256 758d54e888f23dcdba3aa22e33562c7f0346300dbb7cc79f067a8e1d066e4fc9
-MD5 841c8c2c49a54531594fd8907e57be9f ChangeLog 337
-RMD160 fa3039486b4e88d08afd630fa267254931dcf780 ChangeLog 337
-SHA256 758d54e888f23dcdba3aa22e33562c7f0346300dbb7cc79f067a8e1d066e4fc9 ChangeLog 337
+EBUILD mute-0.5.ebuild 2128 RMD160 24d1e7f1aed5d70629b29bef6a6c8151e9884a9b SHA1 0357f992205c4fc6460931d57c00b84201051d6a SHA256 6d54e25bfbdf926403dde20054dac91009bf0165ebc033d509a2b1e6086d7b35
+MD5 191315420dcc534c7002bf7fdbbb945d mute-0.5.ebuild 2128
+RMD160 24d1e7f1aed5d70629b29bef6a6c8151e9884a9b mute-0.5.ebuild 2128
+SHA256 6d54e25bfbdf926403dde20054dac91009bf0165ebc033d509a2b1e6086d7b35 mute-0.5.ebuild 2128
+MISC ChangeLog 469 RMD160 14b2a9610c3755afb443e08a3ec6a5d59782b510 SHA1 0fe043674fe1d6f9f266ea52d09f8f3875c500d2 SHA256 a2c80999eb8739dcf56a85219843e06b689555f9363c83420cd89d0ef7f01d05
+MD5 b1f337246494ee696f5e751b7989ee41 ChangeLog 469
+RMD160 14b2a9610c3755afb443e08a3ec6a5d59782b510 ChangeLog 469
+SHA256 a2c80999eb8739dcf56a85219843e06b689555f9363c83420cd89d0ef7f01d05 ChangeLog 469
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170

diff --git a/net-p2p/mute/mute-0.5.ebuild b/net-p2p/mute/mute-0.5.ebuild
index 5aea46712364cc15e5c22a879439d815f02a7301..880c42157a78e7cfbcd8b6c9e277dbf8179998ec 100644 (file)
--- a/net-p2p/mute/mute-0.5.ebuild
+++ b/net-p2p/mute/mute-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,35 +17,37 @@ KEYWORDS="~x86"
 IUSE="wxwindows"
 
 DEPEND="wxwindows? ( >=x11-libs/wxGTK-2.6 )"
-RDEPEND=$DEPEND
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+       if use wxwindows ; then
+               WX_GTK_VER=2.6
+               need-wxwidgets gtk2
+       fi
+
+       if [ $(gcc-major-version) -ge 4 ]; then
+               einfo "${P} doesn't compile with gcc version >= 4"
+               die "${P} needs gcc version < 4"
+       fi
+}
+
 src_unpack() {
-       unpack "${A}"
+       unpack ${A}
        cd "${S}"
        epatch "${FILESDIR}/${P}-configure.patch"
        epatch "${FILESDIR}/${P}-makefile.patch"
 
-       cd "${S}/MUTE/otherApps/fileSharing/userInterface/languages/"
+       cd "${S}"/MUTE/otherApps/fileSharing/userInterface/languages/
        mv Espa?ol.txt Espanol.txt
        rm TranslationHelper.txt
 }
 
-pkg_setup() {
-       if [ $(gcc-major-version) -ge 4 ]; then
-               einfo "${P} doesn't compile with gcc version >= 4"
-               die "${P} needs gcc version < 4"
-       fi
-}
-
 src_compile() {
-       export WX_GTK_VER=2.6
-       need-wxwidgets gtk2 || die
-
        # not an autotools configure
        cd "${S}/MUTE"
-       ./configure >/dev/null
+       ./configure >/dev/null || die "configure failed"
 
        # break the crypto at startup
        filter-flags -fomit-frame-pointer