public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/caja-dropbox/, mate-extra/caja-dropbox/files/
@ 2015-09-22  7:13 NP Hardass
  0 siblings, 0 replies; 2+ messages in thread
From: NP Hardass @ 2015-09-22  7:13 UTC (permalink / raw
  To: gentoo-commits

commit:     d5013f29d98c849287a40c0132232b1ff97717f7
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 05:37:01 2015 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 05:37:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=d5013f29

Version bump caja-dropbox to 1.10.0

Package-Manager: portage-2.2.20
Manifest-Sign-Key: 0x1CD9411DB2AF18FB

 mate-extra/caja-dropbox/Manifest                   | 31 ++++++++++++----------
 ...box-1.8.0.ebuild => caja-dropbox-1.10.0.ebuild} |  4 +--
 mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild  |  2 +-
 .../files/caja-dropbox-1.10.0-system-rst2man.patch | 13 +++++++++
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index bb385fc..6302043 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -2,25 +2,28 @@
 Hash: SHA256
 
 AUX caja-dropbox-0.7.0-system-rst2man.patch 463 SHA256 f8c6add8d61b73ac8083a79177705a172005a16f1f0738f37e09ce5daddc3702 SHA512 5a34c3e6ff51a1a14eac11e0619a81afeec05979944d128ed37076cadb9a79edd839918ee289c409c537be73a913ee3bc58f19cc2227cda8762328e2f0fbd7eb WHIRLPOOL 75f33c78b99b923da61a2dc926e0c4a62973cc61e36e7c5bd0a52fa840757b876fd9badf158ba1e78a42094023f76eaedf0fa72ba6795acd90bc3dd30683d9e6
+AUX caja-dropbox-1.10.0-system-rst2man.patch 463 SHA256 6e2260a6bbf2f25911b23735f155a0a7e0da38bc0433bd7054e2f0ad9122380f SHA512 c3fcfd5b87f7801c77e8935f20d26c2a32ad60a03f068eb891e4bc491296ee1b19763634a02e387d7cf8b4192c30931a6dd9d9bf44f7ce3f8965db62a184c806 WHIRLPOOL b26c60b7bd75a08c5a737dbcc58f9e38b8aea5079f0be3e572e07198773adce4109adedf74bab8129fc18bedb0759153ae5bf2abd60b457b8f3ff0cc0a44d6df
 AUX caja-dropbox-1.8.0-system-rst2man.patch 463 SHA256 6e2260a6bbf2f25911b23735f155a0a7e0da38bc0433bd7054e2f0ad9122380f SHA512 c3fcfd5b87f7801c77e8935f20d26c2a32ad60a03f068eb891e4bc491296ee1b19763634a02e387d7cf8b4192c30931a6dd9d9bf44f7ce3f8965db62a184c806 WHIRLPOOL b26c60b7bd75a08c5a737dbcc58f9e38b8aea5079f0be3e572e07198773adce4109adedf74bab8129fc18bedb0759153ae5bf2abd60b457b8f3ff0cc0a44d6df
+DIST caja-dropbox-1.10.0.tar.xz 310904 SHA256 80a1caeaaa5adc76182c6c36b6f65875af49b7d47889f84e5be572d7dcf9a49e SHA512 a1ae41741cf3da985302fed07dafe560751ef5eb43814ba4bd069b9eac487414d2058a1eb1532b20cae5a2dc72870a17d42fb6462ba3a8ef648230e1f8fc7c05 WHIRLPOOL 04f89ccbc399f6f15f9374c4226db33866023a7f032e43f747c59fd4dce1985ff34b9693ed0da13f197048d24f613c65e6efaeab4090c2165ac897a7d4c20194
 DIST caja-dropbox-1.8.0.tar.xz 310592 SHA256 bb26151cad68e910979af6dd8b323434462a2457998ad67529660135c0caa513 SHA512 33c0804ba756ec50b531e4992b74577848f52fef60b8c69b96f307a2b8a57fd42ff951d6d3fdd55a6b1e260c4f46d0a26f90f730a88dc45a66e2d78888492fbc WHIRLPOOL 3b200e6a1b5e6f9926566962c48b9585fa0f9cc1ccc8ee89e45489d87c41cbf50a2b1bd62036140ba7492edf5a2812b918c4c4596b17c4674e0821a72d29550f
