use die to bail out instead of exit which produces confusing error messages (bug #273800)

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 12 insertions, 7 deletions

diff --git a/games-misc/fortune-mod-slackware/ChangeLog b/games-misc/fortune-mod-slackware/ChangeLog
index b1773c93cc6a..2960a6e02e55 100644
--- a/games-misc/fortune-mod-slackware/ChangeLog
+++ b/games-misc/fortune-mod-slackware/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-misc/fortune-mod-slackware
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-slackware/ChangeLog,v 1.11 2008/08/04 15:45:00 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-slackware/ChangeLog,v 1.12 2009/06/12 21:53:34 mr_bones_ Exp $
+
+  12 Jun 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  fortune-mod-slackware-1.15.ebuild:
+  use die to bail out instead of exit which produces confusing error messages
+  (bug #273800)
 
   04 Aug 2008; Jeroen Roovers <jer@gentoo.org>
   fortune-mod-slackware-1.15.ebuild:
diff --git a/games-misc/fortune-mod-slackware/Manifest b/games-misc/fortune-mod-slackware/Manifest
index 3ecac5b45493..d3301860c1d3 100644
--- a/games-misc/fortune-mod-slackware/Manifest
+++ b/games-misc/fortune-mod-slackware/Manifest
@@ -1,4 +1,4 @@
 DIST slack-fortunes-all-1.15.tgz 122880 RMD160 ea6c438375ff56ceb9000a70a2dd00d74379d3dd SHA1 4bc10275c9af3c7d6e38a74d006b0a93c92dfbcc SHA256 37dcfcf5c536b3aecc8f40363d36fec0fd188d31917980075b27d1790a6afff9
-EBUILD fortune-mod-slackware-1.15.ebuild 1179 RMD160 3604e10032a870706f77f5e8ea50d74daf492a11 SHA1 d383812b4b7c10cee58eaab4615c9c0a0030f445 SHA256 5e050d04bd0ea44213abd1b388408c0a9f33bfa0bba4373d2e26ab98cb41d368
-MISC ChangeLog 1759 RMD160 04f4a629d80d4e73ba33ec9c73de64dab12e2aa8 SHA1 5563f4425260e55c3b9548e2b489192eea7ee929 SHA256 2a862011b2f0b0dddff8c810c68f9acad2c2358fea5f0a6eabc178bf5efea6f1
+EBUILD fortune-mod-slackware-1.15.ebuild 1241 RMD160 ce364a8ace29cc1a64bee24c59ec8f47436b87c0 SHA1 a5a438c8df8bdd4dd83c9861e8b38d0252737e69 SHA256 4e923a67cf4d9d36030cad3bc0556a7bec70c2571c2df828b50d936de0109d9c
+MISC ChangeLog 1952 RMD160 b5924f384ef3f5766982a91028edf8059d8feaca SHA1 01ca8714de8d824500b5d71ee8d532fecbc966d9 SHA256 dc83d3ee7abc903a39d172ddb59c4c1c20212f4c57652968a11dc05e888d38e1
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild b/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild
index 533574ac4f18..d8a20a8cbe8b 100644
--- a/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild
+++ b/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild,v 1.7 2008/11/09 12:08:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild,v 1.8 2009/06/12 21:53:34 mr_bones_ Exp $
 
 # this ebuild now uses the offensive flag since AOLS
 # is not exactly 'G' rated :)
@@ -24,7 +24,7 @@ pkg_setup() {
 		elog "These fortunes have offensive content. Enable offensive USE Flag"
 		elog "ex: USE=\"offensive\" emerge ${PN}"
 		elog " or add to package.use file: games-misc/fortune-mod-slackware offensive"
-		exit 1
+		die "Setting the offensive use flag is required for this package"
 	fi
 }