app-backup/nautilus-dropbox: Version bumped.

5 files changed, 52 insertions, 17 deletions

diff --git a/app-backup/nautilus-dropbox/Manifest b/app-backup/nautilus-dropbox/Manifest
index e098fb7..458d09b 100644
--- a/app-backup/nautilus-dropbox/Manifest
+++ b/app-backup/nautilus-dropbox/Manifest
@@ -1,4 +1,6 @@
-DIST nautilus-dropbox-0.6.1.tar.bz2 306545 RMD160 52638938e453dc3b7e13d52fda41c964d6338892 SHA1 c22c91a368fc03daac44db95d43fb9aa6ff0a92a SHA256 104520fc0a16c733cfd1e9a4ffa0ab1f4ad9a2a5dbf15357011ea3b9c331e36f
+AUX nautilus-dropbox-0.6.2-datadir.patch 785 RMD160 81927d71e604862d9d23cbc498b500e47622c2cc SHA1 e6399cddc112b3db672e08adf18f65f63192d27b SHA256 7943ec2fbac4b40814c54fcb3154895282a1dceebff7a5b4e5e6324a2d11a0bc
 DIST nautilus-dropbox-0.6.2.tar.bz2 320684 RMD160 fc1744d0c53de9a0d96633e82acab61e9f1b35e4 SHA1 335f81f847c3fb4261ae40bed360e27cfc541ec2 SHA256 8d0f47f9e33a4d35132b9e618d692cf9f950d91f79f12b6f0f88d6a38d921f2d
-EBUILD nautilus-dropbox-0.6.1.ebuild 1480 RMD160 6022ba8fd61a17647c381e291711b5e193b17317 SHA1 a7431e6e4c53c5f32dbfd5fa1444f85abaaa4c38 SHA256 ba32db35e188953aa7b6c2e1bc50ec96f235740997e3129b989ae9587ab99c42
-EBUILD nautilus-dropbox-0.6.2.ebuild 1610 RMD160 b9c3f5df7550c8463f9733193e2315ca86be5aef SHA1 24364c7565b46c676aefe491e8a915f8372c7147 SHA256 f3ad080e70969f0fd9f9112b70dd2295e4487f01094631e4b4a28f025a5f675d
+DIST nautilus-dropbox-0.6.7.tar.bz2 323995 RMD160 d1aee276a39ab3e7a27b1e856d2f20c046ffd50c SHA1 5f1aecfc48fc0bbf693167bec104ac7fbdeebbdc SHA256 8528bfbf846f496629246c862f8512795a3a457dd980c0e97fd2585f4e004aba
+EBUILD nautilus-dropbox-0.6.2.ebuild 1653 RMD160 696df80a35420599d5400943348a9f62fdfd33dc SHA1 ac6993fc02fe1cf13c7789ca498311330332025f SHA256 e1b338dd2f08e2477e804cd490aa5cafff21edce1975f7a797c45803b83f933f
+EBUILD nautilus-dropbox-0.6.7.ebuild 1632 RMD160 362ad804fc8ba738d1a8885220907f8ebe17eadd SHA1 dd9ca46caa94c8391d91273f841191ed1fe8be0a SHA256 cf24ea965f6c588529b9ce23a7f13662ad8e2e5bce7488acfca1fb12d4943727
+MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371
diff --git a/app-backup/nautilus-dropbox/files/nautilus-dropbox-0.6.2-datadir.patch b/app-backup/nautilus-dropbox/files/nautilus-dropbox-0.6.2-datadir.patch
new file mode 100644
index 0000000..edfa4af
--- /dev/null
+++ b/app-backup/nautilus-dropbox/files/nautilus-dropbox-0.6.2-datadir.patch
@@ -0,0 +1,12 @@
+diff -Naur nautilus-dropbox-0.6.2.orig/dropbox.in nautilus-dropbox-0.6.2/dropbox.in
+--- nautilus-dropbox-0.6.2.orig/dropbox.in	2010-04-09 04:04:10.000000000 +0900
++++ nautilus-dropbox-0.6.2/dropbox.in	2010-06-24 12:33:31.000000000 +0900
+@@ -845,7 +845,7 @@
+     if u".config" in contents:
+         autostart_dir = os.path.join(home_dir, u".config", u"autostart")
+         autostart_link = os.path.join(autostart_dir, u"%s.desktop" % "dropbox") #BUILD_KEY.lower()
+-        desktop_file = u"/usr/local/share/applications/%s.desktop" % "dropbox" #BUILD_KEY.lower()
++        desktop_file = u"@datadir@/applications/%s.desktop" % "dropbox" #BUILD_KEY.lower()
+         if should_autostart:
+             if os.path.exists(desktop_file):
+                 if not os.path.exists(autostart_dir):
diff --git a/app-backup/nautilus-dropbox/metadata.xml b/app-backup/nautilus-dropbox/metadata.xml
new file mode 100644
index 0000000..5b14597
--- /dev/null
+++ b/app-backup/nautilus-dropbox/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+<email>matsuu@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
+
diff --git a/app-backup/nautilus-dropbox/nautilus-dropbox-0.6.2.ebuild b/app-backup/nautilus-dropbox/nautilus-dropbox-0.6.2.ebuild
index 8548f88..37a2d78 100644
--- a/app-backup/nautilus-dropbox/nautilus-dropbox-0.6.2.ebuild
+++ b/app-backup/nautilus-dropbox/nautilus-dropbox-0.6.2.ebuild
@@ -39,7 +39,10 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 	python_convert_shebangs 2 dropbox.in || die
+
+	epatch "${FILESDIR}/${P}-datadir.patch"
 }
