Fix bug #529344 (add selinux-dropbox dependency when USE="selinux")

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

diff --git a/net-misc/dropbox/ChangeLog b/net-misc/dropbox/ChangeLog
index 9541854a4d655534b81372a6fa30107445535d09..745658e5a27493ec98877aa5985ce74ff1776ed7 100644 (file)
--- a/net-misc/dropbox/ChangeLog
+++ b/net-misc/dropbox/ChangeLog
@@ -1,6 +1,11 @@
 # 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.60 2014/10/18 02:09:07 naota Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/ChangeLog,v 1.61 2015/02/16 17:17:44 swift Exp $
+
+*dropbox-2.10.41-r1 (16 Feb 2015)
+
+  16 Feb 2015; Sven Vermeulen <swift@gentoo.org> +dropbox-2.10.41-r1.ebuild:
+  Fix bug #529344 (add selinux-dropbox dependency when USE="selinux")
 
 *dropbox-2.10.41 (18 Oct 2014)
 

diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 46e2842f17def428d4236aac0cbde257961a05a6..6a4f325379a3e0fc306ccbc5d55ba3a26951de8a 100644 (file)
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX dropbox.conf 322 SHA256 b45db3c9676cfd8bf568ca5ce86a4e1a6b95cd604edeba2b3e2b3fb604e19ab4 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132 WHIRLPOOL 2093d21df44308b478654457bf753913b56cc64ff76dd037720dcf15ba061307fc65175cf32c3ae54a16dba32614b1f123aff3c69bad599651ed67be0685f791
 AUX dropbox.initd 1690 SHA256 dbac078542afef637917e53ec7602d7fe2028b39ed747612c490b998b80d2234 SHA512 dfeeefa7623a8861f743c2640d19f2ced5e6e501ad9c133929c66ef8ddb5fc98e0420ec6bfa6af2a4853581e581eae593d039e313aca1b977500601e1d3197c1 WHIRLPOOL d7bb2b891544448a07e7cdfaad517573393f65d6ff1275a42370123ad6d44a81d2b651213d451a3df877bbe564b5d74a4634c4ea5aaf53e5bd91b1c648f15b29
 AUX dropbox_at.service 220 SHA256 8a02c67f98781a781741ab54d5c22ff904871db84e5549bc2e4864b8d5b9cee8 SHA512 cb33bf6aa290be0ba1afce2f5e525489f8bf4144daf09619b15292968657c74ee17678ed1aba6aa9d2dbd068dc394a10896e7dbd0eaf74d74a928368394bc933 WHIRLPOOL eb318ca1804cd023ca3a78eb923ce5be4dce1166187956fc190af23ae9676bcad61e6180869778e2bea53c572d7e53c0e3f9402874d57791b9e728ad9dd3cc4d
@@ -12,9 +15,27 @@ DIST dropbox-lnx.x86_64-2.4.10.tar.gz 22867842 SHA256 1bd9cff2a4c3a03cd900cf8f74
 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-r1.ebuild 2717 SHA256 18a43a5ccedd29d0d5855f2b555280b500dd070dc8c7bc9e3232df62fff1ca78 SHA512 0a457f7e78dd62b82c4a71a7f0fbe77cabac6ab5e2def37eee085009b1b39f445e8c68a1c0f8c70d6f21a6b105b91f3ab47f9dad2108aea5c0dc8151d30ebcdd WHIRLPOOL 3f06fed3231c28559044617d1f78366f0b747d281da5cf5bb9d9e7e5e47264abb02c97848f933351f4e20c07f9a4b0c6e5fc5966c266d2b9026a3ae407fe7b1c
 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 9343 SHA256 9aca906c23c2e41e7f32f63135c5ef6473b5417155d44f4798b4e230769035c1 SHA512 893ef659409e11528ff98fe3233501bdc34be0d7d2dfc162cfab40ac084a88b5dfd1670c04a27a0dfcdd6a2c614f697b7e3adaa09515f2c8d51c23f2fd4bbcde WHIRLPOOL 1a4b437559df68ee976c8e7d3a7d50d400b308e9894519d74d7bb2bcb7c3ee37d6b877c9d9182381b7fb64c04818f8e4cd232552c5fc94d99231bcac0787bb62
