version bump

Package-Manager: portage-2.2.14/cvs/Linux x86_64

diff --git a/games-puzzle/connectagram/ChangeLog b/games-puzzle/connectagram/ChangeLog
index b86d307d9bce1658ba66f4b19b933dc7dceb6ea4..10d4b4d75ffc1b1bf0e29eb56d29ffb3ac1a3f68 100644 (file)
--- a/games-puzzle/connectagram/ChangeLog
+++ b/games-puzzle/connectagram/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-puzzle/connectagram
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/ChangeLog,v 1.10 2014/08/29 17:16:14 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/ChangeLog,v 1.11 2015/02/08 07:32:12 mr_bones_ Exp $
+
+*connectagram-1.2.1 (08 Feb 2015)
+
+  08 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +connectagram-1.2.1.ebuild, +files/connectagram-1.2.1-gentoo.patch,
+  files/connectagram-1.1.2-gentoo.patch:
+  version bump
 
   29 Aug 2014; Michael Sterrett <mr_bones_@gentoo.org>
   -connectagram-1.1.1.ebuild, -files/connectagram-1.1.1-gentoo.patch:

diff --git a/games-puzzle/connectagram/Manifest b/games-puzzle/connectagram/Manifest
index 92274ecd3cf5b38db70c6e76a6e95d915ad48173..1490cfe8cccbce0157cf32dc0fcebeff04256515 100644 (file)
--- a/games-puzzle/connectagram/Manifest
+++ b/games-puzzle/connectagram/Manifest
@@ -1,7 +1,10 @@
 AUX connectagram-1.1.2-gentoo.patch 2536 SHA256 06756eaf8a8ed0ee2981bbfc646786c73cc3c588dc338ead8ae116174d6c37e8 SHA512 d0bcda5bcbe66d6664d7e1f30daa591caeb6b938e182844491636487a815d73510739a0da0da8a9190cdeeac7e3ee93e80410722539d542e7cee0353350697d9 WHIRLPOOL 4497825ba0e538292f265ef217559d1bd0f8c877ad5709f5736a83d8d5a932ef894b6727a81f0c8af7d0b7adbb94f9a1adec785c49b12aa9ccb33de220f025cc
+AUX connectagram-1.2.1-gentoo.patch 2551 SHA256 7f3a31432ff51b7a02a2308bb4405a1d7de2030999a9a7e173c3837556920c73 SHA512 a95856c1f76670d1ea1e86a34f8d05ed7621479d6268068df46c7b3882dff633e7a8236f01c9ad3215d0f6e89a5702d2ece106be3db971431b129752be272804 WHIRLPOOL 9a65158ad0a1105158b140257bc863e180ae68ae50c80c473ff83904da28a03ba988cd6bcd6d65c07994a2399ee7314a90b9d427670f55ff96ee49b911bb19dc
 DIST connectagram-1.0.1-src.tar.bz2 263808 SHA256 6d3696b69f09eda26cdd2a42fe4d91de3effc4757c68f5109b19c1d4d6510e37 SHA512 747a34c7f42a7ac4b09178bc10d17124429d06d257b9e6f25cf800ecb2c06037611871c45bc67c17eda690ea77bba7c59661d1730a3bd01fb0aa0ccd82244aeb WHIRLPOOL 70b126c2b7e0a8d96f6b447348196549163bc90a47049bde2801bbe06feddfdc3ecd43ae688b333719a8292984ca0a10813fe7d94aa19ccfdc03530e97550a58
 DIST connectagram-1.1.2-src.tar.bz2 1415066 SHA256 06e03fed6d7651383cf8d771d0e89e09bb149c0aef431c1374296e62319087c4 SHA512 1dcc7b5a7992ed8656614ca9d86207574d0cd4557a02a0688b1572740d3f3f496f587705647dac9bc7c616491ee0800ca925aa5218769159da58f24f696dddda WHIRLPOOL b33b5644ef7f3b5b5c352c31ebde5515b7edb3bb5e42bc77cd9261d28284c2e81e097f98b54ac5bf6cce7fe2ff3cf6df6bd82d8af85f388feced0fcf37d75f58