-EBUILD caja-dropbox-1.8.0.ebuild 2098 SHA256 5da0c9e0abcb6821d763281e23bffec114e49098750bf61af1f0b79c1b76ea59 SHA512 6ed1ad1132232b3ba990bf2af8f13da56ea107d92c3be049bdd0900e2dc6f228bcbb458ca61bea3a3c21469252319f6e1056e4f5f0280d184de6acc89dc006f5 WHIRLPOOL d43dd12a7f91b37db32e5b6d724f970694b5c8356a2b23a3468b7686dd653408a506ea6cf9e8a8609fe1e2381326198f28ea1c4e5c4b41b1f8d64ef2fed9187f
+EBUILD caja-dropbox-1.10.0.ebuild 2130 SHA256 abe98497d7644808a9c97bfa0d88cbb39ead64afdf99a0213bd9460d487615b6 SHA512 181bd1cd988f4dd432788f7d9e0883055247884349dc1959871c6b8432c6a69e1c8f9da91be8793dca264900b63c59eec11bb33339fa8cb732ba7d0e5f499e6e WHIRLPOOL cf547ae69fd715fb4eb8440dbb7ad71204bd5033e6f0b8d63bb7b4bd92e455701b255719f33a1278f88b46623181e9daf85e601d8f93af0083b36ccc4c2cf360
+EBUILD caja-dropbox-1.8.0.ebuild 2129 SHA256 8c83435cf1de85489579fb8606ef62291c39af51fb96b0e0dfa0a7eb19562629 SHA512 1bb33468a098a60e89ca44bed7602a7f6cbf5f05400b8c56000571f078905c7567c56833ca228e2904dda300f6c62acc77db528c356cbf3c1fed22a6fed0f27b WHIRLPOOL 2f6caa0d053c36a06a3ab0eed06c9459eac2f4ee5e9f37c166d9cfb86f170d24050c300434266df44ae6ed7670c7a3a15df94a120a31fd00e04903f2d0c8a35c
 MISC ChangeLog 1194 SHA256 7f0ee75b6796e6155e2feff0fe4372eadd2beec3752bc68c42906dc5b0b1cd43 SHA512 032540ae360a1954fddb5065e167d4b3ae334e0a9b5f1c7cf74b62814da6cf7f864bf6398e7b92c7c11fd702a70d21c5caf77bd8f3db8e4ac50b15a9f390fae6 WHIRLPOOL b1a118835659fd3539e83d7bb3e5c8bc2aec1811249a227cffa04b5df15d18b13d2bc7b2eb46ae838ad28bb5daf69879524b3fe6eddd586097fb7605766434df
 MISC metadata.xml 263 SHA256 f0c6fe36b36ad3b31ebf4ec4942b3d919cf22ecfaef865f7db06a84210431d46 SHA512 b1584eb694eaa1b44bd08248244135adedfd08e14e7bf6e80e3d360a836b28e6bdba969a6562597b8d9c1252f06f6779c3bc57a4d65a323457a81d5a0244fdad WHIRLPOOL 0cecf7185350c35ce3a284a79827fbee923a140e4b616ddd3b5e8cace9ce30a97784aff506ac7a57c668e81fe65eb17159594d72da841f4c24a69b73fbe12ea1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJWAOEVAAoJEBzZQR2yrxj7GWAP/2aIADPCkViBmxVjNN33oSwg
