Version bump. #417699. Drop old versions.

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

10 files changed, 33 insertions, 377 deletions

diff --git a/net-misc/dropbox/ChangeLog b/net-misc/dropbox/ChangeLog
index 0495f5f823c3..ec1bfee8027c 100644
--- a/net-misc/dropbox/ChangeLog
+++ b/net-misc/dropbox/ChangeLog
@@ -1,6 +1,14 @@
 # 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.20 2012/05/16 12:46:14 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/ChangeLog,v 1.21 2012/05/29 08:33:02 naota Exp $
+
+*dropbox-1.4.7 (29 May 2012)
+
+  29 May 2012; Naohiro Aota <naota@gentoo.org> +dropbox-1.4.7.ebuild,
+  -dropbox-1.2.13-r1.ebuild, -dropbox-1.2.13-r2.ebuild, -dropbox-1.2.13.ebuild,
+  -dropbox-1.2.24-r1.ebuild, -dropbox-1.2.24.ebuild, -dropbox-1.2.48.ebuild,
+  -dropbox-1.2.51-r1.ebuild, -dropbox-1.2.51.ebuild:
+  Version bump. #417699. Drop old versions.
 
 *dropbox-1.4.3 (16 May 2012)
 
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 10ae6e8ce4fb..8c9e748780ac 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -3,43 +3,34 @@ Hash: SHA256
 
 AUX dropbox.conf 322 RMD160 30a58ee1863f493cc49d69fa25aa603b35a0ef66 SHA1 d795f2744b445dff9e56e75dfb76bf9cca398865 SHA256 b45db3c9676cfd8bf568ca5ce86a4e1a6b95cd604edeba2b3e2b3fb604e19ab4
 AUX dropbox.initd 1603 RMD160 5243338448765a0c1b8af1997253ec4d10198cdf SHA1 5dd3fb1f0a1b65e2ada2050fa7f353d5fc2a0278 SHA256 364ef14835b8ad888d9257ccd4fef46926beea67a4793a56af206f62e10c239f
-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
 DIST dropbox-lnx.x86-1.2.48.tar.gz 15790350 RMD160 f3d9fb70c2ff3a616d1c7269a1a2b55599c23bd7 SHA1 4d933809ce20614bee23cc307c356e759a7face3 SHA256 ee21f84729a85b0d45b8e82edb1e50918c906a51d373e920c1c3053fb5ebc267
 DIST dropbox-lnx.x86-1.2.51.tar.gz 15794517 RMD160 b67eec46838f64d2249fb969c2c117044475a73f SHA1 63ae4d8806e4dd3951419c6a287c5d3a49562ff6 SHA256 ccfa42c19b6ceaefae9be210096fe58755179ac51f318cfa06d1e7bd5aebbb26
 DIST dropbox-lnx.x86-1.4.3.tar.gz 17738364 RMD160 b8667e78b0f7b610f6ae12ced0ebd2b8cd50142c SHA1 389936a70ed2ef9495f929bb2b47ab23011baffa SHA256 62fb5d5f892c114e6988e3cd6c3282174e6853dfff6e06eea0fa52a9b3fe1269
