From: Pacho Ramos Date: Sun, 11 Jul 2010 14:20:09 +0000 (+0000) Subject: Drop hppa keywords and old versions per bug 324511 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5ffce78ca05001d6d4c6ee092314c4b72c3cce11;p=gentoo.git Drop hppa keywords and old versions per bug 324511 Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/app-office/abiword-plugins/ChangeLog b/app-office/abiword-plugins/ChangeLog index 0c3ee7507f1a..015a49c38170 100644 --- a/app-office/abiword-plugins/ChangeLog +++ b/app-office/abiword-plugins/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/abiword-plugins # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.78 2010/07/06 00:34:06 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.79 2010/07/11 14:18:41 pacho Exp $ + + 11 Jul 2010; Pacho Ramos abiword-plugins-2.4.6.ebuild, + -abiword-plugins-2.6.4.ebuild, abiword-plugins-2.6.8.ebuild: + Drop hppa keywords and old versions per bug 324511 06 Jul 2010; Jeroen Roovers abiword-plugins-2.6.8.ebuild: Stable for HPPA (bug #306405). diff --git a/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild b/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild index 54a8555b7dac..06fed61cb895 100644 --- a/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild +++ b/app-office/abiword-plugins/abiword-plugins-2.4.6.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-plugins/abiword-plugins-2.4.6.ebuild,v 1.17 2010/02/10 23:02:47 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild,v 1.18 2010/07/11 14:18:41 pacho Exp $ EAPI=2 @@ -12,7 +12,7 @@ SRC_URI="http://www.abisource.com/downloads/abiword/${PV}/abiword-${PV}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86" IUSE="bzip2 debug gnome grammar jpeg libgda math ots pdf readline svg thesaurus wmf wordperfect" # libgsf dependency used by some document format importers diff --git a/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild b/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild deleted file mode 100644 index aff44c4a202e..000000000000 --- a/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild +++ /dev/null @@ -1,91 +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-plugins/abiword-plugins-2.6.4.ebuild,v 1.11 2010/04/19 21:54:12 eva Exp $ - -EAPI=2 - -inherit eutils - -DESCRIPTION="Set of plugins for abiword" -HOMEPAGE="http://www.abisource.com/" -SRC_URI="http://www.abisource.com/downloads/abiword/${PV}/source/${P}.tar.gz - http://www.abisource.com/downloads/abiword/${PV}/source/${P//-plugins/}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="hppa" -IUSE="cxx debug gnome grammar jabber jpeg libgda math ots pdf readline svg thesaurus wmf wordperfect" - -# FIXME: add asio support (better wait on boost 1.35) -# add abiscan when we get gnome-scan - -RDEPEND="=app-office/abiword-${PV}* - >=media-libs/fontconfig-1 - >=dev-libs/fribidi-0.10.4 - >=dev-libs/glib-2 - >=x11-libs/gtk+-2 - x11-libs/libXft - >=gnome-base/libglade-2 - >=gnome-extra/libgsf-1.14.4 - cxx? ( >=dev-libs/boost-1.33.1 ) - gnome? ( >=x11-libs/goffice-0.4:0.4[gnome] ) - grammar? ( >=dev-libs/link-grammar-4.2.2 ) - !alpha? ( !ia64? ( jabber? ( - >=dev-libs/libxml2-2.4 - >=net-libs/loudmouth-1.0.1 ) ) ) - jpeg? ( >=media-libs/jpeg-6b-r2 ) - libgda? ( - =gnome-extra/libgda-1* - =gnome-extra/libgnomedb-1* ) - math? ( >=x11-libs/gtkmathview-0.7.5 ) - !ia64? ( !ppc64? ( !sparc? ( ots? ( >=app-text/ots-0.5 ) ) ) ) - pdf? ( >=app-text/poppler-0.12.3-r3[abiword,utils] ) - readline? ( sys-libs/readline ) - thesaurus? ( >=app-text/aiksaurus-1.2 ) - wordperfect? ( >=app-text/libwpd-0.8 ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - svg? ( >=gnome-base/librsvg-2 )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9" - -pkg_setup() { - if use jabber && ! use cxx; then - eerror "AbiCollab needs dev-libs/boost to be build" - die "Add USE=\"cxx\" to build AbiCollab plugin" - fi -} - -src_configure() { - local myconf="--enable-all \ - --with-abiword="${WORKDIR}/abiword-${PV}" \ - $(use_with cxx boost) \ - $(use_with cxx OpenXML) \ - $(use_enable debug) \ - $(use_with gnome abigoffice) \ - $(use_with grammar abigrammar) \ - $(use_with jabber abicollab) \ - $(use_with jpeg) \ - $(use_with libgda gda) \ - $(use_with math abimathview) \ - $(use_with ots) \ - $(use_with pdf) \ - $(use_with readline abicommand) - $(use_with svg librsvg) \ - $(use_with thesaurus aiksaurus) \ - $(use_with wmf) \ - $(use_with wordperfect libwpg) \ - --disable-abiscan \ - --without-psion" - - econf $myconf || die "./configure failed" -} - -src_compile() { - emake || die "Compilation failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "Installation failed" - dodoc AUTHORS ChangeLog README -} diff --git a/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild b/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild index 17c754b74fdf..c290201f9371 100644 --- a/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild +++ b/app-office/abiword-plugins/abiword-plugins-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-plugins/abiword-plugins-2.6.8.ebuild,v 1.14 2010/07/06 00:34:06 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild,v 1.15 2010/07/11 14:18:41 pacho Exp $ EAPI=2 @@ -13,7 +13,7 @@ SRC_URI="http://www.abisource.com/downloads/abiword/${PV}/source/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86" IUSE="cxx debug gnome grammar jabber jpeg libgda math ots pdf readline svg thesaurus wmf wordperfect" # FIXME: add asio support (better wait on boost 1.35) 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 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 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