new release, mark 2.2.7 x86

Package-Manager: portage-2.0.51.19

10 files changed, 20 insertions, 238 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 2e78a523b0a2..e645254ba1f4 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/abiword
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.110 2005/05/15 02:32:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.111 2005/06/16 21:08:29 foser Exp $
+
+*abiword-2.2.8 (16 Jun 2005)
+
+  16 Jun 2005; Marinus Schraal <foser@gentoo.org> abiword-2.2.8.ebuild :
+  New release
 
   15 May 2005; Aron Griffis <agriffis@gentoo.org> abiword-2.2.7.ebuild:
   add ~ia64
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 1985b60aa4e3..cb9355acf7db 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,12 +1,8 @@
-MD5 1b49e3803b78910475de9628cee03272 abiword-2.2.3.ebuild 2341
+MD5 ddd2999190aff1943ca60a04a9f1f79f abiword-2.2.8.ebuild 2383
 MD5 e6db7765c211a23397424573e92c2dc9 abiword-2.2.5.ebuild 2281
-MD5 728e85c3f04c02a833f996e3a6ecfbdf abiword-2.0.10.ebuild 2440
-MD5 03e5d59f6aa4597bd4af368984a7125f abiword-2.2.7.ebuild 2386
-MD5 9ba3c56a7ac3936cbf08b6f956b1ce2f abiword-2.2.2.ebuild 2262
-MD5 e16781b1632fad1b132e4ae0c2042c75 ChangeLog 14752
+MD5 450ec9346cc080aca94c72ad5d6dd5eb abiword-2.2.7.ebuild 2382
+MD5 ff85e3aaf46c7205fdbafb9312291a0f ChangeLog 14867
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 4b3719f3158acf5c443b4739886272f4 files/digest-abiword-2.0.10 69
-MD5 3b6aacecf03d65d9c41833afe9d29687 files/digest-abiword-2.2.2 68
-MD5 b99de998f7d17ea36a6f83bea33406be files/digest-abiword-2.2.3 68
 MD5 05bd382bc17a222b7d38e46dd90350c0 files/digest-abiword-2.2.5 68
 MD5 18acb96f28cede2da43044aaa82a6f94 files/digest-abiword-2.2.7 68
