Drop apel dependency if >=emacs-22. #455958

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

5 files changed, 34 insertions, 26 deletions

diff --git a/app-emacs/ddskk/ChangeLog b/app-emacs/ddskk/ChangeLog
index ff0ea98bea8e..67aae19205ea 100644
--- a/app-emacs/ddskk/ChangeLog
+++ b/app-emacs/ddskk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/ddskk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ChangeLog,v 1.40 2013/01/15 07:54:21 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ChangeLog,v 1.41 2013/02/12 07:56:05 naota Exp $
+
+  12 Feb 2013; Naohiro Aota <naota@gentoo.org> ddskk-14.2.ebuild,
+  ddskk-14.3.ebuild, ddskk-14.4.ebuild:
+  Drop apel dependency if >=emacs-22. #455958
 
 *ddskk-14.4 (15 Jan 2013)
 
diff --git a/app-emacs/ddskk/Manifest b/app-emacs/ddskk/Manifest
index e5bdf06f7a5f..f54b118d8208 100644
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@@ -9,25 +9,26 @@ DIST ddskk-14.3.tar.gz 805289 SHA256 478e2c824cfcd4e956a2e30e0f3967c3e385b3941f1
 DIST ddskk-14.4.tar.gz 847188 SHA256 a538c641f3302432aca07ae748bc0e4a7fcc91ff01c3d96b3169d1fbaa5a7d4a SHA512 d44d0afd2557c087549f337acf2778988128e06a82d1f15d080efcad4034cedfbe52fee7bad102d8dee4159ba4f5c89008055a51ce5a564d220fed98e61ef4c9 WHIRLPOOL 4f16a3f82f3c863e6f9df38ff9012507d69d8b16072c94ca953c185a588510aa8c35efc01cd5cc20bd38b2b674cee199e689c3a3572d8020815d8b1ce53a0584
 EBUILD ddskk-13.1-r1.ebuild 1334 SHA256 5141551d300e96249298f8efd73146e224ed7cef4dee3c300f8652ee475a4897 SHA512 33cfce3d265799af5dee0c764e5cc8e280788c49285b0934ffc160d6f8a893836766eca85859788265fcd6a1e93b614a98a5960e443533fca2461c5516169ea1 WHIRLPOOL 04ecb2b7343fbaef150da002394021085eeb41611acdaf3543cb0bf0ad31658194e06f742db2c38acb2da14ed17e67360e279ad12ea59dad64626beded444299
 EBUILD ddskk-14.1.ebuild 1579 SHA256 a6d036a7a22ca5e1a7e38d7c2b2fad3e95049cdb521d41ebdc7413d5b5494567 SHA512 95f9ffd406cb09e1e12cf3f388d8c81b954181e18e4d261eae73ed44902ec7b38834e0e383fcba9d096b09c65020b186634e5efc5c951cf005b1cfbb38f3c91d WHIRLPOOL a0274c5c095cf181cbf4c95941d29e20518940195d6749d43f5297e13a58997f00258d1275169e0d6045bd389a545c8300b08bd950f8a2c8817269452f1c9469
