version bump #524502; Improve init script

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key F8551514)

3 files changed, 115 insertions, 6 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/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}"