version bump #524502; Improve init script

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

4 files changed, 134 insertions, 11 deletions

diff --git a/net-misc/dropbox/ChangeLog b/net-misc/dropbox/ChangeLog
index 3bea2dbe0956..9541854a4d65 100644
--- a/net-misc/dropbox/ChangeLog
+++ b/net-misc/dropbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dropbox
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/ChangeLog,v 1.59 2014/09/01 10:47:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/ChangeLog,v 1.60 2014/10/18 02:09:07 naota Exp $
+
+*dropbox-2.10.41 (18 Oct 2014)
+
+  18 Oct 2014; Naohiro Aota <naota@gentoo.org> +dropbox-2.10.41.ebuild,
+  files/dropbox.initd:
+  version bump #524502; Improve init script
 
   01 Sep 2014; Pacho Ramos <pacho@gentoo.org> dropbox-2.10.2.ebuild:
   x86 stable, bug #520166
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 27611fc7b78f..277e84c548ab 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,26 +2,40 @@
 Hash: SHA256
 
 AUX dropbox.conf 322 SHA256 b45db3c9676cfd8bf568ca5ce86a4e1a6b95cd604edeba2b3e2b3fb604e19ab4 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132 WHIRLPOOL 2093d21df44308b478654457bf753913b56cc64ff76dd037720dcf15ba061307fc65175cf32c3ae54a16dba32614b1f123aff3c69bad599651ed67be0685f791
-AUX dropbox.initd 1648 SHA256 f7a1ce99c970838f7e0eef12a193d6c50ce5d2b32cc4f8f9283fa5b392ca0597 SHA512 04bf66cb7f7befab6cdf11f78c24810f7b91e81d0428ae3797ec3ffdc665573cd4433ab8383c7966888a7d2cd4efcaf21f4917d20da2e1eeb6c4c6bb80ffe654 WHIRLPOOL d1066dac17b9b288a8ec62f9939cb866920b2c7c9ae7531031b402505c44037f147fceaccf1dde39a357623f67334b97fcb7f98b41c6fda08aa755b499992d3a
+AUX dropbox.initd 1690 SHA256 dbac078542afef637917e53ec7602d7fe2028b39ed747612c490b998b80d2234 SHA512 dfeeefa7623a8861f743c2640d19f2ced5e6e501ad9c133929c66ef8ddb5fc98e0420ec6bfa6af2a4853581e581eae593d039e313aca1b977500601e1d3197c1 WHIRLPOOL d7bb2b891544448a07e7cdfaad517573393f65d6ff1275a42370123ad6d44a81d2b651213d451a3df877bbe564b5d74a4634c4ea5aaf53e5bd91b1c648f15b29
+AUX dropbox.initd.orig 1648 SHA256 f7a1ce99c970838f7e0eef12a193d6c50ce5d2b32cc4f8f9283fa5b392ca0597 SHA512 04bf66cb7f7befab6cdf11f78c24810f7b91e81d0428ae3797ec3ffdc665573cd4433ab8383c7966888a7d2cd4efcaf21f4917d20da2e1eeb6c4c6bb80ffe654 WHIRLPOOL d1066dac17b9b288a8ec62f9939cb866920b2c7c9ae7531031b402505c44037f147fceaccf1dde39a357623f67334b97fcb7f98b41c6fda08aa755b499992d3a
 AUX dropbox_at.service 220 SHA256 8a02c67f98781a781741ab54d5c22ff904871db84e5549bc2e4864b8d5b9cee8 SHA512 cb33bf6aa290be0ba1afce2f5e525489f8bf4144daf09619b15292968657c74ee17678ed1aba6aa9d2dbd068dc394a10896e7dbd0eaf74d74a928368394bc933 WHIRLPOOL eb318ca1804cd023ca3a78eb923ce5be4dce1166187956fc190af23ae9676bcad61e6180869778e2bea53c572d7e53c0e3f9402874d57791b9e728ad9dd3cc4d
 DIST dropbox-lnx.x86-2.10.2.tar.gz 26078108 SHA256 a43e24342e5f337034cf0d378f5a532ad69ad59bf00eb8a2065c465c969e3455 SHA512 0fb408d7a221c470fbc59c4ddb1f65d4fcb2d33c855b37474b6202a58f7be04b9cf0ed1ea18080efdd02998fe370bdef99ce1e27b8f627515ba3db859251e5ef WHIRLPOOL a33260d2a8907d676230464c9b4200b12debe2ac8aae5a7322250218481f348a2cc4217a84155900cbe9284e4070d424fbc7589e7733fab79d98e2ee324c5e02
