fix prefix support (bug #378721)

Package-Manager: portage-2.2.0_alpha121/cvs/Linux i686

3 files changed, 27 insertions, 20 deletions

diff --git a/gnome-extra/nautilus-dropbox/ChangeLog b/gnome-extra/nautilus-dropbox/ChangeLog
index bed22fa1178e..7f3e94b48897 100644
--- a/gnome-extra/nautilus-dropbox/ChangeLog
+++ b/gnome-extra/nautilus-dropbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/nautilus-dropbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/ChangeLog,v 1.16 2012/06/07 22:22:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/ChangeLog,v 1.17 2012/08/23 03:16:47 ottxor Exp $
+
+  23 Aug 2012; Christoph Junghans <ottxor@gentoo.org>
+  nautilus-dropbox-1.4.0.ebuild:
+  fix prefix support (bug #378721)
 
   07 Jun 2012; Zac Medico <zmedico@gentoo.org> nautilus-dropbox-0.6.9.ebuild,
   nautilus-dropbox-0.7.0.ebuild, nautilus-dropbox-0.7.1.ebuild,
@@ -88,4 +92,3 @@
   +nautilus-dropbox-0.6.7.ebuild, +metadata.xml:
   Moved from sunrise overlay. Thanks to everybody from bug 237433 that helped
   developing this ebuild
-
diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index 05be72b62a85..0b3802814d99 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1,21 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX nautilus-dropbox-0.7.0-system-rst2man.patch 463 RMD160 c047adc124ba99b5fe567a3a73678000ef606f62 SHA1 df910ef68d5dc69339329df1a7c836e7db0c20a1 SHA256 f8c6add8d61b73ac8083a79177705a172005a16f1f0738f37e09ce5daddc3702
-DIST nautilus-dropbox-0.6.9.tar.bz2 351131 RMD160 116eedc009dd34a51a34909f4093537ebcb060d4 SHA1 bad6402183b2ed1190ecb8faec2eccaf9ae3e821 SHA256 f1c16c0a485884a5600121a168d4617dc4b47842b22524007f5e2b116b1701f6
-DIST nautilus-dropbox-0.7.0.tar.bz2 353719 RMD160 48dbf2ff6859e7a1aae7726aa48bf1752e671351 SHA1 1b6764b15cfca95a49771b3fd4ed64062b94085c SHA256 4fe171760c897c0ab4166cea70f8587623f72c616ef66ea7d81565b702322daa
-DIST nautilus-dropbox-0.7.1.tar.bz2 353942 RMD160 19e1ad4f628915254996c11639027b1c51aa034d SHA1 efeea06f5b80de82acf7f7dd9913f1520fbf74a6 SHA256 87effa9c89d27f36350628bdd42fad4a4e013af3f8e42e4761790ff4ecd09770
-DIST nautilus-dropbox-1.4.0.tar.bz2 353988 RMD160 0bdad36dfd4730fe3b96882acbcd7d553a64a221 SHA1 0b929a0afe8fb24b9f3cee37082572133d860cd6 SHA256 3412554d31a4a819a45edcb96bb1ab071a3e2d781817b90a14df8010137cb802
-EBUILD nautilus-dropbox-0.6.9.ebuild 2132 RMD160 6eaf04828fb6e5020f4ca6d96134133a7ffce4dc SHA1 df37e5a290284ccc93a354c20d3c6d2aa2d6f4a1 SHA256 a03aaff62145640c547da8337cc9223d1f3ebf68b307c8a419110730104f423f
-EBUILD nautilus-dropbox-0.7.0.ebuild 2096 RMD160 b254dd91ce906af3317764ef298beb256f6f1f03 SHA1 c8fee871ad597de6f2ff0cd90f5e9df992df99fb SHA256 be389ecdf7ac58f2b02103284de14d6890bf69caf263126718af38a1425bfeb1
-EBUILD nautilus-dropbox-0.7.1.ebuild 2101 RMD160 575a599b3914c0005b19b4f751a5477e46bd4427 SHA1 f8dde61bc28326929a9fc4c68d35dbbb91fcdd64 SHA256 3902bc1cb50f1ddcd2f3134a8f22e00a161153b97e9479d38a35135a25296fba
-EBUILD nautilus-dropbox-1.4.0.ebuild 2103 RMD160 8c8736cb3e98fe4f8bd852be2e1b02067ad79165 SHA1 d858142a6df1a02e3da2b44bce8eb73261bbfb42 SHA256 a09657da907f725dff7d4f5bf8652809370e37a5b1e720d5694295871f7511cb
-MISC ChangeLog 3352 RMD160 12e70c1577b9ed62200a403ce1724697ad41b148 SHA1 83cb5cdf1b0f8aecfd4e45fea014e2de52dab9e0 SHA256 2c327fce08f74f342927150f5acc84dbaae273d8dc9e157da656e600d4d63462
-MISC metadata.xml 278 RMD160 85ae612f4b725d8857a7fe0808090691c0e58fbd SHA1 c97840692a46e7d54f22bfcfd0a564a8d08033dd SHA256 07a0afc4dfc12865b213ef6815169e0524357989b213ac40bc9436dea94c3160
+AUX nautilus-dropbox-0.7.0-system-rst2man.patch 463 SHA256 f8c6add8d61b73ac8083a79177705a172005a16f1f0738f37e09ce5daddc3702 SHA512 5a34c3e6ff51a1a14eac11e0619a81afeec05979944d128ed37076cadb9a79edd839918ee289c409c537be73a913ee3bc58f19cc2227cda8762328e2f0fbd7eb WHIRLPOOL 75f33c78b99b923da61a2dc926e0c4a62973cc61e36e7c5bd0a52fa840757b876fd9badf158ba1e78a42094023f76eaedf0fa72ba6795acd90bc3dd30683d9e6
+DIST nautilus-dropbox-0.6.9.tar.bz2 351131 SHA256 f1c16c0a485884a5600121a168d4617dc4b47842b22524007f5e2b116b1701f6
+DIST nautilus-dropbox-0.7.0.tar.bz2 353719 SHA256 4fe171760c897c0ab4166cea70f8587623f72c616ef66ea7d81565b702322daa
+DIST nautilus-dropbox-0.7.1.tar.bz2 353942 SHA256 87effa9c89d27f36350628bdd42fad4a4e013af3f8e42e4761790ff4ecd09770
+DIST nautilus-dropbox-1.4.0.tar.bz2 353988 SHA256 3412554d31a4a819a45edcb96bb1ab071a3e2d781817b90a14df8010137cb802
+EBUILD nautilus-dropbox-0.6.9.ebuild 2132 SHA256 a03aaff62145640c547da8337cc9223d1f3ebf68b307c8a419110730104f423f SHA512 a7cef5b67042ad0bfcf889192af9564a8c6b6bf6ffb067a9d5ea37468aca8dcbaef671936aea24e31c21fbf34528d4b8b113f000e6cb45abe5a203732246347e WHIRLPOOL 9624ff6ed75e5145436e90e285924fb199135d65e9f1b118dba54fe2567dc78267e64422a7f0465bf70320a8ef5f84e0cb42261cf6215c73500916c18ed55170
+EBUILD nautilus-dropbox-0.7.0.ebuild 2096 SHA256 be389ecdf7ac58f2b02103284de14d6890bf69caf263126718af38a1425bfeb1 SHA512 2a5f43c12550556bd461767eeb4016ba5c644da155438e080c484b3cc04ce46583435a103b041ab58dce4501c1570017594e74d61493d08693d3bce5d0a88c06 WHIRLPOOL 2ed493d27a6fcc69a78493a2a35d8129567c71217f0d034811fe2bdd7f247dc41f10c04b8858da0bcf1d99c1877e4f53effb5b8912e9c6d916e175b85b8f64b3
+EBUILD nautilus-dropbox-0.7.1.ebuild 2101 SHA256 3902bc1cb50f1ddcd2f3134a8f22e00a161153b97e9479d38a35135a25296fba SHA512 5bd7b9fffc40cf76632884fe1aafdcb30af3fd9a18753a1d6f48616c9166e105c2c4b4ae7bb4774140e707f9705aa17d307e13dd1cc26d6e1e9fea5ad1a424aa WHIRLPOOL 63ae08033703b0adf4553b9957a51ad99d0c48cb3f50c2faea8f9b43581774507c01f152bbb68a83a6ff6c1518c166326fce32a7a7b17e964f8b94411d1a0399
+EBUILD nautilus-dropbox-1.4.0.ebuild 2124 SHA256 f8d8c9b08fbae372b1643e51a41be82109a187387f47ca496461640e423ee3e6 SHA512 4ee8b3d2d4a1c5cc612fbfbd36e4845731155a29bb25018f1e23d565bece981f0454acd64c1089e42dbadcd9d5ba4aa80382fdcfbe9567ae2d6fad93ae3e00bd WHIRLPOOL 428487d663effc0f9149e7e911bad0843b95dfe89f8754f969a40cc0e30334cf2126fc8e93e57ac8e4a0cc7efdac44cbbc8a45301bdd685ea3f33cb8de740120
+MISC ChangeLog 3473 SHA256 75eaa4cee41acd54abc396a6d2c22a78dda48c4288f810077c5d540694971381 SHA512 d02f57decaff156a87eb5b22d99b04a97a164f4223218a8ca1d428e9ef5cc24aada99123a27dc19b87ce5c4c835858f94b2a1dd4290e83ebcd4e2568f9f9ea5a WHIRLPOOL a1361c37da7ef199f38d821e21f781903def8e56a0eb1d7582f5ec3ed16d9130cc2874f2d579a1d873af81bf6144f68eb97e1f0119af3a29f43686cf19773a14
+MISC metadata.xml 278 SHA256 07a0afc4dfc12865b213ef6815169e0524357989b213ac40bc9436dea94c3160 SHA512 c47ad7b85f6516eec5bc86f26785d8731544436f25fce07093a7c51de184ddfeca02253022c54fb88c1b75645350d8d23de7fc1d8c62e8050e1288b4d6ebaba6 WHIRLPOOL 5fc748443c6e622808acfb4f906cc41bac88b04718771a678462d1079185b74de2840d3dfe1c0949ad96c5b8d2a278f7587af8b1381cddf72c92b9b3099b40c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/RKZEACgkQ/ejvha5XGaOsxQCeOivMfp5zL3wtzl8jJErYQJmA
-/T8AoLh8dlK1u6jDLiOlQoe1xhz2hj0m
-=KdsR
+iQEcBAEBCAAGBQJQNaCmAAoJEOeBhlrCAAWGOi0H/j+6D3cPKBs0t8Auxz9Wyjjs
+u1cdVRH7En8CGAIfQRRjnHXzmaGmEwV4MC1B1+nYuWSVTE1mSb6edGGFRjkDMbPb
+acQDa6dnJ3+X+7LmbRbUOjoL+372PXB9zwusPXciCT7M5SEIjUafkwHwjNwg6bhG
+XNVSOZV6fboAC/toydIHEhXIHCOKLohJ9rPy4+bS2ZyiP1LQD4/7FNU+FyvE8ODp
+UNo/UuwRh2PBNVi5c4h4LVH96KZSDlO2Uyk7pn6tUOo/CsWpx4CzdBIszByj3+QL
+aHMJJYGfI5ewe0K9d1aF2j7KdEHtNjEsPHEiUOWzgbl0pjvOM8neFOww7d5WGMY=
+=lkYf
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.4.0.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.4.0.ebuild
index 26c6ece4ddb8..0e31cae13299 100644
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.4.0.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.4.0.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/nautilus-dropbox/nautilus-dropbox-1.4.0.ebuild,v 1.2 2012/06/07 22:22:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.4.0.ebuild,v 1.3 2012/08/23 03:16:47 ottxor Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -44,8 +44,8 @@ src_prepare() {
 	python_convert_shebangs 2 dropbox.in
 
 	# use sysem dropbox
-	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
-		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
+	sed -e "s|~/[.]dropbox-dist|${EPREFIX}/opt/dropbox|" \
+		-e "s|\(DROPBOXD_PATH = \).*|\1\"${EPREFIX}/opt/dropbox/dropboxd\"|" \
 			-i dropbox.in || die
 	# us system rst2man
 	epatch "${FILESDIR}"/${PN}-0.7.0-system-rst2man.patch