Version bump. Bug #390135

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

4 files changed, 25 insertions, 80 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/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
 }