* [gentoo-commits] gentoo-x86 commit in gnome-extra/cinnamon: ChangeLog cinnamon-1.2-r1.ebuild
@ 2012-02-04 18:14 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Rostovtsev (tetromino) @ 2012-02-04 18:14 UTC (permalink / raw
To: gentoo-commits
tetromino 12/02/04 18:14:01
Modified: ChangeLog cinnamon-1.2-r1.ebuild
Log:
Do not pull in networkmanager if USE=-networkmanager (bug #402153, thanks to Lee Trager).
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Revision Changes Path
1.6 gnome-extra/cinnamon/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?r1=1.5&r2=1.6
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog 30 Jan 2012 22:33:08 -0000 1.5
+++ ChangeLog 4 Feb 2012 18:14:01 -0000 1.6
@@ -1,6 +1,11 @@
# ChangeLog for gnome-extra/cinnamon
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.5 2012/01/30 22:33:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.6 2012/02/04 18:14:01 tetromino Exp $
+
+ 04 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ cinnamon-1.2-r1.ebuild:
+ Do not pull in networkmanager if USE=-networkmanager (bug #402153, thanks to
+ Lee Trager).
30 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
cinnamon-1.2-r1.ebuild:
1.3 gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild?r1=1.2&r2=1.3
Index: cinnamon-1.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cinnamon-1.2-r1.ebuild 30 Jan 2012 22:33:08 -0000 1.2
+++ cinnamon-1.2-r1.ebuild 4 Feb 2012 18:14:01 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild,v 1.2 2012/01/30 22:33:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild,v 1.3 2012/02/04 18:14:01 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -41,7 +41,6 @@
>=net-im/telepathy-logger-0.2.4[introspection]
net-libs/libsoup:2.4[introspection]
>=net-libs/telepathy-glib-0.15.5[introspection]
- >=net-misc/networkmanager-0.8.999[introspection]
>=sys-auth/polkit-0.100[introspection]
>=x11-wm/muffin-1.0.0[introspection]
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in gnome-extra/cinnamon: ChangeLog cinnamon-1.2-r1.ebuild
@ 2012-01-30 22:33 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Rostovtsev (tetromino) @ 2012-01-30 22:33 UTC (permalink / raw
To: gentoo-commits
tetromino 12/01/30 22:33:08
Modified: ChangeLog cinnamon-1.2-r1.ebuild
Log:
Fix building on x86 (bug #401223, thanks to Adrian Bassett and Lucian Muresan).
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Revision Changes Path
1.5 gnome-extra/cinnamon/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?r1=1.4&r2=1.5
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog 27 Jan 2012 21:54:26 -0000 1.4
+++ ChangeLog 30 Jan 2012 22:33:08 -0000 1.5
@@ -1,6 +1,11 @@
# ChangeLog for gnome-extra/cinnamon
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.4 2012/01/27 21:54:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.5 2012/01/30 22:33:08 tetromino Exp $
+
+ 30 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ cinnamon-1.2-r1.ebuild:
+ Fix building on x86 (bug #401223, thanks to Adrian Bassett and Lucian
+ Muresan).
*cinnamon-1.2-r1 (27 Jan 2012)
1.2 gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild?r1=1.1&r2=1.2
Index: cinnamon-1.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cinnamon-1.2-r1.ebuild 27 Jan 2012 21:54:26 -0000 1.1
+++ cinnamon-1.2-r1.ebuild 30 Jan 2012 22:33:08 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild,v 1.1 2012/01/27 21:54:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild,v 1.2 2012/01/30 22:33:08 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -142,7 +142,9 @@
files/usr/bin/cinnamon-settings \
files/cinnamon-settings.pot \
files/makepot || die "sed 2 failed"
- mv files/usr/lib files/usr/$(get_libdir) || die "mv failed"
+ if [[ "$(get_libdir)" != lib ]]; then
+ mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
+ fi
eautoreconf
gnome2_src_prepare
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-04 18:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-04 18:14 [gentoo-commits] gentoo-x86 commit in gnome-extra/cinnamon: ChangeLog cinnamon-1.2-r1.ebuild Alexandre Rostovtsev (tetromino)
-- strict thread matches above, loose matches on Subject: below --
2012-01-30 22:33 Alexandre Rostovtsev (tetromino)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox