From 809ce572a107af153637a6c46e7c649cd782aadc Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Mon, 30 Jun 2008 16:53:24 +0000 Subject: 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) --- net-irc/rbot/ChangeLog | 12 ++- net-irc/rbot/metadata.xml | 37 +++++--- net-irc/rbot/rbot-9999-r10.ebuild | 178 ++++++++++++++++++++++++++++++++++++++ net-irc/rbot/rbot-9999-r9.ebuild | 152 -------------------------------- 4 files changed, 212 insertions(+), 167 deletions(-) create mode 100644 net-irc/rbot/rbot-9999-r10.ebuild delete mode 100644 net-irc/rbot/rbot-9999-r9.ebuild (limited to 'net-irc/rbot') diff --git a/net-irc/rbot/ChangeLog b/net-irc/rbot/ChangeLog index b2b3a52fec84..f08c80d91af2 100644 --- a/net-irc/rbot/ChangeLog +++ b/net-irc/rbot/ChangeLog @@ -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ò 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) diff --git a/net-irc/rbot/metadata.xml b/net-irc/rbot/metadata.xml index 29eab6ab0522..bd801cd84a2f 100644 --- a/net-irc/rbot/metadata.xml +++ b/net-irc/rbot/metadata.xml @@ -6,11 +6,6 @@ flameeyes@gentoo.org - - 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. - Add dependency over dev-ruby/tzinfo to enable the "time" plugin for rbot. If the USE flag is disabled the plugin is also @@ -19,7 +14,14 @@ 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. + + + 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. Add dependency over dev-ruby/mechanize, which is needed @@ -32,8 +34,8 @@ disabled the plugin is also disabled by default. - Add dependency over dev-ruby/ruby-gettext, 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 dev-ruby/ruby-gettext). Add dependency over dev-ruby/ruby-dict, which is needed @@ -41,24 +43,31 @@ the plugin is also disabled by default. - Add dependency over app-misc/figlet, 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 app-misc/figlet, 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. + + + Add dependency over app-misc/toilet, 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. Add dependency over games-misc/fortune-mod, 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. 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. Add dependency over net-dns/bind-tools (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. diff --git a/net-irc/rbot/rbot-9999-r10.ebuild b/net-irc/rbot/rbot-9999-r10.ebuild new file mode 100644 index 000000000000..ac423ca34837 --- /dev/null +++ b/net-irc/rbot/rbot-9999-r10.ebuild @@ -0,0 +1,178 @@ +# 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 +} diff --git a/net-irc/rbot/rbot-9999-r9.ebuild b/net-irc/rbot/rbot-9999-r9.ebuild deleted file mode 100644 index aca7a4e6f24c..000000000000 --- a/net-irc/rbot/rbot-9999-r9.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# 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-r9.ebuild,v 1.1 2008/06/23 15:46:00 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" -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? ( 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 ) - 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 "/s.version =/s:'.\+':'9999':" Rakefile \ - || die "Unable to fix Rakefile version." - 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" - } - - if ! use spell; then - disable_rbot_plugin spell || die "Unable to disable spell plugin" - elif use aspell; then - # This is not officially supported, but as ispell is quite a - # bad piece of code, at least give an opportunity to use - # something that works a bit better. - sed -i -e 's:ispell:ispell-aspell:' \ - "${S}"/data/rbot/plugins/spell.rb \ - || die "Unable to replace ispell with aspell." - fi - - use_rbot_plugin timezone time - use_rbot_plugin translator translator - use_rbot_plugin shorturl shortenurls - use_rbot_plugin dict dictclient - use_rbot_plugin figlet figlet - use_rbot_plugin fortune fortune - use_rbot_plugin cal cal - use_rbot_plugin host 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 - - 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 -} -- cgit v1.2.3-65-gdbad