commit: 9504f2fd617a863cab0fdd86c920f8cd69b87cf7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 21 23:04:42 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 21 23:12:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9504f2fd
app-text/cherrytree: Drop pygtk-based 0.37.0-r1, 0.38.9-r1 Bug: https://bugs.gentoo.org/708094 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-text/cherrytree/Manifest | 2 - app-text/cherrytree/cherrytree-0.37.0-r1.ebuild | 54 --------------------- app-text/cherrytree/cherrytree-0.38.9-r1.ebuild | 56 ---------------------- .../files/cherrytree-0.38.9_update_setup_py.patch | 17 ------- profiles/package.mask | 3 +- 5 files changed, 1 insertion(+), 131 deletions(-) diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest index 762a81d7baf..22a7dfb44bb 100644 --- a/app-text/cherrytree/Manifest +++ b/app-text/cherrytree/Manifest @@ -1,3 +1 @@ -DIST cherrytree-0.37.0.tar.gz 8888703 BLAKE2B 737c0c247c581086e23e4c3e5fba0b18459788b385078ec8092af8b7352d77c8b273c939f702178d0ae59c8633bf996a7a7e5223e22da703ced3c8bf1d7cbde3 SHA512 a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5 -DIST cherrytree-0.38.9.tar.gz 9928805 BLAKE2B 4de4187ae7e650090d82de5e8b1b7f85c4af6dbb2c9b2bc67f10b074db4c08c4b4593c4769708bfaf584958eefe083a3626f7e9c4d7736bc53d143528c754e09 SHA512 40c1c26fa1a6868b447d31625c14b10cf712185289cf97b71881c253d2f72c58f51b974a1615fca5b532099c4741c56f8419df2d02e4ca821b2a1b909152e56b DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9 SHA512 4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54 diff --git a/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild b/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild deleted file mode 100644 index 1e0aa58e041..00000000000 --- a/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" -DISTUTILS_SINGLE_IMPL=true - -inherit distutils-r1 xdg-utils - -DESCRIPTION="A hierarchical note taking application" -HOMEPAGE="https://www.giuspen.com/cherrytree"; -SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~amd64 ~x86" -LICENSE="GPL-3" -SLOT="0" -IUSE="nls" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] - dev-python/pyenchant[${PYTHON_MULTI_USEDEP}] - dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}] - dev-python/pygtksourceview:2[${PYTHON_MULTI_USEDEP}] - ')" - -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" - -python_prepare_all() { - sed -r -i \ - -e '/\bupdate-desktop-database\b/d' \ - setup.py || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - use nls || mydistutilsargs+=( --without-gettext ) -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/app-text/cherrytree/cherrytree-0.38.9-r1.ebuild b/app-text/cherrytree/cherrytree-0.38.9-r1.ebuild deleted file mode 100644 index 3451ffc2b7e..00000000000 --- a/app-text/cherrytree/cherrytree-0.38.9-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" -DISTUTILS_SINGLE_IMPL=true - -inherit distutils-r1 xdg-utils - -DESCRIPTION="A hierarchical note taking application" -HOMEPAGE="https://www.giuspen.com/cherrytree"; -SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~amd64 ~x86" -LICENSE="GPL-3" -SLOT="0" -IUSE="nls" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] - dev-python/pyenchant[${PYTHON_MULTI_USEDEP}] - dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}] - dev-python/pygtksourceview:2[${PYTHON_MULTI_USEDEP}] - dev-python/lxml[${PYTHON_MULTI_USEDEP}] - ')" - -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" - -PATCHES=( "${FILESDIR}"/${P}_update_setup_py.patch ) - -python_configure_all() { - use nls || mydistutilsargs+=( --without-gettext ) -} - -src_install() { - distutils-r1_src_install - python_optimize "${D}/usr/share/${PN}/modules" - - dodoc README.md changelog.txt -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch b/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch deleted file mode 100644 index aad93f93a15..00000000000 --- a/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ur a/setup.py b/setup.py ---- a/setup.py 2019-08-17 14:23:16.000000000 +0300 -+++ b/setup.py 2019-11-17 15:33:44.243070851 +0300 -@@ -195,7 +195,7 @@ - ("share/mime-info", ["linux/cherrytree.mime", "linux/cherrytree.keys"]), - ("share/application-registry", ["linux/cherrytree.applications"]), - ("share/metainfo", ["linux/cherrytree.appdata.xml"]), -- ("share/man/man1", ["linux/cherrytree.1.gz"]) -+ ("share/man/man1", ["linux/cherrytree.1"]) - ], - cmdclass={ - 'build': BuildData, -@@ -205,4 +205,3 @@ - }, - distclass=CherryTreeDist - ) -- subprocess.call("update-desktop-database") diff --git a/profiles/package.mask b/profiles/package.mask index 54975eea6c2..f9e8277f0fb 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -256,11 +256,10 @@ dev-ruby/rack-mount # Andreas Sturmlechner <ast...@gentoo.org> (2020-05-23) # Obsolete GNOME 2 era packages, stuck on Python 2 and pygtk, -# bugs #640022, #708094. Masked for removal in 30 days. +# bugs #640022. Masked for removal in 30 days. dev-python/gconf-python dev-python/gnome-python-base dev-python/pygtksourceview -<app-text/cherrytree-0.39.2 # Hans de Graaff <gra...@gentoo.org> (2020-05023) # Masked for removal in 30 days.
