Fix ability to compile with USE=-ruby for bug #497080.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x743A52E86BA81050

3 files changed, 30 insertions, 22 deletions

diff --git a/net-irc/epic5/ChangeLog b/net-irc/epic5/ChangeLog
index de5f827357ef..864061be3b8b 100644
--- a/net-irc/epic5/ChangeLog
+++ b/net-irc/epic5/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/epic5
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/ChangeLog,v 1.19 2012/12/23 20:14:47 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/ChangeLog,v 1.20 2014/03/25 07:05:11 binki Exp $
+
+  25 Mar 2014; Nathan Phillip Brink <binki@gentoo.org> epic5-1.1.2.ebuild:
+  Fix ability to compile with USE=-ruby for bug #497080.
 
   23 Dec 2012; Ulrich Müller <ulm@gentoo.org> epic5-0.3.5.ebuild,
   epic5-1.0.ebuild, epic5-1.1.2.ebuild:
@@ -93,4 +96,3 @@
   +files/0.0.2-segfault-fix.patch, +files/epic-defaultserver.patch,
   +epic5-0.0.2.ebuild:
   Initial import, ebuild based on net-irc/epic4
-
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 94f86dac6679..4c66a12333b4 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -11,23 +11,23 @@ DIST epic5-1.0.tar.bz2 743330 SHA256 930a8db1225e16b56d27fc2b7a02072df24694b64e9
 DIST epic5-1.1.2.tar.bz2 769464 SHA256 f21b873db281f042435cffc0189536911c896d4b03c80cd8ec025c4125309d27 SHA512 595a20ff7d9c40c9a2432a73ec156009a2f553d6600e8e159f93002a61608d05020b3f8ee6c304c90ce6ab56de1c17ea2d08f6c0febefe587dac71a58f40588c WHIRLPOOL 9fedccbf73ccb8b39c85ad1fb2f9479e32050f32d1f5dd892a3d516cd99b2e58103c07bb587ee6a787371c2d98207c1bb09877aad7f1e114981ec4c6fd365822
 EBUILD epic5-0.3.5.ebuild 1336 SHA256 71a1180cbf87ed550ede55a9c41b34b49b726ac4a4aab23967495f654a47a8b3 SHA512 9b4fe08e52237fd5225cd6540abdf35d792c92826bfeca6d2850bf9c31524b80445a74cb7b010e6129cc4b4d42412af63f3cba77c6c896fd42392da7dba53bc3 WHIRLPOOL e9ec7d74681e68744f8242f3b2043db329e87ccad7b4db92bc512aa46c2fc5a81d8b1a7ebe48f1e69a00b31f13fbda54fc6c743422bbb3e50c31764ee1998fc2
 EBUILD epic5-1.0.ebuild 1408 SHA256 0c04b14b155ae1bf6e583f3e928c9fb162b5ab488268e20fe0bf2d037fc9eea6 SHA512 c2eaefec7499b069c45338ec727dc98f14abcccdce87771402b520df24fe42a0064143aad1186174335887e5dcd275de5283b6bdd1e2d3ff7e98e822498446df WHIRLPOOL a83a60466376df210a21201b5058548838e3782c5a21865f0b6f026a703dfb5a236546340021b78f3cf12a2343e082dd0372fefd60b54ea1c7f2b55dca9bec67
-EBUILD epic5-1.1.2.ebuild 1924 SHA256 dac8a8de773d6d2c5881e7860c02fa4941b1a08365fb61842eb47e02ee58413d SHA512 ef51b20b704acd51c424c646c1acc95e89155f1b557e8ccd93d0eb8ac65c998c3e15d70a947eee334049fd23a95da58e6fc3f795dba7d479bfbcd640a9cff004 WHIRLPOOL 422a2dbe87d1157a1311039c97994d6ad8d6ca5f896ed8d1804a15c6035502d93d7a82426505e160af3b3f0078d456d53feee5d643fa27979554f1f6d481e36b
-MISC ChangeLog 3130 SHA256 56edfdc589321051368887cfb6910118ea796e9681120863095ae15c79c766bf SHA512 380f18d1b35407cacf240ce23743cc1ea68c2b37b72447cd696dbc673847162342236b0647ecf753812c6ff0211d0e54368c4c8e53e2ee17c8b3f6937ee1648d WHIRLPOOL c0a1cf29d20257bf4b7c0b3cea102b40c03d9d8e31ae8ac9d5f3f6058f7e7b1f97faf320c8ac0010e0ed725b5eae1958c26bd1e99ee84731df6f5fe60bf4c811
+EBUILD epic5-1.1.2.ebuild 2040 SHA256 0c114f3515f7950a2d254b549ed4d1c6e4aca6f71ea011c041974636d6e02d95 SHA512 44f7f41021a3a63b59de2cba277c7baa3d3404fbd6f8bac1e934f848cba94df0b35c03ce89e2bfdfdadef23d06f4e67c89ef773121cba07c69eb152b34b9cdb0 WHIRLPOOL b4ffc8b31394ea8df095aec90b47f3ed7814ccb03467fc0978a31b63f3cf82f3109953c5d892bb7be8a2ac84f8071499c771762eb37790bdf409035df61bd813
+MISC ChangeLog 3264 SHA256 f88ff7d8846b5bee936f64913b2bc56c6dc5ce48c36ed2059280f1de0015ff56 SHA512 3d6feb267e39f5e5d0adfb73eda52a3a97849521a2de3246ec7d7c8daa7113494f89ce97c7b2c8c606a9b4ff3d093e73a457429d547c2a0f5ca9211b0f75965a WHIRLPOOL ced14b1faf55f5fc58dcbf4fefb3ab937577b636016a305da78867f6c71ae9bc0549bc90e8e9c492329eb602b7b30c6283606cc2ec5ea831bdb9eb150653d408
 MISC metadata.xml 441 SHA256 e20a2146057bc3d5e2e27e659d95b2b2139d8b5c3df752d5efc257a6750cfe3f SHA512 599eeeca94a2f27712b3f1356e9510ff74fb1fbb567dea9cdf97b0f195aeb166bdb6edfa28c6666e1d92e09a685507383ba065f99d8a71e565782d7115575884 WHIRLPOOL 430bce6fe7ee5787510c1fbe4b494f23d413be35f57631b93cae0439608d19140ada145b25d049f126c3f2830922a10be0f5a99521a0665cb0fe1e7082f832f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ12a4AAoJEDxpGckxwJCBaiIQAI1cqa+r89dX408TwESMlT6b
