diff options
author | 2013-09-08 17:53:29 +0000 | |
---|---|---|
committer | 2013-09-08 17:53:29 +0000 | |
commit | 57196602e07cd12e170a6b8c732a95e878944faa (patch) | |
tree | a65bd1157f0b7514f3e877f1b071ae47b011ffb5 /gnome-base | |
parent | Drop libXt dependency, bug #483256. Drop old revisions. (diff) | |
download | gentoo-2-57196602e07cd12e170a6b8c732a95e878944faa.tar.gz gentoo-2-57196602e07cd12e170a6b8c732a95e878944faa.tar.bz2 gentoo-2-57196602e07cd12e170a6b8c732a95e878944faa.zip |
Automake-1.13 fix, bug #479890.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/gnome-panel/ChangeLog | 7 | ||||
-rw-r--r-- | gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild | 7 | ||||
-rw-r--r-- | gnome-base/gnome-panel/gnome-panel-3.6.2-r1.ebuild | 5 | ||||
-rw-r--r-- | gnome-base/gnome-panel/gnome-panel-3.6.2.ebuild | 70 |
4 files changed, 15 insertions, 74 deletions
diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog index 534f24374d24..f6f70e93788e 100644 --- a/gnome-base/gnome-panel/ChangeLog +++ b/gnome-base/gnome-panel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gnome-panel # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.360 2013/07/28 10:06:52 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.361 2013/09/08 17:53:29 eva Exp $ + + 08 Sep 2013; Gilles Dartiguelongue <eva@gentoo.org> + gnome-panel-2.32.1-r3.ebuild, -gnome-panel-3.6.2.ebuild, + gnome-panel-3.6.2-r1.ebuild: + Automake-1.13 fix, bug #479890. 28 Jul 2013; Pacho Ramos <pacho@gentoo.org> gnome-panel-3.6.2-r1.ebuild: app-text/yelp-tools is needed (#478398 by Sean Santos) diff --git a/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild index 04f16f1d36c9..6ef0151a480d 100644 --- a/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild +++ b/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild,v 1.12 2012/10/16 03:47:52 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild,v 1.13 2013/09/08 17:53:29 eva Exp $ EAPI="3" GCONF_DEBUG="no" @@ -95,6 +95,9 @@ src_prepare() { # Fix underlinking, bug #384533 epatch "${FILESDIR}/${P}-underlinking.patch" + # automake-1.13 fix, bug #479890 + sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die + AT_M4DIR=${WORKDIR} eautoreconf gnome2_src_prepare } diff --git a/gnome-base/gnome-panel/gnome-panel-3.6.2-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-3.6.2-r1.ebuild index 8da7c553a1ab..24c47da31575 100644 --- a/gnome-base/gnome-panel/gnome-panel-3.6.2-r1.ebuild +++ b/gnome-base/gnome-panel/gnome-panel-3.6.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-3.6.2-r1.ebuild,v 1.2 2013/07/28 10:06:52 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-3.6.2-r1.ebuild,v 1.3 2013/09/08 17:53:29 eva Exp $ EAPI="5" GCONF_DEBUG="no" @@ -78,6 +78,9 @@ src_prepare() { # Use the generic marshaller epatch "${FILESDIR}/${P}-generic-marshaller.patch" + # automake-1.13 fix, bug #479890 + sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die + eautoreconf gnome2_src_prepare } diff --git a/gnome-base/gnome-panel/gnome-panel-3.6.2.ebuild b/gnome-base/gnome-panel/gnome-panel-3.6.2.ebuild deleted file mode 100644 index 77d6e9378da4..000000000000 --- a/gnome-base/gnome-panel/gnome-panel-3.6.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-3.6.2.ebuild,v 1.1 2012/12/24 14:47:19 eva Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 - -DESCRIPTION="The GNOME panel" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" -SLOT="0" -IUSE="eds +introspection networkmanager" -# Odd behaviour w.r.t. panels: https://bugzilla.gnome.org/show_bug.cgi?id=631553 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" - -RDEPEND=">=dev-libs/glib-2.31.14:2 - >=dev-libs/libgweather-3.5.1:2= - dev-libs/libxml2:2 - >=gnome-base/dconf-0.13.4 - >=gnome-base/gconf-2.6.1:2[introspection?] - >=gnome-base/gnome-desktop-2.91:3= - >=gnome-base/gnome-menus-3.1.4:3 - gnome-base/gsettings-desktop-schemas - gnome-base/librsvg:2 - >=net-libs/telepathy-glib-0.14 - sys-auth/polkit - >=x11-libs/cairo-1[X] - >=x11-libs/gdk-pixbuf-2.25.2:2 - >=x11-libs/gtk+-3.3.8:3[introspection?] - x11-libs/libXau - x11-libs/libICE - x11-libs/libSM - >=x11-libs/libXrandr-1.2 - >=x11-libs/libwnck-2.91:3 - >=x11-libs/pango-1.15.4[introspection?] - - eds? ( >=gnome-extra/evolution-data-server-3.5.3:= ) - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) - networkmanager? ( >=net-misc/networkmanager-0.6.7 ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.1.2 - >=dev-lang/perl-5 - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - virtual/pkgconfig -" -# eautoreconf needs -# dev-libs/gobject-introspection-common -# gnome-base/gnome-common - -src_configure() { - # XXX: Make presence/telepathy-glib support optional? - # We can do that if we intend to support fallback-only as a setup - G2CONF="${G2CONF} - --disable-deprecation-flags - --disable-static - --with-in-process-applets=clock,notification-area,wncklet - --enable-telepathy-glib - $(use_enable networkmanager network-manager) - $(use_enable introspection) - $(use_enable eds) - ITSTOOL=$(type -P true)" - DOCS="AUTHORS ChangeLog HACKING NEWS README" - gnome2_src_configure -} |