summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-04-17 10:51:55 +0000
committerJustin Lecher <jlec@gentoo.org>2011-04-17 10:51:55 +0000
commit51b698828e1d2babaa4f4cfa255edb80f8163b17 (patch)
tree09d1ce0b03ee0774e98aef01e3908d238ff3eade /sci-chemistry/viewmol
parentx86 stable per bug 363633 (diff)
downloadgentoo-2-51b698828e1d2babaa4f4cfa255edb80f8163b17.tar.gz
gentoo-2-51b698828e1d2babaa4f4cfa255edb80f8163b17.tar.bz2
gentoo-2-51b698828e1d2babaa4f4cfa255edb80f8163b17.zip
Fix installation into /usr/usr/share, #360271
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/viewmol')
-rw-r--r--sci-chemistry/viewmol/ChangeLog10
-rw-r--r--sci-chemistry/viewmol/viewmol-2.4.1-r2.ebuild (renamed from sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild)6
2 files changed, 12 insertions, 4 deletions
diff --git a/sci-chemistry/viewmol/ChangeLog b/sci-chemistry/viewmol/ChangeLog
index dd33098ff521..c0051330e010 100644
--- a/sci-chemistry/viewmol/ChangeLog
+++ b/sci-chemistry/viewmol/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-chemistry/viewmol
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/ChangeLog,v 1.13 2010/10/10 21:30:32 ulm Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/ChangeLog,v 1.14 2011/04/17 10:51:55 jlec Exp $
+
+*viewmol-2.4.1-r2 (17 Apr 2011)
+
+ 17 Apr 2011; Justin Lecher <jlec@gentoo.org> -viewmol-2.4.1-r1.ebuild,
+ +viewmol-2.4.1-r2.ebuild:
+ Fix installation into /usr/usr/share, #360271
10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> viewmol-2.4.1-r1.ebuild:
Fix openmotif dependency.
diff --git a/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild b/sci-chemistry/viewmol/viewmol-2.4.1-r2.ebuild
index 86832215e9be..143d8bd8d422 100644
--- a/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild
+++ b/sci-chemistry/viewmol/viewmol-2.4.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild,v 1.5 2010/10/10 21:30:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/viewmol-2.4.1-r2.ebuild,v 1.1 2011/04/17 10:51:55 jlec Exp $
EAPI="3"
@@ -80,4 +80,6 @@ src_compile() {
src_install() {
./install "${ED}"/usr || die
+ mv "${ED}"/usr/{usr/share,} || die
+ rm -rf "${ED}"/usr/usr
}