summaryrefslogtreecommitdiff
path: root/x11-misc/zim
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc/zim')
-rw-r--r--x11-misc/zim/Manifest4
-rw-r--r--x11-misc/zim/zim-0.70_rc3.ebuild (renamed from x11-misc/zim/zim-0.68.ebuild)65
2 files changed, 38 insertions, 31 deletions
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 41866378c7bf..510127e2762c 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,10 +1,10 @@
AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5acf9023dfd87819b4c8834bba09f2211c901512d9fe186eee7939e44a5f098c09ef65f1d28cc55eb97e9b7 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb
-DIST zim-0.68.tar.gz 2044224 BLAKE2B 5c53c3197bc5de90c38059e7323366ed5b7600ebf0b3575d81e618d972d0360f67660da4637f1e6f1459549b21525ed17183e9c2f57f8ab0b27236e36bda9666 SHA512 4ab7f2b55e37ae917a7faa0018a36cbad2534bb43146f47810479155009eb2ccbf4f8ab185d8b4cd3ba7e22a4e2fc5eb08c4bae0688186c13d31dfcab23b0048
DIST zim-0.69.tar.gz 2044631 BLAKE2B 447fa4fb2d11b1399668ec6b627e23150577b574afb1e5c33738cb690779f49adb2d60e0b01eb82d2cf0dfd4a430099c1ae4b52186b60a2564c501b93aa01822 SHA512 452b2119d63927765c3807dbbdfadea94be31ee7fd3eb9b8cf79e8699c57478ec9cd392299a6e1dc3690dbe520925cddf5fca4596db809a2cc296bb6669d12af
DIST zim-0.70_rc1.tar.gz 2889546 BLAKE2B ca0c2274472f7e3f50e2b51ba59a75ae1422e7bad86a8fdc55474c150b1ac227ad785c3484d1255079a8aa169bc437e6016254ed8d4691d8e8d78a5112d71038 SHA512 fca61ea5c249ba33187d48a6794c11f30afd664e07462c738ca2b64f7d970e95628ecbcdb9c19a23b70c1609993d4111a9976cdddbf2fd5ad3029014a8a01339
+DIST zim-0.70_rc3.tar.gz 2877315 BLAKE2B 1467bbd6bbd11e53120193a5f77dc7ab52eb8f1478c3dbc98e229d784f4432e862ab578277b79058eae43943bfbe8812b45153130779f7c84f14b342d3ba7357 SHA512 32fcad48c2deb9739cb7d3214138cdac7c6499008f884ba61aeb51ec387d600b87c7848abf7982fa165c4130446c307e57ee1762f7107894b70d96ded528bc0e
EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
-EBUILD zim-0.68.ebuild 1847 BLAKE2B 12615ea89e434348ff24ed1f492a09c11944c54c1bc4931f8a555b04eed4bb909a205e7b980ae1a6e63054441cafb854c5b76b21b068ad2b62daa51a76e69238 SHA512 5fe0bd6aa83e1645b630a70c287fe50e16a60fc6bdb966fb768be2052d65bd4c484ee1896379fd6990d30614b4048834460813ffa15179ac57127946a51504d5
EBUILD zim-0.69.ebuild 1849 BLAKE2B 7bad44da4be87ee0b8c9a9dde44264035bf7ef330f22db53a0086badfae364285f1d51592671e36f05af67a3e025c8f58fe394bdbb370de94469042f0254bdf1 SHA512 5346b7821aa43fd866af288a9cb8ff9374cb463a68123ae931d1f4145bd8e8bd3ea23ae8faa40c95a5dc9f0ac085fd21d108aad8aaaf5c396a830e96e4628250
EBUILD zim-0.70_rc1.ebuild 1975 BLAKE2B 353454f5ea9e44f5ad8a191fa795eeaf80f14ce709c7bc71688f65d438dc3861276dd717b1141d684393a90aeb90182133519695a78a37b12d9e9624d9312cb7 SHA512 40693d96c405ba43e3ad1f2d112fd2312303ecc133316e485ad680c78c49cd9d36c3b84608b8fbd0dbcfffae54aa3f85f196afb394bb0a0eecc0169d62bcc9ab
+EBUILD zim-0.70_rc3.ebuild 1999 BLAKE2B 60396c782d89816504beb13a5b40f53f62588947384394f54a7abbcceaeb2bc6b000b5c31e7b8702ea8e59c54b3adc9ccf9190c40677b4e2c67daa094af5da7d SHA512 ffcfa8797f19fc0b0f63ff14b40f289abda49c4a3863f5ef9b5bce24cedfdf5bbeafc54cdaeefa033092177d0344e9af7f8fc98dd58494b87d1c7327c493d87b
MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.68.ebuild b/x11-misc/zim/zim-0.70_rc3.ebuild
index 44110e717f31..78b40b796324 100644
--- a/x11-misc/zim/zim-0.68.ebuild
+++ b/x11-misc/zim/zim-0.70_rc3.ebuild
@@ -1,34 +1,41 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{4,5,6} )
PYTHON_REQ_USE="sqlite"
DISTUTILS_SINGLE_IMPL=1
-
inherit xdg-utils distutils-r1 gnome2-utils virtualx
DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
+HOMEPAGE="
+ http://zim-wiki.org/
+ https://github.com/zim-desktop-wiki/
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
-RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
- dev-python/pygobject:2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+RDEPEND="
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
x11-misc/xdg-utils
+"
+DEPEND="
+ ${RDEPEND}
test? (
dev-vcs/bzr
dev-vcs/git
- dev-vcs/mercurial )"
-
-DOCS=( CHANGELOG.txt README.txt HACKING )
+ dev-vcs/mercurial
+ )
+"
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
python_prepare_all() {
sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
@@ -47,33 +54,33 @@ python_prepare_all() {
}
python_test() {
- VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
+ virtx ${PYTHON} test.py
}
python_install() {
- distutils-r1_python_install --skip-xdg-cmd
+ distutils-r1_python_install
}
pkg_postinst() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
if ! has_version ${CATEGORY}/${PN}; then
- einfo "Please emerge these packages for additional functionality"
- einfo " dev-lang/R"
- einfo " dev-python/gtkspell-python"
- einfo " dev-vcs/bzr"
- einfo " media-gfx/graphviz"
- einfo " media-gfx/imagemagick"
- einfo " media-gfx/scrot"
- einfo " media-sound/lilypond"
- einfo " sci-visualization/gnuplot"
- einfo " virtual/latex-base app-text/dvipng"
+ elog "Please install these packages for additional functionality"
+ elog " dev-lang/R"
+ elog " dev-python/gtkspell-python"
+ elog " dev-vcs/bzr"
+ elog " media-gfx/graphviz"
+ elog " media-gfx/imagemagick"
+ elog " media-gfx/scrot"
+ elog " media-sound/lilypond"
+ elog " sci-visualization/gnuplot"
+ elog " virtual/latex-base app-text/dvipng"
fi
}
pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
}