Version bump. Bug #390135

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

5 files changed, 49 insertions, 84 deletions

diff --git a/gnome-extra/nautilus-dropbox/ChangeLog b/gnome-extra/nautilus-dropbox/ChangeLog
index 48b35744879c..a871f12ab5cc 100644
--- a/gnome-extra/nautilus-dropbox/ChangeLog
+++ b/gnome-extra/nautilus-dropbox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/nautilus-dropbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/ChangeLog,v 1.8 2011/11/05 22:05:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/ChangeLog,v 1.9 2011/11/12 10:37:27 hwoarang Exp $
+
+*nautilus-dropbox-0.7.0 (12 Nov 2011)
+
+  12 Nov 2011; Markos Chandras <hwoarang@gentoo.org>
+  +nautilus-dropbox-0.7.0.ebuild,
+  +files/nautilus-dropbox-0.7.0-system-rst2man.patch,
+  -nautilus-dropbox-0.6.7-r1.ebuild, -nautilus-dropbox-0.6.7-r2.ebuild:
+  Version bump. Bug #390135
 
   05 Nov 2011; Robin H. Johnson <robbat2@gentoo.org>
   nautilus-dropbox-0.6.7-r1.ebuild:
diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index 9c6e6f4761bd..39e836e7f662 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1,7 +1,27 @@
-DIST nautilus-dropbox-0.6.7.tar.bz2 324049 RMD160 a8e3601e47a429e3a5331468b1bfa0c1f87e790e SHA1 77ce777bd342eaf7ada3e3a4f6664f66ca4189fb SHA256 4f37ac309a674bccc7edcd37d62bdccec590e78e6db8224dda4e641d5022b554
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX nautilus-dropbox-0.7.0-system-rst2man.patch 463 RMD160 c047adc124ba99b5fe567a3a73678000ef606f62 SHA1 df910ef68d5dc69339329df1a7c836e7db0c20a1 SHA256 f8c6add8d61b73ac8083a79177705a172005a16f1f0738f37e09ce5daddc3702
 DIST nautilus-dropbox-0.6.9.tar.bz2 351131 RMD160 116eedc009dd34a51a34909f4093537ebcb060d4 SHA1 bad6402183b2ed1190ecb8faec2eccaf9ae3e821 SHA256 f1c16c0a485884a5600121a168d4617dc4b47842b22524007f5e2b116b1701f6
-EBUILD nautilus-dropbox-0.6.7-r1.ebuild 1939 RMD160 3684fb277688bcf8ce449449f4b2ed4460c2089c SHA1 6b12a25265e8737482e3d12a3ab9327320dd901b SHA256 c43553287a48f3e8eef5cb191ed6fc202b9e8dad6c4b55a504c72a38e111e8c8
-EBUILD nautilus-dropbox-0.6.7-r2.ebuild 2112 RMD160 9d13352a117c6a0d0faa3b12433fabf31a93c4a6 SHA1 bac19dbee17bab73be4fae4d415c7d0477ecde5c SHA256 4435e8d63a2c1385532658db4186a85406b085c1a417611cb2269da2f88b3523
+DIST nautilus-dropbox-0.7.0.tar.bz2 353719 RMD160 48dbf2ff6859e7a1aae7726aa48bf1752e671351 SHA1 1b6764b15cfca95a49771b3fd4ed64062b94085c SHA256 4fe171760c897c0ab4166cea70f8587623f72c616ef66ea7d81565b702322daa
 EBUILD nautilus-dropbox-0.6.9.ebuild 2108 RMD160 b86b25ee7a5a67a8a8e38076d1f55bd064dbf0ba SHA1 0e270aad6a7ae54ebbe111d613070f6b58a19d8b SHA256 aafadeba31131a208fbfc4430753e235309d8bd71194cad669af6c973ef5d2d4
-MISC ChangeLog 1828 RMD160 d188b6ceb2091728d8d9ebbef5bf7039aecdca5f SHA1 3dd6ae5123ae248d67f211a60a74591a019b1b38 SHA256 790e7ad0011b6de68f9869eb2b365ca509ae7e03461cc008a86a6fce79833874
+EBUILD nautilus-dropbox-0.7.0.ebuild 2072 RMD160 e42519aaeaaedb166186cac426d57331210fdcb8 SHA1 b8d0719dacf84032bb62db30efc1a3597a9bffb6 SHA256 932941ed615eda60df78ce8dc0e9634f084cb764568d9f6cf58973be30230f30
+MISC ChangeLog 2110 RMD160 a1e921b71a2b6e4662ac3f79510b253eceba50c5 SHA1 0d542d1f9c73a3105a458a2e71469b7edfeef327 SHA256 1284bc7670b273eba9c7d8c83de55d162c4c9bcff2ce515f55a753dea6acdb7e
 MISC metadata.xml 278 RMD160 85ae612f4b725d8857a7fe0808090691c0e58fbd SHA1 c97840692a46e7d54f22bfcfd0a564a8d08033dd SHA256 07a0afc4dfc12865b213ef6815169e0524357989b213ac40bc9436dea94c3160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOvlooAAoJEPqDWhW0r/LCX40P/jvqsuarpVDBvhTIU5Uvt/Qh
