[gentoo-commits] gentoo-x86 commit in net-irc/rbot: ChangeLog metadata.xml rbot-9999-r10.ebuild rbot-9999-r9.ebuild

[Diego Petteno (flameeyes)]

flameeyes    08/06/30 16:53:24

  Modified:             ChangeLog metadata.xml
  Added:                rbot-9999-r10.ebuild
  Removed:              rbot-9999-r9.ebuild
  Log:
  Updated live ebuild. Adds USE flags for toilet (figlet replacement) and hunspell (through ispell-compatibility interface -- use rbot-hunspell if you want full hunspell support). Configure the path to tools in the global configuration file rather than editing the plugins themselves. Set to run /bin/false when the tools are disabled.
  (Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 x86_64)

Revision  Changes    Path
1.32                 net-irc/rbot/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/rbot/ChangeLog?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/rbot/ChangeLog?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/rbot/ChangeLog?r1=1.31&r2=1.32

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChangeLog	23 Jun 2008 15:46:00 -0000	1.31
+++ ChangeLog	30 Jun 2008 16:53:24 -0000	1.32
@@ -1,6 +1,16 @@
 # ChangeLog for net-irc/rbot
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.31 2008/06/23 15:46:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.32 2008/06/30 16:53:24 flameeyes Exp $
+
+*rbot-9999-r10 (30 Jun 2008)
+
+  30 Jun 2008; Diego Pettenò <flameeyes@g.o> metadata.xml,
+  -rbot-9999-r9.ebuild, +rbot-9999-r10.ebuild:
+  Updated live ebuild. Adds USE flags for toilet (figlet replacement) and
+  hunspell (through ispell-compatibility interface -- use rbot-hunspell if
+  you want full hunspell support). Configure the path to tools in the global
+  configuration file rather than editing the plugins themselves. Set to run
+  /bin/false when the tools are disabled.
 
 *rbot-9999-r9 (23 Jun 2008)
 



1.9                  net-irc/rbot/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/rbot/metadata.xml?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/rbot/metadata.xml?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/rbot/metadata.xml?r1=1.8&r2=1.9

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/rbot/metadata.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- metadata.xml	23 Jun 2008 14:51:12 -0000	1.8
+++ metadata.xml	30 Jun 2008 16:53:24 -0000	1.9
@@ -6,11 +6,6 @@
   <email>flameeyes@g.o</email>
 </maintainer>
 <use>
-  <flag name="snapshot" restrict="=net-irc/rbot-9999">
-    Name the generated Ruby Gem in a proper manner to be used for a
-    snapshot ebuild. The format used is 9998_pre followed by the SVN
-    checked out revision number.
-  </flag>
   <flag name="timezone">
     Add dependency over <pkg>dev-ruby/tzinfo</pkg> to enable the "time"
     plugin for rbot. If the USE flag is disabled the plugin is also
@@ -19,7 +14,14 @@
   <flag name="aspell">
     Use aspell instead of ispell in the "spell" plugin for rbot. The
     vanilla plugin uses ispell, but enabling this flag makes it use
-    the ispell interface for aspell instead.
+    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
@@ -32,8 +34,8 @@
     disabled the plugin is also disabled by default.
   </flag>
   <flag name="nls">
-    Add dependency over <pkg>dev-ruby/ruby-gettext</pkg>, which is
-    needed for the translation of the bot's messages to work.
+    Build and install translation for the messages coming from the bot
+    and its plugins (through <pkg>dev-ruby/ruby-gettext</pkg>).
   </flag>
   <flag name="dict">
     Add dependency over <pkg>dev-ruby/ruby-dict</pkg>, which is needed
@@ -41,24 +43,31 @@
     the plugin is also disabled by default.
   </flag>
   <flag name="figlet">
-    Add dependency over <pkg>app-misc/figlet</pkg>, which is needed to
-    enable the "figlet" plugin for rbot. If the USE flag is disable
-    dthe plugin is also disabled by default.
+    Add dependency over <pkg>app-misc/figlet</pkg>, which is used by
+    the "figlet" plugin for rbot. If the USE flag is disabled the
+    plugin will be unable to use figlet; if toilet is also disabled,
+    the plugin will be disabled.
+  </flag>
+  <flag name="toilet">
+    Add dependency over <pkg>app-misc/toilet</pkg>, which is used by
+    the "figlet" plugin for rbot. If the USE flag is disabled the
+    plugin will be unable to use toilet; if figlet is also disabled,
+    the plugin will be disabled.
   </flag>
   <flag name="fortune">
     Add dependency over <pkg>games-misc/fortune-mod</pkg>, which is
     needed to enable the "fortune" plugin for rbot. If the USE flag is
-    disable dthe plugin is also disabled by default.
+    disabled the plugin is also disabled by default.
   </flag>
   <flag name="cal">
     Add dependency over a package providing the /usr/bin/cal command,
     which is needed to enable the "cal" plugin for rbot. If the USE
-    flag is disable dthe plugin is also disabled by default.
+    flag is disabled the plugin is also disabled by default.
   </flag>
   <flag name="host">
     Add dependency over <pkg>net-dns/bind-tools</pkg> (providing
     /usr/bin/host), which is needed to enable the "host" plugin for
-    rbot. If the USE flag is disable dthe plugin is also disabled by
+    rbot. If the USE flag is disabled the plugin is also disabled by
     default.
   </flag>
 </use>



1.1                  net-irc/rbot/rbot-9999-r10.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/rbot/rbot-9999-r10.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/rbot/rbot-9999-r10.ebuild?rev=1.1&content-type=text/plain

Index: rbot-9999-r10.ebuild
===================================================================
# Copyright 1999-2008 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.1 2008/06/30 16:53:24 flameeyes Exp $

