summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-12-13 16:49:50 +0000
committerJeroen Roovers <jer@gentoo.org>2012-12-13 16:49:50 +0000
commitdc69bf04b40d09f053ddeea748f0e640bc32a253 (patch)
tree3d55813a87e607f94923fb0cf504a33b207fd8cd
parentvirtual/blas: Drop sci-libs/blas-atlas from deps due to coming removal, #372323 (diff)
downloadhistorical-dc69bf04b40d09f053ddeea748f0e640bc32a253.tar.gz
historical-dc69bf04b40d09f053ddeea748f0e640bc32a253.tar.bz2
historical-dc69bf04b40d09f053ddeea748f0e640bc32a253.zip
Version bump by poncho (bug #447098).
Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
-rw-r--r--x11-misc/zim/ChangeLog8
-rw-r--r--x11-misc/zim/Manifest22
-rw-r--r--x11-misc/zim/zim-0.55.ebuild67
-rw-r--r--x11-misc/zim/zim-0.57.ebuild (renamed from x11-misc/zim/zim-0.54.ebuild)24
4 files changed, 31 insertions, 90 deletions
diff --git a/x11-misc/zim/ChangeLog b/x11-misc/zim/ChangeLog
index 9a321e57138f..fec57ee63b2c 100644
--- a/x11-misc/zim/ChangeLog
+++ b/x11-misc/zim/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-misc/zim
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.20 2012/06/07 15:23:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.21 2012/12/13 16:49:49 jer Exp $
+
+*zim-0.57 (13 Dec 2012)
+
+ 13 Dec 2012; Jeroen Roovers <jer@gentoo.org> -zim-0.54.ebuild,
+ -zim-0.55.ebuild, +zim-0.57.ebuild:
+ Version bump by poncho (bug #447098).
*zim-0.56 (07 Jun 2012)
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 874518b1f481..65178143f155 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,18 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-DIST zim-0.54.tar.gz 1326924 RMD160 02f9746fe474b34519815b8f0ed543e97cab661b SHA1 fd8cdfe78185a532016da3974da64373998a46a3 SHA256 a4cd618c6bc8bedeb11a28fc54652c05648f940e13d2d3df7be800d5ce455195
-DIST zim-0.55.tar.gz 1376720 RMD160 483dd7c0206ec2ef401e71132ded45275c998364 SHA1 0485260e6b06eebbbc8bf5528fbabb9606fd04c4 SHA256 f80b6d3be744af07e88a512e665897e4cdc0170a16305106edbb9b144f5fe093
-DIST zim-0.56.tar.gz 1419603 RMD160 d1dc071718e18424d192c6c3267e72467ed605e7 SHA1 b618221685bbe6292f109f81889a9d986218dd0f SHA256 a4708a0e1f63a4b51ace7460d9324dc806b5b0221b51c1c821a24fdf5deaf1da
-EBUILD zim-0.54.ebuild 1747 RMD160 6baa2084817d8137078d82d6cd9d74ce002f0564 SHA1 0c2273707a50b94ddffb6c0259a4f2299579c5f0 SHA256 9c7becfdd07bf16d9a17bd89d732f91d5ddb6cd0794cdb1a106dcfc4162ce4a9
-EBUILD zim-0.55.ebuild 1747 RMD160 2a1abacc5dbfcc09a9d78c6cce8b08333419eebb SHA1 61a6daa971b7c78790bf8c0212250d461d3af3e5 SHA256 3fc5a61fd351f1e6367be9aaf6610cdb6d3275c87a9154be07045ff7bb07b309
-EBUILD zim-0.56.ebuild 1747 RMD160 2518aa20002db4c94211be072d062866b595bf10 SHA1 7eded6ff661072d17b372a2e3e7d5aa06d835b70 SHA256 c9f8660cc6ccb988072b55c1ec30f379e4994609deab67693ea5770297a269a7
-MISC ChangeLog 3965 RMD160 d13a8d2499e8c57cdee9b497a78ce9e0db5a8be9 SHA1 4cc812a64ddc653cfe9c7bb5aef667ec0c273d0c SHA256 5a28915781e6d7af26bc256c8a289e141143ddc664fc66410797cf1907519a93
-MISC metadata.xml 727 RMD160 ec2e0f9d8841ec67ccdd729321582efe37c30ba4 SHA1 af48c645f468bbd126a1a917f384a638cae6b6b8 SHA256 c377b11e645a7257ee7a4d966bd95bcb15a621601c6d876d44d9171f4601f051
+DIST zim-0.56.tar.gz 1419603 SHA256 a4708a0e1f63a4b51ace7460d9324dc806b5b0221b51c1c821a24fdf5deaf1da SHA512 e7564ad00221e4fea3d0bc03ae105f6f716584afb1e0f62ad828c83991b4be7bf4881987b0d7c6643368a377b6464e470d4f4e2ce89f5bdee686b3bc585d1636 WHIRLPOOL b68a8887590397c99c0c3b36835bc2ef66a24355688490ed9d942efd71385984c68f76ceb1379241b59afd2941d7e2ea9a7726bd7619b79c11209f41ccd55923
+DIST zim-0.57.tar.gz 1565535 SHA256 1e29eeef6a3d467a5598f0f17b9e0d0b32a43b70cd32f71de12fa801b2338366 SHA512 4f5ca5cdc41b0d5e2bb06b6a38e9dac4a7d270fbb9f64970aa10d6f28de5e36aea175dfe29f1f23294b5f554c11361e267f373a2b4b8e531028676e03f557367 WHIRLPOOL 80965fd3ce25e79cc0a33c952b7455201e4d53d5a105da806cb4c8a026ae0f864cecc17ab11f8c6ebbcd07e76e7422a73b72e7ab9b200d387be6a48fdccc4e37
+EBUILD zim-0.56.ebuild 1747 SHA256 c9f8660cc6ccb988072b55c1ec30f379e4994609deab67693ea5770297a269a7 SHA512 12a922c8c8e184cc43779b3ddee012313d2a898ef6fa62852c1ee594ec15ac4093e5a0f830b2de47b4b91e08f0577f6dd2dfcc33fa40550dcb82270e63144d1b WHIRLPOOL aee6bf5cad6c443a2600b762aca0768b3646658a8673ad5355890027dc3c1b5be0db78cf5afac65f98e0d673f37b25e59d766eb5dbc4dd53d5e022662217f1db
+EBUILD zim-0.57.ebuild 1873 SHA256 d2ad86abfcf3988e4dccacbddbbb8b21e80533927b6085a0ff55e837a12fe997 SHA512 6cc540e5218542996d4d259d9f881cb2393e84c75ed96cc695ac517868047a5137145dd3ec51beac7b9eb2ecef8511e04f5edde745613942612eb2974b3b4bb9 WHIRLPOOL e5bc8ed4a84d21ef5319ffa3de90f301301285c87217c2742777d9120278fb88fa94ebb22599835b6db0a0217a00e9bbb617a3c36397c06e1fee21d88b811586
+MISC ChangeLog 4134 SHA256 6891d1796a054a2c40cdbe7133f90ed28e902e7cd0a4fdf50f9ed519f6691eb6 SHA512 b074774ede39eca898832e7f401bac1c9ffc3ec000e2a89a50e7b044196382b792cc4545bb3531d181ea2a67d5cab964eca5a87a3d13a203b360772fad6919f5 WHIRLPOOL bb9c93727e1edfaa33e0c29adfe4a279e28b82e64d3054a8af1ae8fc91797312039a8da8d7ce2b55ba735ce37459b6092b999338f6a7c64299406e23b2afe9eb
+MISC metadata.xml 727 SHA256 c377b11e645a7257ee7a4d966bd95bcb15a621601c6d876d44d9171f4601f051 SHA512 84bfa4082cfc864157a781efe41e673a5d0412b11d9edfea122cb27fa222eff5ee34ff388334e066324d67aaddbaad4291346b62019702577e194f345a11bac6 WHIRLPOOL 37d64cd8fc204bbb4765fff0c3427ea4745295f27b5fb91b56a14f31adc9a1b0c918a13fd1f0f8020f485ae4d01e49e573d54fd4915d81c1b7a04d5cf9e1c227
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAk/Qx20ACgkQknrdDGLu8JDdGQD/d50UrQWIIIm2M7PO5xHnEVGv
-awsiozgLKcZCHF7+JCUA/1i8OFObfkCLugI0qGH/Xxo22xy8r6XFKq6SxkfyZCEr
-=Ze0x
+iEYEAREIAAYFAlDKBy4ACgkQVWmRsqeSphNKNQCcC3BWGx0JvckxsgRFippTAPZ1
+VIwAniXtIvMvV64ayv9NFIjGTUDpXffU
+=En0T
-----END PGP SIGNATURE-----
diff --git a/x11-misc/zim/zim-0.55.ebuild b/x11-misc/zim/zim-0.55.ebuild
deleted file mode 100644
index a01dc1768d3c..000000000000
--- a/x11-misc/zim/zim-0.55.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.55.ebuild,v 1.1 2012/06/04 21:21:16 xmw Exp $
-
-EAPI=3
-
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="2:2.5"
-
-inherit distutils eutils fdo-mime virtualx
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="|| ( >=dev-lang/python-2.6 dev-python/simplejson )
- dev-python/pygtk"
-DEPEND="${RDEPEND}
- x11-misc/xdg-utils
- test? ( dev-vcs/bzr )"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-}
-
-src_test() {
- VIRTUALX_COMMAND="$(PYTHON)" virtualmake test.py || die
-}
-
-src_install () {
- doicon data/${PN}.png || die "doicon failed"
- distutils_src_install --skip-xdg-cmd
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
- fdo-mime_desktop_database_update
- xdg-icon-resource install --context mimetypes --size 64 \
- "${ROOT}/usr/share/pixmaps/zim.png" \
- application-x-zim-notebook || die "xdg-icon-resource install failed"
- ewarn "Please emerge these packages for additional functionality"
- ewarn " dev-lang/R"
- ewarn " dev-python/gtkspell-python"
- ewarn " dev-vcs/bzr"
- ewarn " media-gfx/graphviz"
- ewarn " media-gfx/imagemagick"
- ewarn " media-gfx/scrot"
- ewarn " sci-visualization/gnuplot"
- ewarn " virtual/latex-base app-text/dvipng"
-}
-
-pkg_postrm() {
- distutils_pkg_postrm
- fdo-mime_desktop_database_update
- xdg-icon-resource uninstall --context mimetypes --size 64 \
- application-x-zim-notebook || die "xdg-icon-resource uninstall failed"
-}
diff --git a/x11-misc/zim/zim-0.54.ebuild b/x11-misc/zim/zim-0.57.ebuild
index b0a2bb07604f..cc038d29d22f 100644
--- a/x11-misc/zim/zim-0.54.ebuild
+++ b/x11-misc/zim/zim-0.57.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.54.ebuild,v 1.2 2012/04/13 19:51:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.57.ebuild,v 1.1 2012/12/13 16:49:49 jer Exp $
EAPI=3
@@ -48,15 +48,19 @@ pkg_postinst() {
xdg-icon-resource install --context mimetypes --size 64 \
"${ROOT}/usr/share/pixmaps/zim.png" \
application-x-zim-notebook || die "xdg-icon-resource install failed"
- ewarn "Please emerge these packages for additional functionality"
- ewarn " dev-lang/R"
- ewarn " dev-python/gtkspell-python"
- ewarn " dev-vcs/bzr"
- ewarn " media-gfx/graphviz"
- ewarn " media-gfx/imagemagick"
- ewarn " media-gfx/scrot"
- ewarn " sci-visualization/gnuplot"
- ewarn " virtual/latex-base app-text/dvipng"
+ 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() {