Add git snapshot fixing bug 488674. Remove 9999-r10, bug 479812.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x8E740238

4 files changed, 91 insertions, 47 deletions

diff --git a/net-irc/rbot/ChangeLog b/net-irc/rbot/ChangeLog
index 771ce58c816e..f68d052c550b 100644
--- a/net-irc/rbot/ChangeLog
+++ b/net-irc/rbot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/rbot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.54 2013/08/20 12:20:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.55 2013/10/27 18:24:53 a3li Exp $
+
+*rbot-0.9.15_p20131020 (27 Oct 2013)
+
+  27 Oct 2013; Alex Legler <a3li@gentoo.org> +rbot-0.9.15_p20131020.ebuild,
+  -rbot-9999-r10.ebuild, +files/rbot-rakefile.patch:
+  Add git snapshot fixing bug 488674. Remove 9999-r10, bug 479812.
 
   20 Aug 2013; Patrick Lauer <patrick@gentoo.org> -rbot-0.9.10-r1.ebuild:
   QA: Remove version with unsatisfiable dependencies
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index c21c13f0c1df..5eaebb40e4c2 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX rbot-rakefile.patch 819 SHA256 5b96121c31e997047b446df274c6eb3ece92968cf4f63b472cac7fcde24cf8f4 SHA512 3e1bbb29591bb0b797ce98907b2483b1a9fd41dbe71336eabf6dc8de47fd8681cffc1772bc0977a1bab9ce5ae0dd3a16378ee72c841d87a2e043c29968962a76 WHIRLPOOL 9e6d5d41a33cd07628e44b7adfe4fbb3ea13f8cfc3a637ca6f6c2ce45c37874f9d8207503a4c2c992d14859c7e3865c6189fea8479fc204777f621d3b0ec0186
 AUX rbot.conf 944 SHA256 89ccc3e036414c2a4b1ba8338408cc9a5b89c3bfae4268a27fb9c6094bcc95f6 SHA512 fa68050203a50cbcb8a8ec95f4cf7864d614eb23f75fa43a2236796851da590399096d3871c11a012aa58dd2466af454d5f099eb6c9b4bc0eea2110d5cb926b4 WHIRLPOOL 29557e61deb3abd13f2baea145fb3613816c9c4e18ee314ebbd8085691d05ebfeaaf2d080f4c54eaa86eb0e82bcac3f10f3080814d97f4487c80a42302d7e319
 AUX rbot.conf2 1111 SHA256 22c2b489846c56d054f3e88e1763486bcb59df621c288e8b816fd2a109b08742 SHA512 19f96fdcdd7c312da58f22f1ca089cf4e9bde03273e37ecd179e5fa94e1d59f8ebada435a0f27e7c6c5fae39b9ba575d9e397fa9543d82f846bcc5eb728bd0f8 WHIRLPOOL 7f8fc775a7abcd76c9a3a2987cdf0524c48e72e10bbb66617eb9129dd281c5acd59c40cc432017ad523499bd67ff3af69617168a1d112ff69834557f59a316bc
 AUX rbot.init 1564 SHA256 6755c99f34b679decace984c63d1c93f1f2d44cd73eab92ad0a225c5add5af57 SHA512 7acd93358b4ef21363716d4fc5b7387d316547f168f8ff932c1fc8fc64b1b315f8031f705e024302aed86e0e8ba7b18bbe009903b2b12aee772dea3a6a20e501 WHIRLPOOL 94a1ce7b268d3776fc3c00c578a922eea6658b3084062fe5b7e1da45c80ea7579494a1ba1d23c3d30abd6ed1adb5631f198cfeea1f93ba01dac09995955c91ad
 AUX rbot.init2 1446 SHA256 f751394c927424c9b614c70dcaba19652d2d4383d30f20c295cd7da4268e02c1 SHA512 464e22209cbf4d367eacb6adf85dfb7addb8d5ee5c9b824596854a632ffc67bfdb1090ef4ae13a332e41e45ae6dd7dbef15516447c836c33da5d1ee4178ebd1a WHIRLPOOL ebd3ccd8cdc5ef96c54adfcbf34363fbc0bfa75a3a653536fded31083f229f213989de75fc812d20543a6e8cb78d682bbbe94bad184171a41657b04dc0a96d8b
 DIST rbot-0.9.15.tgz 709338 SHA256 f5f41b6760ad22a7057cf81c661b93ad59152fcc94374ef2c8c0e96f821a7f0b SHA512 2dfe67378d149e0836d0f88144c0f487b61e1b5432c6391858605e68a4bdf0c3e57220615dd355e8dee6720883cb33de62a242c0b5f956b403a5393abbae19ac WHIRLPOOL fe3e7faacfe6edd16007457c67f25420df4ec7fe346c87691a3f075f1d8212ffac55c2efd7a1b8aab93a95ce8c73a5abcb7b356e91eb4a6a6fb8d91f3a8fc522
