Add ~amd64-linux/~x86-linux, use ED instead of D in a couple places

Package-Manager: portage-2.2.0_alpha19_p61/cvs/Linux i686

3 files changed, 25 insertions, 12 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 083bc3d42f76..537daf1049f7 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/abiword
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.232 2011/02/04 10:06:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.233 2011/02/05 20:35:04 abcd Exp $
+
+  05 Feb 2011; Jonathan Callen <abcd@gentoo.org> abiword-2.8.6.ebuild:
+  Add ~amd64-linux/~x86-linux, use ED instead of D in a couple places
 
   04 Feb 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Give more information about 'plugins' USE flag.
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 3ac2560dc2a3..0ae12f1b7e57 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 11_history_fullpath.dpatch 1905 RMD160 17c9ceecbe54c9e83605fe74d1b52ee42b5bbc4f SHA1 4eb037972e1115b01c04e2d4e6474973d787d8a7 SHA256 16b50d4aa4822aba7577f804bd98fc35c30561e5aa354f2c2ca9cd0c8819941f
 AUX freebsd_fix.patch 550 RMD160 aa37f1f1737c1723840b72a1e48724575dd196a6 SHA1 c39b6964ef1e24652c026c344513facd94c88226 SHA256 28db978a944016d43862a221af8ef9dbc69e239b3abde14ede33ca21485ed8c5
@@ -8,13 +8,23 @@ DIST abiword-2.6.8.tar.gz 9516443 RMD160 8fcf455a5226a5525b9a89f88c9916b20e97360
 DIST abiword-2.8.6.tar.gz 9218827 RMD160 caabab25d197f9553ea12376de36fc7f5a771a58 SHA1 998f69d038000b3fc027d4259548f02d67c8d0df SHA256 d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15
 EBUILD abiword-2.4.6.ebuild 2386 RMD160 4ac1e0a59095bc57db60a1a058843239347d4048 SHA1 44aa8a580436ffd8658e4358944c14c8658ee667 SHA256 ce092cb97fba3e39c431405f54fc313db7b91118eb12e6ee07cd0b89501a1b35
 EBUILD abiword-2.6.8.ebuild 2505 RMD160 9ede2fe9064f1cb186e81365d5cc64f9bb56c3f3 SHA1 38310e886a7aa4771287e13d29e93073daa81f8d SHA256 91ef7b431b767ac51f3a0d323a45377bf7936cdde0538fcf045d2758f9e28db0
-EBUILD abiword-2.8.6.ebuild 4612 RMD160 7cc306c2f8922b24cafa1c6f2306d7f2e6d772c2 SHA1 114a5dc7a5302ad2592d6a2d5289fdfdaaf4efad SHA256 bbeb37edeaa4ce20145454141b48e7efe794aae03a539f21243bfacfdbcd08a6
-MISC ChangeLog 31085 RMD160 b66faa5c9a8097922b745f0dd2cdbf9e23d89f22 SHA1 aeb8084ffc63dbd58faac5e28bb87ce7be936c3d SHA256 9dbf965da8c5b8b7b6b5f799c9424f55a8281059e601577d26622b85d5fe0d42
+EBUILD abiword-2.8.6.ebuild 4638 RMD160 d150f2ee7f8c15afbf38115c17cea2491a251a44 SHA1 a79fead7e742bf317a1976109119e5cb7bf5e2f3 SHA256 69337e3be5c8e57ca5e3d8d583bc52a58342b1bc04cdc3775e574622eb847cc6
+MISC ChangeLog 31226 RMD160 79a500da5f95f3c287045c2bc7a2f8b551c345c3 SHA1 d422833c81377df45a5dadaf89ba55e0783d0b58 SHA256 599785f5fe7896067383672c12212a52e2da086ce2a5909723d87c080a82bf49
 MISC metadata.xml 879 RMD160 df1f57e78a294b266ece583d9c04e685fc6f2b53 SHA1 8876780818c62eb42318ba47ef68c15cc80a2a10 SHA256 68442b26d087af39be60f2b41749ae53e94073770449f80bf8f6fd2286e0be84
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1Lz7kACgkQCaWpQKGI+9RyZACfZ711wY2OKxEtoerO22a/HZ0y
-G6sAn1CoIpSIIz1PEiRc4d5U0zwrJQOo
-=UsmP
+iQIcBAEBCAAGBQJNTbSCAAoJELHSF2kinlg4qjAP+wUUeJjl7p27GKdCTXePkTPv
+o12YWtG17kVPxpSUSnnQ+0JbxHpuSPfNE6S9tAgirtpdq0Cb7xJ+IX9urdP8KrYB
+behyJ2D2aqtxEqAxQCk6vem/Oai+uyIRuHhDxQoycxibL4U/uA9mXBAkDnor9FER
+PTFKVG8jmoiHUpun4BXpM7ZeAxc879v9dQdkx8R4Vy9nsHL3DsS6iJhDU//FjaTI
+KyO7mofH+Ud+yPW2+++dYo+FKrwHN++5O7jU7nirg96vW7lQNrwCmgURwnGOFfZD
+85ATboleG9Tz7R6K14kbLwYbZXqC07YY30AyzW10/AxBO061F6QTQNkOIPU6HHyj
+8tbAYsm+oqIww10SYiOJ85+HHVWi74vLZRqz9r/D13QUaOsg921h9+wKA+tsavzQ
+b7ECHuPd+PFzA7gp8FVKO0JUB1+j25YFhOtpyp2+tXBO+YZiERxGBYRAOCJzcyTs
+89c7wTnxtyvm7oyt6vUfW53bYG/Jj8BZsQOZQ5eejX5z69NFXl7jUb9BT/TZGTDa
+bP+0XoreV/7G1qdNGju3TiKb5x/wOZotLa+2GqQlIPv6eim92Y6Y8XdM/PkZA0/N
+gS2BI5ktTYUUlJV/YhxeKsMb0EmpM4W8IQRap0pTU9n2Qotgms+4vDZfYjRxoudn
+WNcUDTpgvJwnalUV5XS0
+=DHoY
 -----END PGP SIGNATURE-----
diff --git a/app-office/abiword/abiword-2.8.6.ebuild b/app-office/abiword/abiword-2.8.6.ebuild
index 4b4d7bdfa0f4..21ab8202e8c1 100644
--- a/app-office/abiword/abiword-2.8.6.ebuild
+++ b/app-office/abiword/abiword-2.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6.ebuild,v 1.13 2011/01/26 21:21:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6.ebuild,v 1.14 2011/02/05 20:35:04 abcd Exp $
 
 EAPI="3"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="collab cups gnome grammar latex libgda math ots openxml plugins readline spell wordperfect wmf thesaurus" # svg
 
 # libgsf raised to make sure it provides gio backend (ebuild)
@@ -135,9 +135,9 @@ src_install() {
 	gnome2_src_install
 
 	sed "s:Exec=abiword:Exec=abiword-${MY_MAJORV}:" \
-		-i "${D}"/usr/share/applications/abiword.desktop || die "sed 3 failed"
+		-i "${ED}"/usr/share/applications/abiword.desktop || die "sed 3 failed"
 
-	mv "${D}/usr/bin/abiword" "${D}/usr/bin/AbiWord-${MY_MAJORV}"
+	mv "${ED}/usr/bin/abiword" "${ED}/usr/bin/AbiWord-${MY_MAJORV}"
 	dosym AbiWord-${MY_MAJORV} /usr/bin/abiword-${MY_MAJORV}
 
 	dodoc AUTHORS user/wp/readme.txt || die "dodoc failed"