Add new USE flag librsync-bundled to use bundled librsync library.

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

4 files changed, 103 insertions, 7 deletions

diff --git a/net-misc/dropbox/ChangeLog b/net-misc/dropbox/ChangeLog
index 32f132ec6c43..2b823ef6a1c1 100644
--- a/net-misc/dropbox/ChangeLog
+++ b/net-misc/dropbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dropbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/ChangeLog,v 1.14 2012/02/20 09:07:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/ChangeLog,v 1.15 2012/02/25 13:28:28 naota Exp $
+
+*dropbox-1.2.51-r1 (25 Feb 2012)
+
+  25 Feb 2012; Naohiro Aota <naota@gentoo.org> +dropbox-1.2.51-r1.ebuild,
+  metadata.xml:
+  Add new USE flag librsync-bundled to use bundled librsync library.
 
   20 Feb 2012; Justin Lecher <jlec@gentoo.org> dropbox-1.2.51.ebuild:
   Add missing deps
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 6ff5b4abd4c2..581d82eeb112 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST dropbox-lnx.x86-1.2.13.tar.gz 15768362 RMD160 13c60ba4c3bcab4f84ed283cb008ee5488e6caef SHA1 2a9e9387ecadb3c355875d49d8bda43aab4f67fe SHA256 c72cf96b89daabe3afc709a95f21e7a41101c9ad58c80ef09af8412fa08afb5d
 DIST dropbox-lnx.x86-1.2.24.tar.gz 15783212 RMD160 a23d00f604ea79eaba1329b6ebdb0777d5b2f68e SHA1 39930070ff0c40ef575af2b812e4994043480516 SHA256 beb28ccede90818035f1ada2a5b861b76ef279b5988a59a855341547db04feea
@@ -16,13 +16,24 @@ EBUILD dropbox-1.2.24-r1.ebuild 1297 RMD160 43e14a9d58bb0e5bda8b70250736c85c6913
 EBUILD dropbox-1.2.24.ebuild 1104 RMD160 f76f5032fbfb60cac081cfcf22c24de5e8f1f6a9 SHA1 71f0650b23b44a7baf4d3f5dd3c6b2f7349a25dd SHA256 ee4ad2ddb00221601dd4536cebfab5becebc09c1582eefada7bb71cea70136b6
 EBUILD dropbox-1.2.48-r1.ebuild 1389 RMD160 0941bba51e2e1f2b9d7c0b6081782974685be151 SHA1 1c4cb08f5c4fc1fe050b21822e67e96893fdcabd SHA256 eb1a6b9a893d227181d848ea6054d566bde7519cf8c10a0cfebcff55bfa8e285
 EBUILD dropbox-1.2.48.ebuild 1294 RMD160 3620c8ff08de66fa43be9c1515f3ce81967b0fd3 SHA1 9756eae1c72fc8431a33f305ceeec1b824ccec68 SHA256 6aa3c28447913b5209deb322b614f1ff11466e80659637622865a1afed80a885
+EBUILD dropbox-1.2.51-r1.ebuild 1768 RMD160 f1f80374c7f28820f526330be543e2d999dc6484 SHA1 fd385d8b460eac1fb576ee3254901caa03dad3b6 SHA256 02822e415db5ff782d4b7dada5ebe4fe231a6cd76156643075c25e27644ea67a
 EBUILD dropbox-1.2.51.ebuild 1695 RMD160 29b87591523ed74788018763cb9dedc9f01df32a SHA1 c8247352d5db7a515d4a9577eb400a389da98c19 SHA256 8e60da58534b4d9c795b1d45f0817684551e9d5ecde8544496edf7094877bfc5