-BXsJK9M8HuC+SxS4VPhYOB2ku7XAG+O5rxdSPt4YGbqd1aPg9dX0KFb76GcjDxhK
-ImoIEZil4/SGdPT+SThXYuWN5Ds0z/6cgeNtIwCfdrne0SwZaPgJGX9Bxx7KzhBt
-ivfonVvWhKY+2arkyc+Nvm0wNj5B0Ai8f4I4DaRcN8T94mV2VT+928qvnmIQlqno
-wpUsxLcayjarufhqTjWjr89vuxLyIKzwYnBurBMgrdfy8Ig0Yu8GMJ9DB1YZeF2E
-y9iiy39KZBzisi8dv2HjOZr0C5nYj8qFKJoBZHXfArifU4pzDSfBAAoNGoZfaZDc
-AUq2WSLiCTh1S5IyB2MH9PhQzU56QxmiZ5U56o3k7+O/f0m/aWOwIGqkov3wUCqX
-+4qpjgl4rPCrA7tCtgCy9JzMYqnFwAg2OthoT9bedoaCa/ivK6cYPttoAfdZg4bt
-bJj0yn04zwM86umS1vKeu9f54cxO8JI2YpHbClncH8ijxGFxAjYzuM/mlan9oy0u
-dJZcSq43XRRLHLk53DAVYI8Ne4GBSA3l0qnNYzhMhJCgiBJc/e9gGPwhkBQnCn4x
-yA0o73YsXfvL+MJMjmHEJWq+cQJ4nQVE5j2gtfSwNZrF6YjJP2S+s1qjQsecP1Gi
-JMSZnusdRJfX/WktDjAI
-=YNr9
+iQIcBAEBCAAGBQJTMSqrAAoJEHQ6UuhrqBBQfmkQALC5QfsD+4WNR0Yx1xJjZlCk
+HDRvN+g4Q2JdzxZPVCwStSwUGMRAm5wJzeS4OlQdtjl7jcXsOx41rz1FVO9VN32q
+BPitLdHe0ikCwZt9r5UCL3QIS9lrhbRgfANxFRCNA6eat2GZFZxgxGVTcf8aXgs/
+mU+x2eRpqg+zJKmClLcIaNVaxB4KxVYcpQZYXTT8R/tL0Yzn/zJv6sTIAjTAnXwX
+yyfX9+wp9C14NhPtMpU9ljbtEFL7GVO/NpXDboMjIRAmOtqo54CLApS1wGqKRwPd
+kwxEbwuEftIxA/C6XflsfGCTc7keh3Vns1f+q9ltyQQ1CWhmvy803tcrlvv4DwTH
+/Lv+mkb19vH0Y22t2yU2wyho4+bXGLQAIp+5VOb+ffo2x4CnLSyriQ+xxWkhkN4l
+bx1KfoDeJnn8gu6/ktvmgPjPGAtYPAC0U9d+995WdTQ8zvscxWIXesgwwNv0yTdj
+wkjo3i8dJ8u6W5YHIKIxb/FlpD+/Qgeh3SZiPcrIbTrhFqKoTSJk3WPActDemp+c
+p3ZivJyNMrXhRdl/WpshMUsi4mkAHHpkcmL6bdyQ7rGMTKFWHmtkhA8L4/L05w0H
+lT1PmYauXrG+4G3A52aN4dxG+ccq/n1CW6DhAl+SKDvND32YfuV64EGSu3g6To5p
+kULPoN3Fe3vC0votw78u
+=MTQQ
 -----END PGP SIGNATURE-----
diff --git a/net-irc/epic5/epic5-1.1.2.ebuild b/net-irc/epic5/epic5-1.1.2.ebuild
index 4617231390e9..0ab9b415e2cd 100644
--- a/net-irc/epic5/epic5-1.1.2.ebuild
+++ b/net-irc/epic5/epic5-1.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/epic5-1.1.2.ebuild,v 1.2 2012/12/23 20:14:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/epic5-1.1.2.ebuild,v 1.3 2014/03/25 07:05:11 binki Exp $
 
 EAPI=4
 
@@ -24,12 +24,18 @@ RDEPEND="virtual/libiconv
 	perl? ( >=dev-lang/perl-5.8.8-r2 )
 	tcl? ( dev-lang/tcl )
 	socks5? ( net-proxy/dante )
-	ruby? ( $(ruby_implementation_depend ${USE_RUBY}) )"
+	ruby? ( $(ruby_implementations_depend) )"
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
+REQUIRED_USE="ruby? ( $(ruby_get_use_targets) )"
 
 S=${WORKDIR}/${P}
 
+pkg_setup() {
+	# bug #489608, bug #497080
+	use ruby && ruby-ng_pkg_setup
+}
+
 # Don't use ruby-ng's separated sources support:
 src_unpack() {
 	default