version bump wrt #461390

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

3 files changed, 141 insertions, 1 deletions

diff --git a/games-puzzle/connectagram/ChangeLog b/games-puzzle/connectagram/ChangeLog
index 7e248d5ebc07..8a5e53e27c84 100644
--- a/games-puzzle/connectagram/ChangeLog
+++ b/games-puzzle/connectagram/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-puzzle/connectagram
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/ChangeLog,v 1.5 2013/03/02 21:18:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/ChangeLog,v 1.6 2013/03/11 18:57:18 hasufell Exp $
+
+*connectagram-1.1.0 (11 Mar 2013)
+
+  11 Mar 2013; Julian Ospald <hasufell@gentoo.org> +connectagram-1.1.0.ebuild,
+  +files/connectagram-1.1.0-gentoo.patch:
+  version bump wrt #461390
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org>
   connectagram-1.0.1-r1.ebuild:
diff --git a/games-puzzle/connectagram/connectagram-1.1.0.ebuild b/games-puzzle/connectagram/connectagram-1.1.0.ebuild
new file mode 100644
index 000000000000..adf5c4ee6f51
--- /dev/null
+++ b/games-puzzle/connectagram/connectagram-1.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/connectagram-1.1.0.ebuild,v 1.1 2013/03/11 18:57:18 hasufell Exp $
+
+EAPI=5
+inherit eutils gnome2-utils qt4-r2 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-4.6:4
+	>=dev-qt/qtgui-4.6:4"
+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() {
+	qt4-r2_src_configure
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc ChangeLog
+	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.1.0-gentoo.patch b/games-puzzle/connectagram/files/connectagram-1.1.0-gentoo.patch
new file mode 100644
index 000000000000..0c1937eb98aa
--- /dev/null
+++ b/games-puzzle/connectagram/files/connectagram-1.1.0-gentoo.patch
@@ -0,0 +1,82 @@
+--- connectagram-1.1.0/connectagram.pro
++++ connectagram-1.1.0/connectagram.pro
+@@ -70,28 +70,28 @@
+ 
+ unix: !macx {
+ 	isEmpty(PREFIX) {
+-		PREFIX = /usr/local
++		PREFIX = /usr
+ 	}
+ 	isEmpty(BINDIR) {
+-		BINDIR = bin
++		BINDIR = @GAMES_BINDIR@
+ 	}
+ 
+-	target.path = $$PREFIX/$$BINDIR/
++	target.path = @GAMES_BINDIR@/
+ 
+-	data.files = share/connectagram/data
+-	data.path = $$PREFIX/share/connectagram/
++	data.files = data
++	data.path = @GAMES_DATADIR@/connectagram/
+ 
+ 	pixmap.files = icons/connectagram.xpm
+ 	pixmap.path = $$PREFIX/share/pixmaps/
+ 
+-	icon.files = icons/icons/hicolor/*
++	icon.files = icons/hicolor/*
+ 	icon.path = $$PREFIX/share/icons/hicolor/
+ 
+ 	desktop.files = icons/connectagram.desktop
+ 	desktop.path = $$PREFIX/share/applications/
+ 
+ 	qm.files = translations/*.qm
+-	qm.path = $$PREFIX/share/connectagram/translations
++	qm.path = @GAMES_DATADIR@/connectagram/translations/
+ 
+ 	INSTALLS += target pixmap icon desktop data qm
+ }
+--- connectagram-1.1.0/src/wordlist.cpp
++++ connectagram-1.1.0/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";
+ 		}
+ 	}
+@@ -110,7 +110,7 @@
+ 
+ WordList::WordListData::WordListData(const QString& language) {
+ 	// 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;
+ 	}
+--- connectagram-1.1.0/src/new_game_dialog.cpp
++++ connectagram-1.1.0/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);
+ 	foreach (const QString& language, languages) {
+ 		m_languages_box->addItem(LocaleDialog::languageName(language), language);
+ 	}
+--- connectagram-1.1.0/src/locale_dialog.cpp
++++ connectagram-1.1.0/src/locale_dialog.cpp
+@@ -87,6 +87,7 @@
+ 		paths.append(appdir);
+ 		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
+ 		paths.append(appdir + "/../Resources");
++		paths.append("@GAMES_DATADIR@/connectagram");
+ 	}
+ 	foreach (const QString& path, paths) {
+ 		if (QFile::exists(path + "/translations/")) {