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

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

5 files changed, 10 insertions, 54 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/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 = \