gnome-extra/nautilus-dropbox: Updated ebuild for bug 237433

svn path=/sunrise/; revision=11584

3 files changed, 21 insertions, 28 deletions

diff --git a/gnome-extra/nautilus-dropbox/ChangeLog b/gnome-extra/nautilus-dropbox/ChangeLog
index bcc322fd0..f82322962 100644
--- a/gnome-extra/nautilus-dropbox/ChangeLog
+++ b/gnome-extra/nautilus-dropbox/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Dec 2010; Marc Schifbauer (mschiff) <marc@schiffbauer.net>
+  -nautilus-dropbox-0.6.1-r1.ebuild, +nautilus-dropbox-0.6.7.ebuild:
+  Updated ebuild for bug 237433
+
   25 Oct 2010; Sebastian Pipping <sping@gentoo.org>
   nautilus-dropbox-0.6.1-r1.ebuild:
   Update download URI
diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index 488607f7a..7878bdff4 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1,4 +1,4 @@
-DIST nautilus-dropbox-0.6.1.tar.bz2 306545 RMD160 52638938e453dc3b7e13d52fda41c964d6338892 SHA1 c22c91a368fc03daac44db95d43fb9aa6ff0a92a SHA256 104520fc0a16c733cfd1e9a4ffa0ab1f4ad9a2a5dbf15357011ea3b9c331e36f
-EBUILD nautilus-dropbox-0.6.1-r1.ebuild 1858 RMD160 43d72ca26e572a20f3788c310021eb22c8feace9 SHA1 e597a512d0f64e246a22e4861f37a71dbd12fc2d SHA256 df53e0b6b55ec84f59e7ccd6563865fcce892042ff0deb70bc2eed5038bbed7b
-MISC ChangeLog 1689 RMD160 7af1f25b783d69d1f76613b377a0677d0bcd37ca SHA1 7b1fdf3590be6ceb9d7c97948beafc213328da6c SHA256 8cf06ca32f74f65f6ecfaf4b9b27319762469d18bcb9d1110a5383347f5e9497
+DIST nautilus-dropbox-0.6.7.tar.bz2 323995 RMD160 d1aee276a39ab3e7a27b1e856d2f20c046ffd50c SHA1 5f1aecfc48fc0bbf693167bec104ac7fbdeebbdc SHA256 8528bfbf846f496629246c862f8512795a3a457dd980c0e97fd2585f4e004aba
+EBUILD nautilus-dropbox-0.6.7.ebuild 1444 RMD160 d8668f3683c7fa7c79765d51de5dab54849b2a0e SHA1 f98113a7f0ecf18b93add4148f93a74cd9179a8e SHA256 e9a067dd100e290d05ae9ae92f23191893a0394cfe4fc44c0b2d70e43644d49a
+MISC ChangeLog 1855 RMD160 137e0a95ab410c6d7f1bcc26ac80960ba7d9564a SHA1 b80ce7d091acad9bac2b2dca5b76c9f38bcff299 SHA256 c895c3372365c51ed5bebd1907f7a73898542a1deee330601aeeb2cd36840a1e
 MISC metadata.xml 231 RMD160 6aebfea93d789d2b96ea6d8259dc842dd1fdacd3 SHA1 e10a04c4c18a66af326abc1f40c61b28cc610fae SHA256 48054ea190d00518c1e035fc6663b2368854cdea5ff69a94830e4f9a38260987
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.1-r1.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7.ebuild
index 355dce049..68eb932f2 100644
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.1-r1.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7.ebuild
@@ -2,65 +2,54 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
-
-inherit eutils libtool linux-info python gnome2
+EAPI="3"
+inherit eutils linux-info gnome2
 
 DESCRIPTION="Store, Sync and Share Files Online"
-HOMEPAGE="http://www.getdropbox.com/"
+HOMEPAGE="http://www.dropbox.com/"
 SRC_URI="http://www.dropbox.com/download?dl=packages/${P}.tar.bz2"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="debug"
 
 RDEPEND="gnome-base/nautilus
+	dev-libs/glib:2
 	dev-python/pygtk
-	dev-python/docutils
 	net-misc/wget
+	x11-libs/gtk+:2
 	x11-libs/libnotify
 	x11-libs/libXinerama"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	dev-python/docutils"
 
 DOCS="AUTHORS ChangeLog NEWS README"
+G2CONF="${G2CONF} $(use_enable debug) --disable-static"
 
 CONFIG_CHECK="INOTIFY_USER"
 
 pkg_setup () {
-	linux-info_pkg_setup
-
-	# create the group for the daemon, if necessary
-	# truthfully this should be run for any dropbox plugin
+	check_extra_config
 	enewgroup dropbox
 }
 
-src_configure () {
-	econf --disable-static
-}
-
 src_install () {
-	emake DESTDIR="${D}" install || die
+	gnome2_src_install
 
 	local extensiondir="$(pkg-config --variable=extensiondir libnautilus-extension)"
 	[ -z ${extensiondir} ] && die "pkg-config unable to get nautilus extensions dir"
 
 	find "${D}" -name '*.la' -exec rm -f {} + || die
+
+	fowners root:dropbox "${extensiondir}"/libnautilus-dropbox.so
+	fperms o-rwx "${extensiondir}"/libnautilus-dropbox.so
 }
 
 pkg_postinst () {
 	gnome2_pkg_postinst
 
-	# Allow only for users in the dropbox group
-	# see http://forums.getdropbox.com/topic.php?id=3329&replies=5#post-22898
-	local extensiondir="$(pkg-config --variable=extensiondir libnautilus-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get nautilus extensions dir"
-
-	chown root:dropbox "${ROOT}${extensiondir}"/lib${PN}.so || die "chown failed"
-	chmod o-rwx "${ROOT}${extensiondir}"/lib${PN}.so || die "chmod failed"
-
 	elog "Add any users who wish to have access to the dropbox nautilus"
 	elog "plugin to the group 'dropbox'."
 	elog