+DIST dropbox-lnx.x86-2.10.41.tar.gz 27099644 SHA256 f335301cbbb41cec84353a8f670d01d761de61c08f48b408f5bb79889fad6a38 SHA512 e0eca266c2571f9cf8b6172edf0971d2c7041d2aec0872c45e5f38101eac135d40aca3631268fc567313b8ec3846543a20f053d4c239393227fec0b2e767e9d7 WHIRLPOOL 6b3c528dea8f16f244a7034b9fde7ebcac1e1b4f555072641e0ebe307ceef05ae75d2ac1b7146b93ca9ba7c3eae6b895c8743c7d54c28c3e40602f083338dfaa
 DIST dropbox-lnx.x86-2.4.10.tar.gz 22095816 SHA256 c1f19bace5eb63ef1263721a0866ddaf061c6e126a1f9fa5faa3a70e2aa267cf SHA512 5d3c6ea6cb193cb6cd885d92915ca7ff59ce895b9f517e683c7e32c0979f972bf56b0a569dc7b35f1f15095c7f643562c81b23fc85d9dcca52c07052e5c17832 WHIRLPOOL 1bbe12e8ee4ed42992c984582e8e60c5cdd388bd1d1ba52d97c61bc86954d78ce73f04ac1be2cb465fee82eca9972b0a45060296f9c958897fd82fabed7b609f
 DIST dropbox-lnx.x86-2.6.33.tar.gz 23602308 SHA256 90c6bebb1dda19b56f68d22a2422436903559f646adcbc290672630df9465b76 SHA512 e26f9f4e393e17e63b387e303189fdd716abbfb96d44648fff3c98beac3f373a71e8446bf90b95ee067556264fe9b12264ca66dcf5b2ba509763276f8fa0b224 WHIRLPOOL 2a2cd43c6a4889f262515413a219b6d3df81e5faf377713b9b5a5b34f6d2fde211ae8d2b55d17c03b04b5079ea8d59957a909a34af1a36bc6d145866d91f03c3
 DIST dropbox-lnx.x86-2.8.4.tar.gz 24066498 SHA256 9014842c40953f3d7057a11cb537bb5fcb807a0f1794a5efb908bcd343a2d2c5 SHA512 3c4af0c500fc7f41a4e2040fd1ba56198315ada7ffedd1d722b917466831716802871dffe32d4671693b54a9fee3de3553f2f466a4dc02b34c57e39422c3a8b6 WHIRLPOOL 426c97ca84753d306f55f71ef6341648de28bb65b936483dca41bb8e4a96cab515da9b8926c6f5a926f186154c30a03611bb8a2aaf803c0addec2e791729bc4f
 DIST dropbox-lnx.x86_64-2.10.2.tar.gz 26852053 SHA256 0780001da7af0ee8b07115f59d1998708e5aa36c50ce13f73f32d7c7c0a08d11 SHA512 0746643546bdcd2de71812a87ccf665df4a656750d899e2b67a3dfa958bf7f59fcb1c99109b6bb1424f5dfbb625d0756a7cc0c01ba09b4375ed177d05846256e WHIRLPOOL 787e5882f546377173e73fcb8a4bfe205c1659e562e0ef4aea9d62123fb684cd254c3962861ea2eb54c6fab895561c29a1c507760eb906625db55fac5aa083dd
