old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 5 insertions, 129 deletions

diff --git a/games-puzzle/connectagram/ChangeLog b/games-puzzle/connectagram/ChangeLog
index 0a5def9e4c15..b86d307d9bce 100644
--- a/games-puzzle/connectagram/ChangeLog
+++ b/games-puzzle/connectagram/ChangeLog
@@ -1,6 +1,10 @@
 # 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.9 2014/08/26 05:37:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/ChangeLog,v 1.10 2014/08/29 17:16:14 mr_bones_ Exp $
+
+  29 Aug 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -connectagram-1.1.1.ebuild, -files/connectagram-1.1.1-gentoo.patch:
+  old
 
 *connectagram-1.1.2 (26 Aug 2014)
 
diff --git a/games-puzzle/connectagram/connectagram-1.1.1.ebuild b/games-puzzle/connectagram/connectagram-1.1.1.ebuild
deleted file mode 100644
index 4977c20b90cf..000000000000
--- a/games-puzzle/connectagram/connectagram-1.1.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/connectagram-1.1.1.ebuild,v 1.1 2014/02/05 07:14:44 mr_bones_ 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.1-gentoo.patch b/games-puzzle/connectagram/files/connectagram-1.1.1-gentoo.patch
deleted file mode 100644
index 8aae286bd427..000000000000
--- a/games-puzzle/connectagram/files/connectagram-1.1.1-gentoo.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- connectagram-1.1.1.orig/connectagram.pro
-+++ connectagram-1.1.1/connectagram.pro
-@@ -70,16 +70,16 @@
- 
- 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 = data
--	data.path = $$PREFIX/share/connectagram/
-+	data.path = @GAMES_DATADIR@/connectagram/
- 
- 	pixmap.files = icons/connectagram.xpm
- 	pixmap.path = $$PREFIX/share/pixmaps/
-@@ -91,7 +91,7 @@
- 	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.1.orig/src/locale_dialog.cpp
-+++ connectagram-1.1.1/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/")) {
---- connectagram-1.1.1.orig/src/new_game_dialog.cpp
-+++ connectagram-1.1.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);
- 	foreach (const QString& language, languages) {
- 		m_languages_box->addItem(LocaleDialog::languageName(language), language);
- 	}
---- connectagram-1.1.1.orig/src/wordlist.cpp
-+++ connectagram-1.1.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;
- 	}