gentoo resync : 14.07.2018

3 files changed, 24 insertions, 26 deletions

diff --git a/games-puzzle/connectagram/Manifest b/games-puzzle/connectagram/Manifest
index ae456e550f7c..926cb20cc477 100644
--- a/games-puzzle/connectagram/Manifest
+++ b/games-puzzle/connectagram/Manifest
@@ -1,4 +1,4 @@
-AUX connectagram-1.2.1-gentoo.patch 2551 BLAKE2B f10e4f38d6b3e35a9b564c4139e80d22ccbe9faf3ad1a631f8c9b7633bc1145b56788d4cd1159fe6562cf78fa6d9288fd359f18d88b1b98d585b4f38c7ec1599 SHA512 a95856c1f76670d1ea1e86a34f8d05ed7621479d6268068df46c7b3882dff633e7a8236f01c9ad3215d0f6e89a5702d2ece106be3db971431b129752be272804
-DIST connectagram-1.2.1-src.tar.bz2 1632426 BLAKE2B 8b3f6a42e074dd2698dd29cf74520a1aff972cd9376fcbaf42852daf71e963ef9e9a5b2cc393b8a1b36367a2d9fc2140cb2aedbecf5efdff787d8e43ebaab267 SHA512 0266af5680e7f76d517f60934afc6115c1118832fef237803b1b3d8c0fb785e5c312d585b099f24f4c476f124ca9722868a159dc4d1a9a8a695e9cdfa4f9c1c6
-EBUILD connectagram-1.2.1-r1.ebuild 933 BLAKE2B 22baf28d3d8baf3d7e1da72bd87960143a1b3fb29a77b4f74706e9c903d7c3d7a6350d37363298ba315d328c2f44b031e0c3a72935d120b1cdcbda3eed209faa SHA512 3449296162e5e4c29599064c544ef23123ce803aaecd59081e0ffa355c90d724594592abf97e7e9620e73c2565f1f396cc5907a1470bfcb4ddb73a09d838d33a
+AUX connectagram-1.2.8-gentoo.patch 2479 BLAKE2B 128389ff604e5a7a623e5893d3366ff9f4b7e58f05b49e1435a70c546d754718d0640451fb79a56e1b5a12893445040a020aa09cbd876b31e1dc8042afde0250 SHA512 d45be3e0734c3f2832cbdf56aaf722df5e4fe37ebf9a1d44001463d2bbb0f90de762a55898699343ad99e999c751e7f041f0bb7cefa679a95f56454c6140571c
+DIST connectagram-1.2.8-src.tar.bz2 1760028 BLAKE2B db29251339abaa8ecbda69afff55366a2cc94ae9515bdc3750b9d328b7f5445613ee2da4c308008fb5ad09e20435cb294f97c5e9a23124a4330004cde11bd6c5 SHA512 f48fe0320745919f9532a0bb25799b05272dc30b9acba20e559d1df7ce15570eb37a29a2f746af94077f56306c45e2ee32d49f27585b6e4385477aeb795f4ed8
+EBUILD connectagram-1.2.8.ebuild 910 BLAKE2B 6975e489cb78a8994783b57bd43419eac6c1d00e55e6875aeca89103a28d24b7133289344ebd6b0172adbdbfaf7a1339747e56d026673ba2366b2da48feda22b SHA512 b868f018cea2ddeb980b5950669792a2972d749c614cc2f87f1daf3339af529c0de28b451004022e234001ec92d118566b624305e362ccc5b7c54a1dd69bb093
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/connectagram/connectagram-1.2.1-r1.ebuild b/games-puzzle/connectagram/connectagram-1.2.8.ebuild
index 2ea5d017d259..8405ae6061d8 100644
--- a/games-puzzle/connectagram/connectagram-1.2.1-r1.ebuild
+++ b/games-puzzle/connectagram/connectagram-1.2.8.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gnome2-utils qmake-utils
 
 DESCRIPTION="A word unscrambling game"
@@ -14,18 +15,19 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	>=dev-qt/qtcore-5.2:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
-	>=dev-qt/qtgui-5.2:5
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
 	default
-
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-
 	sed -i \
 		-e "s#@GAMES_BINDIR@#/usr/bin#" \
 		-e "s#@GAMES_DATADIR@#/usr/share#" \
@@ -41,10 +43,6 @@ src_install() {
 	einstalldocs
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	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.8-gentoo.patch
index b02dfef46792..7bb74baeee82 100644
--- a/games-puzzle/connectagram/files/connectagram-1.2.1-gentoo.patch
+++ b/games-puzzle/connectagram/files/connectagram-1.2.8-gentoo.patch
@@ -1,6 +1,6 @@
---- connectagram-1.2.1.orig/connectagram.pro
-+++ connectagram-1.2.1/connectagram.pro
-@@ -74,16 +74,16 @@
+--- 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) {
@@ -21,17 +21,17 @@
  
  	pixmap.files = icons/connectagram.xpm
  	pixmap.path = $$PREFIX/share/pixmaps/
-@@ -98,7 +98,7 @@
- 	appdata.path = $$PREFIX/share/appdata/
+@@ -114,7 +114,7 @@
+ 	appdata.path = $$PREFIX/share/metainfo/
  
- 	qm.files = translations/*.qm
+ 	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
- 	man.path = $$PREFIX/share/man/man6
---- connectagram-1.2.1.orig/src/locale_dialog.cpp
-+++ connectagram-1.2.1/src/locale_dialog.cpp
+--- a/src/locale_dialog.cpp
++++ b/src/locale_dialog.cpp
 @@ -88,6 +88,7 @@
  		paths.append(appdir);
  		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
@@ -40,8 +40,8 @@
  	}
  	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
+--- 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());
@@ -51,8 +51,8 @@
  	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
+--- a/src/wordlist.cpp
++++ b/src/wordlist.cpp
 @@ -91,9 +91,9 @@
  
  QString WordList::defaultLanguage() {