+DIST dropbox-lnx.x86_64-2.10.41.tar.gz 27879035 SHA256 7db18d297a12cdfbb1e03cb21876d748a68846907c21a929058051e8d49d49e2 SHA512 801a8f55991331d5e79682385046bbdd880e4a2e93fbd8369be51070bb0c2bb1af66fcbca00c9aa87c70d4fba8c73575ac077f0e1bb5d880dff834767fd0d2cc WHIRLPOOL 5970bb783d5887502eca00a958c99ab641d3534a806496acd1f94b06ef10a7da20e1e1141f69e54d435277c4e47514955a7a6ddad8fef7593b17eaec41ce84ca
 DIST dropbox-lnx.x86_64-2.4.10.tar.gz 22867842 SHA256 1bd9cff2a4c3a03cd900cf8f7426ccf8d61e9e292666eba61493be26fe8945d4 SHA512 02e7798f515ac492cb40c8ea6b83a9b3d5849a07ea8c34414d5329a1d8c35c6faf7edaca511638b79594cf963a8363d720e70171e6e8f1a3d45b3e3b8018bb75 WHIRLPOOL f87f8309e92095032da209f15ae4905cbc68ee06d41548e2ddfb477e33a90a49b0147128e8e84cb3e0e3ea5d346dbba7aa95b295a238f1829e021c7cb68641e2
 DIST dropbox-lnx.x86_64-2.6.33.tar.gz 24379142 SHA256 b4a7888fe87f23469215103da4b25bbab34a97060abdcd431b32e00b6229c3c2 SHA512 65abf5d15402d0b2393e66321a56461c06953aa6db9a08a3dddfea3582b85f8b48b0538a254c83fb3351384c08c70e97c05d35bffc112b660ad52889646f5aac WHIRLPOOL 706f79dc84303c2e71d279bc8e823a8b51afbdd27780a9b0292bfd81121e1e4084265fd8cd2fb4b066529883aa968f0abf38b1a3155c11e5d87ac48ddcac6d79
 DIST dropbox-lnx.x86_64-2.8.4.tar.gz 24840576 SHA256 0a6e8558ed3c8dc84f8d8ded531fa12a4237169c40f54d8ea4d93967f28e0abe SHA512 253d97653c72c383cc551a97f66cae2bbbdb9ced87de8fab13d66730b86e6a58402963256a0ed55bf41e52d3427005bce0452ae8bb8f1a3fb53fed2d62143fba WHIRLPOOL e8f99d58c5ac9c544e333173661ec9b7b30472dacb3d06b2f798d658099cad8f41b368d87b939cefa6a36d72c1b289a59612961a00009bd55d20e8e75c2893a3
 EBUILD dropbox-2.10.2.ebuild 2662 SHA256 419df1c45428224b28d69823d086b03db515512cdfd9143aacb63a2c72637286 SHA512 a56b8a41003dbda0cd5938ade70ad43efba26a63c224780d50427f519b9249579466326112af0a6d2acd6b095cee920e344cc9c95e904b3712e8adc186ec0dc6 WHIRLPOOL 7fda3e649219694d10cb140ad47db9db38965f48160e90612d44f3d7774439b6652c7920b527abfdda9dbea420dbf9db455778d37c61b20f0878c1548ce01938
+EBUILD dropbox-2.10.41.ebuild 2665 SHA256 421f0fe240d546c65181d073117195ff480d51a94dba4c1288d2c34ba00e2d32 SHA512 bb6b5fe9f641c8dcf897e0eaba322efc8e5067eab1ba7d31107264fb01c341c52f1d528e516ae5b8b9fd00c8d072ab73348c91b99f208b8f850ef09328092d48 WHIRLPOOL 5ff6c1d5de7edeba349ad7050cdeec2e8548332be8001abafc117bb9b944f8547e4f6b2bcd87e7cd2fb3d9180cf00aa80615f93999133289c8362088846ff7c3
 EBUILD dropbox-2.4.10.ebuild 2473 SHA256 d641446d592d82af2f79454a1e2df1027aa1524fc2fe44cd0bc250e996d15a5b SHA512 401f61c38434be6f36432aa3200f75960a00ab3e033a4350389e6a9a18877221e2db4db03126b3c174f4cfd44223c8d317ff009634b97ebede1b0c708606dc87 WHIRLPOOL 24ec5b6c5f0d2bf7d93ab5bfda4175fed87dcfc70e3d09a6791551a767892e784035fdc2beb5ede7e0d8761ece008c37a41b9f888c8d4f994be5320bffed23e8
 EBUILD dropbox-2.6.33.ebuild 2620 SHA256 bce4c218b7de7f09549bef611d7e4b54141793177e62d40b985ecfbec071cf6e SHA512 9b31bcca685631a3f482f5f0c6cf03176e6d92c5ec2c1fff15bb94bc6bee6a85313db2352ce71f2a35a3df3bffd85c6dc95260b3e95ac608e3e8cc80a40933cc WHIRLPOOL 5d0023dca06c5706667faeb89dfa62aaabdf63aaab10902f4085186005897d0d0b73706e039c34893cd90eda652ed21a8aa6fadb82dd7d1644fa571df8b0ea74
 EBUILD dropbox-2.8.4.ebuild 2616 SHA256 3293d06e7157f74fd87ebf28d03897cd78ead976f73c04ef5a1a578c7e3b1106 SHA512 5ae546c2c7572ccab38108e0716ae32eaad4f69189bf60ea027f688939a7171b34ff05353f57183abc25bebae68b260cdc3894bdf97ee305a5f577438d2c7844 WHIRLPOOL 6c5de183cdbcbe0ffe095dda72f1762f9d19c062ef9b2903d3ecf5e2e276437622306bcaa1d401ac1bbcbde75a8e0feb2a5459a85727f357757b75dc77b096f6
