Use system dropbox. Thanks to Peter Volkov <pva@gentoo.org> for the patch. Bug #376709

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

diff --git a/gnome-extra/nautilus-dropbox/ChangeLog b/gnome-extra/nautilus-dropbox/ChangeLog
index c0c4e3fb63a1734f8c9665accf4211d9ce7a7f59..c71a6645a69b28ceae213be09a3b1641571cc4da 100644 (file)
--- a/gnome-extra/nautilus-dropbox/ChangeLog
+++ b/gnome-extra/nautilus-dropbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/nautilus-dropbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/ChangeLog,v 1.4 2011/05/11 15:34:32 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/ChangeLog,v 1.5 2011/08/10 10:45:15 hwoarang Exp $
+
+*nautilus-dropbox-0.6.7-r2 (10 Aug 2011)
+
+  10 Aug 2011; Markos Chandras <hwoarang@gentoo.org>
+  -nautilus-dropbox-0.6.7.ebuild, +nautilus-dropbox-0.6.7-r2.ebuild:
+  Use system dropbox. Thanks to Peter Volkov <pva@gentoo.org> for the patch.
+  Bug #376709
 
 *nautilus-dropbox-0.6.7-r1 (11 May 2011)
 

diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index 494f03464a2f3cf4998f766254f71d21c8df1332..b3bf9dded206e7203f86dbea77cea9801839c4f8 100644 (file)
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -3,23 +3,23 @@ Hash: SHA512
 
 DIST nautilus-dropbox-0.6.7.tar.bz2 324049 RMD160 a8e3601e47a429e3a5331468b1bfa0c1f87e790e SHA1 77ce777bd342eaf7ada3e3a4f6664f66ca4189fb SHA256 4f37ac309a674bccc7edcd37d62bdccec590e78e6db8224dda4e641d5022b554
 EBUILD nautilus-dropbox-0.6.7-r1.ebuild 1939 RMD160 0b01814bec3ff3e61958e85ec8e4dcd4a647b81a SHA1 e68a138f8d93a981ab94880edbc6cd014d840593 SHA256 6c2c3111fdfe08b5b91dd4b12040d9b026cf81ef30acce1b14e5b683b4d1cc32
-EBUILD nautilus-dropbox-0.6.7.ebuild 1808 RMD160 fc40932789e4d8013368d9f23e56dd978abcf4ae SHA1 fa3ff0f8ab811e77e25b2ec685fc2bb0e64c7fd3 SHA256 8add8c2015c21583b920c414e32478c723562011d8c0b049a54e43b8ef7ed815
-MISC ChangeLog 1002 RMD160 8643020b95d804468e1ed4d556e90c14b3513785 SHA1 53fa0f262954ff64890409390569c8f47d0ba0c6 SHA256 acb48db9ba6ed05c79445440ff4d5224c6ef34bd6988918ee03186b44bbefcfb
+EBUILD nautilus-dropbox-0.6.7-r2.ebuild 2110 RMD160 be6afd6b8de95fc731376b88483fd11204273b06 SHA1 9c0ba0e62b7810405ae130b9d1d6d20793cb45bc SHA256 e75ca9e49fcdcd5b51649b88757e17f111d857ae382544cb9df14bb6008eafa7
+MISC ChangeLog 1258 RMD160 e81bbbf085dd81acab2b309f6d6788c2e4f2566a SHA1 437ac48c1ad64e5dd295a9665d895e39710cd7ba SHA256 14ee9af7e44577f8ef3b144876c5e6d4bb333dc81246d38a0968455a14cc8fbb
 MISC metadata.xml 299 RMD160 2e104f9e93f7c11fa27c83226511c841e1a3dbd4 SHA1 25472cd164d586761a84c06a7b1506c6a33c03b7 SHA256 90f87a1654ecc810fd74a96670dee08373b74500e39e378ceb0d64a9c45c6dc5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNyqyKAAoJEPqDWhW0r/LCrRgP/3d0mYm+UmqgaW7CAWmYnoZq
