From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BC671158083 for ; Thu, 5 Sep 2024 19:54:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4BD0DE2AA4; Thu, 5 Sep 2024 19:54:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2BEA7E2AA4 for ; Thu, 5 Sep 2024 19:54:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32892341C4B for ; Thu, 5 Sep 2024 19:54:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98EDB1F3A for ; Thu, 5 Sep 2024 19:54:44 +0000 (UTC) From: "Petr Vaněk" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petr Vaněk" Message-ID: <1725566038.a91d4e08da9ab2c6f8aff1b33d80433cd64b4e1a.arkamar@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/tea/, app-editors/tea/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/tea/Manifest app-editors/tea/files/tea-62.1.1-fix-desktop.patch app-editors/tea/metadata.xml app-editors/tea/tea-47.0.0.ebuild app-editors/tea/tea-62.1.1.ebuild app-editors/tea/tea-62.2.1.ebuild X-VCS-Directories: app-editors/tea/ app-editors/tea/files/ X-VCS-Committer: arkamar X-VCS-Committer-Name: Petr Vaněk X-VCS-Revision: a91d4e08da9ab2c6f8aff1b33d80433cd64b4e1a X-VCS-Branch: master Date: Thu, 5 Sep 2024 19:54:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cb31f787-f78c-4e50-b137-0d03804e24b2 X-Archives-Hash: a67026ac1999dc05a03318e39b132596 commit: a91d4e08da9ab2c6f8aff1b33d80433cd64b4e1a Author: Petr Vaněk gentoo org> AuthorDate: Thu Sep 5 19:35:43 2024 +0000 Commit: Petr Vaněk gentoo org> CommitDate: Thu Sep 5 19:53:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a91d4e08 app-editors/tea: drop 47.0.0, 62.1.1, 62.2.1 Signed-off-by: Petr Vaněk gentoo.org> app-editors/tea/Manifest | 3 - app-editors/tea/files/tea-62.1.1-fix-desktop.patch | 26 ------- app-editors/tea/metadata.xml | 2 - app-editors/tea/tea-47.0.0.ebuild | 59 --------------- app-editors/tea/tea-62.1.1.ebuild | 76 -------------------- app-editors/tea/tea-62.2.1.ebuild | 83 ---------------------- 6 files changed, 249 deletions(-) diff --git a/app-editors/tea/Manifest b/app-editors/tea/Manifest index fed0cbb5a98e..6b85cd89e39a 100644 --- a/app-editors/tea/Manifest +++ b/app-editors/tea/Manifest @@ -1,4 +1 @@ -DIST tea-47.0.0.tar.bz2 437273 BLAKE2B 8ed36526dedc6df4af74ef0e400c2ee2e19bb533cf2a4fa51df83f21ad78abb0e8e90bce3469e2e8db5f780ba8a900aedf2737c736945431b836ba0a76574b26 SHA512 7136d59383bf43c6a024a31aa29860a3e89893ff091a42f44f9e7088fb318920ab886cd1fdabc8ff6e3c30f8eb3d46d707228d2d45fb085ed7c822a4ffd89d13 -DIST tea-qt-62.1.1.tar.gz 675996 BLAKE2B 2219a7f61fe54426b0216e5612b05048ee6f1451084d4aa66c0744110ce6151c2ba46acf1c7e7b5916ae6194516391fa1c23cb797ecd7ac423e3005a88da85f4 SHA512 1d81b83a6f25f385959a507342f4a79c24be5af20c2841d851f0d233cbd77142c672c9f147a185e3088000172d5d943bd290497dfcbec87c1a3e0b96a40a5217 -DIST tea-qt-62.2.1.tar.gz 676570 BLAKE2B f4fa2756d6016d84c0c20c572dc2e03013d8f5b12d726d6d0aa4edbdcb5784552c8330c52f4016dcb85c0d8e1923bfdc90d39dd4dee4f378ac8c07182f1e7eee SHA512 0e2adf21023867466b7a4228c56ac1d05533b27f4abee672529c1f506f8d5e2880216bae35e1ff5ad0e0dc64c22c7536144c54c347c9d8f1d569fb74261101d0 DIST tea-qt-62.4.0.tar.gz 676565 BLAKE2B 2dbeeb37142bcc6d5a8434e21380e316f49f614e3c602799088848994eac0b57bff54ca07f8ac411a76a480a0079fccf6d648bebc1c10a9c8790228f7c2efd87 SHA512 57af069d0afd25319cede65c9dcf08860267d22f4aebbe9b068e28739fd74d8b1da960f09ce41fc1cb88c68e29c96ec2e2a6e167777ac32cd7bd9d543b05dd42 diff --git a/app-editors/tea/files/tea-62.1.1-fix-desktop.patch b/app-editors/tea/files/tea-62.1.1-fix-desktop.patch deleted file mode 100644 index 36af0b5c0027..000000000000 --- a/app-editors/tea/files/tea-62.1.1-fix-desktop.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8fb78950cd2e50c76cbf34b5245a413a5f3477f0 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate -Date: Sun, 19 Nov 2023 12:56:05 +0200 -Subject: [PATCH] Remove whitespace at the end the desktop file - - * QA Notice: This package installs one or more .desktop files that do not - * pass validation. - * - * /usr/share/applications/tea.desktop: error: (will be fatal in the future): value "text/plain;application/epub+zip;application/fb2;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.oasis.opendocument.text;application/rtf;application/x-tex; " for key "MimeType" in group "Desktop Entry" contains value " " which is an invalid MIME type: " " does not contain a subtype - * - -Signed-off-by: Alfred Wingate ---- a/desktop/tea.desktop -+++ b/desktop/tea.desktop -@@ -6,7 +6,7 @@ Icon=tea - Exec=tea %F - Categories=Utility;TextEditor; - StartupNotify=false --MimeType=text/plain;application/epub+zip;application/fb2;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.oasis.opendocument.text;application/rtf;application/x-tex; -+MimeType=text/plain;application/epub+zip;application/fb2;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.oasis.opendocument.text;application/rtf;application/x-tex; - NoDisplay=false - Version=1.1 - Keywords=text editor;text;editor; --- -2.42.1 - diff --git a/app-editors/tea/metadata.xml b/app-editors/tea/metadata.xml index b5d7b51471d8..2b4986d719ab 100644 --- a/app-editors/tea/metadata.xml +++ b/app-editors/tea/metadata.xml @@ -12,7 +12,5 @@ Enable spellchecking using app-text/aspell - Enable spellchecking using app-text/hunspell - Enable support for plugins using QML diff --git a/app-editors/tea/tea-47.0.0.ebuild b/app-editors/tea/tea-47.0.0.ebuild deleted file mode 100644 index 16f6139622f0..000000000000 --- a/app-editors/tea/tea-47.0.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg - -DESCRIPTION="Small, lightweight Qt text editor" -HOMEPAGE="https://tea.ourproject.org/" -SRC_URI="https://tea.ourproject.org/dloads/${P}.tar.bz2" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" -IUSE="aspell djvu hunspell pdf +qml" - -BDEPEND=" - hunspell? ( virtual/pkgconfig ) -" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - sys-libs/zlib - aspell? ( app-text/aspell ) - djvu? ( app-text/djvu ) - hunspell? ( app-text/hunspell:= ) - pdf? ( app-text/poppler[qt5] ) - qml? ( dev-qt/qtdeclarative:5 ) -" -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS ChangeLog NEWS NEWS-RU TODO ) - -src_configure() { - local myqmakeargs=( - PREFIX=/usr - $(usex aspell '' CONFIG+=noaspell) - $(usex djvu CONFIG+=usedjvu '') - $(usex hunspell '' CONFIG+=nohunspell) - $(usex pdf CONFIG+=usepoppler '') - $(usex qml '' CONFIG+=noqml) - ) - eqmake5 tea-qmake.pro "${myqmakeargs[@]}" -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs - - docinto html - dodoc manuals/*.html - - insinto /usr/share/qt5/translations - doins translations/${PN}_*.qm -} diff --git a/app-editors/tea/tea-62.1.1.ebuild b/app-editors/tea/tea-62.1.1.ebuild deleted file mode 100644 index 98ca7bb80309..000000000000 --- a/app-editors/tea/tea-62.1.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg - -MY_P="tea-qt-${PV}" - -DESCRIPTION="Small, lightweight Qt text editor" -HOMEPAGE="https://tea.ourproject.org/" -SRC_URI="https://github.com/psemiletov/tea-qt/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" -IUSE="aspell djvu pdf" - -# qt6 blocked by poppler[qt6] -DEPEND=" - app-text/hunspell:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - sys-libs/zlib - aspell? ( app-text/aspell ) - djvu? ( app-text/djvu ) - pdf? ( app-text/poppler:=[qt5] ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS NEWS-RU TODO ) - -PATCHES=( - "${FILESDIR}/tea-62.1.1-qt-option.patch" - "${FILESDIR}/tea-62.1.1-fix-desktop.patch" -) - -src_prepare() { - cmake_src_prepare - - # Replace AUR link with p.g.o link - sed -i \ - -e 's,AUR: aur.archlinux.org/packages/tea-qt-git,Gentoo: https://packages.gentoo.org/packages/app-editors/tea,' \ - tea.cpp translations/{de,es,fr,pl,ru}.ts || die - - # Rename tea to tea-qt to avoid file conflict with dev-util/tea - # bug #917587 - # https://github.com/psemiletov/tea-qt/issues/50 - sed -i -e '/set_target_properties(tea PROPERTIES$/ a\ - OUTPUT_NAME \"tea-qt\"' \ - CMakeLists.txt || die - sed -i -e '/Exec/ { s/tea/tea-qt/ }' desktop/tea.desktop || die -} - -src_configure() { - local mycmakeargs=( - -DUSE_ASPELL=$(usex aspell) - -DUSE_PDF=$(usex pdf) - -DUSE_DJVU=$(usex djvu) - -DUSE_QT6=OFF # blocked by poppler-qt6 - -DUSE_PRINTER=OFF # only for qt6 - ) - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - - if [[ "${REPLACING_VERSIONS}" == "47.0.0" ]]; then - elog "Executable 'tea' has been renamed to 'tea-qt'" - fi -} diff --git a/app-editors/tea/tea-62.2.1.ebuild b/app-editors/tea/tea-62.2.1.ebuild deleted file mode 100644 index d966ed1501ae..000000000000 --- a/app-editors/tea/tea-62.2.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg - -MY_P="tea-qt-${PV}" - -DESCRIPTION="Small, lightweight Qt text editor" -HOMEPAGE="https://tea.ourproject.org/" -SRC_URI="https://github.com/psemiletov/tea-qt/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" -IUSE="aspell djvu qt6 pdf" - -RESTRICT="test" # no tests - -DEPEND=" - app-text/hunspell:= - sys-libs/zlib - aspell? ( app-text/aspell ) - djvu? ( app-text/djvu ) - qt6? ( - dev-qt/qtbase:6[widgets] - dev-qt/qt5compat:6 - pdf? ( app-text/poppler:=[qt6(-)] ) - ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - pdf? ( app-text/poppler:=[qt5] ) - ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS NEWS-RU TODO ) - -PATCHES=( - "${FILESDIR}/tea-62.1.1-fix-desktop.patch" -) - -src_prepare() { - cmake_src_prepare - - # Replace AUR link with p.g.o link - sed -i \ - -e 's,AUR: aur.archlinux.org/packages/tea-qt-git,Gentoo: https://packages.gentoo.org/packages/app-editors/tea,' \ - tea.cpp translations/{de,es,fr,pl,ru}.ts || die - - # Rename tea to tea-qt to avoid file conflict with dev-util/tea - # bug #917587 - # https://github.com/psemiletov/tea-qt/issues/50 - sed -i -e '/set_target_properties(tea PROPERTIES$/ a\ - OUTPUT_NAME \"tea-qt\"' \ - CMakeLists.txt || die - sed -i -e '/Exec/ { s/tea/tea-qt/ }' desktop/tea.desktop || die -} - -src_configure() { - local mycmakeargs=( - -DUSE_ASPELL=$(usex aspell) - -DUSE_PDF=$(usex pdf) - -DUSE_DJVU=$(usex djvu) - -DUSE_PRINTER=OFF # appears to be setup wrong - $(cmake_use_find_package qt6 Qt6) - ) - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - - if [[ "${REPLACING_VERSIONS}" == "47.0.0" ]]; then - elog "Executable 'tea' has been renamed to 'tea-qt'" - fi -}