-MISC ChangeLog 9171 SHA256 2ce895ac693451410dd6b867e43117fae01b14a337620964a0e1c85a6e03bf9d SHA512 a2d675a32b03349e0079d0b11cce5bc9bc17d7c1a3884f60a293d32cddb7046f28b5289a250eb59360192df31bf52627ff0e4c1d0a5ae10990f95faeee608ea5 WHIRLPOOL 5a3ee8503ff69b0349305ba2dc70c48f434aa0d4364674e816bc10ef79fb4b381241715108abb557647cb37114f711072be81608d6868dd6d1609f2c8dc20973
+MISC ChangeLog 9343 SHA256 9aca906c23c2e41e7f32f63135c5ef6473b5417155d44f4798b4e230769035c1 SHA512 893ef659409e11528ff98fe3233501bdc34be0d7d2dfc162cfab40ac084a88b5dfd1670c04a27a0dfcdd6a2c614f697b7e3adaa09515f2c8d51c23f2fd4bbcde WHIRLPOOL 1a4b437559df68ee976c8e7d3a7d50d400b308e9894519d74d7bb2bcb7c3ee37d6b877c9d9182381b7fb64c04818f8e4cd232552c5fc94d99231bcac0787bb62
 MISC metadata.xml 293 SHA256 8080bd70880d4e0c836cd4c517e65cdf6216c286317ed50a8eeab4162e34ff5c SHA512 393fa16e2d4b86b96b941f64cd143b23bbcd25708df7105a4cbb8d3b88599119e7403ea7acc9a21af3d6e9df36ffbac7921ac8bac2aff240361a7c885382f180 WHIRLPOOL 7f472367e05683054f2219c10a552b3ee6dd583206253cb3ca96b12f3c9ab5fdb944500d8dbe939123c365355e4aa1e2175f4a4b31071b9d7d624de36ce70ce3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQETtYACgkQCaWpQKGI+9S81ACggi9cmkWasE6ZgUew8EyT+ySL
