diff options
| author |   Leonardo Boshell <leonardop@gentoo.org> | 2005-07-19 19:49:42 +0000 |
|---|---|---|
| committer | Leonardo Boshell <leonardop@gentoo.org> | 2005-07-19 19:49:42 +0000 |
| commit | 2b3d64fc294b3275a5c5f480a17e34aeb132bc10 (patch) | |
| tree | ad99e8651cc683d54939b68e8a3156ec6cc134ef /gnome-base | |
| parent | Doh! Forgot to update the (deprecated) multilib patch (diff) | |
| download | historical-2b3d64fc294b3275a5c5f480a17e34aeb132bc10.tar.gz historical-2b3d64fc294b3275a5c5f480a17e34aeb132bc10.tar.bz2 historical-2b3d64fc294b3275a5c5f480a17e34aeb132bc10.zip | |
Fixing bug #99559 (failing if gnome-common is not installed)
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gnome-session/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-base/gnome-session/Manifest | 4 | ||||
| -rw-r--r-- | gnome-base/gnome-session/gnome-session-2.10.0-r2.ebuild | 10 |
3 files changed, 14 insertions, 7 deletions
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog index 7fb250db0f2a..26888161aabb 100644 --- a/gnome-base/gnome-session/ChangeLog +++ b/gnome-base/gnome-session/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gnome-session # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.101 2005/07/19 16:56:45 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.102 2005/07/19 19:49:42 leonardop Exp $ + + 19 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> + gnome-session-2.10.0-r2.ebuild: + Fix unwanted effects from aclocal without gnome-common installed (bug + #99559). *gnome-session-2.10.0-r2 (19 Jun 2005) diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest index 5c541d38d598..56386ec5ed3b 100644 --- a/gnome-base/gnome-session/Manifest +++ b/gnome-base/gnome-session/Manifest @@ -1,6 +1,6 @@ -MD5 f7501f71dbdc792d6d279d7bdc8dfe84 ChangeLog 13359 +MD5 226544f745431ae5e0f62f1ff547b966 ChangeLog 13532 MD5 098560226c7320e0664b3c84a68df44e gnome-session-2.10.0-r1.ebuild 1626 -MD5 0ff09b77098718c6c306bc8cdbc09c7e gnome-session-2.10.0-r2.ebuild 1943 +MD5 45b25a00dc322ac5ddb1303b1327e0ce gnome-session-2.10.0-r2.ebuild 1987 MD5 c9b685052085b1c022785575a65aa502 gnome-session-2.8.1.ebuild 1580 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 4499ec98ae9a50f5de83b8ce43411a80 gnome-session-2.10.0.ebuild 1586 diff --git a/gnome-base/gnome-session/gnome-session-2.10.0-r2.ebuild b/gnome-base/gnome-session/gnome-session-2.10.0-r2.ebuild index 4ba1a17e281e..c5051edd3691 100644 --- a/gnome-base/gnome-session/gnome-session-2.10.0-r2.ebuild +++ b/gnome-base/gnome-session/gnome-session-2.10.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.10.0-r2.ebuild,v 1.1 2005/07/19 16:56:46 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.10.0-r2.ebuild,v 1.2 2005/07/19 19:49:42 leonardop Exp $ inherit eutils gnome2 @@ -22,8 +22,8 @@ RDEPEND=">=x11-libs/gtk+-2.3.1 DEPEND="${RDEPEND} >=sys-devel/gettext-0.10.40 - >=dev-util/pkgconfig-0.12.0 - >=dev-util/intltool-0.29 + dev-util/pkgconfig + dev-util/intltool !gnome-base/gnome-core" # gnome-base/gnome-core overwrite /usr/bin/gnome-session @@ -49,8 +49,10 @@ src_unpack() { # for http://bugzilla.gnome.org/show_bug.cgi?id=116814 epatch ${FILESDIR}/${PN}-2.8.1-hide_splash.patch + export WANT_AUTOMAKE=1.7 + cp aclocal.m4 old_macros.m4 einfo "Running aclocal" - aclocal || die "Aclocal failed" + aclocal -I . || die "Aclocal failed" einfo "Running autoconf" autoconf || die "Autoconf failed" einfo "Running libtoolize" |