-nMnWfDdkUsIsGSLOueMcisLAHjrClnRV59ejkO7iHapKWHhkW7Gsl4nqSX3bKeBg
-Z6+izWrwDcQpfeYKqSsJay0w6/oAWAxGqCZsH3xxyQNNtE4ADDSWA0GHgbj/Imxe
-k9cMeEnjYACZk4B1ibsxQYwGt2JNCD26P68/rA05z3CKP9w4A9tVpe1uZxLlA8qN
-O8zfpmSJbiTRoVfdDcUr8EOzi2RZQeORYrQUHYQUTLbi9FQixNsZX+vtTDQw4bNG
-vci5gwM1d1R0NUfZZl+n2OBxup2uZFEzNZhFZ1qV86Yk2OuWmKfMrZI/CEB13X8B
-8d89iIuw10s6UYkpvPs0jXdfYKZwDgHn9q89HQG4bJRpqpcaWE8GtqlIrKfqdjub
-MVNF9fBcFaWMJhQac8F60Wslr8gudKRqC/DiBkfP/eHfD4cdgKm6TLK5O580xbGq
-NpAjTUz5kqtam8foVAirjvN3W02PZqjIEJJxgF0A93Xo1Yuwdjdg0S2Qva4hczOd
-l1e4y/gvTHAK2ILEhMQMURkchQ9b/8FIOY74QIG+fUXL1/k2/0FlqZCMWd2jXtsy
-auquAgAQiUZSbd4fadl0rrtVKnaxhYFaLWegCsUuaMK+xcq2tahoTiF9ccH6csak
-NVYCwy6GvKlbHRX6/VGR
-=j7qR
+iQIcBAEBCgAGBQJOQmEjAAoJEPqDWhW0r/LC3EkP/2qpjNWT224M+f1ItTxpCGqI
+klahPM9h4jrbAVGiwK1ZYc8r/CXgg4e15H84Vk7dhZ5dGaELc++rs8pvSXci4wMG
+RodDQxWC4lUuJPvFfXy61JRDrldnZh6+uLw49PgnSMk6vG9vz7uNqcR5dhrVVhY7
+Qzq22q5K2bbZM+cq22Sje5AHwFa3P7OXzARyRjcb+0M5t4e4YuJPf48YYROu9x7/
+WIqKp20lqWR5M0E2it5Xin4S18V9xD6ybXgAXhChCZdIAI2846C4C7al6AorqC87
+Fk5U8R4mMBoK4tlmXBLKhJFtQE8S54wEOWjy179ANBBv0jhm0VcnEhiUa4B4jNcs
+AHT3USoB7X7rk+UmccNJebuBnx9BgT8wGywxoEpQGYl904s8LvaWQNBobMwkJ4Nm
+lBuSpm5bz2n5e3D6gMLaXtvn8gf2l8323ghWJFBRYtWpO+c+ep34qHy90z5GQQ2q
+iKu0FbSfeTn269kCBDdsiBTlPeYghnjakn6NN+Wz/GZTIlPI9C/7zMn/Pb3xsLqL
+WUCL8YlgevSPRLfYoSPTlIH/Cd+/XrbP7KH+XCOiF9Y82+WZGkWsB0A2WekQBaIx
+HetUEm5E5283u8XxO2kLpy8RpggQafllQkQGZevEXYpPpiu4FgnfQfGt/5KHPqbB
+LHCugCvWxwdmS/Mf36pp
+=zd8+
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7-r2.ebuild
similarity index 80%
rename from gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7.ebuild
rename to gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7-r2.ebuild
index a6560f0434be90659e1da74035ac7780b7812a2e..86f3db8d384e8064beab98a843ef35fb18b8a3ae 100644 (file)
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7.ebuild,v 1.3 2011/05/06 21:52:43 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7-r2.ebuild,v 1.1 2011/08/10 10:45:15 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
-inherit eutils python linux-info gnome2
+inherit autotools eutils python linux-info gnome2
 
 DESCRIPTION="Store, Sync and Share Files Online"
 HOMEPAGE="http://www.dropbox.com/"
@@ -18,6 +18,7 @@ IUSE="debug"
 RDEPEND="gnome-base/nautilus
        dev-libs/glib:2
        dev-python/pygtk:2
+       net-misc/dropbox
        x11-libs/gtk+:2
        x11-libs/libnotify
        x11-libs/libXinerama"
@@ -41,6 +42,16 @@ pkg_setup () {
 src_prepare() {
        gnome2_src_prepare
        python_convert_shebangs 2 dropbox.in
+
+       # Use system rst2man.py.
+       sed -e "s/python rst2man.py/rst2man.py/" -i Makefile.am || die "sed failed"
+
+       # use sysem dropbox
+       sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
+               -e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
+                       -i dropbox.in || die
+
+       eautoreconf
 }
 
 src_install () {