Version bump to rc2, this re-integrates the nls support.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64

4 files changed, 204 insertions, 5 deletions

diff --git a/net-irc/rbot/ChangeLog b/net-irc/rbot/ChangeLog
index fc015e5499a6..55025bd8c1c8 100644
--- a/net-irc/rbot/ChangeLog
+++ b/net-irc/rbot/ChangeLog
@@ -1,6 +1,12 @@
 # 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.36 2008/07/08 02:02:36 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.37 2008/07/14 10:29:00 flameeyes Exp $
+
+*rbot-0.9.11_rc2 (14 Jul 2008)
+
+  14 Jul 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +rbot-0.9.11_rc2.ebuild, rbot-9999-r10.ebuild:
+  Version bump to rc2, this re-integrates the nls support.
 
   08 Jul 2008; Javier Villavicencio <the_paya@gentoo.org>
   rbot-0.9.11_rc1.ebuild:
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index 2d61471df4ed..d0d131b662ce 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rbot.conf 944 RMD160 1926da2ac328f7a76dacc0ee3690f664a6419cfc SHA1 79c59f667599a92a88363338e12e42b22b574d32 SHA256 89ccc3e036414c2a4b1ba8338408cc9a5b89c3bfae4268a27fb9c6094bcc95f6
 AUX rbot.init 1564 RMD160 75a73a12ee0b40fbdaaaf084504a5fe67bbb8770 SHA1 3ed3ba18f82d87d6dbc57c3d7b5f3525b74f9f33 SHA256 6755c99f34b679decace984c63d1c93f1f2d44cd73eab92ad0a225c5add5af57
 DIST rbot-0.9.10.gem 387584 RMD160 a29dd55aa894fac89b2cc0a05f694df8c7e1489c SHA1 53c85bf45239fc572fcc6e4d68bb9601a0d5df6e SHA256 3433783e2be481d63072c5ef03dd4f61b09bee0520c306607ad1e0fa46b8a4b5
 DIST rbot-0.9.11-rc1-no-mo.tgz 463357 RMD160 99cf4eb5d7e9f0bc54ea722e8de49d9284f25183 SHA1 513cdb7a2130aa6c972c783a8dd7b08f87dad59c SHA256 f4e76b03323308af721297fa1ac2db590355ad7741c6f8bc3243340bfab013bb
+DIST rbot-0.9.11-rc2.tgz 623806 RMD160 8ff0521699a8170e2bfdcd4afdf2aaa751830e7f SHA1 8ad7e794916988ad30e56f72c96c6778df4e3ddb SHA256 0c26b97df9f79ea57478811fb360d9631b1cfbd22bb75337f1152296c528d1af
 EBUILD rbot-0.9.10-r1.ebuild 641 RMD160 d27bacc724b57e685cc112efd8f5dfdf84431c04 SHA1 21cd8238ec956f1d1677db004ba7e85fcdbb8668 SHA256 7495b3782e13fe7ff39b4fd0fa52a6568c88cc3198ff995075251b82afa13597
 EBUILD rbot-0.9.11_rc1.ebuild 3284 RMD160 344ba828fe4dbb967080011ff72a4974d852f1ba SHA1 212b123e04497b3bd1429e0adc36e511e6502588 SHA256 8136da9357c14e825a2b515c29a0c9569ef440a0150910e93ccafe67dcb6b2c8
