[gentoo-commits] repo/gentoo:master commit in: games-puzzle/connectagram/files/, games-puzzle/connectagram/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     95ba26bfe63dace1cadbe8792c43a9fba5d6c789
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 16:17:13 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 16:46:50 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ba26bf

games-puzzle/connectagram: drop 1.2.11

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-puzzle/connectagram/Manifest                 |  1 -
 .../connectagram/connectagram-1.2.11.ebuild        | 53 ---------------
 .../files/connectagram-1.2.8-gentoo.patch          | 76 ----------------------
 3 files changed, 130 deletions(-)

diff --git a/games-puzzle/connectagram/Manifest b/games-puzzle/connectagram/Manifest
index d9b706914176..f275a96f25b6 100644
--- a/games-puzzle/connectagram/Manifest
+++ b/games-puzzle/connectagram/Manifest
@@ -1,2 +1 @@
-DIST connectagram-1.2.11-src.tar.bz2 1754242 BLAKE2B 9322605428a583ed356a7ce2ab67004a8cf2145205d2772652b96a022e085ce89cf3b43b7f77179e5ce7ce593471c39f16d27e35ae28900ffac3bace6fdbe97e SHA512 99432ec3bf9f579e91b05f7ca2da99f4251bb53e18722bf6727dd48640c611b82336b9882922039a233c6ddcd492ebda12589fb299558eee97bf7116a1b3e2f7
 DIST connectagram-1.3.7.tar.bz2 25092666 BLAKE2B 38c5aeac8a3aad2ee5927fc89523f58d2b65693d6a177ef33e09e660a369069ea0ed16cf6c7411233cff525d172a43e118a5fc712763b99fc7f3f35e09d41eae SHA512 263af0c0d12d7af38984af86c7db31394526df177f5241572fc05927bd840c1647892198c9779263efe81fd99472e8694b7d5e732f7b16676aa6237c2b12ea44

diff --git a/games-puzzle/connectagram/connectagram-1.2.11.ebuild b/games-puzzle/connectagram/connectagram-1.2.11.ebuild
deleted file mode 100644
index 3442322f0168..000000000000
--- a/games-puzzle/connectagram/connectagram-1.2.11.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="A word unscrambling game"
-HOMEPAGE="https://gottcode.org/connectagram/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.8-gentoo.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s#@GAMES_BINDIR@#/usr/bin#" \
-		-e "s#@GAMES_DATADIR@#/usr/share#" \
-		${PN}.pro src/{locale_dialog,new_game_dialog,wordlist}.cpp || die
-}
-
-src_configure() {
-	eqmake5 connectagram.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}

diff --git a/games-puzzle/connectagram/files/connectagram-1.2.8-gentoo.patch b/games-puzzle/connectagram/files/connectagram-1.2.8-gentoo.patch
deleted file mode 100644
index 7bb74baeee82..000000000000
--- a/games-puzzle/connectagram/files/connectagram-1.2.8-gentoo.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/connectagram.pro	2018-07-11 19:19:33.058534696 +0200
-+++ b/connectagram.pro	2018-07-11 19:20:30.536282297 +0200
-@@ -90,16 +90,16 @@
- 	RESOURCES += icons/icon.qrc
- 
- 	isEmpty(PREFIX) {
--		PREFIX = /usr/local
-+		PREFIX = /usr
- 	}
- 	isEmpty(BINDIR) {
--		BINDIR = bin
-+		BINDIR = @GAMES_BINDIR@
- 	}
- 
--	target.path = $$PREFIX/$$BINDIR/
-+	target.path = $$BINDIR/
- 
- 	data.files = data
--	data.path = $$PREFIX/share/connectagram/
-+	data.path = @GAMES_DATADIR@/connectagram/
- 
- 	pixmap.files = icons/connectagram.xpm
- 	pixmap.path = $$PREFIX/share/pixmaps/
-@@ -114,7 +114,7 @@
- 	appdata.path = $$PREFIX/share/metainfo/
- 
- 	qm.files = $$replace(TRANSLATIONS, .ts, .qm)
--	qm.path = $$PREFIX/share/connectagram/translations
-+	qm.path = @GAMES_DATADIR@/connectagram/translations
- 	qm.CONFIG += no_check_exist
- 
- 	man.files = doc/connectagram.6
---- a/src/locale_dialog.cpp
-+++ b/src/locale_dialog.cpp
-@@ -88,6 +88,7 @@
- 		paths.append(appdir);
- 		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
- 		paths.append(appdir + "/../Resources");
-+		paths.append("@GAMES_DATADIR@/connectagram");
- 	}
- 	for (const QString& path : paths) {
- 		if (QFile::exists(path + "/translations/")) {
---- a/src/new_game_dialog.cpp
-+++ b/src/new_game_dialog.cpp
-@@ -48,7 +48,7 @@
- 	m_wordlist = new WordList(this);
- 	m_wordlist->setLanguage(WordList::defaultLanguage());
- 	m_languages_box = new QComboBox(this);
--	QStringList languages = QDir("connectagram:").entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-+	QStringList languages = QDir("@GAMES_DATADIR@/connectagram/data").entryList(QDir::Dirs | QDir::NoDotAndDotDot);
- 	for (const QString& language : languages) {
- 		m_languages_box->addItem(LocaleDialog::languageName(language), language);
- 	}
---- a/src/wordlist.cpp
-+++ b/src/wordlist.cpp
-@@ -91,9 +91,9 @@
- 
- QString WordList::defaultLanguage() {
- 	QString language = QLocale().name();
--	if (!QFile::exists("connectagram:" + language)) {
-+	if (!QFile::exists("@GAMES_DATADIR@/connectagram/data/" + language)) {
- 		language = language.left(2);
--		if (!QFile::exists("connectagram:" + language)) {
-+		if (!QFile::exists("@GAMES_DATADIR@/connectagram/data/" + language)) {
- 			language = "en";
- 		}
- 	}
-@@ -112,7 +112,7 @@
- 	m_maximum_length(0)
- {
- 	// Read words from disk
--	QFile file("connectagram:" + language + "/words");
-+	QFile file("@GAMES_DATADIR@/connectagram/data/" + language + "/words");
- 	if (!file.open(QFile::ReadOnly | QIODevice::Text)) {
- 		return;
- 	}