Convert to EAPI4 so we can use REQUIRED_USE to force certain useflag combinations. Bug #327231

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

4 files changed, 38 insertions, 36 deletions

diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index bf062dae5054..4f714f7c3558 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -10,26 +10,20 @@ AUX atheme-services.initd 975 RMD160 83486b35d148bab6f4b611d62fb18da63846a966 SH
 DIST atheme-services-6.0.9.tar.bz2 858804 RMD160 57ed736bb1eaedb0db68e63266ee8c98674f0542 SHA1 1b463ec808d4b92d0047319cdc1e4223a9ca9481 SHA256 058616395d6d5477ac4e63fc1daa88dffb62c9cc5a9239dae5dbe54508b6aaf9
 DIST atheme-services-7.0.0-alpha11.tar.bz2 989641 RMD160 c0520292ce294f0cd0682ed39e699d03a747d0c6 SHA1 160c37a93fa19d2dae0c2daaffd07061567c633b SHA256 0b97edc89bc503c61e9aa6183be985564ee39f038c3d0565da8a92c12a3b12eb
 DIST atheme-services-7.0.0-alpha9.tar.bz2 1055265 RMD160 d86413c63c79579247904965fffa7c2b1e76d688 SHA1 28168d0b4ab36840dd3522283dca2aebbb9a56d3 SHA256 564add960be744d637573d69ee12351555696048e69505af596d767f55b0b3b6
-EBUILD atheme-services-6.0.9-r1.ebuild 2852 RMD160 92a70cea6127f935c60c9718ede4618a8b7bc535 SHA1 018775714301a96f15a11e05062a42c0ff0e4726 SHA256 d5c3bff9b7ba8b10c0bdad3af44d39907fb98680172f654a765e2c8a7ed81826
+EBUILD atheme-services-6.0.9-r1.ebuild 2849 RMD160 827637c8920597dc93e2cf723e2c04a2cf468327 SHA1 6c119a2818e0b025a5d872e6c3ac71a35dc9f4b2 SHA256 96974daf873442125f124ad3662051fba5d62f25676c6e8bb3cd3c0e43430dcd
 EBUILD atheme-services-6.0.9.ebuild 2726 RMD160 0df5ce4dcaa8bf3af0b60934d4b9abb583fdff67 SHA1 ff61636a6ff27c98352550dcb7d9e7c850807cb4 SHA256 926290f55f0aaf149b54dfe8dd5f93411b77ecc9eafa6cb7e02ae68644bdaddf
 EBUILD atheme-services-7.0.0_alpha11.ebuild 3008 RMD160 0898d6820b4d87fa7a669e6926d29e777f58bbbb SHA1 0a747abefb2204d416df142bc265a5b6ed0c9fd8 SHA256 d514be782cf4a40758ee1535bc0420269f0fe5535d719338280138512b19fa72
 EBUILD atheme-services-7.0.0_alpha9.ebuild 3143 RMD160 f7e3516110a1d2e08c03f5ee8be3900e6ebcf331 SHA1 98d527cc26f4badd1fea76562e9126cee87aca1f SHA256 a88da1225d947070a6505e309b61bf2a69ede397f0b347c69450ceb7b2115297