+DIST rbot-0.9.15_p20131020.tar.gz 773953 SHA256 74b4db6a2b24784a1779518cd070bbf8cb6d4a5059167579d8226a0fc69cef15 SHA512 3319031361f7ab23e43a997a94663790775047c50eb8eb51f3f579cf879ca822b48118060fdd9f2816d5d97c57de8f6fb7ce883457336f961ff25cf6c49a8d2a WHIRLPOOL 8e77fdeb290dae0c4932628e010768217df223e94a5ec902ed48e9db3a2c2985ef2df932e84048ab8721b8d4bb954852397974afa02f1bdfc1e1b8533b58d812
 EBUILD rbot-0.9.15.ebuild 4552 SHA256 0941b6cc91e7b3b1e6b5a0f4d6a5b4b7efd201940098662f4427ca1f6747e5fe SHA512 7beb986675df944a5f7f6f309f524ad5be5a0ce9cb01a907dd58798b3eabe968c106fbbcbc3db0ded041be37320e0ea7918c0e6c9fa059dca0e547c9e395cade WHIRLPOOL 7fadcd6f5f93ec3328a10297102c04b5e2df2ea48915a25556214eba967df7f562ea15f9a97b324403f576a17acb33f4eb7376fa0c2c3b1091f97e5fb6a16e28
-EBUILD rbot-9999-r10.ebuild 4556 SHA256 860072cfdc7e5377bff627410b5b90b8ff8a3a5fb3c799fee202ddb96b101dee SHA512 b5c377a5beb4741af827a6d760c48334ca24ec63b746ea0dc90297e5126c39610c730078308acb0042d08e848a27d5689372fbb00639bc9b122feb32bfc701eb WHIRLPOOL 4e4cfbcbff9b8d7faf625f864083e5e4ac2415709b4e59ba5371a17ed8c32cadb4576907fa0ca871967b1f855095040e570bc0dba0e115c801a49e019ae5d165
-MISC ChangeLog 9431 SHA256 c319aee723b8bd7f98bc0fc8f6dc0fd46f273f7a59f79e80d86bbbef4e6752d2 SHA512 78ddf48e6693210ffcea2f37204006b34fd9bc156772e861dc4822ac82179566aa85b70779fb7b0ff1405e8f4f87b205da805f2195909270d58bf01b7453f822 WHIRLPOOL 12f5bd80afe11466522f1b5492adb6154ef0bc9548efbe15b803846127b54282ec671605f203c490bdb5440180285a9394abcfabab26904c73e070abec559ba7
+EBUILD rbot-0.9.15_p20131020.ebuild 4830 SHA256 bfb704ff62c7e0c4420f4884d70d436f98c441ae91f61488b7f836fda8194119 SHA512 33bee1c377c4cc2490c13e01b879f50955ce9437d26e00f6da2e13b62bf0e1c5aa49c3efaa8a5bb0fbf57e157a2998da37ca280c91f34999b2b7556482417e98 WHIRLPOOL 884c49c486574929d612b0a5b4546130157287b3bc0090848c3285f2d46ab88e5226b8c80b3fc7ecf60a05a4844294b9802096b0bbc12b99400823b57c020299
+MISC ChangeLog 9663 SHA256 9c13560def24ddb8daced275a4fc54c606e99c196218d2af0d3ce7a455a512e8 SHA512 19745523197a75d21c5c1474829e489ff389b96d1aaae6b6531024c9cc74f09ca1d80057717fa4d7312a8f86378d3ce14cf25649a1bdabb202e0df42ee8e7a32 WHIRLPOOL 7a47864319294935f6cd90ff8567dde86f24dce1d65636460fe04eb59152a7cd7f93987130a6fa2bd9c85972e2f1bb5010296b629bd02ac5defcc95a46cc83b4
 MISC metadata.xml 2799 SHA256 5dd7f94886d19526bbc3fa2c974507b4835959e177fa3ba82e73d24e82edc911 SHA512 366692b73e2becfefc82cf733983abbaad9c704680eff7d93bf9f2207f5c04d18b05a5258df8d13930fe8dc56a801533c8afd7a03c1c6f5fd5684dd3365d7f28 WHIRLPOOL 32d9fbe256627af08ec22c00b9cebd0ebf332b030516e1b36956f44aa52b9b6cea0c88bdfbc22261e0005de1b216b568cc68d4799c5bceeb90ef6486b910485e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlJtWnsACgkQTEkQYPgooqGwwgCffyIqYIy2zbXK0dnz5Fe+7851
