move die to pkg_setup()

svn path=/sunrise/; revision=533

diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 63a9c187bf3a68f170d2befa96fd776ed5a715ad..f338b6da1e1d02957eafe0df8a297c902cb4ff2c 100644 (file)
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -3,10 +3,10 @@ MD5 bd8480cdb788ea972f95da7c42216a06 files/chuck-1.2.0.5-makefile.patch 5615
 RMD160 5e91631fe43eb48ec5f16dd96e79bff142652fc4 files/chuck-1.2.0.5-makefile.patch 5615
 SHA256 20ab571c47df99c2c0fd965e4183575a69b54844b90dbaaf72c196091c730801 files/chuck-1.2.0.5-makefile.patch 5615
 DIST chuck-1.2.0.5.tgz 1477758 RMD160 648c208ca5ecaf9ada390670fb45518489913aeb SHA1 12ddf3f6b2eda4b6d0732268637b15f8a07b5297 SHA256 0b3a845d887de309488414fbec24020930c495f2f02446dcc1bd6a6509c3a160
-EBUILD chuck-1.2.0.5.ebuild 1722 RMD160 1a86ae2cd4fac9137a0443a3d93e333c6ebbe06d SHA1 d0130d6e672efe7d4655eff089ac1bf9b887e94e SHA256 e9c9d6826b0a08075e14643fb9bd2ee9de2cd5c533eb4cc8b7535bd288c8219f
-MD5 d007e8cef20f7e82a6a9bde8de8859df chuck-1.2.0.5.ebuild 1722
-RMD160 1a86ae2cd4fac9137a0443a3d93e333c6ebbe06d chuck-1.2.0.5.ebuild 1722
-SHA256 e9c9d6826b0a08075e14643fb9bd2ee9de2cd5c533eb4cc8b7535bd288c8219f chuck-1.2.0.5.ebuild 1722
+EBUILD chuck-1.2.0.5.ebuild 1750 RMD160 320bb19d2c1c94c48d3c18f64f371a4920fcb271 SHA1 490a513e55eae57fea0e4387334979430f9e4635 SHA256 f974ec95bb36060b1ef347fe7ba38109abb99d7bf2dc4c559ddf743940b37ec2
+MD5 fa38ee5680f836174890c33cc6372d92 chuck-1.2.0.5.ebuild 1750
+RMD160 320bb19d2c1c94c48d3c18f64f371a4920fcb271 chuck-1.2.0.5.ebuild 1750
+SHA256 f974ec95bb36060b1ef347fe7ba38109abb99d7bf2dc4c559ddf743940b37ec2 chuck-1.2.0.5.ebuild 1750
 MISC ChangeLog 233 RMD160 10f735c420b85d0c20d829f0abe16c734e08318a SHA1 3ae788eb5c43f376105fce968bd3b7320c41c5be SHA256 86f379a203b033cb3531eac4149b69b7699740fd5c69821a445db8f2b91666dd
 MD5 72e19bbae69ec838926286515590dd84 ChangeLog 233
 RMD160 10f735c420b85d0c20d829f0abe16c734e08318a ChangeLog 233

diff --git a/media-sound/chuck/chuck-1.2.0.5.ebuild b/media-sound/chuck/chuck-1.2.0.5.ebuild
index 273374712ac68157e4365096cdb6ec836709b267..33307a5a16348c247f92feac4a10d2667a66ae8e 100644 (file)
--- a/media-sound/chuck/chuck-1.2.0.5.ebuild
+++ b/media-sound/chuck/chuck-1.2.0.5.ebuild
@@ -30,7 +30,11 @@ pkg_setup() {
        use jack && cnt="$((${cnt} + 1))"
        use alsa && cnt="$((${cnt} + 1))"
        use oss && cnt="$((${cnt} + 1))"
-       if [[ "${cnt}" -ne 1 ]] ; then
+       if [[ "${cnt}" -eq 0 ]] ; then
+               local msg="One of the following USE flags is needed: jack, alsa or oss"
+               eerror "${msg}"
+               die "${msg}"
+       elif [[ "${cnt}" -ne 1 ]] ; then
                eerror "You have set ${P} to use multiple audio engine."
                eerror "I don't know which to use!"
                eerror "You can use /etc/portage/package.use to set per-package USE flags"
@@ -49,10 +53,6 @@ src_compile() {
                backend="alsa"
        elif use oss ; then
                backend="oss"
-       else
-               local msg="One of the following USE flags is needed: jack, alsa or oss"
-               eerror "${msg}"
-               die "${msg}"
        fi
        einfo "Compiling against ${backend}"
        emake -j1 "linux-${backend}" || die "emake failed"