From a3f91c59baa714dfcb80b8de6bcafec7707a07c1 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 5 Dec 2013 09:28:39 +0100
Subject: [PATCH] abiword: rebuild against wv-1.2.9 and merge -plugins pkg into
 main pkg.

---
 srcpkgs/abiword-plugins  |  1 -
 srcpkgs/abiword/template | 18 +++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 120000 srcpkgs/abiword-plugins

diff --git a/srcpkgs/abiword-plugins b/srcpkgs/abiword-plugins
deleted file mode 120000
index 21119f1349..0000000000
--- a/srcpkgs/abiword-plugins
+++ /dev/null
@@ -1 +0,0 @@
-abiword
\ No newline at end of file
diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template
index 027dfc343c..d7988bd1c6 100644
--- a/srcpkgs/abiword/template
+++ b/srcpkgs/abiword/template
@@ -1,13 +1,13 @@
 # Template file for 'abiword'
 pkgname=abiword
 version=3.0.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-plugins --enable-clipart --enable-templates"
 hostmakedepends="automake libtool flex pkg-config"
 makedepends="libjpeg-turbo-devel libpng-devel>=1.6
  fribidi-devel libgsf-devel enchant-devel gtk+3-devel librsvg-devel
- wv-devel boost-devel libxslt-devel libwmf-devel libchamplain-devel
+ wv-devel>=1.2.9 boost-devel libxslt-devel libwmf-devel libchamplain-devel
  redland-devel libical-devel"
 short_desc="Free word processing program similar to Microsoft(R) Word"
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -16,8 +16,6 @@ homepage="http://www.abisource.com/"
 distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz"
 checksum=d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01
 
-CPPFLAGS="-I/usr/include/boost"
-
 libabiword_package() {
 	short_desc+=" - Runtime library"
 	pkg_install() {
@@ -25,17 +23,10 @@ libabiword_package() {
 	}
 }
 
-abiword-plugins_package() {
-	short_desc+=" - Plugins"
-	pkg_install() {
-		vmove usr/lib/abiword-3.0/plugins
-	}
-}
-
 abiword-devel_package() {
 	depends="fribidi-devel libgsf-devel wv-devel enchant-devel gtk-devel
-		librsvg-devel libabiword>=${version}"
-	short_desc+=" - Development files"
+		librsvg-devel libabiword>=${version}_${revision}"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
@@ -43,6 +34,7 @@ abiword-devel_package() {
 }
 
 abiword_package() {
+	replaces="abiword-plugins>=0"
 	depends="hicolor-icon-theme desktop-file-utils"
 	pkg_install() {
 		vmove all