+r5wAn3vWZ4sR3FBz/agvbz1qVZt+Mcot
+=qfZe
+-----END PGP SIGNATURE-----
diff --git a/net-irc/rbot/files/rbot-rakefile.patch b/net-irc/rbot/files/rbot-rakefile.patch
new file mode 100644
index 000000000000..35747263870f
--- /dev/null
+++ b/net-irc/rbot/files/rbot-rakefile.patch
@@ -0,0 +1,30 @@
+--- Rakefile.old	2013-08-20 01:00:05.000000000 +0200
++++ Rakefile	2013-10-21 19:42:06.800019343 +0200
+@@ -1,5 +1,6 @@
+ require 'rake'
+-require 'rake/gempackagetask'
++require 'rubygems'
++require 'rubygems/package_task'
+ 
+ task :default => [:buildext]
+ 
+@@ -15,7 +16,7 @@
+ # we must (and can) skip defining the gem packaging tasks.
+ if File.exist? SPECFILE
+   spec = eval(File.read(SPECFILE), nil, SPECFILE)
+-  Rake::GemPackageTask.new(spec) do |pkg|
++  Gem::PackageTask.new(spec) do |pkg|
+     pkg.need_zip = true
+     pkg.need_tar = true
+   end
+@@ -125,8 +126,8 @@
+ }) do |t|
+   po_file, mo_file = t.source, t.name
+   puts "#{po_file} => #{mo_file}"
+-  require 'gettext/utils'
+-  GetText.rmsgfmt po_file, mo_file
++  require 'gettext/tools'
++  GetText::Tools::MsgFmt.run po_file, mo_file
+ end
+ 
+ task :check_po_tools do
diff --git a/net-irc/rbot/rbot-9999-r10.ebuild b/net-irc/rbot/rbot-0.9.15_p20131020.ebuild
index 2859745891b3..a4fd661ba2a7 100644
--- a/net-irc/rbot/rbot-9999-r10.ebuild
+++ b/net-irc/rbot/rbot-0.9.15_p20131020.ebuild
@@ -1,73 +1,60 @@
 # Copyright 1999-2013 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.9 2013/01/12 08:24:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.15_p20131020.ebuild,v 1.1 2013/10/27 18:24:53 a3li Exp $
 
-inherit ruby eutils user
+EAPI="2"
+USE_RUBY="ruby18 ruby19"
 
