Version bump. #417699. Drop old versions.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

9 files changed, 16 insertions, 351 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/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() {