-MISC ChangeLog 6564 RMD160 cbce130d34ef358c8dd47de9a1b63e3be28b9ea8 SHA1 e09a16b23d0db06fd0702899976f0061797b5e41 SHA256 46036036669a87a685d040d459ea08ceb6b865bb9e805dee9dd2ffca95e864b7
+MISC ChangeLog 6683 RMD160 ba7d726b736f1974ba4a91a2f11906c3a5c285ec SHA1 82131e1001eb8b63aa4c3b37175948eaf9781231 SHA256 41b05ae4e410b80f08453189d3cd207ba11d712645be863d36a08f1341f20143
 MISC metadata.xml 771 RMD160 6681a3e8f489ae5a5b0ae882a11d423b932f0081 SHA1 07abec75deb6154fc71a3ff5cf9057d3ce713adb SHA256 a837c036193dc300db84f5539f463723abaa14e1fb15ca6314b7e850fdfac460
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPKz+IAAoJEHQ6UuhrqBBQjigP/iWx4lbiCION2HVAQUY+EvJB
-XUPK6LsVPrw8JXRpxBZf1KA22vtIP2ulLDllHbvjpvcEFXm713dkdi3YOE2SLaB2
-FJbRKxo9s8h4DLXR8fna7+PxgYdy/gzIstghhugr8hkiu5MSGCs92SSRTkqCB/G5
-kShEJsYa+oTEWioLxSgiVEX+VmT+As1e4mBA1Fk70eZdR/CnDXomfij22hJy/Zsq
-+ddAWwo/H4WJBq7DwZzHO541Dpuhv8Pui2XS4SXUAOhrgMd0IR3yZ0/DDIAub/yG
-IYnxd5PEDbfRGDnTEnOZhEbWfk+BYELRKO5s7bZFyntE3gSAgG9Gn1jcKhOfTQ1s
-j82p3qU0xUWx1zN+uKkU9znGo8CU2M6uP50NzP5cHJbmu52a+ZTr08qzHLPzWxRN
-eEN820mYI3wAUm9mswPIZHk/4uUAkbvEh52TrvifBvT0nKaQtqIHpdy0pXQV359n
-FoHS2JmdUX0HJ0VDUAJH3R8eZBDeQm+yguSQJRc4/5dSXSt1Ih2m5tf8tZEA2mXa
-fnc/zVgqTWHwVGVZdSt2/RNhqvlk5kmVcrUr/smzh3WIa5sV5RhjejpKju6pUjbU
-2heKgm6LhJLU+qeHyjZJDRpbjwWvkYq1stxY2tnJ5vUG3rf+98FQuSYRSeaXfaN3
-78cJsuj522UxPuSZTmBT
-=PRdM
+iQEcBAEBCgAGBQJPLQE8AAoJEOTDgjZ80txdMeQH/i9RuPh1kFbcS80FHRJqmkMW
+weAUR/fdZTYhr0zUqDZ19wfCcU21hkUAX8cEGRoQY+xfJ5JAKgEvLkET2+tEO174
+sftOx17zTBzegtIjRzVh90k2OKM1CJI4+ySEpQnfEwvhxAnRRZjJEs3T393dH5Ny
+FYpeJxbaMMbGwBxNwage4f+0La7NUhMUQ29dPEudAPaJ7JmX8RRMrwZV1/sFBGyK
+t4dnm5/xNBsKGJorB/43h+Y4tUOOnEMBM26PLdnIDZEyRa9hanOnOkHA64sowguO
+p2nqHLXvxgbXikyn6G1DVZIW3+BXPTR1ciSk2LDjKv4XyZMth9uw7AJz5d2ka7w=
+=7O/f
 -----END PGP SIGNATURE-----
diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index d31dfe7df9b1..12e15707a18f 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/kvirc
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.138 2011/09/18 13:45:07 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.139 2012/02/04 09:57:10 hwoarang Exp $
+
+  04 Feb 2012; Markos Chandras <hwoarang@gentoo.org> kvirc-4.2_pre5816.ebuild:
+  Convert to EAPI4 so we can use REQUIRED_USE to force certain useflag
+  combinations. Bug #327231
 
   18 Sep 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Add Arfrever as proxy maintainer with proxy-maintainers as herd.
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 8d8343155eec..9737f469d6d2 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,15 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST kvirc-4.2_pre5816.tar.xz 4541000 RMD160 064232041c5009f46aa7646dc623dac227d04042 SHA1 3704848df01028aebca2b206b79a8844f0a9c059 SHA256 438cebdb89834474b001953c87db7abe0a8a7f9035e5e01072e1697e5dc6a294
-EBUILD kvirc-4.2_pre5816.ebuild 2962 RMD160 ba2c8e8c218e5f58fd8a95b2bd1e016b2ef116f1 SHA1 de4895733ebe0c02f381f3476ac9f52025f63713 SHA256 173fd643170459c68454e10f3a7cd1784c28afe98d5d1fce21a2c95846c3c897
+EBUILD kvirc-4.2_pre5816.ebuild 2837 RMD160 8f938fbea09f90e873598c776b720e36a6286e64 SHA1 ede49a6bf6c8ae26be942ea07aaa421b78f7a68f SHA256 47d5cb85e202366455adf94307573ff507d06bc41afce33f20a337afdc45a868
 EBUILD kvirc-9999.ebuild 3017 RMD160 865d0ad628f6df0afca32362f1ed2ca3d2282e6e SHA1 c25f8acffb02e16b7d9c181b4713992f77b5ef0b SHA256 04facdc65b61d50fef766a1d59c34a02eb29dd1fad907756f5ed28bf585b3823