-EBUILD ddskk-14.2.ebuild 1577 SHA256 642f60c37973dd9f825c6940011ae3e4b5e68f0715d59d4b747c3e76f1191dcd SHA512 882d7f45122ce299abc470ce1f1cdb46d7d5186978e1086f3e037b1f37061ed73922fd8df202a1efdc12096ce48febbf66fe1d63c012d2f23c6dead999e58024 WHIRLPOOL 3cc286455ab3156bdf90578498ea07708fd33ce6f3074a49a593d5d0f9d11c140473f140681258c004380f4646b8c93757cd7fecdceee968d4a290b7ecfe2738
-EBUILD ddskk-14.3.ebuild 1579 SHA256 fd1c3b6ad417741f50ef7b3c3dff226714e6eced736c4a3e701edf6dadb1d555 SHA512 d5c64454b619d000bc1aecfa289ef998867d97ff9be9d08915e6d01ee7e7fb1044b7532d89ffd17fc73f3647050454e258bc6a6b0a9aed8f843fdeca73fa541c WHIRLPOOL 6c879bc9206962a3958d5262d8769e36a5dba88bfc21ff7a8d6cf6277994d84c9788a80b0bba481f10c7d020a9f8fba1b319da1c0a3a32123bcb123c47481211
-EBUILD ddskk-14.4.ebuild 1577 SHA256 85ac7f3acfd7814bbee568b2329fa12477346ed815132b6a493ba3179977467d SHA512 1018338906df8053b3b8f237bd4a321a11c5ad2956326f4ae3624196dc72d5e617837dbed36faeaa975812daa75a1971e6b3b6f8a3cdbdc78f020706873ed72c WHIRLPOOL 995b8ba5f4617f972294ac1d99ce9727d018c873a716bc2b58986ddfea74a4987b8e2d58fd04553ed2f002f600b5aede5e71cc2624d37345eadfbcd08e713f3e
-MISC ChangeLog 5905 SHA256 75322738061527e4c4d251089cbcd381200469dd4169835678fe1a8a1481b825 SHA512 fc260466d35d31158e2541f63ab69fe79617c5e00b3a7f8587aee8f95df0874e8894a73bea119897fb513b45c81958c5d0065e0af3333f1623fd8a7342707350 WHIRLPOOL 29b06aac205e93bec9128406ce3c890ce606ee4cfea216a08b098685679cf87842fca272990f12cbb44e9fc588ca97897600695c18929d966cf7c9b972394429
+EBUILD ddskk-14.2.ebuild 1629 SHA256 5f44176a15b15aaf485acd95f2436d4a8bf4bf56632f780af1fb6a51bc09ea84 SHA512 ce38b1bd345b213bbfdc877eb28be9bfb59bd6041c120a07877e2bfb26176b2edaa5fd0cf83275bf5ca9a1036598e5051557b3c5be4d847e63759be41d59a009 WHIRLPOOL a141c0ac3228e5bcd8382bc99c0bba6aca5f1308cf0da4009385fa569bfc197d7943f5b858b5e122773658cea4baaf1e01fcfb4f61f807c1da766a4d54890acb
+EBUILD ddskk-14.3.ebuild 1626 SHA256 5b97a5c98caf65ab358b86453a3a0c9d3db94316daf5263d3bd5182f6e232a37 SHA512 60b9c97150937614f12283abce65cd4ffd12702d88ae20b34f24ebe92909b2c90ddd14b435b61589ad6e7ac7209274b3fbadf95be6d55c127526d253e9173d42 WHIRLPOOL fb1fbbf5706432062a98d5fb57fe7bd91c2138a45f74c6dbc2e6ca9fb3cb313c6b0388faf430761ad575c7a63c4cbe2150d7132a3b9dfc664df5b2ce19390f6e
+EBUILD ddskk-14.4.ebuild 1629 SHA256 6a1ae1e0593ff0d1a61262f4b6ac2b236064cb14ef79ee6f4accd1b17882a1ff SHA512 a6637ba4cf8a163c21275c1e0882ca44a709c8dbc2c8c8356d36609206a59d3a8b5c7c39cf46b61ad21ae4c59324c253dc45e1f39a8275dddcf7983dc24a1b2d WHIRLPOOL 311eba43226acbbfe8449ab00c30a0e1f2056ae039ea7519a58d000d8509fc0b8fd27af6889895d5f5fb2aa5230a5cbd67fcc8b40fa3d97309456e560d683e1e
+MISC ChangeLog 6058 SHA256 04f6247361e28a8d5d5325b608094be7e235c15e71266c4673cf4abe053047fa SHA512 4ccaf91a0f66c2141a1f729dc07b4c33ac2430eae1a64ddd81bc8ec8868d1ce02bf1d9170fc1c8b3d9b1ec6bb2bb9251a7b9f1a4dc38e690cbbd20237b306842 WHIRLPOOL 94107d83c69fc7a06037c94fd367cb4b0c7f4fe5c63a1e6e32291cb17d3d0a946f9236d2acdc11b52aa4fbc93d24c10654256071828e07a753c9a36117c2836f
+MISC ddskk-14.3.ebuild.orig 1579 SHA256 fd1c3b6ad417741f50ef7b3c3dff226714e6eced736c4a3e701edf6dadb1d555 SHA512 d5c64454b619d000bc1aecfa289ef998867d97ff9be9d08915e6d01ee7e7fb1044b7532d89ffd17fc73f3647050454e258bc6a6b0a9aed8f843fdeca73fa541c WHIRLPOOL 6c879bc9206962a3958d5262d8769e36a5dba88bfc21ff7a8d6cf6277994d84c9788a80b0bba481f10c7d020a9f8fba1b319da1c0a3a32123bcb123c47481211
 MISC metadata.xml 175 SHA256 4c1d27d60d55175d9ce0f5edc82678cadd5e6c791936127379066dddb8986c84 SHA512 a935cba473f44ae68d3b52d88f2cd9c6294411df4a133092d18c87ab00e58a94b12ae81143c909be8d534f95d4aa44d1d75a90ceae6c61be06769444cb679ed0 WHIRLPOOL 636aef30ee004f6f33cec67fb73bc3c3536d593b652ccce9764a397c3bf68a086abf1a2d57f47bd3ab6a03b1bb821540cd2893ff8bfb367056f2b05a415e8503
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ9QsvAAoJEDYO1FT4VRUUFl0QAIZbBPChj+DNps7j2FfY7iP4
-arRldZ6GtyK1EMx8f5I3IgD624z0/T0/xYvts0ySYFErwOzVMrCBsmFwf/s+bTcb
-N/Y25rE7yAGDoko+HWQQQfzMNGWKgm5K9GL+9Ki/uoYJ4UFcAWKwQW0wsrg+ZnWi
-+Up4VDCvfo+lUy97LxUXMQ6UIqaUiw0WsttFw+bZJA9TfGJsFK6tGUHqQ696agGD
-/NMkTdkP4bHQ7SAPQeZAvvwbmj+8lRCPpDEMopnwBYG1w5UkMWh6KjUftFtS2pXn
-PdxI6QBmPPKQL7IHpBrnMAbbS1Ky+BDNmJ71rl6tTjk2HRDrGBB49b1t0H8X8UHh
-2LaL+QluRL6jILPRKpWCg7bSyhNR63d7gYkpS2Pvcj7HmzBxEMc6Y93e6PRw8ek3
-KjxlOGE01cr4lhux0252W+/RLXRLX1sPOmrQjN+PUjFdL2o/bDPI8iQyht83QLRk
-1Ubk3GilRc9szzZuXDLXS6m2cE+l1mA38q9Kg7f6cDis8g6stRuJ6WcdWgLOC1ej
-CEL7b0u9bmDL8kjWv2i9f49MaN8WYsFwFSX6nWqyZu6IuU9q5As99gK3xpvgyoTU
-nXpGKbnpKgf/1sVEKBEhMjfPqSEIyiG5p3/Ydyw3smAzZM0lZ5EiZ+K/KAlCymUh
-ZmqfCMc0YBEltYAthtcy
-=oX7w
+iQIcBAEBCAAGBQJRGfXxAAoJEDYO1FT4VRUUd8gP/2+uutY+RFL7Ne7+TVSewstG
+Kir15aSZnDGlGscrAGJJdQz+Li2ISHLdKy1fsKhQkSCumXrI82ep+uDqbkY4HHbs
+B3Ucjuh+svpK0KuLwVyrqYAA/IKPqxmzVbz5QAS4PxCGBcHNwhRrGaCwB5gZmxRW
+iEWRziUB9w+6DHQvdYVz1ojQSB+TmfZsoGF7oz5FbAVgwQDPHDdgajMTbt1NEC7Q
+mzwASzgCZWfEPCnKEOSGApimUQGhvykEoPODSVEaporgYscBDxQ9/P8eGBKFq9O6
+T3/zNH1AZ78mH7jTjnl7fT5pg83mTN2ELm+M4yl0PR63JCzlQAYltmjJ1d1eO3iv
+YTQDxK+noTVDm0nWBdlpCkokuFo2K64FSlJfCIBaow/9m7Hzs1yRhzJItbSHOn8a
+yExfElZYdfNgl6w91qAuO/FcWTVr1T5o/g6u7oVDaMdTgTG0ilIVY0HmHhEvcm8q
+IsL2mRNEmX622p2TipFS6iZ4ew6Nnm2gOGFUaBQ4u+QECu/grre9B/0yGkHdw2nP
+iN6/K6nxcJnGk6YvDyt5u8pOuz86SlT6jUkBoXHozu/ZbI9BBjORK8W6YX5CHqE/
+xJP62N6QNnHefzfCrg+xFaIlDUdiIcrn6AuYs7QJ7dHdddtE45F7/MmAq7BleDW1
+M8yBriP6f+4Zw1QcM/g5
+=ueTH
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/ddskk/ddskk-14.2.ebuild b/app-emacs/ddskk/ddskk-14.2.ebuild
index a764f4acf3e1..9ad9d16b8257 100644
--- a/app-emacs/ddskk/ddskk-14.2.ebuild
+++ b/app-emacs/ddskk/ddskk-14.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-14.2.ebuild,v 1.1 2011/05/14 23:14:07 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-14.2.ebuild,v 1.2 2013/02/12 07:56:05 naota Exp $
 
 EAPI=3
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND=">=app-emacs/apel-10.7"
+DEPEND="|| ( ( =virtual/emacs-21 >=app-emacs/apel-10.7 )
+			 >=virtual/emacs-22 )"
 RDEPEND="${DEPEND}
 	|| ( app-i18n/skk-jisyo virtual/skkserv )"
 