-DIST dropbox-lnx.x86_64-1.2.13.tar.gz 16554330 RMD160 952178de63d46dfc031626411d7bd31230bf751c SHA1 b69dfed32f7b4919f79a5b8b5b246f9f037097df SHA256 f2dd34711415ed8c6b867dd52c6b993768a947fe0a6d80e25f87f383c5adcb15
-DIST dropbox-lnx.x86_64-1.2.24.tar.gz 16564716 RMD160 ae35635ff62886d1447445ca83fe7ffa16db84e7 SHA1 174b0ee37411112b97b84d49e81c62d9e8eb77f2 SHA256 fe13c6b5bc5fdb6ab001f54a275951d43d0b8b78072a9685177a14c2f11e7984
+DIST dropbox-lnx.x86-1.4.7.tar.gz 17765299 RMD160 0bb8706cce1cef9c592d174088959ee8ad08c862 SHA1 a9d8f174ad45344a543553834f30991e38a8b791 SHA256 7162a3f66b5c362a4a01f50c04bbacb69d1de0f55a8c69ce381b32dafb731f1b
 DIST dropbox-lnx.x86_64-1.2.48.tar.gz 16574521 RMD160 f2e25966e6b1441012120251cbc8807d1769e142 SHA1 f56192728f2135afe4d74b859917aeee2640ceef SHA256 406ec2b10bf1c19572a997748358f8ade11d0c534ec90c9d7464a015b582a11f
 DIST dropbox-lnx.x86_64-1.2.51.tar.gz 16578440 RMD160 3bd136fb4ad46c2f546ab799aa1c548734262488 SHA1 50aed7eaa2d948a04871d937df8a08001ba38c79 SHA256 692862a685f4ef0424ea43eb3025244db3ae8078a70ad82a7f17d6de8febab00
 DIST dropbox-lnx.x86_64-1.4.3.tar.gz 18546137 RMD160 09e30939462a04c231d23805932c9ddb10e111e5 SHA1 59340530737b3be113c19974c9a6f8ce21a3d61b SHA256 7b93436027d961eb7ec097f1695a1361b3262b45d90ea445a3170a0faea878ba
-EBUILD dropbox-1.2.13-r1.ebuild 1077 RMD160 905d55c684e2058d75bc96de41b61d45aa5e11c0 SHA1 386b70c5c6a12244a96f30f9bdd0d843f4c8c36b SHA256 a196748422f01f831de3591fe08ecea1b11f95221c8ccb8444a4d49ab5e985c3
-EBUILD dropbox-1.2.13-r2.ebuild 1107 RMD160 ee77b68795a598d116059bda7801f1c55fed009c SHA1 6701e8d6696ee101fe2e0087639533292a4209db SHA256 b9685227336ffb9f2c2ec9d823fcb8c9294b17fb7440362d5c38fbb3c456856d
-EBUILD dropbox-1.2.13.ebuild 1119 RMD160 d2846d74f13eed1c021976d71f80292af8d47677 SHA1 bc9673ae7fc186631f6e0ee66325182355c1df69 SHA256 e712626bae279de9ef414db6a2cfc569efa60d6ceff626cdbe05ef53faa1e70a
-EBUILD dropbox-1.2.24-r1.ebuild 1297 RMD160 43e14a9d58bb0e5bda8b70250736c85c69131127 SHA1 bfca50cf79b3bb76971e195a5804eea238f8d80a SHA256 8a1ef8ef41c9b1d00fc13d708c2c67693b1ecfb56cb21012f02d0e59f2adbbbb
-EBUILD dropbox-1.2.24.ebuild 1104 RMD160 f76f5032fbfb60cac081cfcf22c24de5e8f1f6a9 SHA1 71f0650b23b44a7baf4d3f5dd3c6b2f7349a25dd SHA256 ee4ad2ddb00221601dd4536cebfab5becebc09c1582eefada7bb71cea70136b6
+DIST dropbox-lnx.x86_64-1.4.7.tar.gz 18570864 RMD160 93a7e448ddcda3f9934d68884556d7a2a922614f SHA1 3b62b55e4fdd8245ad41914a2b2795f8b3ca1753 SHA256 a9ca298ec869cabe1232e42c2ab7d5f84935f75602f6464b7926a7e5b2ca84c2
 EBUILD dropbox-1.2.48-r1.ebuild 1392 RMD160 dc2b4be8658c8fc02b8986ad255eabf7704511e2 SHA1 7c6017250abbccef1e510b6f7c380e8c4685f9c8 SHA256 c7c7ba7c97802390a2f6d5fe30dd6c67612f11df8caba9b6a26373003a504c1d
