old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

4 files changed, 6 insertions, 139 deletions

diff --git a/games-puzzle/connectagram/ChangeLog b/games-puzzle/connectagram/ChangeLog
index dbf02f3ce813..8a11ccc6ce1d 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.7 2014/02/05 07:14:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/ChangeLog,v 1.8 2014/08/25 22:19:53 mr_bones_ Exp $
+
+  25 Aug 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -connectagram-1.1.0.ebuild, -files/connectagram-1.1.0-gentoo.patch:
+  old
 
 *connectagram-1.1.1 (05 Feb 2014)
 
diff --git a/games-puzzle/connectagram/Manifest b/games-puzzle/connectagram/Manifest
index 2091e1d35812..255bac298ed0 100644
--- a/games-puzzle/connectagram/Manifest
+++ b/games-puzzle/connectagram/Manifest
@@ -1,10 +1,7 @@
-AUX connectagram-1.1.0-gentoo.patch 2740 SHA256 9e45d797cebb202ce35e4b4c6bfa0bbb27d65e1bf3939628237ac75eeaff52dc SHA512 a7c76eb23dbeed0b74bf4abb85a85184fbbfc22cb9767f27dfa97a7cd97e4eac94992bbb0dede8b60b039cf1b2538206f1946456e311c96fc3adb02b40df0c7a WHIRLPOOL e6dc580df9aa824471d3a7993b7df24358a8abb0fbf1d8c680905c71b22a844823a052f337c7bb1f997521946c0d1657ad10f064d2860f6d736a3aa1ff08ec02
 AUX connectagram-1.1.1-gentoo.patch 2536 SHA256 06756eaf8a8ed0ee2981bbfc646786c73cc3c588dc338ead8ae116174d6c37e8 SHA512 d0bcda5bcbe66d6664d7e1f30daa591caeb6b938e182844491636487a815d73510739a0da0da8a9190cdeeac7e3ee93e80410722539d542e7cee0353350697d9 WHIRLPOOL 4497825ba0e538292f265ef217559d1bd0f8c877ad5709f5736a83d8d5a932ef894b6727a81f0c8af7d0b7adbb94f9a1adec785c49b12aa9ccb33de220f025cc
 DIST connectagram-1.0.1-src.tar.bz2 263808 SHA256 6d3696b69f09eda26cdd2a42fe4d91de3effc4757c68f5109b19c1d4d6510e37 SHA512 747a34c7f42a7ac4b09178bc10d17124429d06d257b9e6f25cf800ecb2c06037611871c45bc67c17eda690ea77bba7c59661d1730a3bd01fb0aa0ccd82244aeb WHIRLPOOL 70b126c2b7e0a8d96f6b447348196549163bc90a47049bde2801bbe06feddfdc3ecd43ae688b333719a8292984ca0a10813fe7d94aa19ccfdc03530e97550a58
-DIST connectagram-1.1.0-src.tar.bz2 780285 SHA256 15ee5ceda89ee378377d8eb3a13e7335c8535f10d0c3740ee05692fbd7ea6adc SHA512 751c1ec7eb30e75da0c2ef2d8ab094011c11b63007d2b8c8c8654a18fc81a5c2ecf17755d0b07738ce620932915b919b00bf74aecebebf8d6904c168aab719a3 WHIRLPOOL edf2ca773c415e94513450c0a8d1ab0e83d4050354555e4045b1dbe3a8a47426885050120f6c527de269080827dcd9a1be85cbdc7ae3423711b86bd28e3e5b9b
 DIST connectagram-1.1.1-src.tar.bz2 787725 SHA256 734c610a59d043a13edb6d7301cc9e72704663128cd95370ba22ae12da4796fb SHA512 ee9e1ab0a3b8d2f5fdbd6eebebc7c4859dc21a05154bcf3436fd79b677341da514f94289553a00da458c35df83b52a0db966c9e3ba977184211daeb5f7b872f9 WHIRLPOOL 6f38a0c36ffb21fb74c78790785868d93a7f411f67bf71bc99632f5aac788ac91de9ba2fef0f360f4994abdcd2e49caed5712086747665fbf1fb40e65d131697
 EBUILD connectagram-1.0.1-r1.ebuild 1026 SHA256 d011945734adcc25263b2077da4780fe93d44aeddfa9b1218973e156c2c7b013 SHA512 1ea721ea99bcd2ae00bc85a281824b319cd288457a0956a6b4f903a3f8221369fd6f818ba265c1dd1170b4b84a87ac11a2853c0a1de1554b5b2e50c7b8d88c1e WHIRLPOOL ec3738986009b72bc97eaf8595dec194e40193c9958c68e6f56ed1ae9892a7063c9d7700ad30d8690c7468415516b84a8a7402c4f930b616c3ff94aebaf2dfc7
-EBUILD connectagram-1.1.0.ebuild 1079 SHA256 39c7d25a6884090de629935c4db534f78ef70fd7bb8686f8598d8bc17c39face SHA512 fcaebb86531d505c3cff40f164dfcceaa7a16544103cd4ad06b8829c67f17ac51b1c99c75a7c40cafc92863f353fb856e2ccbba6f6a8a9019253fe0152e2c5e7 WHIRLPOOL 0693c17623ce3748a22f6a2b8a1f5b7dcadb0aa22c3a95bd8b3562bd3b3229f8ddd489ff3875bdd1fb4f64c117defff42d11d69f8a1b2b3dc69a38756895eae2
 EBUILD connectagram-1.1.1.ebuild 1080 SHA256 453e0bfe27b145cbb6b7b3512952d33b5246a079875d248c0752c8cd0a2632ed SHA512 b06aeed13544a0ff0b45748ee4ab0c462add81d57acb6caff065df454f6b8df5c9169711e30e1d5996ff431119752f91295dd3dc59a3433b43cc68378813609b WHIRLPOOL f563204120509673a23e46a7834ea9cbaf91d37f41255cc2125b656b101179960a5e1c6c776b84f5800e18725b923e6db7a4f3518a09c37c2b9a037245a6f71f
-MISC ChangeLog 1419 SHA256 401166981839ab119f86b741260e71cce89dc63f0a02533bc752820e985e3df1 SHA512 c25e8ee664c73e67f4470b53170df3aed640e33f8b48799683f1e31a192098861d9c8e34e2755ebafca0cf400f3ad5bb50aa82bb5d46383124ccac81ca091191 WHIRLPOOL 978957075ada6ceb8e76dc3ec3199856fde082d1687a7e5efe095346af7638e58f667bececf2d3a285e0b18959cba386f8d586f55f257d18f90088bc26e555fa
+MISC ChangeLog 1551 SHA256 32c1c97da667c20866b43990e6d7e641a15117b6010e310059bb737c182d8c9f SHA512 4489cd676e1caa760c4c43552e91fe04e51fa3478c912406538fd0ff23891712876620f58401795544bacc278c8b32fe38615f23e847dec5ae77e244aaf079bd WHIRLPOOL 80c27b1ec647616544e3da61d6c5031ce68cc9eeee19bf408df952abfa081a72a173679161f451db6ae4d43f0cf072f490d80e18f4b121d7c6f8cded661b2b09
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-puzzle/connectagram/connectagram-1.1.0.ebuild b/games-puzzle/connectagram/connectagram-1.1.0.ebuild
deleted file mode 100644
index adf5c4ee6f51..000000000000
--- a/games-puzzle/connectagram/connectagram-1.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
deleted file mode 100644
index 0c1937eb98aa..000000000000
--- a/games-puzzle/connectagram/files/connectagram-1.1.0-gentoo.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- 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/")) {