summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-06-23 15:46:00 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-06-23 15:46:00 +0000
commit915c31b0492d658231fa765ddc7b805e0dbf759e (patch)
tree5fb4d4d6f788a4db599474a5ac9511b41b231560 /net-irc/rbot
parentSync to branch, fixes linking and desktop entry standard comliance issues. (diff)
downloadhistorical-915c31b0492d658231fa765ddc7b805e0dbf759e.tar.gz
historical-915c31b0492d658231fa765ddc7b805e0dbf759e.tar.bz2
historical-915c31b0492d658231fa765ddc7b805e0dbf759e.zip
Install rbot without rubygems, don't build locale files if they are not requested, remove mandatory dep over ruby-gettext at both build and runtime.
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 x86_64
Diffstat (limited to 'net-irc/rbot')
-rw-r--r--net-irc/rbot/ChangeLog10
-rw-r--r--net-irc/rbot/Manifest10
-rw-r--r--net-irc/rbot/rbot-9999-r9.ebuild (renamed from net-irc/rbot/rbot-9999-r8.ebuild)142
3 files changed, 83 insertions, 79 deletions
diff --git a/net-irc/rbot/ChangeLog b/net-irc/rbot/ChangeLog
index f4691507d942..b2b3a52fec84 100644
--- a/net-irc/rbot/ChangeLog
+++ b/net-irc/rbot/ChangeLog
@@ -1,6 +1,14 @@
# 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.30 2008/06/23 15:08:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.31 2008/06/23 15:46:00 flameeyes Exp $
+
+*rbot-9999-r9 (23 Jun 2008)
+
+ 23 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> -rbot-9999-r8.ebuild,
+ +rbot-9999-r9.ebuild:
+ Install rbot without rubygems, don't build locale files if they are not
+ requested, remove mandatory dep over ruby-gettext at both build and
+ runtime.
23 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> rbot-9999-r8.ebuild:
Add new flags to IUSE.
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index 86f889742f61..696d2fbe0bdb 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -5,13 +5,13 @@ AUX rbot.conf 944 RMD160 1926da2ac328f7a76dacc0ee3690f664a6419cfc SHA1 79c59f667
AUX rbot.init 1564 RMD160 75a73a12ee0b40fbdaaaf084504a5fe67bbb8770 SHA1 3ed3ba18f82d87d6dbc57c3d7b5f3525b74f9f33 SHA256 6755c99f34b679decace984c63d1c93f1f2d44cd73eab92ad0a225c5add5af57
DIST rbot-0.9.10.gem 387584 RMD160 a29dd55aa894fac89b2cc0a05f694df8c7e1489c SHA1 53c85bf45239fc572fcc6e4d68bb9601a0d5df6e SHA256 3433783e2be481d63072c5ef03dd4f61b09bee0520c306607ad1e0fa46b8a4b5
EBUILD rbot-0.9.10-r1.ebuild 641 RMD160 d27bacc724b57e685cc112efd8f5dfdf84431c04 SHA1 21cd8238ec956f1d1677db004ba7e85fcdbb8668 SHA256 7495b3782e13fe7ff39b4fd0fa52a6568c88cc3198ff995075251b82afa13597
-EBUILD rbot-9999-r8.ebuild 4309 RMD160 4127db462e3516c8dd494696ae5b14ccb85620be SHA1 a7be4c9de6a3857ab4b0637fa63d5c21a821b4f2 SHA256 38b181f5d806301b674f3df1bb23e4890ee1ec7c5c9a733b12cb81aa8a4cbb35
-MISC ChangeLog 5036 RMD160 347be243b7523d9d76b84a2e576792397e96b686 SHA1 b10c706526c184d809522454ec71831d12485dae SHA256 110c761815a737e154ec8ca42949a5e50c40bb97aa65ec5253453407c01ea287
+EBUILD rbot-9999-r9.ebuild 4207 RMD160 0b53872005f1a7c62e1938fb763818020a2d473e SHA1 a7107225de6ea1960b2e06fd0d85ec14a199a3be SHA256 e1d372a60a31a371433e6cd77ec1e8c0b9f64dcb9d49bfef18969d4d0fb18c53
+MISC ChangeLog 5320 RMD160 6b557ae6e94e863853843dd632a623618f96e30e SHA1 900b2570403d744538d02aaff75cb4501f15be48 SHA256 e70bed3346523d4f98441adebee96c277654bd00aad28541121f8b71ea197d54
MISC metadata.xml 2634 RMD160 596aa0401939230b488558a86de6fbc7467dfc1b SHA1 f85eb3628ae23fd410ef5fdfc991985dc8d78975 SHA256 d1f47f62ba786d4cee7cbf8a4712ded6e91a218c93ea614038912f82e7ee8964
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkhfvHEACgkQAiZjviIA2XjHrwCeLmA8yFF7nGdzv5hIuE3gzDJ1
-FgsAoMiXIPXgcVD3y/oyGvFZC8x6Q4H4
-=zf4U
+iEYEARECAAYFAkhfxT4ACgkQAiZjviIA2Xgw2gCgzW/+VniyXffvw4mfnZmjXVls
+u+cAn3GpiusN2CNUshpqEAv+seo+Bwyl
+=hKm0
-----END PGP SIGNATURE-----
diff --git a/net-irc/rbot/rbot-9999-r8.ebuild b/net-irc/rbot/rbot-9999-r9.ebuild
index 2acd9682e20d..aca7a4e6f24c 100644
--- a/net-irc/rbot/rbot-9999-r8.ebuild
+++ b/net-irc/rbot/rbot-9999-r9.ebuild
@@ -1,8 +1,8 @@
# 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-r8.ebuild,v 1.3 2008/06/23 15:08:25 flameeyes Exp $
+# $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 gems eutils
+inherit ruby eutils
[[ ${PV} == "9999" ]] && inherit git
@@ -13,8 +13,8 @@ LICENSE="as-is"
SLOT="0"
KEYWORDS=""
IUSE="spell aspell timezone translator shorturl nls dict figlet
- fortune cal host"
-ILINGUAS="zh ru nl de fr it en ja"
+ fortune cal host nls"
+ILINGUAS="zh_CN zh_TW ru nl de fr it ja"
for lang in $ILINGUAS; do
IUSE="${IUSE} linguas_${lang}"
@@ -34,21 +34,16 @@ RDEPEND=">=virtual/ruby-1.8
figlet? ( app-misc/figlet )
fortune? ( games-misc/fortune-mod )
cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) )
- host? ( net-dns/bind-tools )"
-DEPEND=""
+ 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"
-
- 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"
+ # wait for the new releases...
+ SRC_URI=""
fi
pkg_setup() {
@@ -67,30 +62,12 @@ src_unpack() {
}
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-9999.gem"
- MY_P="${PN}-9999"
- 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}
+ mv "${S}"/data/rbot/plugins/$1.rb{,.disabled}
+ }
+ use_rbot_plugin() {
+ use $1 && return
+ disable_rbot_plugin "$2"
}
if ! use spell; then
@@ -100,52 +77,71 @@ src_install() {
# 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 \
+ "${S}"/data/rbot/plugins/spell.rb \
|| die "Unable to replace ispell with aspell."
fi
- use timezone || disable_rbot_plugin time
- use translator || disable_rbot_plugin translator
- use shorturl || disable_rbot_plugin shortenurls
- use dict || disable_rbot_plugin dictclient
- use figlet || disable_rbot_plugin figlet
- use fortune || disable_rbot_plugin fortune
- use cal || disable_rbot_plugin cal
- use host || disable_rbot_plugin host
+ 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.
- 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
+ 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() {