Drop hppa keywords and old versions per bug 324511

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 10 insertions, 101 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index be35f7b982d0..a5d011182b94 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/abiword
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.220 2010/07/06 14:18:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.221 2010/07/11 14:20:09 pacho Exp $
+
+  11 Jul 2010; Pacho Ramos <pacho@gentoo.org> abiword-2.4.6.ebuild,
+  -abiword-2.6.4.ebuild, abiword-2.6.8.ebuild:
+  Drop hppa keywords and old versions per bug 324511
 
   06 Jul 2010; Jeroen Roovers <jer@gentoo.org> abiword-2.8.6.ebuild:
   Marked ~ppc (bug #316219).
diff --git a/app-office/abiword/abiword-2.4.6.ebuild b/app-office/abiword/abiword-2.4.6.ebuild
index 8c55cd86db46..d202ecdc2bca 100644
--- a/app-office/abiword/abiword-2.4.6.ebuild
+++ b/app-office/abiword/abiword-2.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.6.ebuild,v 1.16 2009/12/17 10:54:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.6.ebuild,v 1.17 2010/07/11 14:20:09 pacho Exp $
 
 inherit alternatives eutils fdo-mime
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="debug gnome spell xml"
 
 RDEPEND="dev-libs/popt
diff --git a/app-office/abiword/abiword-2.6.4.ebuild b/app-office/abiword/abiword-2.6.4.ebuild
deleted file mode 100644
index 2bab86f3c32d..000000000000
--- a/app-office/abiword/abiword-2.6.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.4.ebuild,v 1.11 2010/04/19 23:16:35 eva Exp $
-
-EAPI="1"
-
-inherit alternatives eutils gnome2 versionator
-
-MY_MAJORV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Fully featured yet light and fast cross platform word processor"
-HOMEPAGE="http://www.abisource.com/"
-SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="hppa"
-IUSE="debug gnome spell xml"
-
-# FIXME: gsf could probably be conditional
-
-RDEPEND="dev-libs/popt
-	sys-libs/zlib
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2.6
-	x11-libs/libXft
-	>=x11-libs/pango-1.2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=x11-libs/goffice-0.4:0.4
-	>=media-libs/libpng-1.2
-	>=media-libs/fontconfig-2.1
-	>=media-libs/freetype-2.1
-	>=app-text/wv-1.2
-	>=dev-libs/fribidi-0.10.4
-	xml? ( >=dev-libs/libxml2-2.4.10 )
-	!xml? ( dev-libs/expat )
-	spell? ( >=app-text/enchant-1.2 )
-	gnome?	(
-		>=gnome-base/libbonobo-2
-		>=gnome-base/libgnomeui-2.2
-		>=gnome-extra/gucharmap-1.4
-		>=gnome-base/gnome-vfs-2.2 )
-	>=gnome-extra/libgsf-1.12.0"
-
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.9"
-
-# FIXME: --enable-libabiword fails to compile
-
-pkg_setup() {
-	if ! built_with_use --missing true x11-libs/pango X; then
-		eerror "You must rebuild x11-libs/pango with USE='X'"
-		die "You must rebuild x11-libs/pango with USE='X'"
-	fi
-
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable debug symbols)
-		$(use_enable gnome gnomeui)
-		$(use_enable gnome gucharmap)
-		$(use_enable gnome gnomevfs)
-		$(use_enable spell spellcheck)
-		$(use_with xml libxml2)
-		$(use_with !xml expat)
-		--disable-libabiword
-		--enable-printing
-		--enable-threads
-		--disable-scripting"
-}
-
-src_install() {
-	# Install icon to pixmaps, bug #220097
-	sed -i 's:icondir = $(datadir)/icons:icondir = $(datadir)/pixmaps:'	GNUmakefile
-
-	gnome2_src_install
-
-	sed -i "s:Exec=abiword:Exec=abiword-${MY_MAJORV}:" "${D}"/usr/share/applications/abiword.desktop
-
-	mv "${D}/usr/bin/abiword" "${D}/usr/bin/AbiWord-${MY_MAJORV}"
-	dosym AbiWord-${MY_MAJORV} /usr/bin/abiword-${MY_MAJORV}
-
-	dodoc *.TXT user/wp/readme.txt
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
-
-	elog "As of version 2.4, all abiword plugins have been moved"
-	elog "into a seperate app-office/abiword-plugins package"
-	elog "You can install them by running emerge abiword-plugins"
-}
diff --git a/app-office/abiword/abiword-2.6.8.ebuild b/app-office/abiword/abiword-2.6.8.ebuild
index 5be9626ba2db..d805eba2e576 100644
--- a/app-office/abiword/abiword-2.6.8.ebuild
+++ b/app-office/abiword/abiword-2.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.8.ebuild,v 1.7 2010/07/06 00:34:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.8.ebuild,v 1.8 2010/07/11 14:20:09 pacho Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="debug gnome spell xml"
 
 # FIXME: gsf could probably be conditional