Restore -r0 remove newer as it is broken by scarabeus.

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

3 files changed, 23 insertions, 29 deletions

diff --git a/app-dicts/myspell-de/ChangeLog b/app-dicts/myspell-de/ChangeLog
index b658fb2f2e61..722d7bd25983 100644
--- a/app-dicts/myspell-de/ChangeLog
+++ b/app-dicts/myspell-de/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-dicts/myspell-de
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-de/ChangeLog,v 1.30 2012/08/17 11:23:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-de/ChangeLog,v 1.31 2012/08/18 09:20:02 johu Exp $
+
+*myspell-de-2012.06.17 (18 Aug 2012)
+
+  18 Aug 2012; Johannes Huber <johu@gentoo.org> +myspell-de-2012.06.17.ebuild,
+  -myspell-de-2012.06.17-r1.ebuild:
+  Restore -r0 remove newer as it is broken by scarabeus.
 
 *myspell-de-2012.06.17-r1 (17 Aug 2012)
 
diff --git a/app-dicts/myspell-de/Manifest b/app-dicts/myspell-de/Manifest
index af765260bb10..b44bc32ec64d 100644
--- a/app-dicts/myspell-de/Manifest
+++ b/app-dicts/myspell-de/Manifest
@@ -8,23 +8,17 @@ DIST dict-de_ch-frami_2012-06-17.oxt 4600209 SHA256 c2c4eccfba404b7b3adea5df850b
 DIST dict-de_de-frami_2012-06-10.oxt 4597073 SHA256 c97947c6d20061d78a34740f6e8a5f5dff1cb968c37956c8aac067ded3850bff SHA512 64ff878fd29960721761868941f96fc641e2cf9c499ae022c92b41de7f327e2042be5bb3961e4d28ffef51746bd1479f71b0cd10bd54d3ccde4dfd23a2862594 WHIRLPOOL 04ff5e1cec6c373fe5cce5e364c35aeb6dded334916f7941288de595836fed3e87916ecf58e65693ee2dac7213768679617e7ac2fb817ba2e5f30850b89ac9fd
 DIST dict-de_de-frami_2012-06-17.oxt 4606812 SHA256 103e633dcc4dc51dfe39885320cb6e3b497059366951d96b4809e7f2c0ddf9c8 SHA512 62a2cf684c90dfbcaa41eb283d9e2077f3282687893fdb7e50e56349e46672546eebc74d1620d62f70271316f29673901012e802ec619701df63e3e234c0e921 WHIRLPOOL 5dbd61cb099c94c6cf3f234b7e75ad22ecade00a434e1b300c165ff07292d0e986424937ff0d80b0c513edb358e1b8718e710bad47e82642aae6276e5122cbd5
 EBUILD myspell-de-2012.06.10.ebuild 1514 SHA256 066cadfdf91656dcf1639865a5f7ea113a443fafb00da360fc9f6edea3db3a7e SHA512 55476a81bb935b9539646f5e4307ff07a91339724c884da4ee1f6eac088f70bd87f779f7f0f63f0e683a1243c9ee7cfbe94ac249defcae6fedcd93faa2779522 WHIRLPOOL 79bf34317c40cebb1b12b7adb8412920325925ac9c34b593e10f639940e0bef256d28d760f3be34af25bcea9cb14ad8fb2d18cbb840f1154e0c7787a754599a2
-EBUILD myspell-de-2012.06.17-r1.ebuild 1572 SHA256 04057cfc9e490c2966cedb1fdd916948b075d34c0d0abcaa1bc19b56b777ce94 SHA512 c6f24b18f3b2de938811be150ec23be81c54ea1cf24bab27b9ffd846e868bea4efd8aa1d52f04d84d78b65cd26f3a795bd39f78662cd8fd09cec8613246cea11 WHIRLPOOL 62107500d134736f359d165c35dadb2929c75718e6c8a523d8f8c9da7ece40e05d4ecc57cb49de174cd095720e90dd3cac1727f49a56d10184eb50f328fd5ccb
-MISC ChangeLog 4106 SHA256 86ff7fcfba3b04371a200aa8fb16b5ef9bcb9fae8f62d614a928a1d02e31b01d SHA512 1b43d9f67c89a6b8f86c947adbd9cdd8cf84a58deb22b2d885ac499e86755bb8b9a7a5169270b42c525c929fecea0343ed11d39c87f9d7435ed3a606b01e9838 WHIRLPOOL eb9cf3e4a19bb0c6ebfb71fa883dd69f6ff0f111b03bc639f7ca709524dcc77188c15ea554872258d4b1fde200c0cded3a4dec79210d8948a12030a2f27d6b72
+EBUILD myspell-de-2012.06.17.ebuild 1518 SHA256 1a8dbc2524aac56faf33172941b1c63c90a6faef5fddeae5da756cefd281a082 SHA512 b3e2d79943b37790c2b33cd62862e4006038340046ea4694b068b05a9bdd315d036c47d7ff774d2d22faf3a6c42752d653e4dad5857e532a47a25d3215623cf0 WHIRLPOOL 0a101de9ea9e4aa7b64ba4128593631fa264e0d8ae6fee280b114d2e654211d0ff5bae4f72430034013703195918271f28995df5f3cbf67ffed3e6223470263a
+MISC ChangeLog 4312 SHA256 f07944613500ce5ec2e70388b343ff4559b6a4c2172a159d81212fd065912c5e SHA512 d31ab54e13c80b27af3f6fb9d2a190f2e8cddf1bd214b425d4805fc86a8ff6da01c3d9d99a90c4491bdca3ea40e75459dee38cfe6a9e4a85b431344c9f80437b WHIRLPOOL 52dd1045b5143054b0f3799685d67fcaf24968eec1911cdbcec93a9740271b91ad9a84870da4a11de65e4eceb78f05f7f6fbf5a4fab98b8321727603f295c4b6
 MISC metadata.xml 163 SHA256 2a83bf864655c5acb5d551aeb9b060d57545fb7cf1dd9d7fcdc16fbca221cabb SHA512 d8edefa125f81b05e1a1cc9917a2ff6c1618970f9b26b02fe37dbb7b82c466e50168f690c2f629103b199989b4f79d9e10a1af410530e9ca23dada148db91a12 WHIRLPOOL b02df903aeb78e797fd5cb86d14cc93bff3495ec7ca20aab8bca9e5d6f2b545d31972cb7f1b831c5215ee9ea75bf89df20e3c1a80b47ef9cdf1ef47271e9d2bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQLinIAAoJEOSiRoyO7jvonSkP/jPpzFX5kqlolpDCt+0GEutM
