abiword is not fixed and, hence, we don't need to patch abiword-docs

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

6 files changed, 15 insertions, 62 deletions

diff --git a/app-office/abiword-docs/ChangeLog b/app-office/abiword-docs/ChangeLog
index a0b3af00fba8..1f1b58a4d4fc 100644
--- a/app-office/abiword-docs/ChangeLog
+++ b/app-office/abiword-docs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/abiword-docs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-docs/ChangeLog,v 1.4 2013/10/14 20:57:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-docs/ChangeLog,v 1.5 2013/10/17 20:43:16 pacho Exp $
+
+*abiword-docs-3.0.0-r1 (17 Oct 2013)
+
+  17 Oct 2013; Pacho Ramos <pacho@gentoo.org> +abiword-docs-3.0.0-r1.ebuild,
+  -abiword-docs-3.0.0.ebuild, -files/abiword-docs-3.0.0-doc1.patch,
+  -files/abiword-docs-3.0.0-doc2.patch, -files/abiword-docs-3.0.0-doc3.patch:
+  abiword is not fixed and, hence, we don't need to patch abiword-docs
 
 *abiword-docs-3.0.0 (14 Oct 2013)
 
diff --git a/app-office/abiword-docs/Manifest b/app-office/abiword-docs/Manifest
index ca3d7a8e0ec6..ed67f9dfef38 100644
--- a/app-office/abiword-docs/Manifest
+++ b/app-office/abiword-docs/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX abiword-docs-3.0.0-doc1.patch 332 SHA256 62aba30004100448d01b2d15ffa26b4ceacd8cd614961df6b4c3c2af0b44cf65 SHA512 2b3a1187d7af61a4e919a9f400279f4adbcad62b3126484ae70886c2169f91fbc8708e4adbfbb304c4c5dcb1ca8638566a5aee5d9e001fdfbf358d30f7fb5fa4 WHIRLPOOL d8fb85834dc31dbcdd70449109571514c9580d832be96dbd140c19340ab802ef9adf84996c5d576cc41524f9ff34016653a7753d15268afb20972a4a89e40db9
-AUX abiword-docs-3.0.0-doc2.patch 332 SHA256 272f005feeb7a8337b51db1430d60e78f88eeb9b107087c71bb72fe1836e1242 SHA512 1aaa19277b6509512f5174c01d7b32e1baec558a0f3e969aff7fd5faeb89a2faaf650809e477e572cb326fa02666a77c5302b4530b0688222e6d764a04c34f4b WHIRLPOOL e775a12cc478c8d4976f020740ce9e3c39e832999ecf66815841f9e0f1a36a15d93d7eb94ea534c852b2c9aa73ee374123b632749555f09486afbcefce563a97
-AUX abiword-docs-3.0.0-doc3.patch 332 SHA256 05468da556a9ac3b3a074953a11a7359e4551b99e7004e2d2275a2861316d35b SHA512 b0ee19ba27642e220e05ece070d480f439f5c3e169fddfb30687174a3bb9935c332a00b90affd5789fcad62df62f82b95d334ddcd87f416b34d5232c8d6068dd WHIRLPOOL e693d3538cb57cf2eaf36b86aeda6c56eec71971141d5163c8ee4edf38f2a787f8721560d358fe6c97c3eceeeae99b26bdd7e87d6b833a4f86d28b3a93e1b2e1
 DIST abiword-docs-2.8.6.tar.gz 1460563 SHA256 b6620b5887151a44c61ed63118ebe9044e332015f36b624724ab007d3465b502 SHA512 f1ab642071211e17c055a1655cfb4eefa4f017b4241531b63198cb100591bd178a067eb9a6c0eb540d2644a3fa020b5bb3c766e5c9a17debe4d0ee0b0678775e WHIRLPOOL 0285e4b0111a8de7968caf130c98bcbf180746485f9caf5112da477b41dfdb36721a42df9e3cfad80b924c23a05a3cd988283e096027118e6415d6200e11c8ef
 DIST abiword-docs-3.0.0.tar.gz 1482576 SHA256 11bb83cacbead8dd91e14f8dc49473843c683ee997e3974ec3167e7665bc89ad SHA512 13ca23026e162e7e50ef5f287507ea850f15fb1668bec31ea3c7bb90b8c11abff6bebfdadffb53856c895ba286fbe37aa625d241d908e702603c758b1e4ed12d WHIRLPOOL 5d3fb67aa2640d8d5a63a17a14d8d86260747b53a768bfcd0ec8713ee736870949bad203380d5950aaff2630694924b6a1c02f64ca4829100a0bd02f3424eb70
 EBUILD abiword-docs-2.8.6.ebuild 581 SHA256 639d4c13af0739cd44000d254ebddc6f23d1875aa638549ac0fa04482d8ebecf SHA512 77e661a746bc6f98dff8801ecf881b32cd60be516e64f030a5907f591d31729e21406169a81a57d926af2806a9295c11c97698949a04bc844c808a957a3e1f5b WHIRLPOOL 8b417e2a4c419ddb3a184c477c4540ecf752c6beacb1acd7044f12d316d1c80a36ff2cfe747f024c4cf39e5c3dbf26683ed2a983a5ef637ca11e5a41121198b0