inherit ruby eutils

[[ ${PV} == "9999" ]] && inherit git

DESCRIPTION="rbot is a ruby IRC bot"
HOMEPAGE="http://ruby-rbot.org/"

LICENSE="as-is"
SLOT="0"
KEYWORDS=""
IUSE="spell aspell timezone translator shorturl nls dict figlet
	fortune cal host nls toilet hunspell"
ILINGUAS="zh_CN zh_TW ru nl de fr it ja"

for lang in $ILINGUAS; do
	IUSE="${IUSE} linguas_${lang}"
done

RDEPEND=">=virtual/ruby-1.8
	dev-ruby/ruby-bdb
	timezone? ( dev-ruby/tzinfo )
	spell? (
		aspell? ( app-text/aspell )
		!aspell? (
			hunspell? ( app-text/hunspell )
			!hunspell? ( app-text/ispell )
		)
	)
	translator? ( dev-ruby/mechanize )
	shorturl? ( dev-ruby/shorturl )
	nls? ( dev-ruby/ruby-gettext )
	dict? ( dev-ruby/ruby-dict )
	figlet? ( app-misc/figlet )
	toilet? ( app-misc/toilet )
	fortune? ( games-misc/fortune-mod )
	cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) )
	host? ( net-dns/bind-tools )
	nls? ( dev-ruby/ruby-gettext )"
DEPEND="nls? ( dev-ruby/ruby-gettext )"

if [[ ${PV} == "9999" ]]; then
	SRC_URI=""
	EGIT_REPO_URI="git://ruby-rbot.org/rbot.git"
else
	# wait for the new releases...
	SRC_URI=""
fi

pkg_setup() {
	enewuser rbot -1 -1 /var/lib/rbot nobody
}

src_unpack() {
	[[ ${PV} == "9999" ]] || return 0
	git_src_unpack

	cd "${S}"
	sed -i -e '/\$version=/s:".\+":"'9999'":' bin/rbot \
		|| die "Unable to fix rbot script version."
}

src_compile() {
	disable_rbot_plugin() {
		mv "${S}"/data/rbot/plugins/$1.rb{,.disabled}
	}
	use_rbot_plugin() {
		use $1 && return
		disable_rbot_plugin "$2"
	}
	rbot_conf() {
		echo "$1: $2" >> "${T}"/rbot.conf
	}
	use_rbot_conf_path() {
		use "$1" \
			&& rbot_conf "$2" "$3" \
			|| rbot_conf "$2" /bin/false
	}

	local spell_program="/usr/bin/ispell"
	if use !spell; then
		disable_rbot_plugin spell
		spell_program="/bin/false"
	elif use aspell; then
		spell_program="/usr/bin/ispell-aspell"
	elif use hunspell; then
		spell_program="/usr/bin/hunspell -i"
	fi

	rbot_conf spell.program "${spell_program}"

	if use !figlet && use !toilet; then
		disable_rbot_plugin figlet
	fi

	use_rbot_conf_path figlet figlet.path /usr/bin/figlet
	use_rbot_conf_path toilet toilet.path /usr/bin/toilet

	use_rbot_plugin timezone time
	use_rbot_plugin translator translator
	use_rbot_plugin shorturl shortenurls
	use_rbot_plugin dict dictclient

	use_rbot_plugin fortune fortune
	use_rbot_conf_path fortune fortune.path /usr/bin/fortune

	use_rbot_plugin cal cal
	use_rbot_conf_path cal cal.path /usr/bin/cal

	use_rbot_plugin host host
	use_rbot_conf_path host host.path /usr/bin/host

	local rbot_datadir="${D}"/usr/share/rbot

	# This is unfortunately pretty manual at the moment, but it's just
	# to avoid having to run special scripts to package new versions
	# of rbot. The default if new languages are added that are not
	# considered for an opt-out here is to install them, so you just
	# need to add them later.
	if use nls; then
		strip-linguas ${ILINGUAS}
		if [[ -n ${LINGUAS} ]]; then
			# As the the language name used by the rbot data files does
			# not correspond to the ISO codes we usually use for LINGUAS,
			# the following list of local varables will work as a
			# dictionary to get the name used by rbot from the ISO code.
			local lang_rbot_zh_CN="traditional_chinese"
			local lang_rbot_ru="russian"
			local lang_rbot_nl="dutch"
			local lang_rbot_de="german"
			local lang_rbot_fr="french"
			local lang_rbot_it="italian"
			local lang_rbot_ja="japanese"

			for lang in ${ILINGUAS}; do
				use linguas_${lang} && continue

				lang_varname="lang_rbot_${lang}"
				lang_rbot=${!lang_varname}

				rm -r \
					"${S}"/data/rbot/languages/${lang_rbot}.lang \
					"${S}"/data/rbot/templates/lart/larts-${lang_rbot} \
					"${S}"/data/rbot/templates/lart/praises-${lang_rbot} \
					"${S}"/data/rbot/templates/salut/salut-${lang_rbot} \
					"${S}"/po/${lang}
			done
		fi

		rake makemo || die "locale generation failed"
	fi

	ruby_econf || die "ruby_econf failed"
}

src_install() {
	${RUBY} setup.rb install --prefix="${D}" \
		|| die "setup.rb install failed"

	diropts -o rbot -g nobody -m 0700
	keepdir /var/lib/rbot

	insinto /etc
	doins "${T}"/rbot.conf

	newinitd "${FILESDIR}/rbot.init" rbot
	newconfd "${FILESDIR}/rbot.conf" rbot
}

pkg_postinst() {
	einfo
	elog "rbot now can be started as a normal service."
	elog "Check /etc/conf.d/rbot file for more information about this feature."
	einfo
}



-- 
gentoo-commits@l.g.o mailing list