+AKX7tTxDlXrIoa++GqNs+aBF0P1xKjqcTeFJ+4cslO7AxJigw9ErXhYPd2CgaOL2
+kSS9kSG3275eTfXd1KAZ1UbPqEM2V7C3V5eFTRAbbcbde/QdgS3AmcILa1GlGGIj
+bwkP39TWWHwjWU4HiXfVZ0nRS4IZpke1Sk8VMEC7KuNv9aLLoc2MiUEkk6RHsDCD
+DX4Afd/L84nHlylRXKGXH9oI+aVtoWYDBGWEum5+BN6NluI573yJLjlVQhEX8p4Q
+fPv7recvuwNmHHYATBWmw3jRpLGOQxG1kFos3M+V7pK4erwmaMS2kA6Mr1685E0U
+X0uypnjdE7uM0OazTsMnl0dV1rnucic/Y3JCEIZkctAUt3y7vlXJ4QHgBYMyGqbP
+RFRUNhx10fOaioToAF7Imfz4BbGp8Z5/b2glA7fXLmfxwxVVZ0XOhMMlzeX5BnEo
+rmLhyILm7xOoVRRB6E5UNFIClh2H2uR70C175dzqTD/sG8Oj35UNfzUL2paq+O/a
+yXZKYZCgt3agCeoCxlICWnDtnTtDT3AV7Pps/0TfvM01JFmrUi7rO0f+rt8XooYp
+u+ZpW2WfftgyI6DCeQi7h6SQ7SSML+MjzEIVNIRqabTNtnsSz7xMC0emG9g/xh8l
+vmgp+vOkxmGqsiXBT1/o
+=vqS5
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch b/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch
new file mode 100644
index 000000000000..ea0053b4bbb6
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch
@@ -0,0 +1,13 @@
+Index: nautilus-dropbox-0.7.0/configure.in
+===================================================================
+--- nautilus-dropbox-0.7.0.orig/configure.in
++++ nautilus-dropbox-0.7.0/configure.in
+@@ -31,7 +31,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLI
+ 
+ AC_PATH_PROG([PYTHON], [python])
+ 
+-AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
++AC_PATH_PROG([RST2MAN], [rst2man.py], [python rst2man.py])
+ AC_SUBST(RST2MAN)
+ 
+ # define module checking macro
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7-r1.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7-r1.ebuild
deleted file mode 100644
index ebe9792b6cc7..000000000000
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7-r1.ebuild,v 1.2 2011/11/05 22:05:08 robbat2 Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-inherit autotools eutils python linux-info gnome2
-
-DESCRIPTION="Store, Sync and Share Files Online"
-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 ~x86-linux"
-IUSE="debug"
-
-RDEPEND="gnome-base/nautilus
-	dev-libs/glib:2
-	dev-python/pygtk:2
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	x11-libs/libXinerama"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-python/docutils"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-G2CONF="${G2CONF} $(use_enable debug) --disable-static"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup () {
-	check_extra_config
-	enewgroup dropbox
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	python_convert_shebangs 2 dropbox.in
-
-	# Use system rst2man.py.
-	sed -e "s/python rst2man.py/rst2man.py/" -i Makefile.am || die "sed failed"
-
-	eautoreconf
-}
-
-src_install () {
-	gnome2_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libnautilus-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get nautilus extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D
-	extensiondir="${extensiondir#${EPREFIX}}"
-
-	find "${ED}" -name '*.la' -exec rm -f {} + || die
-
-	use prefix || fowners root:dropbox "${extensiondir}"/libnautilus-dropbox.so
-	fperms o-rwx "${extensiondir}"/libnautilus-dropbox.so
-}
-
-pkg_postinst () {
-	gnome2_pkg_postinst
-
-	elog
-	elog "Add any users who wish to have access to the dropbox nautilus"
-	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
-	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
-	elog
-}
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7-r2.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.7.0.ebuild
index c963dcf3074f..6ea4c079fd29 100644
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7-r2.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7-r2.ebuild,v 1.2 2011/08/18 10:09:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.7.0.ebuild,v 1.1 2011/11/12 10:37:27 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -43,14 +43,12 @@ src_prepare() {
 	gnome2_src_prepare
 	python_convert_shebangs 2 dropbox.in
 
-	# Use system rst2man.py.
-	sed -e "s/python rst2man.py/rst2man.py/" -i Makefile.am || die "sed failed"
-
 	# use sysem dropbox
 	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
 		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
 			-i dropbox.in || die
-
+	# us system rst2man
+	epatch "${FILESDIR}"/${P}-system-rst2man.patch
 	eautoreconf
 }