Automake-1.13 fix, bug #479890.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 22 insertions, 82 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/Manifest b/gnome-base/gnome-panel/Manifest
index 0a449080e466..da50ffd64044 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -17,15 +17,14 @@ DIST gnome-panel-2.32.1-patches.tar.bz2 6686 SHA256 b0e2f59e370a2a7da2cd5fd1513c
 DIST gnome-panel-2.32.1.tar.bz2 3132156 SHA256 8f7828eb7a21c817a73b697844a4e20256059b32386414a10f97d51e7d9fca5f SHA512 ceae445cb64db89143b1d5aab46d5cd5e4b4c3333e67c03a54238bb55b396532a159bf13291f617c831664a699a6a323c69c471b534abf54ac697eb9923ef2e0 WHIRLPOOL 2da45235269373a37e722b3bdb92e5b946ed2cd0eb441702eb3ba804c362b5cc4b566ff9d4a012d52c0986badd6f2d0f1aa3c8bb7e50c7d8f2b7dbe7bf59fee3
 DIST gnome-panel-3.6.2.tar.xz 2432152 SHA256 a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079 SHA512 af030927103ef786d1c94d835aea185059609b0a2855d4933c25792ee925425de04ecbaacf7cf8460974c151306a952f5eab88e7cf8215cf0ae3345640e0e1af WHIRLPOOL 6a7d69c09e5c12ece2dc65154a8be66eda105c4b45a45247011b87f041cdefc0cccd2f7b50cf3417ebb87cb9db63c691df2dd23e2cbe40daca85417ac1f1c144
 DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500
-EBUILD gnome-panel-2.32.1-r3.ebuild 3614 SHA256 2d419a3dc389358a958546cb950c9db4de3dd5d041e07ba3a6caccee40e27803 SHA512 252b97b406d498680938056e9565578a6b5868b3ed933b50b991dd84a03da0512dc990b4bc57d9ca9f90ab95466388361ff700ae056a940f02631624578d8d65 WHIRLPOOL eae042d75b504d443fc7d99cd80eb393b0cb81612d3f0105c9f709d8118ccece8d2bcac4acdc8ad902a4e791668a5419c584b342fefa6a8bed01dfdfa727c405
-EBUILD gnome-panel-3.6.2-r1.ebuild 2915 SHA256 634a9cf29dc7684154f405f6706468eaff18bced829648e18f9ada7d310c8819 SHA512 9cd2d7781ee2b56e3d3b6d5616be88a3fb19df5678a15b8a10b12ac6026d53b732309fdeab36a9b9c56c3139805510f76270c008ffef2430535138f6d1b3c180 WHIRLPOOL 4247d7019e5eed00c22b56f672ffdb7c1a8b1f7e64e87ec4a98881e18788175587d5cf3cdd8837299d190356990d9c94353ca42ec7403468848590272556ed66
-EBUILD gnome-panel-3.6.2.ebuild 2110 SHA256 85c0b2e83afa2e5554786ab127d523e9f6a9e0dc401056af65f0586249ec5ef5 SHA512 c8a5455fa9407bf9c84cf793f5f8ab2e5bfa00631f942598ae8534a5b6b912dfbd84537e44e148c0b89c2f0223d9e816a3d631b6cca78597cf674ba454ed1e0d WHIRLPOOL 9881e5263b5669f66fdbbc630d4b8d62cb77d01ba66a2bb8cd29079b58c5b8ae2993550cd648f6351b0c97cb3ba2ffdff4ba12f71334bc7c5981f386eeba5d81
-MISC ChangeLog 52089 SHA256 6e4cf9a4d735df5fd9edba70fa6a8beccb74c81277b4e8df7130a48586be5201 SHA512 f55bacb8d3a6f3bc5e473b8221ec15fa0735b5c335d41b02495729226e40e3c80463d219c54405910615b43cac3c91994996940af930926f330805c57b8c7dcd WHIRLPOOL 70afb5f6e36b64be5c13764a84043ebfa1006af9ad68d527e8b16be2ca3d4210cf70aab06f5b472a3e789fd69f0c192a136b02e8454e3f420713af7802aaab5b
+EBUILD gnome-panel-2.32.1-r3.ebuild 3715 SHA256 69c89901d4325c5057f323120a4707b38f46cd67fbfdfd69cec466daf97c92b5 SHA512 2ca685175894e8d2381d1772e277cc2aebb96756968cfa3a124072c19ca43958508587930fe1bbd38dfb9efb90dab3a0f171bcea0edfd9e6c863e16449c2e20d WHIRLPOOL 0d39f2a28a820a8734e36ea621eecd5d08b2010cadb77b5484c6775e30563ca81ba9aefa32271d1484f2736c2fcf3aeecb5e8d5a9d8f29a211f45e2d90a2145b
+EBUILD gnome-panel-3.6.2-r1.ebuild 3020 SHA256 baf647e5dd86f81774616c63312424a340f9a06abcc9766c781bca37d67ee20e SHA512 83db344f3ad9ff825cef977eeb60a9d52db25ba4031f2f7db8fccacdd77aa3bfd3a8a1f1c529192b3f2810f37d707a67ff19e0dfd7ba1bd1e44ac8ca1fe301a7 WHIRLPOOL 0477aadde9cd2be09b571add0b101e6b0cf547d5c56da3d5fa289534c9c7876eede790c176e1d58c274f7f7fa32506c41fbb66955aab69f847ba67609f7ff586
+MISC ChangeLog 52266 SHA256 68055dbaee2b79d9106659f69fe448fbd3b7c35cf039616b02058fbc29e8a2cd SHA512 074c00b1dfe8cf774a8b168e19ba3d74bfa37ba6e4ba24944b27a935a94665c05a9d0ed288019814f0b3c7dbc4b4a9ef525da93bb97a9da5a3602b1068d8bbbe WHIRLPOOL 307b84ad04f2837d14507af4c0dec248b4a2e2e55635d6daf497114179b4eb4138fb3901452797e0a926d10572830b3db305c5ced9fb6ddf502ab88b1115aaf8
 MISC metadata.xml 275 SHA256 f1aff29e07ed70f09a7456702f2e968436de24580e8082dce5fbb828af2798f4 SHA512 04e4331ae1405fa36f40b26b86859d3427659f7fca39347229ca347ca5b502e6c8c7bbbcfd59fe7b485b3e522d96be4612939a522814165f9679e0a4f073127f WHIRLPOOL 8914bc6dce8db2c018fcfa75c993a1641efa534b0e31e1b74b9cc6c8ded7616a983f3d4c6a4b1f29db799ae187affbdf86ced41ba155e686f182e58f120784bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlH07T4ACgkQCaWpQKGI+9S8fACghIG8/p+HAgtPwoMGOfqMCvYP
-FHAAniqP6uX1IhPrMUu5CGJHlzT1vTkX
-=4Abt
+iEYEAREIAAYFAlIsuZoACgkQ1fmVwcYIWAZxVQCeMC1BFarUkjVHgc40u7KW6ARB
+QcIAn16xzjMWZOc9MIiAPb4e2pXh0mry
+=m6X2
 -----END PGP SIGNATURE-----
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
-}