Do not use ruby-ng eclass as the optional work is completely fucked.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

3 files changed, 23 insertions, 24 deletions

diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index 3015aaf5fd4c..b55126ab715e 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/weechat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.111 2012/04/23 10:48:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.112 2012/05/31 11:15:05 scarabeus Exp $
+
+  31 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> weechat-9999.ebuild:
+  Do not use ruby-ng eclass as the optional work is completely fucked.
 
   23 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> -weechat-0.3.5.ebuild:
   Punt older.
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index f23a6d24888f..9141cfa566dc 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -3,23 +3,23 @@ Hash: SHA1
 
 DIST weechat-0.3.7.tar.bz2 2444611 RMD160 9f830136eccf6d4c61bbd09ceb7b9b5aab22e947 SHA1 897b79e18bbe947e4b78857ff1d428d17441d412 SHA256 8ef5e3daf49e75669e36093c1df852e65b51d512073c6e6b935a7fa90f6b7bca
 EBUILD weechat-0.3.7.ebuild 3195 RMD160 11f58c9622d43a079c1d02e39597d6c5bfafb046 SHA1 87b7b8956525800ac40b5741ee22ab07f8badb15 SHA256 958a993211d6ac7a63d4d9361df0136d20e655197d456405946d4ba434bf1448
-EBUILD weechat-9999.ebuild 3109 RMD160 84bf79a7ec932176dfeae2d6e37c1804b00b20cb SHA1 617b737ddf9cdcd7366ed580f775509cc886e819 SHA256 3925af2d450824a360d13b69ef400626e9c9908979421ceabc8b94f6c61c1b97
-MISC ChangeLog 15061 RMD160 bbdabdf8e13c01a119721e7556a40b4c6b6a1cb8 SHA1 32180394bb81ddb9266ff06fffe5c06eafb86542 SHA256 ec245db970cb0a545ff434ef116cf734a209446cb86cac9133b7e3c73afc5940
+EBUILD weechat-9999.ebuild 3013 RMD160 c13bfe4a48a26ff003885a472541b4a34af873dd SHA1 bfc592c78ca3d4f0588fd2f67d7acc3839c20fa2 SHA256 51204016b9576157ae32479690cb68e6fbb5ee7d49f62e84d594672583607563
+MISC ChangeLog 15209 RMD160 c1c62386537fc7ff756cd3ebd5530ee32922fc88 SHA1 d17ae2a8e1db8622ffb7f4776fbf14ab2aec1731 SHA256 85a153528d5e616164562e8b049ff5754707f9a4684c2f423d3774dfc9f5e089
 MISC metadata.xml 775 RMD160 ef36438a7f202b6510ef55fd90feaa96973aea50 SHA1 3baa683f3123029a1c83677634c6f5f281941d4a SHA256 baddf6a8f9e77502d45119a96455031b564e19a864c8540e5c44500aeb1ddc54
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPlTOdAAoJEOSiRoyO7jvo9BoP/iUFD9RelabIbvKeKRKL7Xz/
-/adH/texs7HqUUy3k98lucX8ExVZqww5BigXH88uasp7m3GRp9sVrKrWhlXQjjKM
-9LCjrCcIkQzvlwXJHlCtGcmjWS2Exq92HaR0fcmZg5CD9t0zt0SpDKvIs4F+Nus8
-TosVwMRfIGKqRrVdNqg0ofFsem8Gq3VhqjrMJURQa1Zozh4o0rHnwN7OmGgK71IW
-tRE66raYvHGfTkaaM8wt1t0a+T2M92QG54ZHKDN4uIEXwBKGW8eKE4gclYJdFm3N
-4oa3gGSNxUnFn1K44JlUKdB5dCE4UKPuLY2bjfYEGlC0fYyYdIi+F0Yfh4ufuNgo
-CwHCaUO+cJuHLVWyEE41fWman4nWrhLg/fZq4zJs0M27yqez7mwgmCaigEMG3ehV
-XroXoaPSirN3gtL2R+xRYBTg+fdzu7r1iT9I+ok53EWwQqhNwzkQ8EZE+F73W+Cy
-npl93Gwfh+eCXdgrkLYldwmz8+JV4BqKvKWAa9GAM15jXBTlLgQIUCLIRbGlY8sj
-rmGJUIbcsqBBa68B8GxR6VSqBoif9PLNV1yOSaG7cZjYV8gAwUveImzVBZHiGBWv
-yzkJu+vW9sEEXf4r/9dAHHoy/7Ee2ZcCtMt1MITuBxfdxxv9wdC6Itsc20/SXjhm
-WVlP2G45Uz7saozWJ+nJ
-=tsqH
+iQIcBAEBAgAGBQJPx1MGAAoJEOSiRoyO7jvoQGYQAKzjUVpxJHgmo+SYqxpVw5Y9
+SffJY6S82adAl+BAk6QKK7oFTl30uGgvXsmzTogm99KSzCimpdsn4KumHlglooP7
+CkqMU3HQQOd8Jo/ZESBidXUitHNYNZ5g5KrMPnJQ9MiCzXuHDBiS2X7JbCDQ2ykn
+st2G0imKLsakPb8EAAmf+O8MIrgMAahZjtb+iVogo0AxvXWNQtMPEKxKnmpze/X4
+aDjJDRyXu3aSmiHs/eDlgbLO6fSYi0tjiyGWjDC9+XOGl5v/f6Xt38yJ5i9qEkHa
+hZaI34FM5IVaqn24s1VejBhkvRlzA+XFfAAN1Lsxr/TboNrURmkHTC2ukmqCQuEw
+jtaI1fw1h6Q2Iegw2YE/7CBb6NjFv+pfoMYgasNSeh6o8vNphR+5nwBsDdDNScW9
+pJlm0nKEVDIpc9zOvIU7L+vudVM+x7pk9qYoaY2Yy2TFchnntQI6Gfj20mZtwExT
+rBgIYxzNN901w6zKcyjB/OtNqrIhN1iua3l3ET5wEqCnLer3RnnIRo/5fClvsRAh
+DsDiBSo0olpRAfHoK/HofnndjMq/q6JOeVAa5AnqsfhgHMJ+1PJ9DkhdFR9fBw42
+RYBmsXg4NEL6c0NgUXcDNUd4fgAh3BZ7oT+gHiUVQyLjX4uLejG6XNVaogHNoRyA
+idyRfo0OIRSenKr9QPSy
+=ZNmO
 -----END PGP SIGNATURE-----
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index ded1133c4ddd..ccaa6f51c9f2 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,17 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.18 2012/04/06 09:43:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.19 2012/05/31 11:15:05 scarabeus Exp $
 
-EAPI=3
-
-USE_RUBY="ruby18 ruby19"
-RUBY_OPTIONAL="yes"
+EAPI=4
 
 PYTHON_DEPEND="python? *"
 
 EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
 [[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
-inherit python multilib ruby-ng cmake-utils ${GIT_ECLASS}
+inherit python multilib cmake-utils ${GIT_ECLASS}
 
 DESCRIPTION="Portable and multi-interface IRC client."
 HOMEPAGE="http://weechat.org/"
@@ -38,7 +35,7 @@ RDEPEND="
 	guile? ( dev-scheme/guile )
 	lua? ( dev-lang/lua[deprecated] )
 	perl? ( dev-lang/perl )
-	ruby? ( $(ruby_implementations_depend) )
+	ruby? ( >=dev-lang/ruby-1.9 )
 	ssl? ( net-libs/gnutls )
 	spell? ( app-text/aspell )
 	tcl? ( >=dev-lang/tcl-8.4.15 )
@@ -60,7 +57,6 @@ done
 
 pkg_setup() {
 	use python && python_pkg_setup
-	use ruby && ruby-ng_pkg_setup
 }
 
 src_prepare() {