+DIST connectagram-1.2.1-src.tar.bz2 1632426 SHA256 0a559243a8d970bb79c6791214be879269fc073b5eaec6aa55fb60be82f140bb SHA512 0266af5680e7f76d517f60934afc6115c1118832fef237803b1b3d8c0fb785e5c312d585b099f24f4c476f124ca9722868a159dc4d1a9a8a695e9cdfa4f9c1c6 WHIRLPOOL 3862fee2f4a87c6d7a78bbbaa64713b640df2c0020dfb542eb5655b77c687ca105380ac96c29dc18a324ad90f8942d503044b25971d64c7862925290eccafdca
 EBUILD connectagram-1.0.1-r1.ebuild 1026 SHA256 d011945734adcc25263b2077da4780fe93d44aeddfa9b1218973e156c2c7b013 SHA512 1ea721ea99bcd2ae00bc85a281824b319cd288457a0956a6b4f903a3f8221369fd6f818ba265c1dd1170b4b84a87ac11a2853c0a1de1554b5b2e50c7b8d88c1e WHIRLPOOL ec3738986009b72bc97eaf8595dec194e40193c9958c68e6f56ed1ae9892a7063c9d7700ad30d8690c7468415516b84a8a7402c4f930b616c3ff94aebaf2dfc7
 EBUILD connectagram-1.1.2.ebuild 1080 SHA256 a83b86f5ee6d22374de0990e58de02acc6c29ef02c1890555c2c643cc433ce31 SHA512 a641fb462fd8e01dfd5738777ab31dd48f28dfcbbd103f4d7f9a4c2145d36e272fa846aa1b137a7e10fc1b4058392a9afd4b4f7ec67566aab6bee5146212bc20 WHIRLPOOL fea5c30a841feabd7106598a7397fd9e418e5fdd8830c06284d77cac77ad13aaa8cd007dd5cc4f492639c360d132d7234646397727d3a4b6ecaf16049fca2fb5
-MISC ChangeLog 1860 SHA256 49fb80d3f3a00d9daec8b8ffa911dd7a2bfc949b9ed6cf19a492397d4bb3f3c6 SHA512 cf4ec3153178ad89591082644dbd4b54a8019b2f90a108089d8ca15413a7f7d80f155f841d4437e3a19832c2d3d791613d2dd6bbe7744449fc9a8583e9b18277 WHIRLPOOL fbe32aabb6ce807fd9278edf4f2eed71fce6b58b1829b4499cef5864ed8bffb1de5d985be75e60c9ebdd3c03b4aeaf2f9488f5b9be39f499687489081e8f2431
+EBUILD connectagram-1.2.1.ebuild 1150 SHA256 ccb79bc8bc559c69c2bdb972ebccb6ff06ebfdcb051a44cd9e4dc3b45d03304c SHA512 c88fb7a581da865d7d64d8e9e0a443a981cb66333bc4b29cf54b596125ac93eafd3e113d932bc943d38ad31b3b5d34367a0de374fc41eb3b8313d2552c237b31 WHIRLPOOL 36f1894d3780ab747eb879684d33ceca34f771ca28f3a45766666fa51fb887ce80151732b1843a20e00d404dec623fa39d4cd8d21d3ee77b8130f970c6e62e6c
+MISC ChangeLog 2077 SHA256 e2d6cdb9125f6e89c3326dd2d4519672ca0680547cf53b124cb3a2cbb8bceadd SHA512 3268bd2502b16d005899df7e1a75964a87458f522cf7eb4504e57a90550ad4887cc84f8bf3147d81ccc0705dc7f58543644e59884e342cd991c150ecc4f193ed WHIRLPOOL c992452fc4d99d41608970d364c0e119a9b2210e59de76a064d369c312240a39b19b12defdc1152973a64879cd62d477c79745a45e9b2170a87ca01ad3357786
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada

diff --git a/games-puzzle/connectagram/connectagram-1.2.1.ebuild b/games-puzzle/connectagram/connectagram-1.2.1.ebuild
new file mode 100644 (file)
index 0000000..25f3cd0
--- /dev/null
+++ b/games-puzzle/connectagram/connectagram-1.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/connectagram-1.2.1.ebuild,v 1.1 2015/02/08 07:32:12 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils gnome2-utils qmake-utils games
+
+DESCRIPTION="A word unscrambling game"
+HOMEPAGE="http://gottcode.org/connectagram/"
+SRC_URI="http://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() {
+       epatch "${FILESDIR}"/${P}-gentoo.patch
+
+       sed -i \
+               -e "s#@GAMES_BINDIR@#${GAMES_BINDIR}#" \
+               -e "s#@GAMES_DATADIR@#${GAMES_DATADIR}#" \
+               ${PN}.pro src/{locale_dialog,new_game_dialog,wordlist}.cpp || die
+}
+
+src_configure() {
+       eqmake5 connectagram.pro
+}
+
+src_install() {
+       emake INSTALL_ROOT="${D}" install
+       dodoc CREDITS ChangeLog NEWS README
+       prepgamesdirs
+}
+
+pkg_preinst() {
+       gnome2_icon_savelist
+       games_pkg_preinst
+}
+
+pkg_postinst() {
+       gnome2_icon_cache_update
+       games_pkg_postinst
+}
+
+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
new file mode 100644 (file)
index 0000000..b02dfef
--- /dev/null
+++ b/games-puzzle/connectagram/files/connectagram-1.2.1-gentoo.patch
@@ -0,0 +1,76 @@
+--- 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;
+       }