-MISC ChangeLog 2373 RMD160 1e29c1448183bd657f49195eb92a673281f649f3 SHA1 0f6e00b1bef4d7aa2f8bace936b7df88c4307f59 SHA256 731bb1759e3ba2fdb59ac065764b27a10f90dd5bc39dda535a2b5f91a91ff714
-MISC metadata.xml 202 RMD160 bb6dfca1294b7a3796e361c3f69f186275ee5f32 SHA1 c12cef549a1dfea6b77e5580146e209a5404da43 SHA256 36dd3867461c37202f288f649ddac9571acba7bbee47e1ab46a5b72074e986ab
+MISC ChangeLog 2568 RMD160 dabeccdba6e13683e9409d403ff1c7fca9bc8f84 SHA1 86d6b7170fbbc00bae10675c3b5428d7b97bb09a SHA256 92227dd169fd48e6b2fb520b983863f2fdd31c5aed102705e0fa7ba5fe9cf89e
+MISC metadata.xml 285 RMD160 ae13065102cceb3e13deeb607af320d262f10e20 SHA1 bc182f824258936d978646ad002659855113294b SHA256 9aea162d0e73c42a22183dac59a6e57f5e695bc4020d41377aedd731a1a4ad5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk9CDVgACgkQgAnW8HDreRaw9ACghMXxiSTJwJjlXFBs9tR/JJqV
-KLUAoIQOjQ9cIfP0kukDd8eLwyNRWp6v
-=AcKw
+iQIcBAEBCAAGBQJPSOIBAAoJEDYO1FT4VRUUyxkP/3XWRgvu6Nytrxv1Yk/I//Ne
+segHJ4t/m7N4u8BEVoON/NwpAB8acnXWwvvWqbTydgpiJLR95pdDFbdK6I4IuhM/
+Pv+OuyQI6hTRtmXDSL4YpR/IrN1pzDlVeFh8CTYLqq+r8gDh43HQnrHWnT3Asym9
+F7Em2VKJLfpOFpr9lsLwx0JyO5GCtcqFyU1mP2IyEgO3Y5MqTagjgh06J5y+vfLY
+5yVqKJDOtkqLiykyj++upIVOhPpZL7mICJQnSOhDPzk9x+kYObDLBc/BVoZmRtJP
+orZK8DcEA4bVq9ICa1TB0611ZvApvbn3rVFd9ghtwUhO9DnJY8UVMu6eaT38QD26
+AgeF8goG1plucryJzBzT1IzTaP4W8Cm0bR60ShkWCCcKaSX7fKDHpOB3zSFyLg17
+O1p4343ifCVJmgsbugCOm+N3eAwrodQiAynt58g+OSRcnqISnc4nlTSmTlCJKOUm
+aAbsCg/m26JdsEfpptgeOv4qNa7MdhK3ukV6k+NzhrBONbkjqC1Zcvd6eima1Irj
+i+pYm8f5OWOJ9E2YqxpOcrvka26MT6osKi704IY9MIbEbRlu9m7W8qFK9iJ+yfTP
+MBMBzJX1+D3apeO3noxvnd1BvUhLHIqQ4YAz4XhTS7h2gnLTRb8jFgbvHOsdebw5
+ANvf7oZQM+19YOHq8ngl
+=1qlz
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dropbox/dropbox-1.2.51-r1.ebuild b/net-misc/dropbox/dropbox-1.2.51-r1.ebuild
new file mode 100644
index 000000000000..3a04d4c1510e
--- /dev/null
+++ b/net-misc/dropbox/dropbox-1.2.51-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.2.51-r1.ebuild,v 1.1 2012/02/25 13:28:28 naota Exp $
+
+EAPI="4"
+
+inherit gnome2-utils pax-utils
+
+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="CCPL-Attribution-NoDerivs-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="librsync-bundled"
+RESTRICT="mirror strip"
+
+QA_DT_HASH="opt/${PN}/.*"
+QA_EXECSTACK_x86="opt/dropbox/_ctypes.so"
+QA_EXECSTACK_amd64="opt/dropbox/_ctypes.so"
+
+DEPEND=""
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/popt
+	dev-libs/openssl:0.9.8
+	media-libs/libpng:1.2
+	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}"/src || die
+	cd "${S}"/src
+	rm -vf libstdc++.so.6 libz* libssl* libbz2* libpopt.so.0 libcrypto.so.0.9.8 libpng12.so.0 || die
+	if ! use librsync-bundled; then
+		rm -vf librsync.so.1 || die
+	fi
+	pax-mark cm "${S}/src/dropbox"
+	cd "${WORKDIR}"
+}
+
+src_install() {
+	cd src || die
+	dodoc README ACKNOWLEDGEMENTS
+	rm README ACKNOWLEDGEMENTS || die
+
+	local targetdir="/opt/dropbox"
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}/dropbox"
+	fperms a+x "${targetdir}/dropboxd"
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	insinto /usr/share
+	doins -r icons
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/dropbox/metadata.xml b/net-misc/dropbox/metadata.xml
index 8a0d67b33f2b..f3634bcb10b3 100644
--- a/net-misc/dropbox/metadata.xml
+++ b/net-misc/dropbox/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer>
 		<email>naota@gentoo.org</email>
 	</maintainer>
+	<use>
+		<flag name="librsync-bundled">Use bundled librsync library</flag>
+	</use>
 </pkgmetadata>