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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DDB3D138334 for ; Wed, 11 Jul 2018 18:35:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B1F3E082F; Wed, 11 Jul 2018 18:34:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C1A6E0828 for ; Wed, 11 Jul 2018 18:34:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A4C3335CA6 for ; Wed, 11 Jul 2018 18:34:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C978377 for ; Wed, 11 Jul 2018 18:34:50 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1531334074.95dd4ebdb5cd696238e52c5d6bd1fcac9bbe880d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/tanglet/files/, games-puzzle/tanglet/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-puzzle/tanglet/Manifest games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch games-puzzle/tanglet/tanglet-1.5.2.ebuild X-VCS-Directories: games-puzzle/tanglet/files/ games-puzzle/tanglet/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 95dd4ebdb5cd696238e52c5d6bd1fcac9bbe880d X-VCS-Branch: master Date: Wed, 11 Jul 2018 18:34:50 +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-Archives-Salt: 5b1eb088-ac53-43a6-9c20-ccce175dc0c5 X-Archives-Hash: a11d67671ef49011a073b93696f19ea7 commit: 95dd4ebdb5cd696238e52c5d6bd1fcac9bbe880d Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jul 11 18:08:52 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jul 11 18:34:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95dd4ebd games-puzzle/tanglet: 1.5.2 version bump Fixes qmake with Qt 5.11. Package-Manager: Portage-2.3.42, Repoman-2.3.9 games-puzzle/tanglet/Manifest | 1 + .../tanglet/files/tanglet-1.5.2-gentoo.patch | 33 +++++++++++++++ games-puzzle/tanglet/tanglet-1.5.2.ebuild | 48 ++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/games-puzzle/tanglet/Manifest b/games-puzzle/tanglet/Manifest index b06a780476a..15f18c90c8e 100644 --- a/games-puzzle/tanglet/Manifest +++ b/games-puzzle/tanglet/Manifest @@ -1 +1,2 @@ DIST tanglet-1.3.1-src.tar.bz2 8461603 BLAKE2B 86542f6248b58dc7f72be8264ded94376d746827865b3633640a24055452a4c4d677bf3f6aab8eb6736ce1cf92b8a8b6963637418118861dad296bb4ccac5b2a SHA512 b939ca45f26baf8e7e32da8775e673707472e5cd07d344642eeb15986ff99319e0ab1bacf78e2ea49f004ec67a6d081a91c939cf7c75228a195654d429235625 +DIST tanglet-1.5.2-src.tar.bz2 8646616 BLAKE2B 0a38690069550e27a302f28e7db3753eaf67af7add730d8069ec4df001a431843e204603475146d56049cdf40c0be20d8ef83ea9f47b27cf82cc232e4fecef35 SHA512 a97b9fe3c9c80a843c4696766d15edcab48369bd905e893c2975bfb9faf91d4a58a3c440d242be91f5838aacdf1526022b5ce8c463adfd8b0bb62e008be460ee diff --git a/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch b/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch new file mode 100644 index 00000000000..8409f2cc48c --- /dev/null +++ b/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch @@ -0,0 +1,33 @@ +--- a/src/src.pro 2018-05-29 13:11:55.000000000 +0200 ++++ b/src/src.pro 2018-07-11 20:02:51.415773874 +0200 +@@ -99,7 +99,7 @@ + RESOURCES += ../icons/icon.qrc + + isEmpty(PREFIX) { +- PREFIX = /usr/local ++ PREFIX = /usr + } + isEmpty(BINDIR) { + BINDIR = bin +--- a/src/locale_dialog.cpp ++++ b/src/locale_dialog.cpp +@@ -85,7 +85,7 @@ + if (paths.isEmpty()) { + QString appdir = QCoreApplication::applicationDirPath(); + paths.append(appdir); +- paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower()); ++ paths.append("/usr/share"); + paths.append(appdir + "/../Resources"); + } + foreach (const QString& path, paths) { +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -46,7 +46,7 @@ + QString path = app.applicationDirPath(); + QStringList paths; + paths.append(path + "/data/"); +- paths.append(path + "/../share/tanglet/data/"); ++ paths.append("/usr/share/data/"); + paths.append(path + "/../Resources/data/"); + QDir::setSearchPaths("tanglet", paths); + diff --git a/games-puzzle/tanglet/tanglet-1.5.2.ebuild b/games-puzzle/tanglet/tanglet-1.5.2.ebuild new file mode 100644 index 00000000000..2595d233626 --- /dev/null +++ b/games-puzzle/tanglet/tanglet-1.5.2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit desktop gnome2-utils qmake-utils xdg-utils + +DESCRIPTION="A single player word finding game based on Boggle" +HOMEPAGE="https://gottcode.org/tanglet/" +SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + sys-libs/zlib:= +" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 +" + +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) + +src_configure() { + eqmake5 tanglet.pro +} + +src_install() { + emake INSTALL_ROOT="${D}" install + einstalldocs +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +}