Make the spell USE flag work, add an aspell USE flag and make tzinfo optional by mean of timezone USE flag. Also allow to disable the languages.

Package-Manager: portage-2.1.3.19

5 files changed, 164 insertions, 96 deletions

diff --git a/net-irc/rbot/ChangeLog b/net-irc/rbot/ChangeLog
index 38e4a110c211..662319e37f5a 100644
--- a/net-irc/rbot/ChangeLog
+++ b/net-irc/rbot/ChangeLog
@@ -1,6 +1,13 @@
 # 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.21 2007/11/19 13:56:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.22 2007/11/19 16:42:46 flameeyes Exp $
+
+*rbot-9999-r4 (19 Nov 2007)
+
+  19 Nov 2007; Diego Pettenò <flameeyes@gentoo.org> -rbot-9999-r3.ebuild,
+  +rbot-9999-r4.ebuild:
+  Make the spell USE flag work, add an aspell USE flag and make tzinfo
+  optional by mean of timezone USE flag. Also allow to disable the languages.
 
   19 Nov 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Take maintainership again, and add the live SVN ebuild I had in my overlay.
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index fe8eaf5cfa4b..7891b5086258 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -14,14 +14,14 @@ EBUILD rbot-0.9.10-r1.ebuild 641 RMD160 d27bacc724b57e685cc112efd8f5dfdf84431c04
 MD5 c442e95b8c69db65ceb2754da8e9630f rbot-0.9.10-r1.ebuild 641
 RMD160 d27bacc724b57e685cc112efd8f5dfdf84431c04 rbot-0.9.10-r1.ebuild 641
 SHA256 7495b3782e13fe7ff39b4fd0fa52a6568c88cc3198ff995075251b82afa13597 rbot-0.9.10-r1.ebuild 641
-EBUILD rbot-9999-r3.ebuild 1760 RMD160 902793e66d327e03fc8f0ebcf8eef4fcaa7c5c9f SHA1 54cee26b585a5535e6286755b0ec3fbcdd3e94ea SHA256 9a51e4a95a96c24e079e2bac70dc45a5bd5184df342cd493de93a1bb227d3ead
-MD5 963578aa9998f0412412b23440d898b2 rbot-9999-r3.ebuild 1760
-RMD160 902793e66d327e03fc8f0ebcf8eef4fcaa7c5c9f rbot-9999-r3.ebuild 1760
-SHA256 9a51e4a95a96c24e079e2bac70dc45a5bd5184df342cd493de93a1bb227d3ead rbot-9999-r3.ebuild 1760
-MISC ChangeLog 3065 RMD160 1f125b177e84a82d2f78de732a431422ad3b0ede SHA1 8e86e4cfcc2e2e9067797574d0a8dec675aa59aa SHA256 d692a5050d5101c81989233a6c8dd0fb423761eb41e5c386e5ba4a8d56fe21eb
-MD5 0a93209cc6a9676a621efe0cbede4dea ChangeLog 3065
-RMD160 1f125b177e84a82d2f78de732a431422ad3b0ede ChangeLog 3065
-SHA256 d692a5050d5101c81989233a6c8dd0fb423761eb41e5c386e5ba4a8d56fe21eb ChangeLog 3065
+EBUILD rbot-9999-r4.ebuild 3732 RMD160 633ee4b59b7ee99b58f4203facac231930363e94 SHA1 82692ddfc6be9300934601942e6cf50252ebf997 SHA256 e0bea362e27248715225df5ad3e50bb569f05d6192192c21cc88787749e0ad09
+MD5 ef1cb840ff67a779d62ea310677804df rbot-9999-r4.ebuild 3732
+RMD160 633ee4b59b7ee99b58f4203facac231930363e94 rbot-9999-r4.ebuild 3732
+SHA256 e0bea362e27248715225df5ad3e50bb569f05d6192192c21cc88787749e0ad09 rbot-9999-r4.ebuild 3732
+MISC ChangeLog 3343 RMD160 7fad3fae9b76f2a9a00df6c1660a08fbf92d8cc9 SHA1 f7bd9ca9755007232d75f0abf55b3475cc5ea73f SHA256 5df38c2fa037d3364c8e72d0153a322317a24740218737118bf108f5f5bc95f2
+MD5 a71e2020f4b0ac04934f7b9db2e2d5d7 ChangeLog 3343
+RMD160 7fad3fae9b76f2a9a00df6c1660a08fbf92d8cc9 ChangeLog 3343
+SHA256 5df38c2fa037d3364c8e72d0153a322317a24740218737118bf108f5f5bc95f2 ChangeLog 3343
 MISC metadata.xml 225 RMD160 ede6cb14260b225b3307ab4bbe59adc1eaf1eeac SHA1 eb66e1fcca86c62211028ad1dac32a267b99dea7 SHA256 a23cfb954813800af8505287814d4de6d5fd24ce671bc8d43c283b86a616149e
 MD5 d28685647954816c8225d5bfd58fce1b metadata.xml 225
 RMD160 ede6cb14260b225b3307ab4bbe59adc1eaf1eeac metadata.xml 225