+MD5 73661645f9c415ca25f9da7c17fd2628 files/digest-abiword-2.2.8 68
diff --git a/app-office/abiword/abiword-2.0.10.ebuild b/app-office/abiword/abiword-2.0.10.ebuild
deleted file mode 100644
index 93e46c4ce0cb..000000000000
--- a/app-office/abiword/abiword-2.0.10.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.10.ebuild,v 1.9 2005/01/01 15:31:00 eradicator Exp $
-
-inherit eutils
-
-IUSE="gnome jpeg spell xml2"
-
-S_P=${S}/${PN}-plugins
-S_D=${S}/${PN}-docs
-S=${WORKDIR}/${P}/abi
-
-DESCRIPTION="Fully featured yet light and fast cross platform word processor"
-HOMEPAGE="http://www.abisource.com"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-KEYWORDS="x86 sparc alpha ppc amd64 hppa"
-LICENSE="GPL-2"
-SLOT="2"
-
-RDEPEND="virtual/x11
-	virtual/xft
-	>=media-libs/fontconfig-2.1
-	media-libs/libpng
-	>=x11-libs/gtk+-2.2
-	>=gnome-base/libglade-2
-	>=app-text/wv-1
-	>=dev-libs/fribidi-0.10.4
-	jpeg?  ( >=media-libs/jpeg-6b-r2 )
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
-	!xml2? ( dev-libs/expat )
-	spell? ( >=app-text/enchant-1 )
-	gnome? ( >=gnome-base/libgnomeui-2.2
-		>=gnome-base/libgnomeprint-2.2.1
-		>=gnome-base/libgnomeprintui-2.2.1
-		>=gnome-base/libbonobo-2 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/automake
-	dev-util/pkgconfig"
-
-src_compile() {
-
-	# this is a hack since I don't want to go hack in the gnome-vfs headerfiles.
-	# The issue is about gnome-vfs containing "long long" which makes gcc 3.3.1 balk
-	cp configure configure.old
-	cat configure.old |sed s:-pedantic::g >configure
-	rm -f configure.old
-
-	econf \
-		`use_enable gnome` \
-		`use_with xml2 libxml2` \
-		`use_enable spell enchant` \
-		--disable-debug \
-		--enable-bidi \
-		--enable-threads \
-		--without-ImageMagick \
-		--disable-scripting \
-		--disable-gucharmap \
-		--with-sys-wv || die
-
-	emake all-recursive || die
-
-	# Build plugins
-
-	cd ${S_P}
-
-	econf \
-		--disable-debug \
-		--enable-all \
-		--with-abiword=${S} \
-		--without-wmf --disable-wmf \
-		--without-ImageMagick || die
-
-	emake || die
-
-}
-
-src_install() {
-
-	dodir /usr/{bin,lib}
-
-	# einstall PERLDEST=${D} || die
-	make DESTDIR=${D} install || die
-
-	dosed "s:Exec=abiword:Exec=abiword-2.0:" /usr/share/applications/abiword.desktop
-
-	rm -f ${D}/usr/bin/abiword-2.0
-	rm -f ${D}/usr/bin/abiword
-	dosym AbiWord-2.0 /usr/bin/abiword-2.0
-
-	dodoc COPYING *.TXT docs/build/BUILD.TXT user/wp/readme.txt
-
-	# install plugins
-
-	cd ${S_P}
-
-	make DESTDIR=${D} install || die
-
-	# install documentation
-
-	cd ${WORKDIR}/${P}/abiword-docs
-	sed -e 's:prefix = /usr/local:prefix = /usr:g' Makefile > Makefile.new
-	mv Makefile.new Makefile
-	make DESTDIR=${D} || die
-
-}
-
-USE_DESTDIR="1"
diff --git a/app-office/abiword/abiword-2.2.2.ebuild b/app-office/abiword/abiword-2.2.2.ebuild
deleted file mode 100644
index f39fa0c3ac63..000000000000
--- a/app-office/abiword/abiword-2.2.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.2.2.ebuild,v 1.5 2005/01/26 19:18:58 gmsoft Exp $
-
-inherit eutils fdo-mime
-
-IUSE="gnome jpeg spell xml2"
-
-S_P=${S}/${PN}-plugins
-S=${WORKDIR}/${P}/abi
-
-DESCRIPTION="Fully featured yet light and fast cross platform word processor"
-HOMEPAGE="http://www.abisource.com"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-KEYWORDS="x86 sparc ~alpha ~ppc ~amd64 hppa ~ppc64"
-LICENSE="GPL-2"
-SLOT="2"
-
-RDEPEND="virtual/x11
-	virtual/xft
-	>=media-libs/fontconfig-2.1
-	media-libs/libpng
-	>=x11-libs/gtk+-2.4
-	>=gnome-base/libglade-2
-	>=app-text/wv-1
-	>=dev-libs/fribidi-0.10.4
-	jpeg?  ( >=media-libs/jpeg-6b-r2 )
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
-	!xml2? ( dev-libs/expat )
-	spell? ( >=app-text/enchant-1.1 )
-	gnome? ( >=gnome-base/libgnomeui-2.2
-		>=gnome-base/libgnomeprint-2.2.1
-		>=gnome-base/libgnomeprintui-2.2.1
-		>=gnome-base/libbonobo-2
-		>=gnome-extra/gucharmap-1.4 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-
-	# this is a hack since I don't want to go hack in the gnome-vfs headerfiles.
-	# The issue is about gnome-vfs containing "long long" which makes gcc 3.3.1 balk
-	cp configure configure.old
-	cat configure.old |sed s:-pedantic::g >configure
-	rm -f configure.old
-
-	econf \
-		`use_enable gnome` \
-		`use_enable gnome gucharmap` \
-		`use_with xml2 libxml2` \
-		`use_enable spell enchant` \
-		--disable-debug \
-		--enable-bidi \
-		--enable-threads \
-		--without-ImageMagick \
-		--disable-scripting \
-		--with-sys-wv || die
-
-	emake all-recursive || die
-
-	# Build plugins
-
-	cd ${S_P}
-
-	econf \
-		--disable-debug \
-		--enable-all \
-		--with-abiword=${S} \
-		--without-ImageMagick || die
-
-	emake || die
-
-}
-
-src_install() {
-
-	dodir /usr/{bin,lib}
-
-	make DESTDIR=${D} install || die
-
-	dosed "s:Exec=abiword:Exec=abiword-2.2:" /usr/share/applications/abiword.desktop
-
-	rm -f ${D}/usr/bin/abiword-2.2
-	rm -f ${D}/usr/bin/abiword
-	dosym AbiWord-2.2 /usr/bin/abiword-2.2
-
-	dodoc COPYING *.TXT docs/build/BUILD.TXT user/wp/readme.txt
-
-	# install plugins
-
-	cd ${S_P}
-
-	make DESTDIR=${D} install || die
-
-}
-
-pkg_postinst() {
-
-	fdo-mime_desktop_database_update
-
-}
-
-USE_DESTDIR="1"
diff --git a/app-office/abiword/abiword-2.2.7.ebuild b/app-office/abiword/abiword-2.2.7.ebuild
index ac9ab96225ef..02afae6d42da 100644
--- a/app-office/abiword/abiword-2.2.7.ebuild
+++ b/app-office/abiword/abiword-2.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.2.7.ebuild,v 1.3 2005/05/15 02:32:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.2.7.ebuild,v 1.4 2005/06/16 21:08:29 foser Exp $
 
 inherit eutils fdo-mime alternatives
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.abisource.com"
 
 SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2"
 
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64 ~hppa ~ppc64 ~ia64"
+KEYWORDS="x86 ~sparc ~alpha ~ppc ~amd64 ~hppa ~ppc64 ~ia64"
 LICENSE="GPL-2"
 SLOT="2"
 
diff --git a/app-office/abiword/abiword-2.2.3.ebuild b/app-office/abiword/abiword-2.2.8.ebuild
index 1b8c689afdd0..4cb0d0a0f864 100644
--- a/app-office/abiword/abiword-2.2.3.ebuild
+++ b/app-office/abiword/abiword-2.2.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.2.3.ebuild,v 1.7 2005/04/03 04:03:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.2.8.ebuild,v 1.1 2005/06/16 21:08:29 foser Exp $
 
-inherit eutils fdo-mime
+inherit eutils fdo-mime alternatives
 
 IUSE="gnome jpeg spell xml2 debug"
 
@@ -12,9 +12,9 @@ S=${WORKDIR}/${P}/abi
 DESCRIPTION="Fully featured yet light and fast cross platform word processor"
 HOMEPAGE="http://www.abisource.com"
 
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2"
 
-KEYWORDS="x86 sparc ~alpha ppc amd64 hppa ~ppc64"
+KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64 ~hppa ~ppc64 ~ia64"
 LICENSE="GPL-2"
 SLOT="2"
 
@@ -59,10 +59,7 @@ src_compile() {
 		--disable-scripting \
 		--with-sys-wv || die
 
-
-	CFLAGS="${CFLAGS} -DHAVE_NAUTILUS=0" \
-	CXXFLAGS="${CXXFLAGS} -DHAVE_NAUTILUS=0" \
-		emake all-recursive || die
+	emake all-recursive || die
 
 	# Build plugins
 
@@ -104,4 +101,6 @@ pkg_postinst() {
 
 	fdo-mime_desktop_database_update
 
+	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
+
 }
diff --git a/app-office/abiword/files/digest-abiword-2.0.10 b/app-office/abiword/files/digest-abiword-2.0.10
deleted file mode 100644
index 6c9c1681b605..000000000000
--- a/app-office/abiword/files/digest-abiword-2.0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0c4d26bb10329f459bf84e0eb13945d4 abiword-2.0.10.tar.bz2 22288134
diff --git a/app-office/abiword/files/digest-abiword-2.2.2 b/app-office/abiword/files/digest-abiword-2.2.2
deleted file mode 100644
index 21aa8fcaac1d..000000000000
--- a/app-office/abiword/files/digest-abiword-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 82121782b4388c12373970bfb695dc44 abiword-2.2.2.tar.bz2 23132155
diff --git a/app-office/abiword/files/digest-abiword-2.2.3 b/app-office/abiword/files/digest-abiword-2.2.3
deleted file mode 100644
index 8a6c4ac9681a..000000000000
--- a/app-office/abiword/files/digest-abiword-2.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 814d9169a46fdeaa40565bc2b567ef42 abiword-2.2.3.tar.bz2 23472285
diff --git a/app-office/abiword/files/digest-abiword-2.2.8 b/app-office/abiword/files/digest-abiword-2.2.8
new file mode 100644
index 000000000000..6d0c8e830337
--- /dev/null
+++ b/app-office/abiword/files/digest-abiword-2.2.8
@@ -0,0 +1 @@
+MD5 f6f58e6ea4720ca635ede7b7f13cf156 abiword-2.2.8.tar.bz2 23918235