gentoo resync : 16.01.2018

2 files changed, 87 insertions, 0 deletions

diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 1264c1be7c9a..5ee6ecbff92b 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -2,7 +2,9 @@ AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd03109
 DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5acf9023dfd87819b4c8834bba09f2211c901512d9fe186eee7939e44a5f098c09ef65f1d28cc55eb97e9b7 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb
 DIST zim-0.66.tar.gz 2020216 BLAKE2B 7a2af3dca2ff72dd94c605c4fa89b0d3be1413643c781aa151483445e6a029db6021ed84df797b6d9aaac05fd791fe50e4bdc9f1682d252e80f083bf37a10602 SHA512 9693dba8ee6ad915a85ca999674350b278043559ba4adf93c03c8815211ecab451a6e2dceaf62ea7048609eb86f19485f2dd77dbaaf6f2d81f97f6450bf25ca9
 DIST zim-0.67.tar.gz 2034747 BLAKE2B 47e49191e699f93727f566593d616ef0da5b826dccb2f952c6220627d67f295d40e57b9e00dec8395a933a0378c0b1b05c25db7a2cb30fd4509e6ee06269c831 SHA512 0f3387a74a9d6a1e972b4ad411230b9318c58432bd853ef6d45cd535dcdef901369a70dd619b842f1e6564a4b583075865d30acb75cc7649facf5acfe43d8b94
+DIST zim-0.68-rc1.tar.gz 2602967 BLAKE2B 7a1eed33e8d7f27ea287c993f1dde5e8d89cc9435f909ede5696f80ceaee454a38d0ab903313d6a07375797bd43cf48925e81be725094d4a4ce188f750fcac9e SHA512 60c2c654f6b40edcf029efb8367e18a8c4cca7fde11339f4ab9b3724f07f4041aae5740cd7a42fe3b2f836537c699ad597cef0eaec0b0511cb7c65b40ea6e04e
 EBUILD zim-0.65.ebuild 1822 BLAKE2B 49464c5b2ffe8447f7f96f18953c853caa6de322f855607d95b64bb72ba24cf9357d75a8876b5a2bace678d44b092ea42ab17b452dde43f4a75cf016847cf862 SHA512 bebb179fd5c993a91307ad3054feb8af96d54cae2fde754ce0fb844c68aa25227fb430417125490b55d4c1c5aa2ca34372bf2dee20ce6275e4eb1b288b65c77e
 EBUILD zim-0.66.ebuild 1824 BLAKE2B ecb564bf1426bd29fc8466842993b5d4520d049cc72d4da68f1d1df565aeb81be4823b4fe08115aca92d6a5f90665663f40c617c30438ba874af6316a5b2f091 SHA512 23cf416615bcc2cf4719474fb8a79b196916b3fd6fc2a3eaa018e3e00cf8a37a56d7446ad21adb866e727d942300443cec51eda4beaf2830bd7b1d4ec28b9677
 EBUILD zim-0.67.ebuild 1873 BLAKE2B 52826353f0a1dc9f00aa54bdabe07073123f31e502195f868b1bbaec7a6d03c9906e8540bc189565f6e0f55e0086152f653e4ba416d80dcb88b9358493542d23 SHA512 8f57af64bb33b49b1ea66de20d571bdd63e0d063cebc8be7043eab944136c203f39bf6246d85dafe90c800191f8f98980ef6f090b934249edf4113f6310de027
+EBUILD zim-0.68_rc1.ebuild 1907 BLAKE2B 992ff1fb7288e7eb27a02bccbffcb306f230e066d8f83ad295a47c7985ee7f66cb81457dcd36bce4d91ccf57eb7df667e370b380e3f598887d2b735a631b11da SHA512 cb950e69e37aca3c6a063b62c4dd85418430c0edfae9a612423feec396529aa5a0d2ed77effaf056c2c082c3617eef96e090fe34649181aa52068baa91fad576
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.68_rc1.ebuild b/x11-misc/zim/zim-0.68_rc1.ebuild
new file mode 100644
index 000000000000..be1a907e7ced
--- /dev/null
+++ b/x11-misc/zim/zim-0.68_rc1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit xdg-utils distutils-r1 gnome2-utils virtualx
+
+MY_P=${P/_/-}
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="http://zim-wiki.org/"
+SRC_URI="http://zim-wiki.org/downloads/${MY_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}
+	x11-misc/xdg-utils
+	test? (
+		dev-vcs/bzr
+		dev-vcs/git
+		dev-vcs/mercurial )"
+
+DOCS=( CHANGELOG.txt README.txt HACKING )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
+}
+
+python_install() {
+	distutils-r1_python_install --skip-xdg-cmd
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_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 "    gnome-extra/zeitgeist"
+		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"
+	fi
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}