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