-[[ ${PV} == *"9999" ]] && inherit git-2
+inherit ruby-ng eutils user
 
 DESCRIPTION="rbot is a ruby IRC bot"
 HOMEPAGE="http://ruby-rbot.org/"
+SRC_URI="http://dev.a3li.li/gentoo/distfiles/${P}.tar.gz"
 
 LICENSE="|| ( feh GPL-2 )"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="spell aspell timezone translator shorturl nls dict figlet
 	fortune cal host toilet"
-ILINGUAS="zh_CN zh_TW ru nl de fr it ja"
+ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
+S="${WORKDIR}/${PN}-master"
 
 for lang in $ILINGUAS; do
 	IUSE="${IUSE} linguas_${lang}"
 done
 
-RDEPEND=">=dev-lang/ruby-1.8
-	dev-ruby/ruby-bdb
-	timezone? ( dev-ruby/tzinfo )
+RDEPEND+="
 	spell? (
 		aspell? ( app-text/aspell )
 		!aspell? ( app-text/hunspell )
 	)
-	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="
+
+ruby_add_bdepend "
 	nls? (
-		dev-ruby/ruby-gettext
+		>=dev-ruby/ruby-gettext-2
 		dev-ruby/rake
 	)"
 
-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
+ruby_add_rdepend "
+	dev-ruby/tokyocabinet
+	timezone? ( dev-ruby/tzinfo )
+	translator? ( dev-ruby/mechanize )
+	shorturl? ( dev-ruby/shorturl )
+	nls? ( dev-ruby/ruby-gettext >=dev-ruby/locale-2.0.5-r2 )
+	dict? ( >=dev-ruby/ruby-dict-0.9.4-r2 )"
+
+RUBY_PATCHES=( "rbot-rakefile.patch" )
 
 pkg_setup() {
 	enewuser rbot -1 -1 /var/lib/rbot nobody
 }
 
-src_unpack() {
-	if [[ ${PV} == *"9999" ]]; then
-		git-2_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() {
+all_ruby_compile() {
 	disable_rbot_plugin() {
 		mv "${S}"/data/rbot/plugins/$1.rb{,.disabled}
 	}
@@ -133,6 +120,7 @@ src_compile() {
 			local lang_rbot_ru="russian"
 			local lang_rbot_nl="dutch"
 			local lang_rbot_de="german"
+			local lang_rbot_fi="finnish"
 			local lang_rbot_fr="french"
 			local lang_rbot_it="italian"
 			local lang_rbot_ja="japanese"
@@ -148,33 +136,41 @@ src_compile() {
 					"${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}
+					"${S}"/po/${lang} &>/dev/null
 			done
 		fi
 
-		rake makemo || die "locale generation failed"
+		ruby /usr/bin/rake makemo || die "locale generation failed"
 	fi
+}
 
-	ruby_econf || die "ruby_econf failed"
+each_ruby_compile() {
+	${RUBY} setup.rb config --prefix="/usr" \
+		|| die "setup.rb install failed"
 }
 
-src_install() {
+each_ruby_install() {
 	${RUBY} setup.rb install --prefix="${D}" \
 		|| die "setup.rb install failed"
+}
 
+all_ruby_install() {
 	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
+	newinitd "${FILESDIR}/rbot.init2" rbot
+	newconfd "${FILESDIR}/rbot.conf2" rbot
 }
 
 pkg_postinst() {
-	einfo
-	elog "rbot now can be started as a normal service."
+	elog "rbot can be started as a normal service."
 	elog "Check /etc/conf.d/rbot file for more information about this feature."
-	einfo
+	ewarn "DEPRECATION NOTICE:"
+	ewarn "The bdb database backend is deprecated and only available on Ruby 1.8."
+	ewarn "To migrate to the new tokyocabinet-based backend, change the core.db"
+	ewarn "parameter in your bot's conf.yaml to 'tc' and restart rbot."
+	ewarn "This procedure requires a Ruby version supporting both BDB and TC."
 }