-EBUILD abiword-docs-3.0.0.ebuild 739 SHA256 cfc8ca8e739b1ee90140530c6a9230b33f4df3f0a798bc9d1cbb8c5026a0d1bd SHA512 1dc516b4dee7f1f9b9d39140c12d14002651cf224d8bfe5d4eea19383101043ade5994ba73f99a9f02b61fdbe017d42b11af3391ca27e284acab821ac4786783 WHIRLPOOL d6884824e6f2c01612d8b5bb85222a3dd95f13bb948dc3b650e1e3707a92d209e719f929542a7ba4ef9c1e7e36539de7c371db5329d9e9bc874988cd3ce8d686
-MISC ChangeLog 946 SHA256 8edc7b6bcff1caa1ff900c8aad78c0919af945c95cd4959cadac792fb9a0758e SHA512 0a90d7a0e997d7088b29cb66d850d0a39f62edef93a418cec1c2eb843fbd1c20d863a32a722eb07dd0df08e18291b2adf1826bf862d4123f03f2f23deeeecaee WHIRLPOOL 6c39be3b3e4ffdd53c5104329d6b7b64ac4f07fd8eed2c5b3b1af9582529d5f2e9382f756ec0a8f49e575319a7d590ec9633101f6d3a57ff0b24577c063232a0
+EBUILD abiword-docs-3.0.0-r1.ebuild 600 SHA256 484cfda04bf3b572ae64c9f03747dedbb9e02b03bcb5c4e9aee61faece288b03 SHA512 fa527129a49f79edaa9c4e50602301279bb1d944e787202d6e58b6fe4c70c1c30541fb6c4db51a3c03a7d8756ef3d47880297a215102531f50fc4b6efee1b9b3 WHIRLPOOL a46b737575d7e48db6693c9418e7a9549cdf87065818e4b61be91fd072b12cfc9eca068ebb98ca4f14714d1565d8a2b8eb943e6f76db255a6adc6b980ec8f31d
+MISC ChangeLog 1279 SHA256 dd76b5aeb9e68cb0a541597f4027f99b4e179623244482838f77438da304ed9b SHA512 0d160085e7cc470b7e4f2219e81a2695c73faf62d06a5d55d9cbbba0cd091dab35cfc2badbca18200403dd202722ca38bf71f8ba0b0aa05047a77072148c09ac WHIRLPOOL 5b77189caefb21a488445a166ad1730f6cf57f001ba4456dec0c0fd185a6c1f3a0a4d5be1a6b81c0b62f1d6048f6af6e5fdda384735d8cdcbb06afd71f8c8b84
 MISC metadata.xml 165 SHA256 9e51028c1f6811ec63067385fb8d6cb393d04b1a1d6688e0bbeb368ef34d57a0 SHA512 4d09a5b04da2c43d3a8a6c621fc1652a33a2dec95ed4379907784c1d72c86c4bd2a12d98a17a390e91fc04721eb6ec46ee70dde2b056637a9e93a304f41656e3 WHIRLPOOL f622c78a19de89566dbb3411859d743bb39d7ae3d23b331ce2389f730b71712cb2455f1b696e9cee5d95b329e2b7b463c4d6b9b44338f40976a0629c0952745a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJcWrcACgkQCaWpQKGI+9R5WQCgiIJL5ou2/BQYChkpkRkIXhVN