-mcIAni2hEtjjdG7zl28+KrJtS+6sMxy3
-=bYxD
+iQIcBAEBCAAGBQJUQcvXAAoJEDYO1FT4VRUURIwQAI7ee4QfwxU93RK72zoKmMlG
+a5xapUb3r5eV4J83Ucg/VR7/HejuTuDyKZyxbsCsXXIK50DNR2rCWOHN3S7m2EJe
+vXGaiFTrei0W+4zI5RzKDiIxLqWtkUqFs2OWb5mtwVsJsNZYaHTqtn/tg/wZMN52
+RJ7VIkSF2+vnQ9Yb6FBDrHa4Qqr92vivrpN7cQ7I0ekcDCOjV07pdjjK22xIZmWC
+yeASLK4bEZ1VJ69rvx2dOAuOBb9dazrXUP/JSPkWe4gvMxgoaAbM1zfge08JfmsX
+b3l+LhqU7ahEG3ntUDHU3s+tcq9YK35mEmnDW5K+As17qN0iJbFl4vr23JrqGfBq
+Lk9A0dvmT17Eyn7a89k5ESRPuHFC0CSG6qQb39z3huX133evuzG4Fpn/jKl333vD
+YtBSzCpi29FdiciJgjuB4kvAlpdgkqXseRaEg7uwUgac19RkX+bRTfOTf0h4Webz
+pQ1Nrl/U4CcOWXCGqjC9WOIw8yC2TDo0lxYJyTcu07aEGolYbzfohaNo6o3MikkZ
+hb4JOpmJsh4f2NQ9J0sQhSousFrd6Os2G0RivLw1fusQgmm2H+QBrRyrItBRg+ah
+2WgMLShQ+xRixwwOhBLLj7c8xnqE1oHNSqr6YQX/f+1gerqR2OxOu9tBUk0zDFiW
+Z8xIiv5c3H0JMlU//GyV
+=lidM
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dropbox/dropbox-2.10.41.ebuild b/net-misc/dropbox/dropbox-2.10.41.ebuild
new file mode 100644
index 000000000000..7fd1a493900a
--- /dev/null
+++ b/net-misc/dropbox/dropbox-2.10.41.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-2.10.41.ebuild,v 1.1 2014/10/18 02:09:07 naota Exp $
+
+EAPI=5
+
+inherit eutils gnome2-utils pax-utils systemd
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="http://dropbox.com/"
+SRC_URI="
+	x86? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
+	amd64? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86_64-${PV}.tar.gz )"
+
+LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled X"
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+DEPEND="librsync-bundled? ( dev-util/patchelf )"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+# USE=X require wxGTK's dependencies. system-library cannot be used due to
+# missing symbol (CtlColorEvent). #443686
+RDEPEND="
+	X? (
+		dev-libs/glib:2
+		media-libs/libpng:1.2
+		sys-libs/zlib
+		virtual/jpeg
+		x11-libs/gtk+:2
+		x11-libs/libSM
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-themes/hicolor-icon-theme
+	)
+	app-arch/bzip2
+	dev-libs/popt
+	!librsync-bundled? ( net-libs/librsync )
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}"
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir .dropbox-dist
+}
+
+src_prepare() {
+	rm -vf libbz2* libpopt.so.0 libpng12.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf *wx* images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' _librsync.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	mv cffi-0.7.2-py2.7-*.egg dropbox_sqlite_ext-0.0-py2.7.egg distribute-0.6.26-py2.7.egg "${T}" || die
+	rm -rf *.egg library.zip || die
+	mv "${T}"/cffi-0.7.2-py2.7-*.egg "${T}"/dropbox_sqlite_ext-0.0-py2.7.egg "${T}"/distribute-0.6.26-py2.7.egg "${S}" || die
+	ln -s dropbox library.zip || die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/dropbox/files/dropbox.initd b/net-misc/dropbox/files/dropbox.initd
index 78a1036da881..c15e368abd07 100644
--- a/net-misc/dropbox/files/dropbox.initd
+++ b/net-misc/dropbox/files/dropbox.initd
@@ -1,9 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/files/dropbox.initd,v 1.4 2014/03/22 07:31:57 naota Exp $
-
-PID_DIR=/var/run/dropbox
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/files/dropbox.initd,v 1.5 2014/10/18 02:09:07 naota Exp $
 
 depend() {
     need localmount net
@@ -15,15 +13,15 @@ start() {
     local tmpionice="${IONICE:+"--ionice "}${IONICE}"
     local started=""
 
-    mkdir -p ${PID_DIR}
-
     ebegin "Starting dropbox"
     for dbuser in ${DROPBOX_USERS}; do
 	local homedir=$(eval echo ~${dbuser})
 	if test -d "${homedir}" && \
+	    echo 0 > ${homedir}/.dropbox/dropbox.pid && \
 	    start-stop-daemon -S -b \
 	    ${tmpnice} ${tmpionice} \
 	    -u ${dbuser} -v \
+	    -p ${homedir}/.dropbox/dropbox.pid \
 	    -e HOME=${homedir} \
 	    -x /opt/bin/dropbox; then
 	    started="${started} ${dbuser}"