-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-r2.ebuild 1798 RMD160 c200cd383a4d1e42a49b5edc6fb4250cfdde91dd SHA1 14bb0dfb202d139375677ffcca4ba00b8dc655fb SHA256 fe90a3ac650e197a1e4d598372b370f8be71a963ebcace7b490764a2605fe4af
-EBUILD dropbox-1.2.51.ebuild 1695 RMD160 29b87591523ed74788018763cb9dedc9f01df32a SHA1 c8247352d5db7a515d4a9577eb400a389da98c19 SHA256 8e60da58534b4d9c795b1d45f0817684551e9d5ecde8544496edf7094877bfc5
 EBUILD dropbox-1.4.3.ebuild 1909 RMD160 8c54adc4ba890be8faed25fbbc01ba1399a8339b SHA1 c7fcc1ef56bfdbbce1094b2b74b572a0c0e9d739 SHA256 84d5e27bc3e84e4decf88180072d211631276737b50640a35a356732210ea2a7
-MISC ChangeLog 3383 RMD160 850f7fddd708cbee3146f41538b5f4a5255d8fd2 SHA1 619ed4977365e16e814ff1743aa1f05efdacb9e0 SHA256 30206cc5e76a66bc6e533a7a32c0b411dc86d25e90b0f8aa3627f2ae3048f71b
+EBUILD dropbox-1.4.7.ebuild 1909 RMD160 e80ef66bef53b15cbb877ed9acd2ff400818a6de SHA1 7ba49301740a9dffa79b9e7f9f9581a23d945abd SHA256 69d6ba6612407659456ab071b94343d27ea5bc2b66babbee7eb0381076f6507c
+MISC ChangeLog 3738 RMD160 0ef88ba661f59cda9644b6a137a6871797c693ae SHA1 e8bb4c47ca946d10dedf5ea4a1fa2d39bb923de5 SHA256 6b2075b4c198d3b83d7ce31d7841cac19d3ee05392a8955e4a582289c1bb1ee6
 MISC metadata.xml 285 RMD160 ae13065102cceb3e13deeb607af320d262f10e20 SHA1 bc182f824258936d978646ad002659855113294b SHA256 9aea162d0e73c42a22183dac59a6e57f5e695bc4020d41377aedd731a1a4ad5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPs6GGAAoJEDYO1FT4VRUULeQP/1ilNSVb1RMZVdRZkDdZTJkU