-aVAAn079YGhv5gDriDBt128BjtWB1KSL
-=tBvW
+iEYEAREIAAYFAlJgS+UACgkQCaWpQKGI+9RRWgCfUbqMHyb5+9fbQuK1dCpW5lYC
+kh4An3X1EB9CjfQYgRpwrA6mk7pT6EUA
+=CqiK
 -----END PGP SIGNATURE-----
diff --git a/app-office/abiword-docs/abiword-docs-3.0.0.ebuild b/app-office/abiword-docs/abiword-docs-3.0.0-r1.ebuild
index 78347ed01f00..bb6938e8d2ad 100644
--- a/app-office/abiword-docs/abiword-docs-3.0.0.ebuild
+++ b/app-office/abiword-docs/abiword-docs-3.0.0-r1.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-office/abiword-docs/abiword-docs-3.0.0.ebuild,v 1.1 2013/10/14 20:57:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-docs/abiword-docs-3.0.0-r1.ebuild,v 1.1 2013/10/17 20:43:16 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -16,11 +16,5 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=app-office/abiword-${PV}"
+RDEPEND=">=app-office/abiword-${PV}-r1"
 DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# http://bugzilla.abisource.com/show_bug.cgi?id=13564
-	epatch "${FILESDIR}"/${PN}-3.0.0-doc{1,2,3}.patch
-	gnome2_src_prepare
-}
diff --git a/app-office/abiword-docs/files/abiword-docs-3.0.0-doc1.patch b/app-office/abiword-docs/files/abiword-docs-3.0.0-doc1.patch
deleted file mode 100644
index 02fdf3c98858..000000000000
--- a/app-office/abiword-docs/files/abiword-docs-3.0.0-doc1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ABW/pl-PL/Makefile.in~	2013-01-23 20:26:45.912523261 +0000
-+++ ABW/pl-PL/Makefile.in	2013-01-23 20:26:45.929523455 +0000
-@@ -196,11 +196,10 @@
- SUBDIRS = \
- 	howto \
- 	info \
--	interface \
- 	plugins \
- 	problems \
- 	tutorial
--
-+#	interface \
- helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/pl-PL
- cssdir = $(helpdir)
- css_DATA = \
diff --git a/app-office/abiword-docs/files/abiword-docs-3.0.0-doc2.patch b/app-office/abiword-docs/files/abiword-docs-3.0.0-doc2.patch
deleted file mode 100644
index a248c77f03f3..000000000000
--- a/app-office/abiword-docs/files/abiword-docs-3.0.0-doc2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ABW/fr-FR/Makefile.in~	2013-01-23 20:43:26.754948930 +0000
-+++ ABW/fr-FR/Makefile.in	2013-01-23 20:43:26.774948255 +0000
-@@ -196,11 +196,10 @@
- SUBDIRS = \
- 	howto \
- 	info \
--	interface \
- 	plugins \
- 	problems \
- 	tutorial
--
-+#	interface \
- helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/fr-FR
- cssdir = $(helpdir)
- css_DATA = \
diff --git a/app-office/abiword-docs/files/abiword-docs-3.0.0-doc3.patch b/app-office/abiword-docs/files/abiword-docs-3.0.0-doc3.patch
deleted file mode 100644
index 4067791755a7..000000000000
--- a/app-office/abiword-docs/files/abiword-docs-3.0.0-doc3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ABW/en-US/Makefile.in~	2013-01-23 19:50:38.980920560 +0000
-+++ ABW/en-US/Makefile.in	2013-01-23 19:50:38.998920705 +0000
-@@ -196,11 +196,10 @@
- SUBDIRS = \
- 	howto \
- 	info \
--	interface \
- 	plugins \
- 	problems \
- 	tutorial
--
-+#	interface \
- helpdir = $(ABIWORD_EXTRAS_PKGDATADIR)/help/en-US
- cssdir = $(helpdir)
- css_DATA = \