+
 src_install() {
 	gnome2_src_install
 
diff --git a/app-backup/nautilus-dropbox/nautilus-dropbox-0.6.1.ebuild b/app-backup/nautilus-dropbox/nautilus-dropbox-0.6.7.ebuild
index 854d956..be92d51 100644
--- a/app-backup/nautilus-dropbox/nautilus-dropbox-0.6.1.ebuild
+++ b/app-backup/nautilus-dropbox/nautilus-dropbox-0.6.7.ebuild
@@ -1,49 +1,58 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit gnome2 eutils
+EAPI="2"
+PYTHON_DEPEND="2"
+inherit eutils gnome2 python
 
 DESCRIPTION="Store, Sync and Share Files Online"
-HOMEPAGE="http://www.getdropbox.com/"
-SRC_URI="http://www.getdropbox.com/download?dl=packages/${P}.tar.bz2"
+HOMEPAGE="http://www.dropbox.com/"
+SRC_URI="http://www.dropbox.com/download?dl=packages/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND=">=gnome-base/nautilus-2.16
 	>=dev-libs/glib-2.14
 	dev-python/pygtk
-	dev-python/docutils
-	>=x11-libs/gtk+-2.12
-	>=net-misc/wget-1.10
-	>=x11-libs/libnotify-0.4.4"
+	>=x11-libs/gtk+-2.12"
 DEPEND="${RDEPEND}
+	dev-python/docutils
 	dev-util/pkgconfig"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
 G2CONF="${G2CONF} $(use_enable debug)"
 
-pkg_setup () {
+pkg_setup() {
 	# create the group for the daemon, if necessary
 	# truthfully this should be run for any dropbox plugin
 	enewgroup dropbox
+
+	python_set_active_version 2
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	python_convert_shebangs 2 dropbox.in || die
+
+	epatch "${FILESDIR}/${PN}-0.6.2-datadir.patch"
 }
 
-src_install () {
+src_install() {
 	gnome2_src_install
 
 	# 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)"
-	fowners root:dropbox "${extensiondir}"/libnautilus-dropbox.{a,la,so}
-	fperms o-rwx "${extensiondir}"/libnautilus-dropbox.{a,la,so}
+	fowners root:dropbox "${extensiondir}"/libnautilus-dropbox.{a,la,so} || die
+	fperms o-rwx "${extensiondir}"/libnautilus-dropbox.{a,la,so} || die
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	gnome2_pkg_postinst
 
 	elog "Add any users who wish to have access to the dropbox nautilus"