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

[Diego Petteno (flameeyes)]

flameeyes    07/12/27 13:46:05

  Modified:             ChangeLog metadata.xml
  Added:                rbot-9999-r7.ebuild
  Removed:              rbot-9999-r6.ebuild
  Log:
  Always depend on ruby-gettext when building the gem, so that the data is properly added to the gem. Add a dict USE flag for the dictclient plugin, depending on the new ruby-dict ebuild.
  (Portage version: 2.1.4_rc11)

Revision  Changes    Path
1.26                 net-irc/rbot/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	26 Dec 2007 20:25:18 -0000	1.25
+++ ChangeLog	27 Dec 2007 13:46:04 -0000	1.26
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/rbot
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.25 2007/12/26 20:25:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.26 2007/12/27 13:46:04 flameeyes Exp $
+
+*rbot-9999-r7 (27 Dec 2007)
+
+  27 Dec 2007; Diego Pettenò <flameeyes@g.o> metadata.xml,
+  -rbot-9999-r6.ebuild, +rbot-9999-r7.ebuild:
+  Always depend on ruby-gettext when building the gem, so that the data is
+  properly added to the gem. Add a dict USE flag for the dictclient plugin,
+  depending on the new ruby-dict ebuild.
 
 *rbot-9999-r6 (26 Dec 2007)
 



1.7                  net-irc/rbot/metadata.xml

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

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/rbot/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml	17 Dec 2007 22:13:09 -0000	1.6
+++ metadata.xml	27 Dec 2007 13:46:04 -0000	1.7
@@ -31,5 +31,14 @@
     to enable the "shortenurl" plugin for rbot. If the USE flag is
     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.
+  </flag>
+  <flag name="dict">
+    Add dependency over <pkg>dev-ruby/ruby-dict</pkg>, which is needed
+    to enable the "dict" plugin for rbot. If the USE flag is disabled
+    the plugin is also disabled by default.
+  </flag>
 </use>
 </pkgmetadata>



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

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

Index: rbot-9999-r7.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-9999-r7.ebuild,v 1.1 2007/12/27 13:46:04 flameeyes Exp $

inherit ruby gems eutils

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

DESCRIPTION="rbot is a ruby IRC bot"
HOMEPAGE="http://www.linuxbrit.co.uk/rbot/"

LICENSE="as-is"
SLOT="0"
KEYWORDS=""
IUSE="spell aspell timezone translator shorturl nls dict"
ILINGUAS="zh ru nl de fr it en 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 )"
DEPEND=""

if [[ ${PV} == "9999" ]]; then
	SRC_URI=""
	ESVN_REPO_URI="svn://linuxbrit.co.uk/giblet/rbot/trunk"

	DEPEND="${DEPEND}
		dev-ruby/rake
		app-arch/zip
		dev-ruby/ruby-gettext"

	IUSE="${IUSE} snapshot"
else
	SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.gem"
fi

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

svn_gem_version() {
	use snapshot && \
		echo 9998.${ESVN_WC_REVISION} || \
		echo 9999
}

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

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

src_compile() {
	[[ ${PV} == "9999" ]] || return 0
	rake makemo || die "locale generation failed"
	rake || die "Gem generation failed"
}

src_install() {
	if [[ ${PV} == "9999" ]]; then
		GEM_SRC="${S}/pkg/rbot-$(svn_gem_version).gem"
		MY_P="${PN}-$(svn_gem_version)"
	else
		MY_P="${P}"
	fi
	gems_src_install

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

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

	local rbot_datadir="${D}/${GEMSDIR}"/gems/${MY_P}/data/rbot

	disable_rbot_plugin() {
		mv "${rbot_datadir}"/plugins/$1.rb{,.disabled}
	}

	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:' \
			"${rbot_datadir}"/plugins/spell.rb \
			|| die "Unable to replace ispell with aspell."
	fi

	use translator || disable_rbot_plugin translator
	use shorturl || disable_rbot_plugin shortenurls
	use dict || disable_rbot_plugin dictclient

	# 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.
	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="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_en="english"
		local lang_rbot_ja="japanese"

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

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

			rm \
				${rbot_datadir}/languages/${lang_rbot}.lang \
				${rbot_datadir}/templates/lart/larts-${lang_rbot} \
				${rbot_datadir}/templates/lart/praises-${lang_rbot} \
				${rbot_datadir}/templates/salut/salut-${lang_rbot}
		done
	fi
}

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@g.o mailing list