diff --git a/app-emacs/ddskk/ddskk-14.3.ebuild b/app-emacs/ddskk/ddskk-14.3.ebuild
index c30c8af6dfc0..c2bf2338118f 100644
--- a/app-emacs/ddskk/ddskk-14.3.ebuild
+++ b/app-emacs/ddskk/ddskk-14.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-14.3.ebuild,v 1.4 2012/03/08 09:01:20 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-14.3.ebuild,v 1.5 2013/02/12 07:56:05 naota Exp $
 
 EAPI=3
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND=">=app-emacs/apel-10.7"
+DEPEND="|| ( ( =virtual/emacs-21 >=app-emacs/apel-10.7 )
+			 >=virtual/emacs-22 )"
 RDEPEND="${DEPEND}
 	|| ( app-i18n/skk-jisyo virtual/skkserv )"
 
diff --git a/app-emacs/ddskk/ddskk-14.4.ebuild b/app-emacs/ddskk/ddskk-14.4.ebuild
index c21e4d6a2af7..de68b36df6f7 100644
--- a/app-emacs/ddskk/ddskk-14.4.ebuild
+++ b/app-emacs/ddskk/ddskk-14.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-14.4.ebuild,v 1.1 2013/01/15 07:54:21 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-14.4.ebuild,v 1.2 2013/02/12 07:56:05 naota Exp $
 
 EAPI=3
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND=">=app-emacs/apel-10.7"
+DEPEND="|| ( ( =virtual/emacs-21 >=app-emacs/apel-10.7 )
+			 >=virtual/emacs-22 )"
 RDEPEND="${DEPEND}
 	|| ( app-i18n/skk-jisyo virtual/skkserv )"