-MISC ChangeLog 20894 RMD160 0eefc2093e9dc338757e651dd6c04a2c6023f8f6 SHA1 73d4d272e8f5485a8ca532938e40a776d9cf07d8 SHA256 b0d8e3db2417ecbf777862f1e07b64294673ee6b992cd72f15b0f5384e0aae3b
+MISC ChangeLog 21076 RMD160 65849d67545ff5aa7aa818142d8b026675e97191 SHA1 1064b68b5b3cc840e891b6047aafd75178ac8647 SHA256 853be94824eb3975109813eddc98474fc91ff1b3f071065246c7c53756a64208
 MISC metadata.xml 713 RMD160 bd67c59cc96788c03c0ab520d9ab42af682abf71 SHA1 33238f9ff1ba626b9ac34909688aebf595ebeb6f SHA256 48d4a0dee1f8de184352de07a28366be5e052353d4836424a8d4f21eebacac44
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk519ekACgkQCaWpQKGI+9SdogCfR4HTqs7Yozch+AHNYaK9Fjos
-8sYAnjzUlYjqQ5DQ2lskGaLgdgaE0iQx
-=YJwy
+iQIcBAEBCgAGBQJPLQD1AAoJEPqDWhW0r/LCq2YP/0JuMD828L5cB52gI8bpaCHP
+jTSCHGu4/FPKQM1As/2uU+vP79O7j+5aQitzyTNAQYoBqHwC2hJhqWJz9+e/cfbW
+wMkTSTEQUqy+lLVIrecKvKPB/BTdWtVfSslcdcmRxPci6Fbir7Ro3jk/OFgLbs1d
+awcm/EXU7zMlGLauECVaO18pLeTme2BG5xW77TD0dmryWY8yBHw1gISzpC4UQmNg
+9RM1qAhmYVRVWyEP2aIq9xA4rPS2WJ8li7DJL19oji2XHYcf0Dk23hbmsCkr+QWs
+ucHCzIKZrqBejz236QpPhOZNJTw3DBM/sgD3xdx6dtczjpAQJRZyVM5nzCnt8Dyi
+zGiuzFDItNCmixVPFn/mRVX9SThl7vQHTmuaWyfH8K7BVvj4aIYAUDpwzVtWWTLU
+kf03+rO3sMAW2RSKOP/4ImNbrn4iQwhk9NwT7a+tMitHm9At6qpUOuyCouPLR5HJ
+8iSlp3cKm5OfeZAsFvFo8k0KKXHk0LgBr90ghapZQ9j2JYXiSrZcRil87ZHo7Cug
+bD5Mzn7dBneaOOw1rzz1sR0MQ8iOpMew3eDD6BOlotg2rx4nIcRsxeu1XHRuIe66
+9j49eyVF1MNRTEVdpJpYrpQ6ksmiW4CzwB7ez4Dnm1M8xH8bAs1KdNgDjkoz4ouF
+DHzoEnghzVKzfUg/8QWB
+=5vVd
 -----END PGP SIGNATURE-----
diff --git a/net-irc/kvirc/kvirc-4.2_pre5816.ebuild b/net-irc/kvirc/kvirc-4.2_pre5816.ebuild
index e63e6b13f956..5e7984c43503 100644
--- a/net-irc/kvirc/kvirc-4.2_pre5816.ebuild
+++ b/net-irc/kvirc/kvirc-4.2_pre5816.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-4.2_pre5816.ebuild,v 1.3 2011/06/19 13:51:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-4.2_pre5816.ebuild,v 1.4 2012/02/04 09:57:10 hwoarang Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="python? 2"
 
 inherit cmake-utils multilib python
@@ -44,15 +44,9 @@ RDEPEND="${RDEPEND}
 
 DOCS="ChangeLog doc/FAQ"
 
-pkg_setup() {
-	if use audiofile && ! use oss; then
-		die "USE=\"audiofile\" requires USE=\"oss\""
-	fi
-
-	if use theora && ! use dcc_video; then
-		die "USE=\"theora\" requires USE=\"dcc_video\""
-	fi
+REQUIRED_USE="audiofile? ( oss ) theora? ( dcc_video )"
 
+pkg_setup() {
 	if use python; then
 		python_set_active_version 2
 		python_pkg_setup