-g7jpqMyTcIsKSCIjtNseQWJEH20h6beTLxCkI2oJg0w/LElzJvQLYPjDSW9c/Mhr
-AIpY5KB68ZqSep181/DkYY3ZO+Hj01ugXZSrloIdx6DX7ZSrL2wniPvfAr6BXldV
-IXQKH4XZth4s4cGVHBWZU9YyCEwaQxX6f3C6952+IIouJrE5YMjCTrepsos7PDUm
-Y7dR0Uwz7f5Y+82/NA92aplJUBuCyrMBT72PWcRQErabIyZwvrEDD1MWXtvZHG78
-RqkkvIBwu0UuEiaZOvmHH5IbGdTOMmyIDO1MpR0yt41v8Ait7DooBtwrYv3E2la/
-J+n1e65rrXeZCGPKqtBjpABq6wEgd/G/BcxWxbsbzeLItrtZQ9IsUh7rQKJ8nwri
-Ob79X5IwJM7fUtCRzyM7rVQpZ/+gn7DVU5GqIEAJaUix4BmKU0XWK6+FhC7Ht93n
-gbe/YG3L7tWFLs4kFVA9YxUEpaBt8JOTOVBnleoJ8/w3ayarvcDEvEP/rFErgD0f
-w12mhG1IW8wRf4+quT1CQP/rUeadnqIslHmC/f6NhfPz6T6qzxLlkrefqxjHCI5O
-iE0ruOC1gHj1kma/ze2wtHzqWuuFkPmtDAnh2Lz6LBwxwzvPW4l9tpcsLT+BYcU7
-MrtjQAbvQU656vCPfXop
-=u4t4
+iQEcBAEBCAAGBQJQL15LAAoJEO+t9ga+3I3aCisIAI90m4Kf9Xu+VkzZt/3ehyNz
+k7xvlWF6ne5JisPxDUwwX6jORCg8pRykC/Gsg+Mo8HxwWa3E3hyALvqIdH2hcgsr
+3d0mUSGYCrVMqYi0DhRpZjwvDgeY6qy6v985wjG9Gf8Lvqmx2LfOPkxx40alVlbo
+pIAeXkVwVFkCB2o1bjocCG4yKQXVUfMfawDclsh2XyFtS1K8dWeq7Sf/tkmp9DZA
+J64QL28UFxd1v6aEroUwnYSZvCH6y88Lx2LeTN9mL/DX4gfPVBxMrTbySueY/vmk
+2dZneu79PaCikPfGDBUy1xALQynIdhuGSDylSwpOtircuTDTNoglwPrWzSSxcHs=
+=Z1PA
 -----END PGP SIGNATURE-----
diff --git a/app-dicts/myspell-de/myspell-de-2012.06.17-r1.ebuild b/app-dicts/myspell-de/myspell-de-2012.06.17.ebuild
index 5b313b2883e5..4a76031e1026 100644
--- a/app-dicts/myspell-de/myspell-de-2012.06.17-r1.ebuild
+++ b/app-dicts/myspell-de/myspell-de-2012.06.17.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-de/myspell-de-2012.06.17-r1.ebuild,v 1.1 2012/08/17 11:23:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-de/myspell-de-2012.06.17.ebuild,v 1.3 2012/08/18 09:20:02 johu Exp $
 
 EAPI=4
 
 MYSPELL_DICT=(
-	"de_AT.aff"
-	"de_AT.dic"
-	"de_DE.aff"
-	"de_DE.dic"
-	"de_CH.aff"
-	"de_CH.dic"
+	"de_AT_frami.aff"
+	"de_AT_frami.dic"
+	"de_DE_frami.aff"
+	"de_DE_frami.dic"
+	"de_CH_frami.aff"
+	"de_CH_frami.dic"
 )
 
 MYSPELL_HYPH=(
@@ -46,9 +46,3 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
-
-src_prepare() {
-	for i in *_frami.*; do
-		mv "${i}" "${i/_frami}" || die
-	done
-}