-1Wcl5ouJDWvZvkM7tUhJsWnSOVx0twgpKEf7Bgr+jsUKb3RGaOrEa8iETbJZjAh6
-PI6Afz/HdglN7Et3pEzWoTBXrKJ1Lzog9+xGzWUH+cDFv4G8yhUbsemP4xB9DuCz
-7uBRpQNlqhcdV0Ip3v+BXYEDbNonrIayloofF955MnEltKg8QZvC8eh78k37JeEz
-oO8PzEYOu9ZI9If54bs72GB9eXunCVinUcurAPahgt3tckbxa3HIbmJrvKRHqdnW
-P+ScVFPXvWzX+K1NEKZzW6rluR6wGwlOQw6ARNfSC3Wsl99pLqsb075LVlTzWS9F
-NBZmiFkre76TgElCO1fPbqIAn2ek6/OSh7jXTv4pkqf63uEPG6Sy0I3LGD+mSgm1
-ptoxHzx7WA2/Pc61GuDOSBAzysKzDywm6EdYLmydzrExjy2bPAwmjoiFN0g6RjlX
-NVX/0VfVfQjpt9fPeTIQwoT3FmwexIC7ycXxLaTc897INxibZSNLmyOx9Uj+Xxdb
-INXmp6TMYSzpch/y2aygS2Mn3qnljGr2bTmgATYEvHevhuCwIAgdGLR47TAjtE9d
-Vg2XxiC0ODvT0y/vA4pgI6e0Z2Eou+mRmtyJzMkbckSw4JyLOQIihZoph22IOlxU
-/avVVyu4fzDxIafK9nqg
-=vwSz
+iQIcBAEBCAAGBQJPxIm8AAoJEDYO1FT4VRUUtxkP/2xmN9UFR5aJROCDjU4F47OI
+GujO8sb/0eRlXan/1jo7W6RCp15lsqyh7MrI1tJzHXZsxfQFSGgGXcsTF1WHUm6V
+EL32jwbsKRVxQK9m8kF5jP2P4p1Z15fOmJa9InHvtuSJ/A4Jns4EMGdrU+DCTWk/
+irjpCKmUS4bpZBqO0gekCl1WfQgKltgTO1QMZedd+tTvvRuAoZ8nL02OOJxkusz2
+8hNBky4IYYALl4U7BE5ogi/jZLO0ftX+iGXZW9WKn6UmcDWxYklU/O3t8drndn+j
+gI3CXLGX9WUyMbR6Zk7x2vXi9pqUIyIvS/3KiEbDgJDPDDq7rCXP1c1BZKonDpE+
+IhTrHkIWm6hLbuTYJZD/1yDSc/T+cENf/1XLGSV1rDgQqSkrWhHxgYppT9K6jFCs
+eFqkJmXleleZgk5/ScmEAsushnSYFZSR4KGEdb/xzFMacaWLUTevFf4XzDeh/NsH
+dg4DQq5A5CTzKDDLCGC5cpvf785rGBqXl5JIptgMHIV+w7zpLj6zw8/cWr8rCEYq
+I8fyl6tNr/2G/DRu6e04kSO4Bq2PNAbUrlpdMie/ib5jBlfhlTZT/h1lEIsuoVv0
+k7lu4bLpSHEXFw7kjsMojI+ixALRVi+zOcJmW7OX84RfHXMT8ddhlbe7LSj5ihPP
+HY+eqARGYkBPpUASWWPO
+=FiZr
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dropbox/dropbox-1.2.13-r1.ebuild b/net-misc/dropbox/dropbox-1.2.13-r1.ebuild
deleted file mode 100644
index 4d33bb5c9d5f..000000000000
--- a/net-misc/dropbox/dropbox-1.2.13-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.13-r1.ebuild,v 1.3 2012/02/15 19:20:40 jlec Exp $
-
-EAPI="4"
-
-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=""
-RESTRICT="mirror strip"
-
-QA_DT_HASH="opt/${PN}/.*"
-QA_EXECSTACK_x86="opt/dropbox/_ctypes.so"
-QA_EXECSTACK_amd64="opt/dropbox/_ctypes.so"
-
-DEPEND=""
-RDEPEND="net-misc/wget"
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}/.dropbox-dist" "${S}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-	insinto "${targetdir}"
-	doins -r icons
-	rm -rf icons || die
-	doins -r *
-	fperms a+x "${targetdir}/dropbox"
-	fperms a+x "${targetdir}/dropboxd"
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-}
diff --git a/net-misc/dropbox/dropbox-1.2.13-r2.ebuild b/net-misc/dropbox/dropbox-1.2.13-r2.ebuild
deleted file mode 100644
index 8e964bf15b19..000000000000
--- a/net-misc/dropbox/dropbox-1.2.13-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.13-r2.ebuild,v 1.2 2012/02/15 19:20:40 jlec Exp $
-
-EAPI="4"
-
-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=""
-RESTRICT="mirror strip"
-
-QA_DT_HASH="opt/${PN}/.*"
-QA_EXECSTACK_x86="opt/dropbox/_ctypes.so"
-QA_EXECSTACK_amd64="opt/dropbox/_ctypes.so"
-
-DEPEND=""
-RDEPEND="net-misc/wget"
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}/.dropbox-dist" "${S}" || die
-}
-
-src_install() {
-	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"
-}
diff --git a/net-misc/dropbox/dropbox-1.2.13.ebuild b/net-misc/dropbox/dropbox-1.2.13.ebuild
deleted file mode 100644
index 511bb7fa7705..000000000000
--- a/net-misc/dropbox/dropbox-1.2.13.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.13.ebuild,v 1.2 2012/02/15 19:20:40 jlec Exp $
-
-EAPI='3'
-
-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=""
-RESTRICT="mirror strip"
-
-QA_EXECSTACK_x86="opt/dropbox/_ctypes.so"
-QA_EXECSTACK_amd64="opt/dropbox/_ctypes.so"
-
-DEPEND=""
-RDEPEND="net-misc/wget"
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}/.dropbox-dist" "${S}" || die
-}
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r icons/* || die
-	rm -rf icons || die
-
-	local targetdir="/opt/dropbox"
-	insinto "${targetdir}" || die
-	doins -r * || die
-	fperms a+x "${targetdir}/dropbox" || die
-	fperms a+x "${targetdir}/dropboxd" || die
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" || die
-}
diff --git a/net-misc/dropbox/dropbox-1.2.24-r1.ebuild b/net-misc/dropbox/dropbox-1.2.24-r1.ebuild
deleted file mode 100644
index 376796f8b75b..000000000000
--- a/net-misc/dropbox/dropbox-1.2.24-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.24-r1.ebuild,v 1.2 2012/02/15 19:20:40 jlec Exp $
-
-EAPI="4"
-
-inherit gnome2-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=""
-RESTRICT="mirror strip"
-
-QA_DT_HASH="opt/${PN}/.*"
-QA_EXECSTACK_x86="opt/dropbox/_ctypes.so"
-QA_EXECSTACK_amd64="opt/dropbox/_ctypes.so"
-
-DEPEND=""
-RDEPEND="net-misc/wget"
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}/.dropbox-dist" "${S}" || die
-}
-
-src_install() {
-	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/dropbox-1.2.24.ebuild b/net-misc/dropbox/dropbox-1.2.24.ebuild
deleted file mode 100644
index 278dd31bdbc6..000000000000
--- a/net-misc/dropbox/dropbox-1.2.24.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.24.ebuild,v 1.2 2012/02/15 19:20:40 jlec Exp $
-
-EAPI="4"
-
-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=""
-RESTRICT="mirror strip"
-
-QA_DT_HASH="opt/${PN}/.*"
-QA_EXECSTACK_x86="opt/dropbox/_ctypes.so"
-QA_EXECSTACK_amd64="opt/dropbox/_ctypes.so"
-
-DEPEND=""
-RDEPEND="net-misc/wget"
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}/.dropbox-dist" "${S}" || die
-}
-
-src_install() {
-	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"
-}
diff --git a/net-misc/dropbox/dropbox-1.2.48.ebuild b/net-misc/dropbox/dropbox-1.2.48.ebuild
deleted file mode 100644
index afa736aa6dca..000000000000
--- a/net-misc/dropbox/dropbox-1.2.48.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.48.ebuild,v 1.2 2012/02/15 19:20:40 jlec Exp $
-
-EAPI="4"
-
-inherit gnome2-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=""
-RESTRICT="mirror strip"
-
-QA_DT_HASH="opt/${PN}/.*"
-QA_EXECSTACK_x86="opt/dropbox/_ctypes.so"
-QA_EXECSTACK_amd64="opt/dropbox/_ctypes.so"
-
-DEPEND=""
-RDEPEND="net-misc/wget"
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}/.dropbox-dist" "${S}" || die
-}
-
-src_install() {
-	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/dropbox-1.2.51.ebuild b/net-misc/dropbox/dropbox-1.2.51.ebuild
deleted file mode 100644
index 9b72752b2cf1..000000000000
--- a/net-misc/dropbox/dropbox-1.2.51.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.ebuild,v 1.6 2012/02/20 09:07:27 jlec 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=""
-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 librsync.so.1 libcrypto.so.0.9.8 libpng12.so.0 || die
-	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/dropbox-1.2.51-r1.ebuild b/net-misc/dropbox/dropbox-1.4.7.ebuild
index 3a04d4c1510e..f418e16e9f03 100644
--- a/net-misc/dropbox/dropbox-1.2.51-r1.ebuild
+++ b/net-misc/dropbox/dropbox-1.4.7.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.4.7.ebuild,v 1.1 2012/05/29 08:33:02 naota Exp $
 
 EAPI="4"
 
@@ -14,21 +14,21 @@ SRC_URI="x86? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
 LICENSE="CCPL-Attribution-NoDerivs-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="librsync-bundled"
+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=""
+DEPEND="x11-themes/hicolor-icon-theme"
 # 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
+	!librsync-bundled? ( net-libs/librsync )
 	net-misc/wget
 	>=sys-devel/gcc-4.2.0
 	sys-libs/zlib
@@ -61,6 +61,9 @@ src_install() {
 
 	insinto /usr/share
 	doins -r icons
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
 }
 
 pkg_preinst() {