abiword: => 2.8.1

8 files changed, 49 insertions, 72 deletions

diff --git a/gnome2-apps/abiword/BUILD b/gnome2-apps/abiword/BUILD
index ac5e3c9c02..519f5a1e85 100755
--- a/gnome2-apps/abiword/BUILD
+++ b/gnome2-apps/abiword/BUILD
@@ -1,11 +1,3 @@
-if [[ $THREADS == y ]]; then
-   OPTS="$OPTS --enable-threads"
-fi &&
-if [[ $PLUGINS == y ]]; then
-   OPTS="$OPTS --enable-builtin-plugins"
-fi &&
-if [[ $EOPTS == y ]]; then
-   OPTS="$OPTS --enable-extra-optimization"
-fi &&
+OPTS="$ABIWORD_OPTS $OPTS"
 
 default_build
diff --git a/gnome2-apps/abiword/CONFIGURE b/gnome2-apps/abiword/CONFIGURE
index ead54601bf..63a3d488bd 100755
--- a/gnome2-apps/abiword/CONFIGURE
+++ b/gnome2-apps/abiword/CONFIGURE
@@ -1,3 +1,7 @@
-config_query THREADS "Enable Posix Threads" y &&
-config_query PLUGINS "Enable experimental plugins" n &&
-config_query EOPTS "Enable extra optimizations" n
+config_query_option ABIWORD_OPTS "Install clipart?" n \
+                                 "--enable-clipart" \
+                                 "--disable-clipart" &&
+
+config_query_option ABIWORD_OPTS "Install additional templates?" n \
+                                 "--enable-templates" \
+                                 "--disable-templates"
diff --git a/gnome2-apps/abiword/DEPENDS b/gnome2-apps/abiword/DEPENDS
index 6d6f2ba584..2c82b4708c 100755
--- a/gnome2-apps/abiword/DEPENDS
+++ b/gnome2-apps/abiword/DEPENDS
@@ -1,61 +1,36 @@
-depends libpng     "--with-libpng"  &&
-depends zlib       "--with-zlib"    &&
-depends gtk+2                       &&
-depends fribidi                     &&
-depends freetype2                   &&
-depends libxml2    "--with-libxml2" &&
-depends popt       "--with-popt"    &&
-depends fontconfig                  &&
-depends libglade2                   &&
-depends wv         "--with-sys-wv"  &&
+depends libpng &&
+depends zlib &&
+depends pango &&
+depends -sub "PDF PS SVG" cairo &&
+depends gtk+2 &&
+depends fribidi &&
+depends freetype2 &&
+depends libgsf &&
+depends wv &&
+depends libxml2 &&
+depends fontconfig &&
 
-optional_depends  libgnomeui                                    \
-                  "--enable-gnomeui"                            \
-                  "--disable-gnomeui"                           \
-                  "enable use of GNOME"                         &&
+optional_depends boost \
+                 "--with-boost" \
+                 "--without-boost" \
+                 "for Boost library support" &&
 
-optional_depends  gnome-vfs2                                    \
-                  "--enable-gnomevfs"                           \
-                  "--disable-gnomevfs"                          \
-                  "enable use of gnome vfs"                     &&
+optional_depends goffice \
+                 "--with-goffice" \
+                 "--without-goffice" \
+                 "for goffice library support" &&
 
-optional_depends  libgnomeprintui                               \
-                  ""                                            \
-                  "--disable-printing"                          \
-                  "for printing support"                        &&
-optional_depends  imagemagick                                   \
-                  "--with-ImageMagick"                          \
-                  ""                                            \
-                  "to manipulte images"                         &&
-optional_depends  psiconv                                       \
-                  ""                                            \
-                  ""                                            \
-                  "to import Psion files"                       &&
-optional_depends  curl                                          \
-                  ""                                            \
-                  ""                                            \
-                  "to enable on the fly dictionary downloading" &&
-optional_depends  jpeg                                          \
-                  ""                                            \
-                  ""                                            \
-                  "for jpeg image support"                      &&
-optional_depends  gucharmap                                     \
-                  "--enable-gucharmap"                          \
-                  "--disable-gucharmap"                         \
-                  "for gucharmap support"                       &&
-optional_depends  nautilus2                                     \
-                  ""                                            \
-                  ""                                            \
-                  "for a nautilus view"                         &&
-optional_depends  "enchant"                                     \
-                  ""                                            \
-                  "--disable-spellcheck"                        \
-                  "For spell checking"                          &&
-optional_depends  "perl"                                        \
-                  "--enable-scripting"                          \
-                  ""                                            \
-                  "Enable perl scripting"                       &&
+optional_depends gnome-vfs2 \
+                 "--with-gnomevfs" \
+                 "--without-gnomevfs" \
+                 "for gnome-vfs library support" &&
 
-if is_depends_enabled $SPELL perl; then
-  sub_depends perl THREADS
-fi
+optional_depends gucharmap \
+                 "--with-gucharmap" \
+                 "--without-gucharmap" \
+                 "for gucharmap support" &&
+
+optional_depends enchant \
+                 "--enable-spell" \
+                 "--disable-spellcheck" \
+                 "for spell checking support"
diff --git a/gnome2-apps/abiword/DETAILS b/gnome2-apps/abiword/DETAILS
index a0c3e1dac1..18e5f5ddc0 100755
--- a/gnome2-apps/abiword/DETAILS
+++ b/gnome2-apps/abiword/DETAILS
@@ -1,10 +1,10 @@
            SPELL=abiword
 if [[ $DEVEL == y ]]; then
-         VERSION=2.6.8
+         VERSION=2.8.1
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
 else
-         VERSION=2.6.8
+         VERSION=2.8.1
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
 fi
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index e1cb933426..eb25647d72 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,10 @@
+2009-10-31 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 2.8.1
+	* DEPENDS: completely rewritten for new version
+	* BUILD, CONFIGURE: removed useless flags; adopted for ABIWORD_OPTS
+	  usage
+	* TRIGGERS: removed, not needed anymore
+
 2009-10-03 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated devel to version 2.6.8. Bug 15271
 
diff --git a/gnome2-apps/abiword/TRIGGERS b/gnome2-apps/abiword/TRIGGERS
deleted file mode 100755
index ab2a526e22..0000000000
--- a/gnome2-apps/abiword/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-if (ldd /usr/bin/abiword | grep gnomeui > /dev/null); then on_cast gal2 cast_self; fi
diff --git a/gnome2-apps/abiword/abiword-2.6.8.tar.gz.sig b/gnome2-apps/abiword/abiword-2.6.8.tar.gz.sig
deleted file mode 100644
index 03b4c17172..0000000000
--- a/gnome2-apps/abiword/abiword-2.6.8.tar.gz.sig
+++ /dev/null
diff --git a/gnome2-apps/abiword/abiword-2.8.1.tar.gz.sig b/gnome2-apps/abiword/abiword-2.8.1.tar.gz.sig
new file mode 100644
index 0000000000..fdde2f05af
--- /dev/null
+++ b/gnome2-apps/abiword/abiword-2.8.1.tar.gz.sig