-EBUILD rbot-9999-r10.ebuild 4653 RMD160 b7aacd7e1ab045c725171b0c495244e7d9aa7156 SHA1 2aa2ec78499f00b8797bd85015edfeea70c65829 SHA256 7b47503302ae26091d161da39f314e79b3e903d85d38583aea85efa537350889
-MISC ChangeLog 6665 RMD160 3cc092f1c56d724821cff5babf07e1e4b8fb9325 SHA1 4134c5c63cbcf061a4679a8c9f8c0e3f7688cb90 SHA256 9ee36bfaf65b4c280a09921ea0ef23aca9dea3119735edd1a4906c1daea0bcf3
+EBUILD rbot-0.9.11_rc2.ebuild 4677 RMD160 6de61e6eec8aeb004c127229915bea9f4a0f1fb2 SHA1 2009707081abf6f1c0438e8ce9bc3d11eb9e0f05 SHA256 2a0fde809ef50914188d06b7e65f76cc211ec2394bd986b304488144d2cd5c06
+EBUILD rbot-9999-r10.ebuild 4647 RMD160 458af5738d74d8cb38439c7ce9fdb5e437b143ab SHA1 13f9c61bdeedebdc363f97888450ed99a773d3f9 SHA256 d5749ea00bdf525d8d843f18a442c6ee9e16b748f6c02ee5e326fee92834c746
+MISC ChangeLog 6860 RMD160 ef8b635cf897879f5df23ad8bcfe225444aef631 SHA1 ebb35782892dee5f60e9d1e5d75d99788f9e8d6a SHA256 83ba44a4e9ba4942a8ebacb129e9f275c43ec013ce19492016d6297fc1351833
 MISC metadata.xml 3059 RMD160 6422e54762960f35af992d79a5bd55a8044a47fa SHA1 01d4124e25c079e813bd3992111b143e2629525d SHA256 a8872b7aab9ba8f8bcb35714d317becb42cd3cf14fc7a8d2b5ec911e72b2f988
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkh7KnMACgkQAiZjviIA2Xjn/gCeIDlahcSJEwj9dwfsnPLuoOSn
+OdMAnir22CtuDWir3xDhhX/D4uIBfry3
+=vXY1
+-----END PGP SIGNATURE-----
diff --git a/net-irc/rbot/rbot-0.9.11_rc2.ebuild b/net-irc/rbot/rbot-0.9.11_rc2.ebuild
new file mode 100644
index 000000000000..881c47121dfa
--- /dev/null
+++ b/net-irc/rbot/rbot-0.9.11_rc2.ebuild
@@ -0,0 +1,181 @@
+# 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-0.9.11_rc2.ebuild,v 1.1 2008/07/14 10:29:00 flameeyes Exp $
+
+inherit ruby eutils
+
+[[ ${PV} == *"9999" ]] && inherit git
+
+DESCRIPTION="rbot is a ruby IRC bot"
+HOMEPAGE="http://ruby-rbot.org/"
+
+LICENSE="GPL-2 as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd"
+IUSE="spell aspell timezone translator shorturl nls dict figlet
+	fortune cal host 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 )"
+DEPEND="nls? ( dev-ruby/ruby-gettext )"
+
+if [[ ${PV} == *"9999" ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="git://ruby-rbot.org/rbot.git"
+else
+	MY_P="${P/_/-}"
+	S="${WORKDIR}/${P%_*}"
+	SRC_URI="http://ruby-rbot.org/download/${MY_P}.tgz"
+fi
+
+pkg_setup() {
+	enewuser rbot -1 -1 /var/lib/rbot nobody
+}
+
+src_unpack() {
+	if [[ ${PV} == *"9999" ]]; then
+		git_src_unpack
+
+		cd "${S}"
+		sed -i -e '/\$version=/s:".\+":"'${PV}'":' bin/rbot \
+			|| die "Unable to fix rbot script version."
+	else
+		unpack ${A}
+	fi
+}
+
+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-r10.ebuild b/net-irc/rbot/rbot-9999-r10.ebuild
index 413b823027f4..909b72e45292 100644
--- a/net-irc/rbot/rbot-9999-r10.ebuild
+++ b/net-irc/rbot/rbot-9999-r10.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2008/07/02 14:04:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-9999-r10.ebuild,v 1.3 2008/07/14 10:29:00 flameeyes Exp $
 
 inherit ruby eutils
 
@@ -47,7 +47,7 @@ if [[ ${PV} == *"9999" ]]; then
 else
 	MY_P="${P/_/-}"
 	S="${WORKDIR}/${P%_*}"
-	SRC_URI="http://ruby-rbot.org/download/${MY_P}-no-mo.tgz"
+	SRC_URI="http://ruby-rbot.org/download/${MY_P}.tgz"
 fi
 
 pkg_setup() {