Update LICENSE, bug 449170. Remove unused hunspell flag from metadata.

(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)

5 files changed, 15 insertions, 19 deletions

diff --git a/net-irc/rbot/ChangeLog b/net-irc/rbot/ChangeLog
index 2dc55bdc701b..e4f1cab5352f 100644
--- a/net-irc/rbot/ChangeLog
+++ b/net-irc/rbot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/rbot
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.52 2012/06/01 03:58:21 zmedico Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.53 2013/01/12 08:24:44 ulm Exp $
+
+  12 Jan 2013; Ulrich Müller <ulm@gentoo.org> rbot-0.9.10-r1.ebuild,
+  rbot-0.9.15.ebuild, rbot-9999-r10.ebuild, metadata.xml:
+  Update LICENSE, bug 449170. Remove unused hunspell flag from metadata.
 
   01 Jun 2012; Zac Medico <zmedico@gentoo.org> rbot-0.9.15.ebuild,
   rbot-9999-r10.ebuild:
diff --git a/net-irc/rbot/metadata.xml b/net-irc/rbot/metadata.xml
index 70239ddc887c..5ea626901d56 100644
--- a/net-irc/rbot/metadata.xml
+++ b/net-irc/rbot/metadata.xml
@@ -18,13 +18,6 @@
     vanilla plugin uses ispell, but enabling this flag makes it use
     the ispell interface from aspell instead.
   </flag>
-  <flag name="hunspell">
-    Use hunspell instead of ispell in the "spell" plugin for rbot. The
-    vanilla plugin uses ispell, but enabling this flag makes it use
-    the ispell interface from hunspell instead. It's overridden by the
-    aspell USE flag. For native hunspell support check the
-    rbot-hunspell plugin.
-  </flag>
   <flag name="translator">
     Add dependency over <pkg>dev-ruby/mechanize</pkg>, which is needed
     to enable the "translator" plugin for rbot. If the USE flag is
diff --git a/net-irc/rbot/rbot-0.9.10-r1.ebuild b/net-irc/rbot/rbot-0.9.10-r1.ebuild
index 9a4e5a13c36d..d418bb6a9cde 100644
--- a/net-irc/rbot/rbot-0.9.10-r1.ebuild
+++ b/net-irc/rbot/rbot-0.9.10-r1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.10-r1.ebuild,v 1.5 2012/04/18 19:05:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.10-r1.ebuild,v 1.6 2013/01/12 08:24:44 ulm Exp $
 
 inherit ruby gems
 
 DESCRIPTION="rbot is a ruby IRC bot"
 HOMEPAGE="http://www.linuxbrit.co.uk/rbot/"
-
 SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.gem"
 
-LICENSE="as-is"
+LICENSE="feh"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
 IUSE="spell"
diff --git a/net-irc/rbot/rbot-0.9.15.ebuild b/net-irc/rbot/rbot-0.9.15.ebuild
index d3a610e041c7..8e5131798998 100644
--- a/net-irc/rbot/rbot-0.9.15.ebuild
+++ b/net-irc/rbot/rbot-0.9.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.15.ebuild,v 1.7 2012/06/01 03:58:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.15.ebuild,v 1.8 2013/01/12 08:24:44 ulm Exp $
 
 EAPI="2"
 # ruby19 needs ruby-gettext on 19 first
@@ -12,7 +12,7 @@ DESCRIPTION="rbot is a ruby IRC bot"
 HOMEPAGE="http://ruby-rbot.org/"
 SRC_URI="http://ruby-rbot.org/download/${P}.tgz"
 
-LICENSE="GPL-2 as-is"
+LICENSE="|| ( feh GPL-2 )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
 IUSE="spell aspell timezone translator shorturl nls dict figlet
diff --git a/net-irc/rbot/rbot-9999-r10.ebuild b/net-irc/rbot/rbot-9999-r10.ebuild
index ca9d93ac714a..2859745891b3 100644
--- a/net-irc/rbot/rbot-9999-r10.ebuild
+++ b/net-irc/rbot/rbot-9999-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-9999-r10.ebuild,v 1.8 2012/06/01 03:58:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-9999-r10.ebuild,v 1.9 2013/01/12 08:24:44 ulm Exp $
 
 inherit ruby eutils user
 
@@ -9,7 +9,7 @@ inherit ruby eutils user
 DESCRIPTION="rbot is a ruby IRC bot"
 HOMEPAGE="http://ruby-rbot.org/"
 
-LICENSE="GPL-2 as-is"
+LICENSE="|| ( feh GPL-2 )"
 SLOT="0"
 KEYWORDS=""
 IUSE="spell aspell timezone translator shorturl nls dict figlet