From: Mike Frysinger Date: Sun, 28 Jan 2007 07:47:08 +0000 (+0000) Subject: arm/sh stable X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fb827f4c45554e9e967a18936e7a8db4c872e0b5;p=gentoo.git arm/sh stable Package-Manager: portage-2.1.2-r4 --- diff --git a/gnome-extra/gcalctool/gcalctool-5.8.25.ebuild b/gnome-extra/gcalctool/gcalctool-5.8.25.ebuild index 193d989d116d..cb60b94d0b34 100644 --- a/gnome-extra/gcalctool/gcalctool-5.8.25.ebuild +++ b/gnome-extra/gcalctool/gcalctool-5.8.25.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.8.25.ebuild,v 1.9 2007/01/21 21:51:15 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.8.25.ebuild,v 1.10 2007/01/28 07:44:23 vapier Exp $ inherit eutils gnome2 @@ -9,7 +9,7 @@ HOMEPAGE="http://calctool.sourceforge.net/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86" IUSE="" RDEPEND=">=x11-libs/gtk+-2.6 @@ -35,5 +35,5 @@ src_install() { gnome2_src_install # remove symlink that conflicts with <2.3 gnome-utils - rm -f ${D}/usr/bin/gnome-calculator + rm -f "${D}"/usr/bin/gnome-calculator } diff --git a/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild b/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild index 84495d5c5f1a..e110caa21289 100644 --- a/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild +++ b/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild,v 1.10 2007/01/21 20:20:07 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild,v 1.11 2007/01/28 07:47:08 vapier Exp $ # make sure games is inherited first so that the gnome2 # functions will be called if they are not overridden @@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2 FDL-1.1" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86" IUSE="artworkextra guile" #avahi disabled upstream due to crashes RDEPEND=">=gnome-base/gconf-2 @@ -27,7 +27,6 @@ RDEPEND=">=gnome-base/gconf-2 artworkextra? ( gnome-extra/gnome-games-extra-data ) >=gnome-base/gnome-common-2.12.0" # avahi? ( net-dns/avahi ) - DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 @@ -36,7 +35,6 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO" - pkg_setup() { # create the games user / group games_pkg_setup diff --git a/gnome-extra/gnome-media/gnome-media-2.16.1.ebuild b/gnome-extra/gnome-media/gnome-media-2.16.1.ebuild index fd11b28feb36..62998e653e14 100644 --- a/gnome-extra/gnome-media/gnome-media-2.16.1.ebuild +++ b/gnome-extra/gnome-media/gnome-media-2.16.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.16.1.ebuild,v 1.10 2007/01/21 20:22:30 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.16.1.ebuild,v 1.11 2007/01/28 07:46:50 vapier Exp $ inherit gnome2 @@ -9,7 +9,7 @@ HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php" LICENSE="GPL-2 FDL-1.1" SLOT="2" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86" IUSE="ipv6 mad ogg vorbis" RDEPEND=">=dev-libs/glib-1.3.7 diff --git a/gnome-extra/gtkhtml/gtkhtml-3.12.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.12.2.ebuild index 5ff30b47b189..90fc16581e0b 100644 --- a/gnome-extra/gtkhtml/gtkhtml-3.12.2.ebuild +++ b/gnome-extra/gtkhtml/gtkhtml-3.12.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.12.2.ebuild,v 1.9 2007/01/21 21:45:20 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.12.2.ebuild,v 1.10 2007/01/28 07:46:25 vapier Exp $ inherit gnome2 eutils @@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2 LGPL-2" SLOT="3.8" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86" IUSE="static" RDEPEND=">=gnome-base/gail-1.1 diff --git a/gnome-extra/gucharmap/gucharmap-1.8.0.ebuild b/gnome-extra/gucharmap/gucharmap-1.8.0.ebuild index 0b6b14f5f20f..c535f8eae6cd 100644 --- a/gnome-extra/gucharmap/gucharmap-1.8.0.ebuild +++ b/gnome-extra/gucharmap/gucharmap-1.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-1.8.0.ebuild,v 1.12 2007/01/21 19:45:24 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-1.8.0.ebuild,v 1.13 2007/01/28 07:46:07 vapier Exp $ inherit gnome2 @@ -9,7 +9,7 @@ HOMEPAGE="http://gucharmap.sourceforge.net/" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86" IUSE="cjk gnome" RDEPEND=">=dev-libs/glib-2.3 diff --git a/gnome-extra/libgsf/libgsf-1.14.2.ebuild b/gnome-extra/libgsf/libgsf-1.14.2.ebuild index 9d2e2c3b1ea1..bdd08f302321 100644 --- a/gnome-extra/libgsf/libgsf-1.14.2.ebuild +++ b/gnome-extra/libgsf/libgsf-1.14.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.2.ebuild,v 1.10 2007/01/21 20:15:24 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.2.ebuild,v 1.11 2007/01/28 07:45:11 vapier Exp $ inherit eutils gnome2 @@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" IUSE="bzip2 doc gnome python static" RDEPEND=">=dev-libs/libxml2-2.4.16 @@ -34,25 +34,21 @@ G2CONF="${G2CONF} \ $(use_enable static)" src_install() { - gnome2_src_install preserve_old_lib /usr/$(get_libdir)/libgsf-1.so.1 preserve_old_lib /usr/$(get_libdir)/libgsf-gnome-1.so.1 preserve_old_lib /usr/$(get_libdir)/libgsf-1.so.113 preserve_old_lib /usr/$(get_libdir)/libgsf-gnome-1.so.113 - } pkg_postinst() { - gnome2_pkg_postinst preserve_old_lib_notify /usr/$(get_libdir)/libgsf-1.so.1 preserve_old_lib_notify /usr/$(get_libdir)/libgsf-gnome-1.so.1 preserve_old_lib_notify /usr/$(get_libdir)/libgsf-1.so.113 preserve_old_lib_notify /usr/$(get_libdir)/libgsf-gnome-1.so.113 - } DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO" diff --git a/gnome-extra/yelp/yelp-2.16.1.ebuild b/gnome-extra/yelp/yelp-2.16.1.ebuild index f64ca9ec675a..50ced3a5232b 100644 --- a/gnome-extra/yelp/yelp-2.16.1.ebuild +++ b/gnome-extra/yelp/yelp-2.16.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.16.1.ebuild,v 1.9 2007/01/14 01:32:21 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.16.1.ebuild,v 1.10 2007/01/28 07:45:50 vapier Exp $ inherit gnome2 @@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ~sh sparc x86" +KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc sh sparc x86" IUSE="beagle" RDEPEND=">=gnome-base/gconf-2 @@ -26,7 +26,7 @@ RDEPEND=">=gnome-base/gconf-2 || ( >=dev-libs/dbus-glib-0.71 ( =sys-apps/dbus-0.30 ) ) beagle? ( >=app-misc/beagle-0.2.4 ) - >=www-client/mozilla-firefox-1.0.2-r1 + !sh? ( >=www-client/mozilla-firefox-1.0.2-r1 ) sys-libs/zlib app-arch/bzip2" DEPEND="${RDEPEND} diff --git a/gnome-extra/yelp/yelp-2.16.2.ebuild b/gnome-extra/yelp/yelp-2.16.2.ebuild index 7aae490c66d7..a3cd3cc88135 100644 --- a/gnome-extra/yelp/yelp-2.16.2.ebuild +++ b/gnome-extra/yelp/yelp-2.16.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.16.2.ebuild,v 1.6 2007/01/21 22:08:46 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.16.2.ebuild,v 1.7 2007/01/28 07:45:50 vapier Exp $ inherit gnome2 @@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha ~amd64 ~arm hppa ia64 ~ppc ppc64 ~sh ~sparc ~x86" +KEYWORDS="alpha ~amd64 arm hppa ia64 ~ppc ppc64 sh ~sparc ~x86" IUSE="beagle" RDEPEND=">=gnome-base/gconf-2 @@ -26,7 +26,7 @@ RDEPEND=">=gnome-base/gconf-2 || ( >=dev-libs/dbus-glib-0.71 ( =sys-apps/dbus-0.30 ) ) beagle? ( >=app-misc/beagle-0.2.4 ) - >=www-client/mozilla-firefox-1.0.2-r1 + !sh? ( >=www-client/mozilla-firefox-1.0.2-r1 ) sys-libs/zlib app-arch/bzip2" DEPEND="${RDEPEND}