@@ -29,13 +29,13 @@ SHA256 a23cfb954813800af8505287814d4de6d5fd24ce671bc8d43c283b86a616149e metadata
 MD5 42dd202e4a68c94d2afb5bb4114ba36a files/digest-rbot-0.9.10-r1 226
 RMD160 962fb7726e27b3f255675d2a262085112fae8b08 files/digest-rbot-0.9.10-r1 226
 SHA256 9304358a3ff69f74bce93f1d6b14bab02994b5161eb6a4b388e4655c51a83da1 files/digest-rbot-0.9.10-r1 226
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-rbot-9999-r3 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-rbot-9999-r3 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-rbot-9999-r3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-rbot-9999-r4 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-rbot-9999-r4 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-rbot-9999-r4 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHQZUEAiZjviIA2XgRAk0oAKCHm1qpV7C8Tf/SrQN9eZlHzpLCJQCdEidF
-piGWUA4odnyEPwDMe13uIRI=
-=soa6
+iD8DBQFHQbviAiZjviIA2XgRAk6eAJ4nicn60vwp3JsUE8WpsbAvti0yrwCgsqaS
+OC4DfM8JWr7kU1L+ar72kdw=
+=uDGE
 -----END PGP SIGNATURE-----
diff --git a/net-irc/rbot/files/digest-rbot-9999-r3 b/net-irc/rbot/files/digest-rbot-9999-r4
index e69de29bb2d1..e69de29bb2d1 100644
--- a/net-irc/rbot/files/digest-rbot-9999-r3
+++ b/net-irc/rbot/files/digest-rbot-9999-r4
diff --git a/net-irc/rbot/rbot-9999-r3.ebuild b/net-irc/rbot/rbot-9999-r3.ebuild
deleted file mode 100644
index 0c78f63442c7..000000000000
--- a/net-irc/rbot/rbot-9999-r3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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-r3.ebuild,v 1.1 2007/11/19 13:56:54 flameeyes Exp $
-
-inherit ruby gems
-
-[[ ${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"
-
-RDEPEND=">=virtual/ruby-1.8
-	dev-ruby/ruby-bdb
-	dev-ruby/tzinfo"
-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"
-
-	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 || 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)"
-	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
-}
-
-pkg_postinst() {
-	einfo
-	elog "rbot now can be started as a normal service."
-	elog "Check /etc/conf.d/rbot file for more information"
-	elog "about using this feature."
-	einfo
-}
diff --git a/net-irc/rbot/rbot-9999-r4.ebuild b/net-irc/rbot/rbot-9999-r4.ebuild
new file mode 100644
index 000000000000..b8e0edaaa473
--- /dev/null
+++ b/net-irc/rbot/rbot-9999-r4.ebuild
@@ -0,0 +1,142 @@
+# 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-r4.ebuild,v 1.1 2007/11/19 16:42:46 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"
+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 )
+	)"
+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"
+
+	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 || 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
+
+	# 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
+}