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
commitc72b12fa51ebec56e008d3d6d87826e38b5b35e3 (patch)
tree80f4d0dccce34a8ec8241bfd0ea04e037d0a6562 /sci-chemistry
parentx86 stable per bug 363633 (diff)
downloadhistorical-c72b12fa51ebec56e008d3d6d87826e38b5b35e3.tar.gz
historical-c72b12fa51ebec56e008d3d6d87826e38b5b35e3.tar.bz2
historical-c72b12fa51ebec56e008d3d6d87826e38b5b35e3.zip
Fix installation into /usr/usr/share, #360271
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/viewmol/ChangeLog10
-rw-r--r--sci-chemistry/viewmol/Manifest12
-rw-r--r--sci-chemistry/viewmol/viewmol-2.4.1-r2.ebuild (renamed from sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild)6
3 files changed, 18 insertions, 10 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/Manifest b/sci-chemistry/viewmol/Manifest
index d54c78c4f7cb..ec63357b43a0 100644
--- a/sci-chemistry/viewmol/Manifest
+++ b/sci-chemistry/viewmol/Manifest
@@ -7,13 +7,13 @@ AUX 2.4.1-look-for-python-in-right-place.patch 866 RMD160 cc62c43ef5a9a84b389b3a
AUX 2.4.1-remove-icc-check.patch 1214 RMD160 b6e1f7fe33b5d21f9fcffb5da63563b8f7236cdd SHA1 4748df9fe707ad8b200de2a705e0ddab814a3b6e SHA256 4c0f638a44ee74093103a8f3b9e94252b31c0eff875596aade43eb7c2faf06c7
AUX 2.4.1-use-root-for-app-defaults.patch 827 RMD160 109cf436c73bb732f89c16f206892b2297a20ee7 SHA1 17ce44db692b61c635719f32bc90d8a36f95bb06 SHA256 c7e82343c254a38e61fee72e5e86ecd86339e56e783255a5d882bcff38937094
DIST viewmol-2.4.1.src.tgz 2229379 RMD160 d63d1a6aa2ab9212874cf9bae82a238a440aba47 SHA1 8e6c55bd1381db076706e19df44fc8e7d3a6b9aa SHA256 dfed3eed6441d89c4bf2be1c13cbe263341c8880edf1742d446fc0f8f4a99e19
-EBUILD viewmol-2.4.1-r1.ebuild 2266 RMD160 57a5b025dcd1888c2d1593af99f721117ef27fb6 SHA1 e0013685c52897c3fa669f07fa307484c2c2aa07 SHA256 a6af4990c2d8c2020432026a4224892cc9afa53bef146ca8104c4a5eff8d5ddd
-MISC ChangeLog 2031 RMD160 05bfe29f45b9ebf98e4d3e5cda19756a35b18ef3 SHA1 118d0d7b3ff8f9dbcee144672e7a83321fcd5fb1 SHA256 c8c638d4ece80b78f871be2281d0b08d308e6786794681f0a1938ff54a3cd403
+EBUILD viewmol-2.4.1-r2.ebuild 2327 RMD160 602f7114b0c5e7c24cbf7e81786d6d90fca8adad SHA1 587b634d3e36e629fa97bc5e164815b721efe47e SHA256 f1fc04fa1d42a4a61fad040671ca102fa9e432ff09646c456e84717304b1ae42
+MISC ChangeLog 2215 RMD160 0f006baf50434e19a2da477fb141d6558b2cf3bd SHA1 6bfcc40efbf2f029cbca07b3ec0b072c3ae6b2ef SHA256 c3cdfce1d896cf83ba99836000bbda1f91321ab190041756a2a1a36004287433
MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAkyyMOwACgkQOeoy/oIi7uwlRQCg6fTM86o4aeZAp3ULl9R1I/TI
-b2QAnR4QX3BcnNhI7J3n94YTIBQ8tKcm
-=BXlO
+iEYEARECAAYFAk2qxlEACgkQgAnW8HDreRZzLACgmxMu/2zwSN+MvnjaNQ1PnNhU
+ujQAn0XTAEw4k4Lpv+Vt0tllkteViyks
+=8qU9
-----END PGP SIGNATURE-----
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
}