+MISC ChangeLog 9526 SHA256 2923794adaedc9acea73a7d5e0a9062efd0fd64cfbfec04f5a2060861ff9bf28 SHA512 ccd9299c5eeadeda2cee50824bb5613bc2495bb9dc441fbbf509972b5ddb07b76267824ada702984836a2c093d1bfa20205bdca99cb0bf2e40bb0b74f309871b WHIRLPOOL 05f82b94efde28274fff860b71784123655770c9031c725a179eda08dd5e712fedb26f4e833fd0fa57b8f87edc242ff50dc850d2b155716f2517c260885cdb4f
 MISC metadata.xml 293 SHA256 8080bd70880d4e0c836cd4c517e65cdf6216c286317ed50a8eeab4162e34ff5c SHA512 393fa16e2d4b86b96b941f64cd143b23bbcd25708df7105a4cbb8d3b88599119e7403ea7acc9a21af3d6e9df36ffbac7921ac8bac2aff240361a7c885382f180 WHIRLPOOL 7f472367e05683054f2219c10a552b3ee6dd583206253cb3ca96b12f3c9ab5fdb944500d8dbe939123c365355e4aa1e2175f4a4b31071b9d7d624de36ce70ce3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQIcBAEBCAAGBQJU4iXSAAoJEC7dUkA7aK9HWNEP/3xXXbl2WvcNq+OJce/kfSW/
+vqchj17SzYZs3vO6U506lJ1T9WAsPIXA2VwBWhAK6Ddo3HBqSnqaWqRHnFQpnpdC
+PozW3Pla7HbNtVKRuMWJeaW390ENoa+m7A0cHyEST6AgEhhQJgGPnevemIYICdL1
+rKuU9JlRSwYOcxFkcubMciSOCdOEsCKS7qzLOaDAMoOOjqOlUdzOFcfIyKuqzxuB
+b4E/Ny47q9WSTlsFp2m9z+P2rBtcUgC2iJvMyRM6IEviXLJz7NkXkozCIEH6/+9e
+IEMd8KATVpUZateergro62NJATUAeHLOfQpJkPRKdMFXO6NMYd5aGJAZHiwvMAaI
+OifsSBsNOtqISqtRV+fxvoh+VIINVyQTStkegjEI6Q1ZsgVe5DcfCYXwM0l4Y1WP
+Ku/SkM9fiXh18GZG/TLon0P/C5npgE10t+35NZWn61dz4FnOwz+8m9mYMKYKZqMF
+FIVN4jBnCRFsNckfwhL00M5sQ3clsUrWmteXL0Jyw50+v0Vdx9FKuCWtBI98+8Mb
+Y4Q8+VV1gjrgxdgbG68xmBzcZcwCWmK9w8T6ZILn+S0nXzJfc1EB88dFkyzhMzkP
+yBcaFzuLYx9yqO+Sp349tKgwh/nbFKOlxs+0j/274nu13rXvCKBquuHbcGSU1d5t
+IWbKNAcbVv2ZknRR9iqZ
+=1cq4
+-----END PGP SIGNATURE-----

diff --git a/net-misc/dropbox/dropbox-2.10.41-r1.ebuild b/net-misc/dropbox/dropbox-2.10.41-r1.ebuild
new file mode 100644 (file)
index 0000000..6173d21
--- /dev/null
+++ b/net-misc/dropbox/dropbox-2.10.41-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 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-r1.ebuild,v 1.1 2015/02/16 17:17:44 swift 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 selinux 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
+       selinux? ( sec-policy/selinux-dropbox )
+"
+
+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
+}