diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-01-30 22:33:08 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-01-30 22:33:08 +0000 |
| commit | de1baf02bf45145134e6df5898835b4ac1925d87 (patch) | |
| tree | 9bfdac46bdddc92dc66708fb2079be519e2eb21f | |
| parent | Fix detection of PYTHON_ABI-versioned Boost Python libraries of >=dev-libs/bo... (diff) | |
| download | gentoo-2-de1baf02bf45145134e6df5898835b4ac1925d87.tar.gz gentoo-2-de1baf02bf45145134e6df5898835b4ac1925d87.tar.bz2 gentoo-2-de1baf02bf45145134e6df5898835b4ac1925d87.zip | |
Fix building on x86 (bug #401223, thanks to Adrian Bassett and Lucian Muresan).
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
| -rw-r--r-- | gnome-extra/cinnamon/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog index 8f40b53c58d0..3df49e129b7f 100644 --- a/gnome-extra/cinnamon/ChangeLog +++ b/gnome-extra/cinnamon/ChangeLog @@ -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) diff --git a/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild b/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild index 0679be78139d..d83e7745c95a 100644 --- a/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild +++ b/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild @@ -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 @@ src_prepare() { 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 |