commit: dae92a95c2e34cc8a15f5fdd103e64ddf2fa187f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jul 11 17:28:12 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jul 11 18:34:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dae92a95
games-puzzle/connectagram: Drop old Package-Manager: Portage-2.3.42, Repoman-2.3.9 games-puzzle/connectagram/Manifest | 1 - .../connectagram/connectagram-1.2.1-r1.ebuild | 54 --------------- .../files/connectagram-1.2.1-gentoo.patch | 76 ---------------------- 3 files changed, 131 deletions(-) diff --git a/games-puzzle/connectagram/Manifest b/games-puzzle/connectagram/Manifest index 31dbfd5d3af..d93542cb42f 100644 --- a/games-puzzle/connectagram/Manifest +++ b/games-puzzle/connectagram/Manifest @@ -1,2 +1 @@ -DIST connectagram-1.2.1-src.tar.bz2 1632426 BLAKE2B 8b3f6a42e074dd2698dd29cf74520a1aff972cd9376fcbaf42852daf71e963ef9e9a5b2cc393b8a1b36367a2d9fc2140cb2aedbecf5efdff787d8e43ebaab267 SHA512 0266af5680e7f76d517f60934afc6115c1118832fef237803b1b3d8c0fb785e5c312d585b099f24f4c476f124ca9722868a159dc4d1a9a8a695e9cdfa4f9c1c6 DIST connectagram-1.2.8-src.tar.bz2 1760028 BLAKE2B db29251339abaa8ecbda69afff55366a2cc94ae9515bdc3750b9d328b7f5445613ee2da4c308008fb5ad09e20435cb294f97c5e9a23124a4330004cde11bd6c5 SHA512 f48fe0320745919f9532a0bb25799b05272dc30b9acba20e559d1df7ce15570eb37a29a2f746af94077f56306c45e2ee32d49f27585b6e4385477aeb795f4ed8 diff --git a/games-puzzle/connectagram/connectagram-1.2.1-r1.ebuild b/games-puzzle/connectagram/connectagram-1.2.1-r1.ebuild deleted file mode 100644 index 2ea5d017d25..00000000000 --- a/games-puzzle/connectagram/connectagram-1.2.1-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2-utils qmake-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="" - -RDEPEND=" - >=dev-qt/qtcore-5.2:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - >=dev-qt/qtgui-5.2:5 -" -DEPEND="${RDEPEND}" - -src_prepare() { - default - - eapply "${FILESDIR}"/${P}-gentoo.patch - - 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_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-puzzle/connectagram/files/connectagram-1.2.1-gentoo.patch b/games-puzzle/connectagram/files/connectagram-1.2.1-gentoo.patch deleted file mode 100644 index b02dfef4679..00000000000 --- a/games-puzzle/connectagram/files/connectagram-1.2.1-gentoo.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- connectagram-1.2.1.orig/connectagram.pro -+++ connectagram-1.2.1/connectagram.pro -@@ -74,16 +74,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/ -@@ -98,7 +98,7 @@ - appdata.path = $$PREFIX/share/appdata/ - - qm.files = translations/*.qm -- qm.path = $$PREFIX/share/connectagram/translations -+ qm.path = @GAMES_DATADIR@/connectagram/translations - - man.files = doc/connectagram.6 - man.path = $$PREFIX/share/man/man6 ---- connectagram-1.2.1.orig/src/locale_dialog.cpp -+++ connectagram-1.2.1/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/")) { ---- connectagram-1.2.1.orig/src/new_game_dialog.cpp -+++ connectagram-1.2.1/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); - } ---- connectagram-1.2.1.orig/src/wordlist.cpp -+++ connectagram-1.2.1/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; - }