-9acaVjQBR5j2/pCZkgOtGski3rhjHMub6UWgOXM8PVaicXs4uNdAvqHfd/GkI2gi
-wqczZhWm/VefknA0RtOmjBv5RYIHAOTK1y/IQdFsAZKLk8GRCY5Brysfl6tvhUAM
-5Fj81/Jn75MfA2dWZo1bnijh8yZR3jcarjvyoh+s8/tzezAibacEdOohaiKobIn7
-CU8ypr4r9AQ/eaZn8QKwJxoDhaKLeaVNe3glfHsLL7R1f2fhK9SEvF4DGqFORdRG
-PMLaIMLmbg0kNYIa9RtAI0FAPikYYx/d1R9DiXLocYmNc+0uTa2drKkwxXXVFlim
-YKER0YAadTDLmYS4AXT3l+iiq9qOzZp9romBIoJUDF8tDPjWLFIIAPxruBTxemyH
-LbxiHK1oyQnbpZWNiBqwNhIBxa0YfrgA1HK44yaxJNbxQfCm0tGmkViC9LdfNjwb
-DF+IZMqrJ4lnQEV8asGCZkQgQDUgDZWlMNEHQNE2JFMYjfnxXNEFCqH0UsYQ4DZt
-s9ZU08qzim01opPbskeoi+d/W1UlwWG2Fc0tFNbp4cALGtsCf8sraRWFZxcRmEBT
-83tHSxTyeMYlrf7HG7lmBW5G9dfqK07H4ZzO7o7RHX1G/ffRNS/g8fUAXp3Y01Sx
-XuEeUqM7rwgVrYHXK3gb
-=bp7p
+iQIcBAEBCAAGBQJWAOj9AAoJEBzZQR2yrxj7sdkP/RoYI4yWpgdgi8xpgBEj+w/3
+Q3E6/OD+3pDWtt2tYSYRNaZmp2+y5KSe9sdncyeHUqlWZnBqMQ2zEHO91ps4AeJL
+l6a3ghLuFR5dsUuGU9e9Ko71xNAJJMuTcxK4pTEnHF3wBU9iEjQbe20ZEd4R0s1C
+8VwouHgj+YT/0qRUFJYMTAd2N2SLvSWE8q3zMz1OsCFW8yisR+BNw+NeEFJzpWKm
+D9B7eWwA3zW2i87zDXR1cCXSk5BCh7fpBdztvRiKRUrs5Rq3DWn4tfvhaJ+4NUzm
+z5N7uKGvKW/sjzvMpB3y3/P3C7dKsgy4Atcpk3zREZokZqlRqlaP1SfFxlUpF0I/
+IwPlVGPQ2NVSZ1NrZtT2LYfMuj6iNs6okCxtEMSeZ4032xYAd0IAtzEXfM3IQq67
+qTTRAw3ifEJ2pVVwNdVBIULQsUefok4nlzA2RNt/6wxscDGsl88CadRvHRqI8d9i
+Hdca96Ny4iTEZA9qpySuk8KGK/5W1SpN9fZDwGhQWiakn5bJzynNC84UC4VPkEWH
+lBQzKWvs6qthYbl973T/OzWSO17avp8XikiX2AJl9coJR1hCr3wZWTPH2monYY4U
+2GttbwKcqwI5/5CaSKTixlaxy1fKNqE8j7Nuz+nRosCU+Q6D4Ecgo2euDJCI059K
+p4a+jH5foW/uLM3alUS+
+=iYd8
 -----END PGP SIGNATURE-----

diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.10.0.ebuild
similarity index 96%
copy from mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild
copy to mate-extra/caja-dropbox/caja-dropbox-1.10.0.ebuild
index 50c5484..1d5c248 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.10.0.ebuild
@@ -9,7 +9,7 @@ GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2 python-single-r1 linux-info user versionator
 
-MATE_BRANCH="1.8"
+MATE_BRANCH="$(get_version_component_range 1-2)"
 
 SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
 DESCRIPTION="Store, Sync and Share Files Online"
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-libs/atk:0
 	>=dev-libs/glib-2.14:2
 	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.8:0
+	>=mate-base/caja-1.10:0
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
 	net-misc/dropbox:0

diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild
index 50c5484..67ac049 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild
@@ -9,7 +9,7 @@ GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2 python-single-r1 linux-info user versionator
 
-MATE_BRANCH="1.8"
+MATE_BRANCH="$(get_version_component_range 1-2)"
 
 SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
 DESCRIPTION="Store, Sync and Share Files Online"

diff --git a/mate-extra/caja-dropbox/files/caja-dropbox-1.10.0-system-rst2man.patch b/mate-extra/caja-dropbox/files/caja-dropbox-1.10.0-system-rst2man.patch
new file mode 100644
index 0000000..7404182
--- /dev/null
+++ b/mate-extra/caja-dropbox/files/caja-dropbox-1.10.0-system-rst2man.patch
@@ -0,0 +1,13 @@
+Index: nautilus-dropbox-0.7.0/configure.ac
+===================================================================
+--- nautilus-dropbox-0.7.0.orig/configure.ac
++++ nautilus-dropbox-0.7.0/configure.ac
+@@ -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


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/caja-dropbox/, mate-extra/caja-dropbox/files/
@ 2020-04-09 22:52 Adam Feldman
  0 siblings, 0 replies; 2+ messages in thread
From: Adam Feldman @ 2020-04-09 22:52 UTC (permalink / raw
  To: gentoo-commits

commit:     0a03ed073dda26574278ebda884f7c915d263bbe
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 19:08:36 2020 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 22:49:24 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=0a03ed07

mate-extra/caja-dropbox: Drop old, sync from Gentoo

Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 mate-extra/caja-dropbox/Manifest                   |  6 +-
 .../caja-dropbox/caja-dropbox-1.12.0-r1.ebuild     | 90 ---------------------
 mate-extra/caja-dropbox/caja-dropbox-1.16.0.ebuild | 92 ----------------------
 ...1.18.0.ebuild => caja-dropbox-1.22.1-r1.ebuild} | 42 +++++-----
 ...ox-1.14.0.ebuild => caja-dropbox-1.24.0.ebuild} | 51 ++++++------
 mate-extra/caja-dropbox/caja-dropbox-9999.ebuild   | 51 ++++++------
 .../files/caja-dropbox-1.8.0-system-rst2man.patch  | 13 ---
 7 files changed, 80 insertions(+), 265 deletions(-)

diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index 4e327de..b4b4745 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,4 +1,2 @@
-DIST caja-dropbox-1.12.0.tar.xz 311488 BLAKE2B 823ec57de4ca943914a14aa90bf6bc4c4ce25cde66cf2102cca21f82c39d47e5d0e75440e5c9050ee554db7ce21471f413a2c7050966ca825d73db9bd6100763 SHA512 32d8fcd2d2aa4a03a976c7848cd628e240558b802247ad6a36242ea95628aa97088aa55ae6d9c889616910e5fc36e2db6753c4f8854d6f9e626c990469d71223
-DIST caja-dropbox-1.14.0.tar.xz 310964 BLAKE2B dc58105549291e05b31752a69bed62f1f9a41699c1ef203e7e75937b3961bb188055f7d2b2569a86650a5a799b0af1b046f1e7d78f3cc0e83be187fa367a756f SHA512 e13012bff812d43eb5ddd9ca8a73907bf9aa2d46bd8947f58695b32fe590a4ecd6bea2ac0d30330c8bd1fa8c652681beb964e7bd658525e99cda73e36a207a50
-DIST caja-dropbox-1.16.0.tar.xz 311144 BLAKE2B f64af2c129906517f8d2bb189f0718c6848a298fd5694de09fcc7e5d17720273eee6453c88363018cafb2a8b10ee8116eb8156f1ac43316ed6164fd64397210b SHA512 ba8ec3952be08d520b10f55c3ff5dbfd38a062dcf3c4fa4569e8d68823f8fbebed596e963e5bf7d59161fea138dbc27b299f66e1d0f6064da54499c4023ac1ad
-DIST caja-dropbox-1.18.0.tar.xz 323116 BLAKE2B 1aafb5c15fea5935c7e89964ad4237fc2095a2c81921c14058d3472e4b51a4053327e175b144c17f2bdd0a3c106b32c436593b354db375689259501ec18b679b SHA512 0e240f8f6ef17ad3b6bbe21bede6d911b0ef89d8fd5a9faba6b96bc74f06472dcedf68caa94c6fbfb2c05c10c82e1f025b4022657cacc5b80d55ee41999be560
+DIST caja-dropbox-1.22.1.tar.xz 309600 BLAKE2B a54778bae439a52babd4b9c88ed77ef9cebf01cb5e396e9e2dae0e74b1d55bb6b575d301133593b130af86ecb06f35fd2d11c3b7e3d67a7e741798ad701d788d SHA512 e7e9107c7654fac910762727782f35e3039b45e737341937d225126b2f63f8911f99281097b2488d3b79c0ed09fff4270b4c557166b94a722a2b1cd30fea2a2c
+DIST caja-dropbox-1.24.0.tar.xz 309024 BLAKE2B 2ae560dcd6e744fe96d9e0fcd876a899c22ad06b8238c2ad9e5394cf80aa8844cd634431dc6bb245396e6d919da857645488214880947e5b90413c254cd4c6a2 SHA512 64d699b4c3957d5996ef69936b4b2746641bc2db4efb7b23535febf5eed3ee767330927aeeda67747c0d72e0f052a2979ae2160ffaaf01e4fd82aff68a5f27bf

diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.12.0-r1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.12.0-r1.ebuild
deleted file mode 100644
index e94a799..0000000
--- a/mate-extra/caja-dropbox/caja-dropbox-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-MATE_LA_PUNT="yes"
-
-inherit mate python-single-r1 linux-info user
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug"
-
-RDEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.14:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.6
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	net-misc/dropbox:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXinerama:0
-	x11-libs/pango:0"
-
-DEPEND="${RDEPEND}
-	dev-python/docutils:0
-	virtual/pkgconfig:*"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup () {
-	python-single-r1_pkg_setup
-	check_extra_config
-	enewgroup dropbox
-}
-
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Use system dropbox.
-	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
-		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
-			-i caja-dropbox.in || die
-
-	# Use system rst2man.
-	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install () {
-	python_fix_shebang caja-dropbox.in
-
-	mate_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D.
-	extensiondir="${extensiondir#${EPREFIX}}"
-	use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so
-	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
-}
-
-pkg_postinst () {
-	mate_pkg_postinst
-
-	elog
-	elog "Add any users who wish to have access to the dropbox caja"
-	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/mate-extra/caja-dropbox/caja-dropbox-1.16.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.16.0.ebuild
deleted file mode 100644
index 7bdc743..0000000
--- a/mate-extra/caja-dropbox/caja-dropbox-1.16.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-MATE_LA_PUNT="yes"
-
-inherit mate python-single-r1 linux-info user
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.14:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.6
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXinerama:0
-	x11-libs/pango:0"
-
-RDEPEND="${COMMON_DEPEND}
-	net-misc/dropbox:0"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/docutils:0
-	virtual/pkgconfig:*"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup () {
-	python-single-r1_pkg_setup
-	check_extra_config
-	enewgroup dropbox
-}
-
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Use system dropbox.
-	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
-		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
-			-i caja-dropbox.in || die
-
-	# Use system rst2man.
-	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install () {
-	python_fix_shebang caja-dropbox.in
-
-	mate_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D.
-	extensiondir="${extensiondir#${EPREFIX}}"
-	use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so
-	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
-}
-
-pkg_postinst () {
-	mate_pkg_postinst
-
-	elog
-	elog "Add any users who wish to have access to the dropbox caja"
-	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/mate-extra/caja-dropbox/caja-dropbox-1.18.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.22.1-r1.ebuild
similarity index 70%
rename from mate-extra/caja-dropbox/caja-dropbox-1.18.0.ebuild
rename to mate-extra/caja-dropbox/caja-dropbox-1.22.1-r1.ebuild
index b02406c..a5d05ac 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.18.0.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.22.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 MATE_LA_PUNT="yes"
 
 inherit mate python-single-r1 linux-info user
@@ -13,35 +13,38 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
+LICENSE="CC-BY-ND-3.0 GPL-3+ public-domain"
 SLOT="0"
 
 IUSE="debug"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.17.1
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=mate-base/caja-1.19.1
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
-	x11-libs/cairo:0
+	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXinerama:0
-	x11-libs/pango:0"
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libXinerama
+	x11-libs/pango
+	${PYTHON_DEPS}"
 
 RDEPEND="${COMMON_DEPEND}
-	net-misc/dropbox:0"
+	net-misc/dropbox"
 
 DEPEND="${COMMON_DEPEND}
-	dev-python/docutils:0
+	dev-python/docutils
 	virtual/pkgconfig:*"
 
 CONFIG_CHECK="~INOTIFY_USER"
 
-pkg_setup () {
+pkg_setup() {
 	python-single-r1_pkg_setup
 	check_extra_config
 	enewgroup dropbox
@@ -55,8 +58,7 @@ src_prepare() {
 		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
 			-i caja-dropbox.in || die
 
-	# Use system rst2man.
-	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
+	sed -e 's|\[rst2man\]|\[rst2man\.py\]|' -i configure.ac || die
 
 	mate_src_prepare
 }
@@ -67,7 +69,7 @@ src_configure() {
 		$(use_enable debug)
 }
 
-src_install () {
+src_install() {
 	python_fix_shebang caja-dropbox.in
 
 	mate_src_install
@@ -81,12 +83,12 @@ src_install () {
 	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	mate_pkg_postinst
 
 	elog
 	elog "Add any users who wish to have access to the dropbox caja"
-	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
+	elog "plugin to the group 'dropbox'. You need to setup a Dropbox account"
 	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
 	elog
 }

diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.14.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.24.0.ebuild
similarity index 68%
rename from mate-extra/caja-dropbox/caja-dropbox-1.14.0.ebuild
rename to mate-extra/caja-dropbox/caja-dropbox-1.24.0.ebuild
index 7bdc743..5d30f1a 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.14.0.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.24.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 MATE_LA_PUNT="yes"
 
 inherit mate python-single-r1 linux-info user
@@ -13,35 +13,41 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
+LICENSE="CC-BY-ND-3.0 GPL-3+ public-domain"
 SLOT="0"
 
 IUSE="debug"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.14:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.6
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=mate-base/caja-1.19.1
+	mate-extra/caja-extensions
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
-	x11-libs/cairo:0
+	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXinerama:0
-	x11-libs/pango:0"
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libXinerama
+	x11-libs/pango
+"
 
 RDEPEND="${COMMON_DEPEND}
-	net-misc/dropbox:0"
+	net-misc/dropbox
+"
 
 DEPEND="${COMMON_DEPEND}
-	dev-python/docutils:0
-	virtual/pkgconfig:*"
+	dev-python/docutils
+	virtual/pkgconfig:*
+"
 
 CONFIG_CHECK="~INOTIFY_USER"
 
-pkg_setup () {
+pkg_setup() {
 	python-single-r1_pkg_setup
 	check_extra_config
 	enewgroup dropbox
@@ -55,8 +61,7 @@ src_prepare() {
 		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
 			-i caja-dropbox.in || die
 
-	# Use system rst2man.
-	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
+	sed -e 's|\[rst2man\]|\[rst2man\.py\]|' -i configure.ac || die
 
 	mate_src_prepare
 }
@@ -67,7 +72,7 @@ src_configure() {
 		$(use_enable debug)
 }
 
-src_install () {
+src_install() {
 	python_fix_shebang caja-dropbox.in
 
 	mate_src_install
@@ -81,12 +86,12 @@ src_install () {
 	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	mate_pkg_postinst
 
 	elog
 	elog "Add any users who wish to have access to the dropbox caja"
-	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
+	elog "plugin to the group 'dropbox'. You need to setup a Dropbox account"
 	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
 	elog
 }

diff --git a/mate-extra/caja-dropbox/caja-dropbox-9999.ebuild b/mate-extra/caja-dropbox/caja-dropbox-9999.ebuild
index b02406c..5d30f1a 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-9999.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 MATE_LA_PUNT="yes"
 
 inherit mate python-single-r1 linux-info user
@@ -13,35 +13,41 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
+LICENSE="CC-BY-ND-3.0 GPL-3+ public-domain"
 SLOT="0"
 
 IUSE="debug"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.17.1
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=mate-base/caja-1.19.1
+	mate-extra/caja-extensions
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
-	x11-libs/cairo:0
+	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXinerama:0
-	x11-libs/pango:0"
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libXinerama
+	x11-libs/pango
+"
 
 RDEPEND="${COMMON_DEPEND}
-	net-misc/dropbox:0"
+	net-misc/dropbox
+"
 
 DEPEND="${COMMON_DEPEND}
-	dev-python/docutils:0
-	virtual/pkgconfig:*"
+	dev-python/docutils
+	virtual/pkgconfig:*
+"
 
 CONFIG_CHECK="~INOTIFY_USER"
 
-pkg_setup () {
+pkg_setup() {
 	python-single-r1_pkg_setup
 	check_extra_config
 	enewgroup dropbox
@@ -55,8 +61,7 @@ src_prepare() {
 		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
 			-i caja-dropbox.in || die
 
-	# Use system rst2man.
-	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
+	sed -e 's|\[rst2man\]|\[rst2man\.py\]|' -i configure.ac || die
 
 	mate_src_prepare
 }
@@ -67,7 +72,7 @@ src_configure() {
 		$(use_enable debug)
 }
 
-src_install () {
+src_install() {
 	python_fix_shebang caja-dropbox.in
 
 	mate_src_install
@@ -81,12 +86,12 @@ src_install () {
 	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	mate_pkg_postinst
 
 	elog
 	elog "Add any users who wish to have access to the dropbox caja"
-	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
+	elog "plugin to the group 'dropbox'. You need to setup a Dropbox account"
 	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
 	elog
 }

diff --git a/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch b/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch
deleted file mode 100644
index 7404182..0000000
--- a/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: nautilus-dropbox-0.7.0/configure.ac
-===================================================================
---- nautilus-dropbox-0.7.0.orig/configure.ac
-+++ nautilus-dropbox-0.7.0/configure.ac
-@@ -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


^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-09 22:52 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-09 22:52 [gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/caja-dropbox/, mate-extra/caja-dropbox/files/ Adam Feldman
  -- strict thread matches above, loose matches on Subject: below --
2015-09-22  7:13 NP Hardass

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox